proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

3017 files changed, 119786 insertions, 0 deletions

diff --git a/dev-java/absolutelayout/Manifest b/dev-java/absolutelayout/Manifest
new file mode 100644
index 000000000000..afacb66b7121
--- /dev/null
+++ b/dev-java/absolutelayout/Manifest
@@ -0,0 +1 @@
+DIST absolutelayout-6.7_beta.tar.bz2 3359 SHA256 2abee4256899275124026c128a78a61045e1aa8a8eb16338cc439b1f7b8ac777 SHA512 2e14300fca85d2d81533147de4dbfa13660749a46134d9a80facd992948ed18147e02fcf2ca3590154823342201bd99f6e84eb251176ae1906c09477718a36e3 WHIRLPOOL 56930c4d46c7f3abe90548cdcd66bb92e931a088dbe594016d201a4b6aa3648ec24414d6f537546ed21e3459fb5a3515ba5d9e7a72f16bc402cd5e7b519ab957
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..5882af37c8b0
--- /dev/null
+++ b/dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..604e0a4238bb
--- /dev/null
+++ b/dev-java/absolutelayout/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/annogen/Manifest b/dev-java/annogen/Manifest
new file mode 100644
index 000000000000..91ba65df251a
--- /dev/null
+++ b/dev-java/annogen/Manifest
@@ -0,0 +1 @@
+DIST annogen-0.1.0.zip 1008931 SHA256 60cf2bed2bc90d366b2c8ad9f83cc4f4a8b205298bdf55c85fadcc4cd4e05246 SHA512 f5c4eeb92ef8c87874df6619ef701b99dace01bd3ebc87f201ee3ab523fe612b6d143da2646c280d4831bc8e3051887514aa06b8bad6928b68ddd6cd6357fa16 WHIRLPOOL 02c7bae1a7f06d6348bcf060c1e81896cc6e2861c2066323dd4a0716f8413321d8a4248040ab2b9924ca383022f06d66af79c408596ef19c002becbd9992e802
diff --git a/dev-java/annogen/annogen-0.1.0.ebuild b/dev-java/annogen/annogen-0.1.0.ebuild
new file mode 100644
index 000000000000..d03f59edc70a
--- /dev/null
+++ b/dev-java/annogen/annogen-0.1.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A tool which helps you work with JSR175 annotations"
+HOMEPAGE="http://annogen.codehaus.org/"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+
+CDEPEND="java-virtuals/stax-api:0
+	java-virtuals/jdk-with-com-sun:0
+	dev-java/ant-core:0
+	dev-java/qdox:1.6"
+
+RDEPEND=">=virtual/jdk-1.6
+		${CDEPEND}"
+
+DEPEND=">=virtual/jre-1.6
+		app-arch/unzip
+		${CDEPEND}"
+
+S="${WORKDIR}"
+
+# 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
+)
+
+src_unpack() {
+	default
+	unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
+}
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	mkdir "${S}"/classes || die
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}/src.list" || die
+
+	ejavac -d "${S}"/classes \
+		-classpath $(java-pkg_getjars stax-api,qdox-1.6,ant-core):$(java-config --tools) \
+		"@${T}/src.list"
+
+	cd "${S}"/classes || die
+	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	# For if this is ever needed:
+	# java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc org
+	use examples && java-pkg_doexamples "examples"
+}
diff --git a/dev-java/annogen/metadata.xml b/dev-java/annogen/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/annogen/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-antlr/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.2.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.2.ebuild
new file mode 100644
index 000000000000..56e9bec8f5ca
--- /dev/null
+++ b/dev-java/ant-antlr/ant-antlr-1.9.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for Antlr"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-java/antlr-2.7.5-r3:0[java]"
+
+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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-antlr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -0,0 +1,2 @@
+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
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..754013fa4bd1
--- /dev/null
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="bcel"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-apache-bcel/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -0,0 +1,2 @@
+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
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..8c70ce17ee59
--- /dev/null
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="bsf-2.3"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-apache-bsf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -0,0 +1,2 @@
+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
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..0d8b1507919d
--- /dev/null
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="log4j"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-apache-log4j/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-apache-oro/Manifest
@@ -0,0 +1,2 @@
+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
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..2bca7faeab73
--- /dev/null
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="jakarta-oro-2.0"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-apache-oro/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -0,0 +1,2 @@
+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
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..bfd291c9b537
--- /dev/null
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="jakarta-regexp-1.4"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-apache-regexp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -0,0 +1,2 @@
+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
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..0c02493b4310
--- /dev/null
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="xml-commons-resolver"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-apache-resolver/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -0,0 +1,2 @@
+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
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..db70288cb155
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="xalan"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/ant-apache-xalan2-1.9.2.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild
new file mode 100644
index 000000000000..e19cd5621198
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="xalan"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/xalan"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	ant-tasks_src_unpack all
+}
diff --git a/dev-java/ant-apache-xalan2/metadata.xml b/dev-java/ant-apache-xalan2/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-commons-logging/Manifest
@@ -0,0 +1,2 @@
+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
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..25fb894689dc
--- /dev/null
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-commons-logging/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-commons-net/Manifest
@@ -0,0 +1,2 @@
+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
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..7d0b23b7e42f
--- /dev/null
+++ b/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-commons-net/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
new file mode 100644
index 000000000000..5b36966779dc
--- /dev/null
+++ b/dev-java/ant-contrib/Manifest
@@ -0,0 +1,2 @@
+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
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..1604cd90ba45
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A collection of tasks (and at one point maybe types and other tools) 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 ppc 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-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
new file mode 100644
index 000000000000..2cfb3264a294
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-ivy"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A collection of tasks (and at one point maybe types and other tools) 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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+
+#	test? ( dev-java/ant-junit dev-java/ant-testutil )
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/bcel-5.1:0
+	dev-java/commons-httpclient:3
+	dev-java/xerces:2
+	dev-java/ant-ivy:0
+	>=dev-java/ant-core-1.7.0"
+
+# javatoolkit for cElementTree
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/javatoolkit-0.3.0-r2
+	${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+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"
+}
+
+java_prepare() {
+	epatch "${FILESDIR}/tests-visibility.patch"
+
+	find . -name "*.jar" -print -delete || die
+
+	rewrite_build_xml
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="ant-core,bcel,commons-httpclient-3,xerces-2,ant-ivy"
+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..9452de6d1452
--- /dev/null
+++ b/dev-java/ant-contrib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-core/Manifest
@@ -0,0 +1,2 @@
+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
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..27760106933b
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	http://dev.gentoo.org/~tomwij/files/dist/ant-${PV}-gentoo.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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 "http://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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-core/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
new file mode 100644
index 000000000000..952214bc4e1c
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -0,0 +1,4 @@
+DIST ecjsrc-3.7.2.jar 1366333 SHA256 755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32 WHIRLPOOL 399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
+DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
+DIST ecjsrc-4.4.1.jar 1759152 SHA256 ba3a471d000ae983498a0f398955e2f09d8c1093880c9f37544d47e5460ff82a SHA512 27086c4c6d35a07f38e2c5ae3d34314fcdfe8b03fd1bbd3e652acd10195a0ec4a20b312f4cc0d0e8204b824eb230d1730a2aef9d886896b81f26b93eff1ae2d1 WHIRLPOOL 1b1da40f61ea5b3768e48dd7b9685b9405e35f3b5019acaeae937335f521819743cb7bacd5a7603ea72a20fe1310c6e28fb57d6c64e46b2035b70335029b2937
+DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 WHIRLPOOL 5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild
new file mode 100644
index 000000000000..8f2be6cf7db3
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit java-pkg-2
+
+DMF="R-${PV}-201202080800"
+S="${WORKDIR}"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF/.0}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="3.7"
+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.2.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
new file mode 100644
index 000000000000..d0fba0a6683d
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.1.ebuild
new file mode 100644
index 000000000000..42f622df54b8
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-201409250400"
+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 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.4"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6
+	~dev-java/eclipse-ecj-${PV}
+	>=dev-java/ant-core-1.7"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-4.4"
+
+java_prepare() {
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find -name "*.properties" | xargs jar uvf "${S}/${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.4.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
new file mode 100644
index 000000000000..d96a1f23a6fa
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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/files/ecj-3.7 b/dev-java/ant-eclipse-ecj/files/ecj-3.7
new file mode 100644
index 000000000000..49b17dc92ac9
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-3.7
@@ -0,0 +1,7 @@
+JAVAC="/usr/bin/ecj-3.7"
+PACKAGE="=dev-java/ant-eclipse-ecj-3.7*"
+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-3.7,ant-eclipse-ecj-3.7"
+GENERATION="2"
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/metadata.xml b/dev-java/ant-eclipse-ecj/metadata.xml
new file mode 100644
index 000000000000..f685f4a1f625
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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..05a8defd68cb
--- /dev/null
+++ b/dev-java/ant-ivy/Manifest
@@ -0,0 +1,4 @@
+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
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..dcb06c406c51
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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..dcdf04ebc139
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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..9b482b8a76a7
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0.ebuild
new file mode 100644
index 000000000000..643bdd6a798f
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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"
+
+# There may be additional optional dependencies (commons-logging, commons-lang...)
+COMMON_DEP="
+	dev-java/ant-core:0
+	dev-java/bcpg:0
+	dev-java/bcpkix:0
+	dev-java/bcprov: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}"
+
+java_prepare() {
+	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
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="ant-core,bcpg,bcpkix,bcprov,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/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..e97bb1c449fb
--- /dev/null
+++ b/dev-java/ant-ivy/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-jai/Manifest
@@ -0,0 +1,2 @@
+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
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..1d3d087d7653
--- /dev/null
+++ b/dev-java/ant-jai/ant-jai-1.9.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="sun-jai-bin"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc 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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-jai/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-javamail/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.2-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..e6b511ad56db
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-1.9.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="--virtual oracle-javamail"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/oracle-javamail:0
+	java-virtuals/jaf:0"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	ant-tasks_src_unpack all
+	java-pkg_jar-from --virtual jaf
+}
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.2.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.2.ebuild
new file mode 100644
index 000000000000..8a33236d3d01
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-1.9.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="--virtual javamail"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="java-virtuals/javamail
+	java-virtuals/jaf"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	ant-tasks_src_unpack all
+	java-pkg_jar-from --virtual jaf
+}
diff --git a/dev-java/ant-javamail/metadata.xml b/dev-java/ant-javamail/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/ant-javamail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-jdepend/Manifest
@@ -0,0 +1,2 @@
+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
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..ef849d37c740
--- /dev/null
+++ b/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-jdepend/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-jmf/Manifest
@@ -0,0 +1,2 @@
+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
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..f061fb71913d
--- /dev/null
+++ b/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-jmf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-jsch/Manifest
@@ -0,0 +1,2 @@
+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
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..8928ce20f93c
--- /dev/null
+++ b/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-jsch/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-junit/Manifest
@@ -0,0 +1,2 @@
+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
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..f202b92d6431
--- /dev/null
+++ b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-junit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-junit4/Manifest
@@ -0,0 +1,2 @@
+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
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..8edd055f37a1
--- /dev/null
+++ b/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_JDKVER=1.5
+ANT_TASK_JREVER=1.5
+ANT_TASK_DEPNAME="junit-4"
+
+inherit ant-tasks
+
+KEYWORDS="amd64 ppc 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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-junit4/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-nodeps/Manifest b/dev-java/ant-nodeps/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-nodeps/Manifest
@@ -0,0 +1,2 @@
+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
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..11093dfac280
--- /dev/null
+++ b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-nodeps/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-owanttask/Manifest b/dev-java/ant-owanttask/Manifest
new file mode 100644
index 000000000000..5ed3fa62b8e1
--- /dev/null
+++ b/dev-java/ant-owanttask/Manifest
@@ -0,0 +1 @@
+DIST ow_util_ant_tasks_1.3.2.zip 1170518 SHA256 9269ed0a08fda3407c2ad726a883eddb4f7e6882f162b4ab32d030b39ddcbcfc SHA512 c2ca84d34864b075c39e9699ac1a41c2980615ea6d813d007ee503fe19cfd5c869cdd0f6be27cbfdafc33aa49c32022b99ced2387381fdb6816925957207a603 WHIRLPOOL 558d860692b1fe105484b31a339bb1f8cc80742b50568d1005a5ce90f16c87a5e24832d35a211b98a92a71a9635c792cf310f19773dba3e64434ba98c0bbfe1d
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..d1541235fa08
--- /dev/null
+++ b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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/files/MultipleCopy.java b/dev-java/ant-owanttask/files/MultipleCopy.java
new file mode 100644
index 000000000000..bd6a431bf06c
--- /dev/null
+++ b/dev-java/ant-owanttask/files/MultipleCopy.java
@@ -0,0 +1,12 @@
+package org.objectweb.util.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.Copy;
+
+public class MultipleCopy extends Copy {
+
+	public void execute() throws BuildException {
+		throw new BuildException("MultipleCopy is not compatible with ant >=1.7.0");
+	}
+
+}
diff --git a/dev-java/ant-owanttask/files/ant-owanttask-1.1-classpath.patch b/dev-java/ant-owanttask/files/ant-owanttask-1.1-classpath.patch
new file mode 100644
index 000000000000..cd3d2e0fd42a
--- /dev/null
+++ b/dev-java/ant-owanttask/files/ant-owanttask-1.1-classpath.patch
@@ -0,0 +1,17 @@
+diff -ru owanttask-1.1/build.xml owanttask-1.1-patched/build.xml
+--- owanttask-1.1/build.xml	2004-02-09 03:57:02.000000000 -0500
++++ owanttask-1.1-patched/build.xml	2006-08-05 20:06:03.000000000 -0400
+@@ -3,9 +3,12 @@
+     <property name="out" value="${basedir}/output"/>
+     <property name="out.build" value="${out}/build"/>
+     <property name="out.lib" value="${out}/lib"/>
++    <path id="build.classpath">
++        <fileset dir="lib" includes="*.jar"/>
++    </path>
+ 	<target name="compile">
+ 		<mkdir dir="${out.build}"/>
+-		<javac srcdir="${prj.src}" destdir="${out.build}" debug="on">
++		<javac srcdir="${prj.src}" destdir="${out.build}" debug="on" classpathref="build.classpath">
+ 			<include name="**/*.java"/>
+ 		</javac>
+ 	</target>
diff --git a/dev-java/ant-owanttask/metadata.xml b/dev-java/ant-owanttask/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/ant-owanttask/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-swing/Manifest
@@ -0,0 +1,2 @@
+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
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..b80540dd3276
--- /dev/null
+++ b/dev-java/ant-swing/ant-swing-1.9.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# No extra dependencies are needed.
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for Swing"
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-swing/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-testutil/Manifest
@@ -0,0 +1,2 @@
+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
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..676c63e31668
--- /dev/null
+++ b/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional test utility classes"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-testutil/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ant-trax/Manifest b/dev-java/ant-trax/Manifest
new file mode 100644
index 000000000000..fc8a10d97263
--- /dev/null
+++ b/dev-java/ant-trax/Manifest
@@ -0,0 +1,2 @@
+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
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..a2b6ee082bb0
--- /dev/null
+++ b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..7303cef96964
--- /dev/null
+++ b/dev-java/ant-trax/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
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..7ad645263e2a
--- /dev/null
+++ b/dev-java/ant/ant-1.9.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..6cfffe619d55
--- /dev/null
+++ b/dev-java/ant/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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/antenna/Manifest b/dev-java/antenna/Manifest
new file mode 100644
index 000000000000..a6ae0ae3a18e
--- /dev/null
+++ b/dev-java/antenna/Manifest
@@ -0,0 +1 @@
+DIST antenna-src-1.0.2.zip 1502020 SHA256 a6a15d257ae2af8805cf002e51675246b119cb34f23bf3cc15398acaca0bcfe8 SHA512 38ff589b82f2298e17846b2437981ffe549e35129624b36f439bfeb9943fe5a6577ef2ec4aba7314f59c8c4f30fb8c45cd6e3c675af0196ac4248a4d256e48d7 WHIRLPOOL e1d958ac110e5f97caad2160df3e6cd019640a5ed36697f373115b8850cdbd8ac5d070860a5dea476d31baf6bd484a13282b5aba9c1380a0805a888e23b095d5
diff --git a/dev-java/antenna/antenna-1.0.2-r1.ebuild b/dev-java/antenna/antenna-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..17a28ab6e2f7
--- /dev/null
+++ b/dev-java/antenna/antenna-1.0.2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_P=${DISTDIR}/${PN}-src-${PV}.zip
+
+DESCRIPTION="Ant task for J2ME"
+HOMEPAGE="http://antenna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/antenna/${PN}-src-${PV}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/ant-core:0
+	dev-java/antlr:0
+	java-virtuals/servlet-api:2.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	default
+	unzip -n lib/preprocessor-src-1.1.zip
+}
+
+java_prepare() {
+	rm -rf lib
+	java-ant_bsfix_one build.xml
+	java-ant_rewrite-classpath build.xml
+}
+
+src_compile() {
+	local cp="ant-core,antlr,servlet-api-2.4"
+	EANT_GENTOO_CLASSPATH="${cp}" \
+		EANT_BUILD_TARGET="init compile package" \
+		EANT_DOC_TARGET="" java-pkg-2_src_compile
+	if use doc; then
+		javadoc -encoding latin1 -d api $(find src -name "*.java") \
+			-classpath $(java-pkg_getjars "${cp}") \
+			|| die "javadoc failed"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar dist/${PN}-bin-${PV}.jar
+	java-pkg_register-ant-task
+
+	if use doc; then
+		java-pkg_dohtml doc/*
+		java-pkg_dojavadoc api
+	fi
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples samples
+}
diff --git a/dev-java/antenna/antenna-1.0.2-r2.ebuild b/dev-java/antenna/antenna-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..4765b98f69ba
--- /dev/null
+++ b/dev-java/antenna/antenna-1.0.2-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_P=${DISTDIR}/${PN}-src-${PV}.zip
+
+DESCRIPTION="Ant task for J2ME"
+HOMEPAGE="http://antenna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/antenna/${PN}-src-${PV}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/ant-core:0
+	dev-java/antlr:0
+	java-virtuals/servlet-api:3.0"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+JAVA_PKG_BSFIX="off"
+
+java_prepare() {
+	unzip -n lib/preprocessor-src-1.1.zip || die "can't unzip preprocessor-src-1.1.zip"
+	rm -rf lib || die "can't remove lib directory"
+
+	java-ant_bsfix_one build.xml
+	java-ant_rewrite-classpath build.xml
+}
+
+src_compile() {
+	local cp="ant-core,antlr,servlet-api-3.0"
+
+	EANT_GENTOO_CLASSPATH="${cp}" \
+		EANT_BUILD_TARGET="init compile package" \
+		EANT_DOC_TARGET="" java-pkg-2_src_compile
+
+	if use doc; then
+		javadoc -encoding latin1 -d api $(find src -name "*.java") \
+			-classpath $(java-pkg_getjars "${cp}") \
+			|| die "javadoc failed"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar dist/${PN}-bin-${PV}.jar
+	java-pkg_register-ant-task
+
+	if use doc; then
+		java-pkg_dohtml doc/*
+		java-pkg_dojavadoc api
+	fi
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples samples
+}
diff --git a/dev-java/antenna/files/antenna-0.9.13-ant.patch b/dev-java/antenna/files/antenna-0.9.13-ant.patch
new file mode 100644
index 000000000000..cf548f9e147c
--- /dev/null
+++ b/dev-java/antenna/files/antenna-0.9.13-ant.patch
@@ -0,0 +1,107 @@
+diff -ru antenna/build.xml antenna-patched/build.xml
+--- antenna/build.xml	2004-08-29 17:04:24.000000000 -0400
++++ antenna-patched/build.xml	2005-08-07 15:33:08.000000000 -0400
+@@ -1,53 +1,69 @@
+ <?xml version="1.0"?>

+ 

+ <project name="antenna" default="all" basedir=".">

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

++

++	<property name="classpath.servlet" value="set in build.properties"/>

++	<property name="project.version" value="set in build.properties" />

++	<property name="project.name" value="set in build.properties" />

++

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

++	<property name="build.javadoc" value="build/doc/api"/>

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

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

++	<property name="project.src.zip" value="${project.name}-src-${project.version}.zip"/>

++	<property name="project.jar" value="${project.name}-bin-${project.version}.jar"/>

+ 

+-	<property name="antenna.servlet" value="c:/Java/tomcat-5.0.25/common/lib/servlet-api.jar" />

+-	<property name="antenna.classes" value="tmpclasses" />

+-	<property name="antenna.version" value="0.9.13" />

+ 	

+ 	<target name="init">

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

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

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

+ 	</target>

+ 

+-	<target name="compile">

+-		<javac srcdir="src" debug="true" destdir="${antenna.classes}" classpath="${ant.home}/lib/ant.jar;${antenna.servlet}" />

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

++		<javac srcdir="${src}" debug="true" destdir="${build.classes}" classpath="${classpath.servlet}" />

+ 	</target>

+ 

+-	<target name="package">

+-

+-		<mkdir dir="dist" />

+-		<jar jarfile="dist/antenna-bin-${antenna.version}.jar">

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

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

++		<jar jarfile="${dist}/${project.jar}">

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

+ 				<include name="**/*.class" />

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

+ 			</fileset>

+ 

+ 			<fileset dir="res" />

+ 		</jar>

++	</target>

+ 

+-		<zip zipfile="dist/antenna-src-${antenna.version}.zip">

++	<target name="src-release">

++		<zip zipfile="${dist}/${project.src.zip}">

+ 			<fileset dir=".">

+-				<include name="src/**/*.java" />

++				<include name="${src}/**/*.java" />

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

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

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

+ 				<include name="samples/**/build.xml" />

+ 				<include name="LICENSE" />

+-				<include name="build.xml" />

++				<include name="build.*" />

+ 			</fileset>

+-

+ 		</zip>

+ 	</target>

++	

++	<target name="package" depends="jar,src-release"/>

+ 

+-	<target name="deploy">

+-		<copy file="dist/antenna-bin-${antenna.version}.jar" tofile="${ant.home}/lib/antenna.jar" />

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

++		<copy file="${dist}/${project.jar}" tofile="${ant.home}/lib/${project.name}.jar" />

++	</target>

++

++	<target name="javadoc">

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

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

++		</javadoc>

+ 	</target>

+ 

+ 	<target name="clean">

+-		<delete dir="${antenna.classes}" failonerror="false" />

+-		<delete file="dist/antenna-bin-${antenna.version}.jar" failonerror="false" />

+-		<delete file="dist/antenna-src-${antenna.version}.zip" failonerror="false" />

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

++		<delete dir="${dist}" failonerror="false"/>

+ 		<delete includeEmptyDirs="true">

+ 			<fileset dir="samples">

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

+@@ -60,11 +76,7 @@
+ 		</delete>

+ 	</target>

+ 

+-	<target name="done" depends="">

+-		<delete dir="${antenna.classes}" failonerror="false" />

+-	</target>

+-

+-	<!--target name="all" depends="clean,init,compile,package,done,deploy" /-->

+-    <target name="all" depends="clean,init,compile,package,done" />

++	<!--target name="all" depends="clean,init,compile,package,deploy" /-->

++    <target name="all" depends="clean,init,compile,package" />

+ 

+ </project>

diff --git a/dev-java/antenna/metadata.xml b/dev-java/antenna/metadata.xml
new file mode 100644
index 000000000000..b426ce1c3377
--- /dev/null
+++ b/dev-java/antenna/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">antenna</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
new file mode 100644
index 000000000000..9bce4f8f37ab
--- /dev/null
+++ b/dev-java/antlr/Manifest
@@ -0,0 +1,6 @@
+DIST 4.4.zip 1107695 SHA256 68a79e4accae4dfd9d45a8292fe9b2812c6a3ec1d903412e205a06ead083b8ae SHA512 5e4a92b3d0bb8583f52cbed554ef68909412cd3e9de7589870eead3359a6f5efb492029c3bcce50d6a19a220c83c809824dbde3d08a6b39a42e9fbe3eaef8ce4 WHIRLPOOL 80cf60f9679cd5d3cb512b2e1a9c4987d34fb7994a976b42c95351fb4670944343dd8b8cf0e1738b94cc177122dcf635ee5d1a262290f6b89a8e38d06adc2077
+DIST antlr-2.7.7.tar.gz 1816180 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9 SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d WHIRLPOOL def5ac0ddfe5a65f9f7d5489d039048c5d630b46cd5626593bd12e9b393d5ec26884f90b013bcdf58511e26abbf06e0d7b3789a11298b017f7e70af2ec8dde4a
+DIST antlr-3.1.3-generated.tar.bz2 47167 SHA256 ed326de0f1f92dd72e8d9644e8eaf59d02b9725b4b5218f5c54e12100f8d05f4 SHA512 4ea01ad0d5fc99607ffa445fb99ae424648b713dca293d05ff4ec064cac0a0fe5073df3834f9b6990e99f3cefc5cdd191a1ee3c3951d97615908b94630070bba WHIRLPOOL 61f7829811251a35528c322952830dc5a6e82e23e36f664af179b41955734e771aaad070298666a15be0f41982dbb8b19955b5967987582c6b666e602384d060
+DIST antlr-3.1.3.tar.gz 10743515 SHA256 1fca0fc7304140807e64ec263a58d93ef1b380cfb6407084e6909f8220bc1039 SHA512 6814b970740bd61e6727f81b1a2fb4249f8f029e756694d852224eee54e0231540f8e23d2fa8f78eef234d6497f5fa1411e76020ffaed737d8c1a5178321a062 WHIRLPOOL 9d9a1caf39595dbb9b300f730091cfa38a12ab10b8a59d58c7bdd9ba4674bce9f49bc21b5b170129216ff9d880dbf5f0bdb5bfe614b003a4ffe948948b5413c9
+DIST antlr-3.5.2-complete-no-st3.jar 1862097 SHA256 46531814ba9739cdf20c6c1789c252d3d95b68932813d79fb8bbfdf8d5840417 SHA512 227f56edfb8d1935fc0f5bd69a730a2230b173f38baa7837b6dac9b4a10c5d4a9b2eb806416b21bed2621bb0b8e0fb98a6f48da2660b326728326f078bc28ea9 WHIRLPOOL 5c5285894e2d4182650a8a573ae83996e1f463d6ce866ddcff43959b16cf1070c3042b21d80c9350865716a6719d15fcd42b7370b4af69b6eca863d26ffcc325
+DIST antlr-4.3-complete.jar 1340431 SHA256 da9afec193edcc4d8080a4897e77e1e2f6a0c0bc265fccb8c44ae10660f7a8f0 SHA512 669cc21ef72ec899509181b1ec77d918fce9dba3db165d9d7429e0058c58a9d716cbf274d7a54b6bd9143d95d9a902d82acfa5bcb5e6c805c4e9fdf90b83349e WHIRLPOOL f665a200850d294ee0f8c3127bb918a9c9625098a97a960afe08b3a3940ba2c2ad54099e34c82fab5058b668a721b3ed5621a85820d0aca0e16af2f81627c723
diff --git a/dev-java/antlr/antlr-2.7.7-r5.ebuild b/dev-java/antlr/antlr-2.7.7-r5.ebuild
new file mode 100644
index 000000000000..dad4b634104d
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r5.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+DISTUTILS_OPTIONAL="y"
+DISTUTILS_SINGLE_IMPL="y"
+DISTUTILS_IN_SOURCE_BUILD="y"
+
+inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
+
+DESCRIPTION="A parser generator for C++, C#, Java, and Python"
+HOMEPAGE="http://www.antlr2.org/"
+SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc debug examples mono +cxx +java python script source static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# TODO do we actually need jdk at runtime?
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	>=virtual/jdk-1.3
+	mono? ( dev-lang/mono )"
+DEPEND="${RDEPEND}
+	script? ( !dev-util/pccts )
+	source? ( app-arch/zip )"
+
+PATCHES=( "${FILESDIR}"/${PV}-{gcc-4.3,gcc-4.4,makefixes}.patch )
+
+make_shared_lib() {
+	local soname=$(basename "${1%.a}")$(get_libname $(get_major_version))
+	einfo "Making ${soname}"
+	[[ ${CHOST} == *-darwin* ]] \
+		&& make_shared_lib_macho "${soname}" "$1" "$2"\
+		|| make_shared_lib_elf "${soname}" "$1" "$2"
+}
+
+make_shared_lib_elf() {
+	local soname=$1 archive=$2 cc=$3
+	${cc:-$(tc-getCXX)} ${LDFLAGS} \
+		-shared -Wl,-soname="${soname}" \
+		-Wl,--whole-archive "${archive}" -Wl,--no-whole-archive \
+		-o $(dirname "${archive}")/"${soname}" || return 1
+}
+
+make_shared_lib_macho() {
+	local soname=$1 archive=$2 cc=$3
+	${cc:-$(tc-getCXX)} ${LDFLAGS} \
+		-dynamiclib -install_name "${EPREFIX}/usr/$(get_libdir)/${soname}" \
+		-force_load "${archive}" \
+		-o $(dirname "${archive}")/"${soname}" || return 1
+}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+
+	sed -i \
+		-e 's/install:.*this-install/install:/' \
+		lib/cpp/src/Makefile.in || die
+
+	use static-libs || epatch "${FILESDIR}/${PV}-static-libs-fix.patch"
+
+	# See bug #468540, this can be removed once bug #469150 is fixed.
+	sed -i 's/tlib lib ar/ar/' configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	# don't ask why, but this is needed for stuff to get built properly
+	# across the various JDKs
+	JAVACFLAGS="+ ${JAVACFLAGS}"
+
+	# mcs for https://bugs.gentoo.org/show_bug.cgi?id=172104
+	CSHARPC="mcs" econf $(use_enable java) \
+		$(use_enable python) \
+		$(use_enable mono csharp) \
+		$(use_enable debug) \
+		$(use_enable examples) \
+		$(use_enable cxx) \
+		--enable-verbose
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS} -fPIC"
+	if use cxx; then
+		pushd lib/cpp/src > /dev/null
+		make_shared_lib libantlr.a || die
+		if use static-libs; then
+			make clean
+			emake
+		fi
+		popd > /dev/null
+	fi
+
+	if use python ; then
+		pushd "${S}"/lib/python > /dev/null
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	dobin scripts/antlr-config
+
+	if use cxx ; then
+		pushd lib/cpp > /dev/null
+		einstall
+		dolib.so src/libantlr$(get_libname $(get_major_version))
+		dosym libantlr$(get_libname $(get_major_version)) \
+			/usr/$(get_libdir)/libantlr$(get_libname)
+		use static-libs && dolib.a src/libantlr.a
+		newdoc AUTHORS{,.cpp}
+		newdoc ChangeLog{,.cpp}
+		newdoc TODO{,.cpp}
+		popd > /dev/null
+	fi
+
+	if use java ; then
+		java-pkg_dojar antlr/antlr.jar
+		use script && java-pkg_dolauncher antlr --main antlr.Tool
+		use source && java-pkg_dosrc antlr
+		use doc && java-pkg_dohtml -r doc/*
+	fi
+
+	if use mono ; then
+		pushd lib > /dev/null
+		dodir /usr/$(get_libdir)/antlr/
+		insinto /usr/$(get_libdir)/antlr/
+		doins antlr.astframe.dll
+		doins antlr.runtime.dll
+		sed -e "s|@prefix@|${EPREFIX}/usr|" \
+			-e 's|@exec_prefix@|${prefix}|' \
+			-e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
+			-e 's|@libs@|-r:${libdir}/antlr.astframe.dll -r:${libdir}/antlr.runtime.dll|' \
+			-e "s|@VERSION@|${PV}|" \
+			"${FILESDIR}"/antlr.pc.in > antlr.pc
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins antlr.pc
+		popd > /dev/null
+	fi
+
+	if use python ; then
+		pushd "${S}"/lib/python > /dev/null
+		distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	if use examples ; then
+		find "${S}"/examples -iname Makefile\* -exec rm \{\} \;
+		insinto /usr/share/doc/${PF}/examples
+		use cxx && doins -r "${S}"/examples/cpp
+		use java && doins -r "${S}"/examples/java
+		use mono && doins -r "${S}"/examples/csharp
+		use python && doins -r "${S}"/examples/python
+	fi
+
+	dodoc README.txt
+}
diff --git a/dev-java/antlr/antlr-2.7.7-r6.ebuild b/dev-java/antlr/antlr-2.7.7-r6.ebuild
new file mode 100644
index 000000000000..783a98f4ff67
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r6.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+DISTUTILS_OPTIONAL="y"
+DISTUTILS_SINGLE_IMPL="y"
+DISTUTILS_IN_SOURCE_BUILD="y"
+
+inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
+
+DESCRIPTION="A parser generator for C++, C#, Java, and Python"
+HOMEPAGE="http://www.antlr2.org/"
+SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc debug examples mono +cxx +java python script source static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# TODO do we actually need jdk at runtime?
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	>=virtual/jdk-1.6
+	mono? ( dev-lang/mono )"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.15
+	script? ( !dev-util/pccts )
+	source? ( app-arch/zip )"
+
+PATCHES=( "${FILESDIR}"/${PV}-{gcc-4.3,gcc-4.4,makefixes}.patch )
+
+make_shared_lib() {
+	local soname=$(basename "${1%.a}")$(get_libname $(get_major_version))
+	einfo "Making ${soname}"
+	[[ ${CHOST} == *-darwin* ]] \
+		&& make_shared_lib_macho "${soname}" "$1" "$2"\
+		|| make_shared_lib_elf "${soname}" "$1" "$2"
+}
+
+make_shared_lib_elf() {
+	local soname=$1 archive=$2 cc=$3
+	${cc:-$(tc-getCXX)} ${LDFLAGS} \
+		-shared -Wl,-soname="${soname}" \
+		-Wl,--whole-archive "${archive}" -Wl,--no-whole-archive \
+		-o $(dirname "${archive}")/"${soname}" || return 1
+}
+
+make_shared_lib_macho() {
+	local soname=$1 archive=$2 cc=$3
+	${cc:-$(tc-getCXX)} ${LDFLAGS} \
+		-dynamiclib -install_name "${EPREFIX}/usr/$(get_libdir)/${soname}" \
+		-force_load "${archive}" \
+		-o $(dirname "${archive}")/"${soname}" || return 1
+}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+
+	sed -i \
+		-e 's/install:.*this-install/install:/' \
+		lib/cpp/src/Makefile.in || die
+
+	use static-libs || epatch "${FILESDIR}/${PV}-static-libs-fix.patch"
+
+	# See bug #468540, this can be removed once bug #469150 is fixed.
+	sed -i 's/tlib lib ar/ar/' configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	# don't ask why, but this is needed for stuff to get built properly
+	# across the various JDKs
+	JAVACFLAGS="+ ${JAVACFLAGS}"
+
+	# mcs for https://bugs.gentoo.org/show_bug.cgi?id=172104
+	CSHARPC="mcs" econf $(use_enable java) \
+		$(use_enable python) \
+		$(use_enable mono csharp) \
+		$(use_enable debug) \
+		$(use_enable examples) \
+		$(use_enable cxx) \
+		--enable-verbose
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS} -fPIC"
+	if use cxx; then
+		pushd lib/cpp/src > /dev/null
+		make_shared_lib libantlr.a || die
+		if use static-libs; then
+			make clean
+			emake
+		fi
+		popd > /dev/null
+	fi
+
+	if use python ; then
+		pushd "${S}"/lib/python > /dev/null
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	dobin scripts/antlr-config
+
+	if use cxx ; then
+		pushd lib/cpp > /dev/null
+		einstall
+		dolib.so src/libantlr$(get_libname $(get_major_version))
+		dosym libantlr$(get_libname $(get_major_version)) \
+			/usr/$(get_libdir)/libantlr$(get_libname)
+		use static-libs && dolib.a src/libantlr.a
+		newdoc AUTHORS{,.cpp}
+		newdoc ChangeLog{,.cpp}
+		newdoc TODO{,.cpp}
+		popd > /dev/null
+	fi
+
+	if use java ; then
+		java-pkg_dojar antlr/antlr.jar
+		use script && java-pkg_dolauncher antlr --main antlr.Tool
+		use source && java-pkg_dosrc antlr
+		use doc && java-pkg_dohtml -r doc/*
+	fi
+
+	if use mono ; then
+		pushd lib > /dev/null
+		dodir /usr/$(get_libdir)/antlr/
+		insinto /usr/$(get_libdir)/antlr/
+		doins antlr.astframe.dll
+		doins antlr.runtime.dll
+		sed -e "s|@prefix@|${EPREFIX}/usr|" \
+			-e 's|@exec_prefix@|${prefix}|' \
+			-e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
+			-e 's|@libs@|-r:${libdir}/antlr.astframe.dll -r:${libdir}/antlr.runtime.dll|' \
+			-e "s|@VERSION@|${PV}|" \
+			"${FILESDIR}"/antlr.pc.in > antlr.pc
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins antlr.pc
+		popd > /dev/null
+	fi
+
+	if use python ; then
+		pushd "${S}"/lib/python > /dev/null
+		distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	if use examples ; then
+		find "${S}"/examples -iname Makefile\* -exec rm \{\} \;
+		insinto /usr/share/doc/${PF}/examples
+		use cxx && doins -r "${S}"/examples/cpp
+		use java && doins -r "${S}"/examples/java
+		use mono && doins -r "${S}"/examples/csharp
+		use python && doins -r "${S}"/examples/python
+	fi
+
+	dodoc README.txt
+}
diff --git a/dev-java/antlr/antlr-3.1.3-r3.ebuild b/dev-java/antlr/antlr-3.1.3-r3.ebuild
new file mode 100644
index 000000000000..8a8c83b10f8f
--- /dev/null
+++ b/dev-java/antlr/antlr-3.1.3-r3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A parser generator for C++, C#, Java, and Python"
+HOMEPAGE="http://www.antlr.org/"
+# You need to generate v3 grammars so that boostrapping works
+SRC_URI="http://www.antlr.org/download/${P}.tar.gz
+	mirror://gentoo/${P}-generated.tar.bz2"
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gunit"
+
+COMMON_DEPEND=">=dev-java/stringtemplate-3.2:0
+	 >=dev-java/antlr-2.7.7:0[java]
+	 gunit? ( dev-java/junit:4 )"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.5"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-jdk-8.patch || die
+
+	rm -v lib/*.jar lib/.*.jar || die
+	rm -v runtime/ActionScript/project/lib/*.jar || die
+	# We must bundle this as we can't depend on ourselves
+	cp -v "${WORKDIR}"/*.java tool/src/main/antlr/org/antlr/grammar/v3 || die
+	local version="${PV} $(date '+%B %d, %Y %T')"
+	local propertyfile="tool/src/main/resources/org/antlr/antlr.properties"
+	[[ $(egrep "^[^#]" ${propertyfile} | wc -l) != 1 ]] \
+		&& die "Unknown property found"
+	sed -i "s/^\(antlr.version\)=.*$/\1=${version}/" ${propertyfile} || die
+}
+
+antlr2() {
+	java -cp $(java-pkg_getjars antlr) antlr.Tool "${@}" || die "antlr2 failed"
+}
+
+antlr3() {
+	local cp="${S}/bootstrap:${S}/tool/src/main/resources/"
+	java -cp "${cp}":$(java-pkg_getjars antlr,stringtemplate) \
+		org.antlr.Tool "${@}" || die "building v3 grammars failed"
+}
+
+build_antlr() {
+	cd "${S}"
+	local dest="${1}"
+	# runtime
+	find runtime -name "*.java" > "${T}/sources" || die
+	# tool
+	find tool/src/main -name "*.java" >> "${T}/sources" || die
+	ejavac -d "${dest}" -cp $(java-pkg_getjars antlr,stringtemplate) "@${T}/sources"
+}
+
+# Uses maven so let's just do things manully for now
+# when bumping use jardiff and apicheck to make sure
+# produced jars are good
+src_compile() {
+	einfo "Bootstrapping antlr3 with bundled sources"
+	cd tool/src/main/antlr2/org/antlr/grammar/v2/ || die
+	# the command line only takes one at a time
+	for grammar in *.g; do
+		antlr2 ${grammar} || die
+	done
+
+	cd "${S}" || die
+	mkdir bootstrap || die
+	build_antlr bootstrap
+
+	einfo "Building v3 grammars with boostrapped antlr"
+	local v3dir=tool/src/main/antlr/org/antlr/grammar/v3/
+	rm -v "${v3dir}"/*.java || die
+	antlr3 "${v3dir}"/*.g
+
+	mkdir build || die
+	cp -r "${S}"/tool/src/main/resources/* build || die
+	build_antlr build
+
+	if use gunit; then
+		einfo "building gunit"
+		antlr3 gunit/src/main/antlr3/org/antlr/gunit/*.g
+
+		find gunit -name "*.java" > "${T}/gunit" || die
+		ejavac -d build -cp $(java-pkg_getjars stringtemplate,junit-4):build \
+			"@${T}/gunit"
+
+		cp -vr gunit/src/main/resources/org build || die
+	fi
+
+	# jar things up
+	cd build
+	find -type f >> "${T}/classes" || die
+	jar cf ${PN}3.jar "@${T}/classes" || die "jar failed"
+}
+
+src_install() {
+	# Single jar like upstream
+	java-pkg_dojar build/antlr3.jar
+	java-pkg_dolauncher antlr3 --main org.antlr.Tool
+	use gunit && java-pkg_dolauncher gunit --main org.antlr.gunit.Interp
+
+	use source && java-pkg_dosrc tool/src/main/org \
+		runtime/Java/src/main/java/org/
+}
+
+pkg_postinst() {
+	elog "Currently the ebuild only has support for the Java backend."
+}
diff --git a/dev-java/antlr/antlr-4.4.ebuild b/dev-java/antlr/antlr-4.4.ebuild
new file mode 100644
index 000000000000..cc1b6136dfc0
--- /dev/null
+++ b/dev-java/antlr/antlr-4.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+# List of jar files we need to get from the Internets.
+JAR_LIST=(antlr-3.5.2-complete-no-st3.jar antlr-4.3-complete.jar)
+
+DESCRIPTION="A parser generator for C++, C#, Java, and Python"
+HOMEPAGE="http://www.antlr.org/"
+SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.zip
+http://www.antlr3.org/download/${JAR_LIST[0]}
+http://www.antlr.org/download/${JAR_LIST[1]}"
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gunit"
+
+CDEPEND="
+	>=dev-java/stringtemplate-3.2:0
+	gunit? ( dev-java/junit:4 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}4-${PV}"
+
+src_prepare() {
+	# Disable manual download + lib directory creation.
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+
+	# Create lib directory ourselves.
+	mkdir "${S}"/lib/
+
+	# Copy downloaded jars in lib directory.
+	for myjar in ${JAR_LIST[@]}; do
+		cp "${DISTDIR}"/${myjar} "${S}"/lib/
+	done
+}
+
+src_compile() {
+	eant -f build.xml
+}
+
+src_install() {
+	# Single jar like upstream
+	java-pkg_newjar dist/antlr-4.4-complete.jar antlr.jar
+	java-pkg_dolauncher antlr4 --main org.antlr.v4.Tool
+
+	if use gunit; then
+		java-pkg_dolauncher gunit --main org.antlr.v4.gunit.Interp
+	fi
+
+	if use source; then
+		java-pkg_dosrc tool/src/org \
+			runtime/Java/src/org
+	fi
+}
+
+pkg_postinst() {
+	elog "This ebuild only supports the Java backend for the time being."
+}
diff --git a/dev-java/antlr/files/2.7.7-gcc-4.3.patch b/dev-java/antlr/files/2.7.7-gcc-4.3.patch
new file mode 100644
index 000000000000..628f8dd2645a
--- /dev/null
+++ b/dev-java/antlr/files/2.7.7-gcc-4.3.patch
@@ -0,0 +1,11 @@
+diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
+--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp	2006-11-01 22:37:17.000000000 +0100
++++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp	2008-03-19 20:09:21.000000000 +0100
+@@ -10,6 +10,7 @@
+ 
+ #include <antlr/config.hpp>
+ 
++#include <cstring>
+ #include <map>
+ 
+ #ifdef HAS_NOT_CCTYPE_H
diff --git a/dev-java/antlr/files/2.7.7-gcc-4.4.patch b/dev-java/antlr/files/2.7.7-gcc-4.4.patch
new file mode 100644
index 000000000000..e1790ec4e0c6
--- /dev/null
+++ b/dev-java/antlr/files/2.7.7-gcc-4.4.patch
@@ -0,0 +1,10 @@
+--- lib/cpp/antlr/CharScanner.hpp~      2008-11-11 21:24:02.000000000 +0000
++++ lib/cpp/antlr/CharScanner.hpp       2008-11-11 21:24:33.000000000 +0000
+@@ -10,6 +10,7 @@
+
+ #include <antlr/config.hpp>
+
++#include <cstdio>
+ #include <cstring>
+ #include <map>
+
diff --git a/dev-java/antlr/files/2.7.7-makefixes.patch b/dev-java/antlr/files/2.7.7-makefixes.patch
new file mode 100644
index 000000000000..cb12752189a7
--- /dev/null
+++ b/dev-java/antlr/files/2.7.7-makefixes.patch
@@ -0,0 +1,68 @@
+diff -Nur antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in
+--- antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in	2006-11-01 23:37:17.000000000 +0200
++++ antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in	2009-03-30 02:09:28.000000000 +0300
+@@ -143,7 +143,7 @@
+ @abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.cpp \
+ @abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.hpp \
+ 	:
+-	@ @MAKE@ -C @abs_this_builddir@/examples/cpp/tinyc
++	@ $(MAKE) -C @abs_this_builddir@/examples/cpp/tinyc
+ 
+ $(objdir)/.subc.g : $(srcdir)/subc.g $(objdir)/TinyCParserTokenTypes.txt @ANTLR_JAR@
+ 	@ANTLRFLAGS="-glib `@CYGPATH_W@ $(_srcdir)/../tinyc/tinyc.g` -o `@CYGPATH_W@ $(thisdir)`" @ANTLR_COMPILE_CMD@ $(srcdir)/subc.g
+diff -Nur antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in
+--- antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in	2006-11-01 23:37:17.000000000 +0200
++++ antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in	2009-03-30 02:07:25.000000000 +0300
+@@ -77,7 +77,7 @@
+ 	@ @CP@ $< $@
+ 
+ @abs_this_builddir@/examples/java/tinyc/TinyCParserTokenTypes.txt	:
+-	@ @MAKE@ -C @abs_this_builddir@/examples/java/tinyc test
++	@ $(MAKE) -C @abs_this_builddir@/examples/java/tinyc test
+ 
+ 
+ ## How to generated *.java ..
+diff -Nur antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in
+--- antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in	2006-11-01 23:37:18.000000000 +0200
++++ antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in	2009-03-30 02:09:07.000000000 +0300
+@@ -61,11 +61,11 @@
+ ## file resides. Therefore we are going to "make" the base
+ ## grammar first and then copy required vocabulary over ..
+ TinyCTokenTypes.txt : 
+-	@MAKE@ -C ../tinyc
++	$(MAKE) -C ../tinyc
+ 	@CP@ ../tinyc/$@ $@
+ 
+ @abs_this_builddir@/examples/python/tinyc/%.py :
+-	@MAKE@ -C ../tinyc
++	$(MAKE) -C ../tinyc
+ 
+ test :: test1
+ 
+diff -Nur antlr-2.7.7/Makefile.in antlr-2.7.7_patched/Makefile.in
+--- antlr-2.7.7/Makefile.in	2006-11-01 23:37:18.000000000 +0200
++++ antlr-2.7.7_patched/Makefile.in	2009-03-30 02:05:41.000000000 +0300
+@@ -31,7 +31,7 @@
+ 
+ test clean distclean install ::
+ 	@ if test -f examples/Makefile ; then \
+-		@MAKE@ -C examples $@ ; \
++		$(MAKE) -C examples $@ ; \
+ 	fi
+ 
+ # Rule  to  remove  all objects, cores, ANTLR generated,
+diff -Nur antlr-2.7.7/scripts/config.make.in antlr-2.7.7_patched/scripts/config.make.in
+--- antlr-2.7.7/scripts/config.make.in	2006-11-01 23:37:18.000000000 +0200
++++ antlr-2.7.7_patched/scripts/config.make.in	2009-03-30 02:04:54.000000000 +0300
+@@ -47,9 +47,9 @@
+ 		*) \
+ 		if test -f "$${d}/Makefile" ; then \
+ 		  echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
+-		  echo ">> @MAKE@ -C $(subdir)/$${d} $@                          " ; \
++		  echo ">> $(MAKE) -C $(subdir)/$${d} $@                          " ; \
+ 			echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
+-			@MAKE@ -C "$$d" $@ || exit 1 ;\
++			$(MAKE) -C "$$d" $@ || exit 1 ;\
+ 		fi ; \
+ 		;; \
+ 		esac ; \
diff --git a/dev-java/antlr/files/2.7.7-static-libs-fix.patch b/dev-java/antlr/files/2.7.7-static-libs-fix.patch
new file mode 100644
index 000000000000..163aa3e97e5c
--- /dev/null
+++ b/dev-java/antlr/files/2.7.7-static-libs-fix.patch
@@ -0,0 +1,22 @@
+diff --git a/scripts/antlr-config.in.old b/scripts/antlr-config.in
+index 75b94c6..adab1e6 100755
+--- a/scripts/antlr-config.in.old
++++ b/scripts/antlr-config.in
+@@ -19,7 +19,7 @@ Options:
+ 	[--cflags]
+ 	[--cxxflags]
+ Libraries:
+-	libantlr.a
++	libantlr.so
+ EOF
+ 	exit $1
+ }
+@@ -58,7 +58,7 @@ while test $# -gt 0; do
+           libs="${libdir}/antlr.lib"
+           ;;
+           *)
+-          libs="${libdir}/libantlr.a"
++          libs="${libdir}/libantlr.so"
+           ;;
+       esac
+       echo_libs=yes
diff --git a/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch b/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch
new file mode 100644
index 000000000000..a40fc60b16e6
--- /dev/null
+++ b/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch
@@ -0,0 +1,28 @@
+From 126414cf2731a3fe8a42393d0b41ce0060844b34 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 8 Aug 2015 03:46:00 +0200
+Subject: [PATCH] Fix CompositeGrammer.getIndirectDelegates for JDK 8
+
+https://github.com/antlr/antlr3/issues/151
+---
+ tool/src/main/java/org/antlr/tool/CompositeGrammar.java | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
+index bb15723..fc16f01 100644
+--- a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
++++ b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
+@@ -219,7 +219,9 @@ public class CompositeGrammar {
+ 	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;
+ 	}
+ 
+-- 
+2.5.0
+
diff --git a/dev-java/antlr/files/antlr-4.4-build.xml.patch b/dev-java/antlr/files/antlr-4.4-build.xml.patch
new file mode 100644
index 000000000000..1e64d30e9fc3
--- /dev/null
+++ b/dev-java/antlr/files/antlr-4.4-build.xml.patch
@@ -0,0 +1,20 @@
+--- build.xml.orig	2015-05-20 19:58:28.345000000 +0000
++++ build.xml	2015-05-20 19:58:44.809000000 +0000
+@@ -11,8 +11,6 @@
+         <property name="antlr3.version" value="3.5.2"/>
+         <property name="antlr3.jar.name" value="antlr-${antlr3.version}-complete-no-st3.jar"/>
+         <property name="antlr3.jar" value="${lib.dir}/${antlr3.jar.name}"/>
+-        <mkdir dir="${lib.dir}"/>
+-        <get src="http://www.antlr3.org/download/${antlr3.jar.name}" dest="${antlr3.jar}" skipexisting="true"/>
+         <path id="cp.antlr3" path="${antlr3.jar}"/>
+ 
+         <property name="build.antlr3.dir" value="${build.dir}/generated-sources/antlr3" />
+@@ -23,8 +21,6 @@
+         <property name="antlr4.version" value="4.3"/>
+         <property name="antlr4.jar.name" value="antlr-${antlr4.version}-complete.jar"/>
+         <property name="antlr4.jar" value="${lib.dir}/${antlr4.jar.name}"/>
+-        <mkdir dir="${lib.dir}"/>
+-        <get src="http://www.antlr.org/download/${antlr4.jar.name}" dest="${antlr4.jar}" skipexisting="true"/>
+         <path id="cp.antlr4" path="${antlr4.jar}"/>
+ 
+         <property name="build.antlr4.dir" value="${build.dir}/generated-sources/antlr4" />
diff --git a/dev-java/antlr/files/antlr.pc.in b/dev-java/antlr/files/antlr.pc.in
new file mode 100644
index 000000000000..fb5480637a90
--- /dev/null
+++ b/dev-java/antlr/files/antlr.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+
+
+Name: antlr
+Description: ANother Tool for Language Recognition
+Version: @VERSION@
+Libs: @libs@
diff --git a/dev-java/antlr/metadata.xml b/dev-java/antlr/metadata.xml
new file mode 100644
index 000000000000..b73c834d5599
--- /dev/null
+++ b/dev-java/antlr/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<use>
+		<flag name="script">Install a script to run antlr</flag>
+		<flag name="gunit" restrict="&gt;=dev-java/antlr-3.1.3-r1">
+		  gUnit is a "Unit Test" framework for ANTLR grammars
+	  </flag>
+	</use>
+	<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..be6c42d9cb7b
--- /dev/null
+++ b/dev-java/aopalliance/Manifest
@@ -0,0 +1 @@
+DIST aopalliance-1.0-gentoo.tar.bz2 4203 SHA256 30c954c195d3dbb189f68c28be51aecb41e5100e2ec9b58aeb5cb9ef43f72ebe SHA512 6761933b9c127af9773f518df89a905fd67696964837b8cb841664f16564bc879dcfbd5f47dcf85e999d4dd64561a3b46edac1c639471d3ee9be3237d9064187 WHIRLPOOL ee180ce23232a666aff6a69b8cf6880744be78e3d206cd92da3e43e93e9b9ca3c509f8c5e8c8598d7389e4355be4920e615be3f8332d7463f3179a40895c16a4
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..d830be462acf
--- /dev/null
+++ b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..7303cef96964
--- /dev/null
+++ b/dev-java/aopalliance/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/appframework/Manifest b/dev-java/appframework/Manifest
new file mode 100644
index 000000000000..4d977184e10d
--- /dev/null
+++ b/dev-java/appframework/Manifest
@@ -0,0 +1 @@
+DIST AppFramework-1.03-src.zip 413438 SHA256 9fad98a0b70e6c67cc38dfe9d01b00fe7b7fedf51fa50ac68e7a86d7d1c38fcd SHA512 7d24329361f0d5f2225a7248ba30b1f0db364efd93e0581e1f10d0f8e2b6354f9d578d585ff1a08b27846dfae0b805b0f609711234be616b3f0a065dc1801309 WHIRLPOOL ef3e4ea022bc3f902334255e26703bc12910f939aa87c12dd6191326c33b2ea9da3abfbf5f29d6d5fa8ad6e65af329520c7cc7c90e36407a1b7b6f384f13c8ea
diff --git a/dev-java/appframework/appframework-1.03-r3.ebuild b/dev-java/appframework/appframework-1.03-r3.ebuild
new file mode 100644
index 000000000000..05d9eb02d8e9
--- /dev/null
+++ b/dev-java/appframework/appframework-1.03-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="AppFramework"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A small set of Java classes that simplify building desktop applications"
+HOMEPAGE="https://appframework.dev.java.net/"
+SRC_URI="https://appframework.dev.java.net/downloads/${MY_P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="dev-java/swing-worker:0"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/jnlp-api:0
+	app-arch/unzip:0
+	${COMMON_DEP}
+	test?
+	(
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+EANT_GENTOO_CLASSPATH="swing-worker"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+
+java_prepare() {
+	rm -v lib/*.jar || die
+
+	java-ant_rewrite-classpath
+	java-ant_rewrite-classpath nbproject/build-impl.xml
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only jnlp-api)"
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_newjar "${S}/dist/AppFramework.jar" "${PN}.jar"
+
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src/org
+	use examples && java-pkg_doexamples src/examples/*
+}
+
+src_test() {
+	local cp=$(java-pkg_getjars --build-only junit):$(java-pkg_getjars swing-worker)
+	ANT_TASKS="ant-junit" eant \
+		-Duser.home="${T}" \
+		-Drun.test.classpath="${cp}:dist/${MY_PN}.jar:build/test/classes" \
+		-Dgentoo.classpath="${cp}" test
+}
diff --git a/dev-java/appframework/metadata.xml b/dev-java/appframework/metadata.xml
new file mode 100644
index 000000000000..fd5a55423e4f
--- /dev/null
+++ b/dev-java/appframework/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..417497d0edfa
--- /dev/null
+++ b/dev-java/apple-java-extensions-bin/Manifest
@@ -0,0 +1 @@
+DIST apple-java-extensions-bin-1.5.zip 18036 SHA256 82a2de820045c484f7850d0a02a36a03890eea8c7f0d3907ba64da43ee9f13bd SHA512 9f3e9a8eab3980feda8584ca75d58da8b31ec0ed77fb2a4a1488d0b2ca0efd845ff705fc372ba3958753690f839b0ccb2e9310d6896564317b625ff9ba9cc456 WHIRLPOOL bad2c6232daafd0a5c755855a8e94f3c095a41db8f3ccdc9688382e87f7b45a815a57f692e3f53189b8f01b6efb33ff3e033bb0e946caf88406d3c72f023f99d
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..8d5a23a45234
--- /dev/null
+++ b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-pkg-2
+
+DESCRIPTION="A pluggable jar of stub classes representing the new 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 ~ppc ~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/apple-java-extensions-bin-1.5.ebuild b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5.ebuild
new file mode 100644
index 000000000000..ee80d0ee07d5
--- /dev/null
+++ b/dev-java/apple-java-extensions-bin/apple-java-extensions-bin-1.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit java-pkg-2
+
+DESCRIPTION="A pluggable jar of stub classes representing the new 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 ppc 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..3b7bcf54f1d2
--- /dev/null
+++ b/dev-java/apple-java-extensions-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild b/dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild
new file mode 100644
index 000000000000..3c32c01ce151
--- /dev/null
+++ b/dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit java-vm-2 eutils
+
+DESCRIPTION="Links to Apple's version of Sun's J2SE Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.6.0/"
+SLOT="1.6"
+LICENSE="public-domain"
+KEYWORDS="-* ~x64-macos ~x86-macos"
+IUSE=""
+
+JAVA_PROVIDE="jdbc-stdext"
+
+APPLE_JAVA_DIR="/System/Library/Frameworks/JavaVM.framework/Versions/${PV}/Home"
+
+pkg_preinst() {
+	[[ ! -d ${APPLE_JAVA_DIR} ]] && die "Java 6 not installed!"
+}
+
+src_install() {
+	local dirs="bin include lib man"
+	dodir /opt/${P}
+
+	for d in ${dirs}; do
+		ln -s "${APPLE_JAVA_DIR}"/${d} "${ED}"/opt/${P}/${d}
+	done
+	# Apple just puts al JRE stuff in the Home dir next to the JDK stuff,
+	# "emulate" it to make the wrappers happy
+	ln -s "${APPLE_JAVA_DIR}" "${ED}"/opt/${P}/jre
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+	# Create files used as storage for system preferences.
+	touch "${ED}/opt/${P}/.systemPrefs/.system.lock"
+	chmod 644 "${ED}/opt/${P}/.systemPrefs/.system.lock"
+	touch "${ED}/opt/${P}/.systemPrefs/.systemRootModFile"
+	chmod 644 "${ED}/opt/${P}/.systemPrefs/.systemRootModFile"
+
+	set_java_env
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	elog "Note: you're using your OSX (pre-)installed Java installation"
+}
diff --git a/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.4.env b/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.4.env
new file mode 100644
index 000000000000..2b67566c4e67
--- /dev/null
+++ b/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.4.env
@@ -0,0 +1,17 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Apple's Sun JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
+LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.4"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.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"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.5.env b/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.5.env
new file mode 100644
index 000000000000..d7556e68ce31
--- /dev/null
+++ b/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.5.env
@@ -0,0 +1,17 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Apple's Sun JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_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/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.5"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.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"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.6.env b/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.6.env
new file mode 100644
index 000000000000..bf6ed0710a42
--- /dev/null
+++ b/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.6.env
@@ -0,0 +1,17 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Apple's Sun JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_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/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.6"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.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"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/apple-jdk-bin/metadata.xml b/dev-java/apple-jdk-bin/metadata.xml
new file mode 100644
index 000000000000..4561e552bd04
--- /dev/null
+++ b/dev-java/apple-jdk-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>prefix</herd>
+</pkgmetadata>
diff --git a/dev-java/apt-mirror/Manifest b/dev-java/apt-mirror/Manifest
new file mode 100644
index 000000000000..33557e6c7c74
--- /dev/null
+++ b/dev-java/apt-mirror/Manifest
@@ -0,0 +1 @@
+DIST apt-mirror-1.0.tar.bz2 21396 SHA256 62daf3cf424d1d55f7c93ca12c6996e4a7ec11acbeba6d4903d7839471cbae62 SHA512 fdb58498bc5ff1f77858716b67dd952a3f3bea55d06d7190b1a1d283d11843ebf03c7403ba58f23478c1c553402d21c2089c2dca52f216d693ab713a43f5c1ff WHIRLPOOL a948b7b2521c150e00a53e0ac7c5b56c1792199110c328d22234ba332f2e6aded30e8bb850818d4bc4bc8948aca662bb955eb8c5d9dd7f6d2a79b1eef21b4f76
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..78bd7728254c
--- /dev/null
+++ b/dev-java/apt-mirror/apt-mirror-1.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/apt"
diff --git a/dev-java/apt-mirror/files/build.xml-1.0 b/dev-java/apt-mirror/files/build.xml-1.0
new file mode 100644
index 000000000000..f376e5733624
--- /dev/null
+++ b/dev-java/apt-mirror/files/build.xml-1.0
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<project name="apt-mirror" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac debug="false" srcdir="." destdir="build" encoding="UTF-8"/>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="apt-mirror.jar">
+      <fileset dir="build" includes="**/*.class"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/apt-mirror/metadata.xml b/dev-java/apt-mirror/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/apt-mirror/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/args4j/Manifest b/dev-java/args4j/Manifest
new file mode 100644
index 000000000000..5363704e6006
--- /dev/null
+++ b/dev-java/args4j/Manifest
@@ -0,0 +1 @@
+DIST args4j-2.32-sources.jar 65381 SHA256 feaa3544def7e4c772d2155a16d0542698d997fa2db2a4ae7993e075aba5bfa2 SHA512 97b48a133f6e3348e17a653aa15d92e0bc240e689615c22321573f7f82f01f22cffe43ef7b24f72a9a52cfb91ab6601463567b18f634fcc64362ea366456a12f WHIRLPOOL b6e3b5de9c03198b2c3eb4622a2ba4a263d745cfd2d8f5df6aa8f99762ea528795d0d24420caea948603e5588f0558c791a8214aebd7f596db1b6ed1cd5d2f1d
diff --git a/dev-java/args4j/args4j-2.32.ebuild b/dev-java/args4j/args4j-2.32.ebuild
new file mode 100644
index 000000000000..a2033cbd7b69
--- /dev/null
+++ b/dev-java/args4j/args4j-2.32.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a620379538aa
--- /dev/null
+++ b/dev-java/args4j/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+<maintainer>
+	<email>monsieurp@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
new file mode 100644
index 000000000000..9794b84a1b83
--- /dev/null
+++ b/dev-java/asm/Manifest
@@ -0,0 +1,7 @@
+DIST asm-1.4.3.tar.gz 135980 SHA256 45970ef619fb39d30c48379ef362b2e2738586382df1d8090519736219c22a01 SHA512 c8bbcd702bb8593cf31a313fc82c4951f8b46b2818ba93571f9fbb909dbb50e1766111e25e5bb6cc73f9929dff7caf55c05c0e4fc66331591a3ddf087ce75641 WHIRLPOOL 109e3ffb86df3c645bc8c74b0768b1632aad271234556793b0ca64bba35cd8558394d12bfd3a77baf8dd85d17a04d5db15e230dfb5848526b9d559684fdc3989
+DIST asm-1.5.3.tar.gz 151370 SHA256 e58fda42c5a539ba2a1b99aa68329c27f3732299cf0942f654799b9f1fed1d3a SHA512 85ecf5bf676dc2a0a1ec6486f0d89b2da86b6fa4226b18b729c0cd7c648a4ed567d34871aa480b08bab37897ddb0c120c05b4dc299ebd79524319c4072b45ccc WHIRLPOOL 5b4674e484718b950fed1129b2cb9f9be81bfce6de256fe1048ae5305c522d9ae686b6a99601a705dd25a491f8a85e9652e96d3349f937d00e284e6f959e533f
+DIST asm-2.0.tar.gz 258426 SHA256 8c0b305819f123aa3333efb66acbeb8f5deb8cef5419c1d940310c7fbe7c194e SHA512 6736d7cccecfb6de999a2f5fdf527112206b056646da70f3597f272138b191b5b28ee620aa1a708c9941416eca7bb56c5dcf947ec377c9899f05aaf014186c4d WHIRLPOOL 779b1ea46fbd9458eb00ec59e035492f1fa1ec2f5fa03a01547f3ef1600a0f886d6f51b96b5e47e972db47d709f381788eaa023ce8cdbb3c36590339b632f4cc
+DIST asm-2.2.3.tar.gz 287535 SHA256 56c5ce25bff92c3641b6435e28eee71718bc4eb62d4964faa9da6bb9d1002344 SHA512 765b145a42cc02ef3066a6922afacdc70e63d7713c971e76621e7e03bdfd7e9426ca61a4b302fa0ad78f88046bfda5382befe84b690eb8102c7df912c0f0b73a WHIRLPOOL aca2299cf522034685a3ac008067a30230aaa811fc96cc3451b81b937903e21759c512330638acfc48101680576d90db46b915d097abdd902b3a58825877c4bf
+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
diff --git a/dev-java/asm/asm-1.4.3-r3.ebuild b/dev-java/asm/asm-1.4.3-r3.ebuild
new file mode 100644
index 000000000000..a2df87c9a54f
--- /dev/null
+++ b/dev-java/asm/asm-1.4.3-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="1.4"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	dev-java/ant-owanttask"
+RDEPEND=">=virtual/jre-1.3"
+
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	echo "objectweb.ant.tasks.path /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
+		>> build.properties
+}
+
+src_compile() {
+	eant jar $(use_doc jdoc)
+}
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+
+	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-1.4.3-r4.ebuild b/dev-java/asm/asm-1.4.3-r4.ebuild
new file mode 100644
index 000000000000..410ba50a6d35
--- /dev/null
+++ b/dev-java/asm/asm-1.4.3-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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="1.4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	dev-java/ant-owanttask"
+RDEPEND=">=virtual/jre-1.3"
+RESTRICT="test"
+
+src_prepare() {
+	echo "objectweb.ant.tasks.path ${EPREFIX}/usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
+		>> build.properties
+}
+
+src_compile() {
+	eant jar $(use_doc jdoc)
+}
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-1.5.3-r1.ebuild b/dev-java/asm/asm-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..bae27a980191
--- /dev/null
+++ b/dev-java/asm/asm-1.5.3-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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="1.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc source"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	dev-java/ant-owanttask
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+
+RESTRICT="test"
+
+src_prepare() {
+	echo "objectweb.ant.tasks.path ${EPREFIX}/usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
+		>> build.properties
+}
+
+EANT_DOC_TARGET=jdoc
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-1.5.3.ebuild b/dev-java/asm/asm-1.5.3.ebuild
new file mode 100644
index 000000000000..8f3ce183b087
--- /dev/null
+++ b/dev-java/asm/asm-1.5.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="1.5"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc source"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	dev-java/ant-owanttask
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	echo "objectweb.ant.tasks.path /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
+		>> build.properties
+}
+
+EANT_DOC_TARGET=jdoc
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-2.0-r1.ebuild b/dev-java/asm/asm-2.0-r1.ebuild
new file mode 100644
index 000000000000..f505db0b3a26
--- /dev/null
+++ b/dev-java/asm/asm-2.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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="2"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="doc source"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	dev-java/ant-owanttask
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+RESTRICT="test"
+
+src_prepare() {
+	echo "objectweb.ant.tasks.path ${EPREFIX}/usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
+		>> build.properties
+}
+
+src_compile() {
+	eant jar $(use_doc jdoc)
+}
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-2.2.3-r1.ebuild b/dev-java/asm/asm-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..d9b888f3ddca
--- /dev/null
+++ b/dev-java/asm/asm-2.2.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="2.2"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc source"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	dev-java/ant-owanttask
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+
+# Needs unpackaged deps.
+# http://bugs.gentoo.org/show_bug.cgi?id=212860
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}" || die
+	# disables test coverage stuff
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+	# see bug #153971 and http://forge.objectweb.org/tracker/index.php?func=detail&aid=306349&group_id=23&atid=100023
+	epatch "${FILESDIR}/${P}-commons.patch"
+	echo "objectweb.ant.tasks.path = $(java-pkg_getjar --build-only ant-owanttask ow_util_ant_tasks.jar)" >> build.properties
+}
+
+EANT_DOC_TARGET="jdoc"
+
+src_install() {
+	for x in output/dist/lib/*.jar ; do
+		java-pkg_newjar ${x} $(basename ${x/-${PV}})
+	done
+	use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/asm/asm-3.3.1.ebuild b/dev-java/asm/asm-3.3.1.ebuild
new file mode 100644
index 000000000000..809950ee4215
--- /dev/null
+++ b/dev-java/asm/asm-3.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+# 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-4.0.ebuild b/dev-java/asm/asm-4.0.ebuild
new file mode 100644
index 000000000000..225d7825543a
--- /dev/null
+++ b/dev-java/asm/asm-4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P="${PN}-${PV/rc/RC}"
+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}/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="4"
+IUSE=""
+KEYWORDS="amd64 ~arm ppc 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"
+
+S="${WORKDIR}/${MY_P}"
+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"
+
+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.0.3.ebuild b/dev-java/asm/asm-5.0.3.ebuild
new file mode 100644
index 000000000000..d006b9f27836
--- /dev/null
+++ b/dev-java/asm/asm-5.0.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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/files/asm-2.2.3-build.xml.patch b/dev-java/asm/files/asm-2.2.3-build.xml.patch
new file mode 100644
index 000000000000..b2c4a7e67190
--- /dev/null
+++ b/dev-java/asm/files/asm-2.2.3-build.xml.patch
@@ -0,0 +1,65 @@
+diff -Nur asm-2.2.3/build.xml asm-2.2.3_patched/build.xml
+--- asm-2.2.3/build.xml	2006-07-05 18:32:20.000000000 +0300
++++ asm-2.2.3_patched/build.xml	2008-09-25 23:12:06.000000000 +0300
+@@ -96,17 +96,6 @@
+       <pathelement location="${out.build}"/>

+     </path>

+ 

+-    <path id="cobertura.classpath">

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

+-        <include name="cobertura-1.7.jar"/>

+-        <include name="log4j-1.2.9.jar"/>

+-        <include name="jakarta-oro-2.0.8.jar"/>

+-        <include name="asm-2.1.jar"/>

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

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

+-      </fileset>

+-    </path>

+-

+         <taskdef name="multipleAnt"

+              classname="org.objectweb.util.ant.MultipleAnt"

+              classpath="${objectweb.ant.tasks.path}"/>

+@@ -118,8 +107,6 @@
+     <taskdef name="multipleCopy"

+              classname="org.objectweb.util.ant.MultipleCopy"

+              classpath="${objectweb.ant.tasks.path}"/>

+-

+-    <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>

+   </target>

+ 

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

+@@ -180,34 +167,6 @@
+     </junitreport>

+   </target>

+ 

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

+-        <delete file="cobertura.ser"/>

+-        <delete dir="${out.instr}"/>

+-    <cobertura-instrument todir="${out.instr}">

+-      <ignore regex="org.apache.log4j.*"/>

+-      <fileset dir="${out.build}/tmp">

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

+-        <exclude name="**/optimizer/*.class" />

+-        <exclude name="**/*Test*.class" />

+-      </fileset>

+-    </cobertura-instrument>

+-    <copy todir="${out.instr}" preservelastmodified="yes">

+-      <fileset dir="${out.build}/tmp"/>

+-    </copy>

+-        <property name="classes" value="${out.instr}"/>

+-    <ant antfile="${test}/build.xml" target="test" inheritRefs="true"/>         

+-  </target>

+-

+-  <target name="coverage.report" depends="init">

+-    <cobertura-report destdir="${out}/coverage" srcdir="${src}" format="xml"/>

+-    <cobertura-report destdir="${out}/coverage">

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

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

+-        <exclude name="**/asm/optimizer/**/*.java"/>

+-      </fileset>

+-    </cobertura-report>

+-  </target>

+-

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

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

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

diff --git a/dev-java/asm/files/asm-2.2.3-commons.patch b/dev-java/asm/files/asm-2.2.3-commons.patch
new file mode 100644
index 000000000000..f7b9d7931efa
--- /dev/null
+++ b/dev-java/asm/files/asm-2.2.3-commons.patch
@@ -0,0 +1,13 @@
+diff -ru asm-2.2.3-orig/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java asm-2.2.3/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java
+--- asm-2.2.3-orig/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java	2006-11-19 00:21:09.000000000 -0500
++++ asm-2.2.3/src/org/objectweb/asm/commons/SerialVersionUIDAdder.java	2006-11-19 00:22:12.000000000 -0500
+@@ -431,7 +431,7 @@
+         try {

+             return MessageDigest.getInstance("SHA").digest(value);

+         } catch (Exception e) {

+-            throw new UnsupportedOperationException(e);

++            throw new UnsupportedOperationException(e.toString());

+         }

+     }

+ 

+Only in asm-2.2.3/src/org/objectweb/asm/commons: SerialVersionUIDAdder.java.orig
diff --git a/dev-java/asm/metadata.xml b/dev-java/asm/metadata.xml
new file mode 100644
index 000000000000..d399bf77554e
--- /dev/null
+++ b/dev-java/asm/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<herd>java</herd>
+
+	<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..dd9ed6b9c478
--- /dev/null
+++ b/dev-java/aspectj/Manifest
@@ -0,0 +1,2 @@
+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
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..629db6c1cee7
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..4c24f5610839
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.7.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..604e0a4238bb
--- /dev/null
+++ b/dev-java/aspectj/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
new file mode 100644
index 000000000000..1cf80731ef77
--- /dev/null
+++ b/dev-java/avalon-framework/Manifest
@@ -0,0 +1,2 @@
+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
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..44f3d3ec2ffe
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..195afe333c8b
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+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 ~ppc ~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..970a1c10146f
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..c80b883eaebf
--- /dev/null
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~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..838c00a4a448
--- /dev/null
+++ b/dev-java/avalon-framework/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
new file mode 100644
index 000000000000..9ce57063aef3
--- /dev/null
+++ b/dev-java/avalon-logkit/Manifest
@@ -0,0 +1,2 @@
+DIST avalon-logkit-2.1-src.tar.gz 60218 SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155 SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a WHIRLPOOL 8fdd0206c2b65c2a8626331ea07b8e5668ef9b2c841ce20ae85459bc8e128c4096c2091f05ad7e92b7c9c769ba0ad485738f7078ce5f205fa38e21d9a1ca1b47
+DIST logkit-1.2.2-src.tar.gz 113180 SHA256 2c81edc87571fbd05797da7f65515e089c62cbb735bdbd10f93e29bd3aa3ddb8 SHA512 a2a027e70a2432d07ef44d229edde57b1fe7a89ee9db2cd85c5609b180d704e28273f7ddbe55b7086260bc4be2c0ac56b1e23f405b785068678a50a8159a5333 WHIRLPOOL 2f5eebe87fd6dddce535360c44bb62e0ff90f2eead5a162dea748d7ee712faf2385b16ab0b719cd1537cada0436a9217f093e48de1a50767680d1230eff301f9
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..651c72a0bb95
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="An easy-to-use Java logging toolkit designed for secure, performance-oriented logging"
+HOMEPAGE="http://avalon.apache.org/"
+SRC_URI="mirror://apache/avalon/logkit/source/logkit-${PV}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="1.2"
+IUSE=""
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+
+COMMON_DEP="
+	dev-java/avalon-framework:4.1
+	dev-java/log4j:0
+	java-virtuals/jaf:0
+	java-virtuals/javamail:0
+	java-virtuals/jms:0
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/logkit-${PV}-dev"
+SRC_DIR="${S}/src/java"
+JAVADOC_DIR="${S}/javadoc"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-java7.patch"
+}
+
+src_compile() {
+	mkdir classes || die "Could not create compile output dir"
+
+	ejavac \
+		-encoding "ISO-8859-1" \
+		-classpath $(java-pkg_getjars jaf,javamail,jms,log4j,servlet-api-2.5,avalon-framework-4.1) \
+		-d classes $(find "${SRC_DIR}" -name "*.java") \
+		|| die "Compilation failed"
+
+	jar -cf "${S}/${PN}.jar" -C classes . || die "Could not create jar"
+
+	#Generate javadoc
+	if use doc ; then
+		mkdir "${JAVADOC_DIR}" || die "Could not create javadoc dir"
+		cd "${SRC_DIR}"
+		javadoc \
+			-encoding "ISO-8859-1" \
+			-sourcepath "${SRC_DIR}" \
+			-classpath $(java-pkg_getjars jaf,javamail,jms,log4j,servlet-api-2.5,avalon-framework-4.1) \
+			-source "${JAVA_VERSION}" \
+			-d "${JAVADOC_DIR}" \
+			$(find "org/apache/log" -type d | tr '/' '.') \
+			|| die "Could not create javadoc"
+	fi
+}
+
+src_test() {
+	mkdir test-classes || die "Unable to make dir"
+	local TESTJAR="avalon-logkit-test.jar"
+
+	ejavac \
+		-encoding "ISO-8859-1" \
+		-classpath "avalon-logkit.jar:$(java-config -p junit-4)" \
+		-d test-classes \
+		$(find src/test -name '*.java')
+
+	jar -cf "${TESTJAR}" -C test-classes .
+
+	java -cp "avalon-logkit.jar:${TESTJAR}:$(java-config -p junit:4)" \
+		org.junit.runner.JUnitCore org.apache.log.format.test.FormatterTestCase \
+		org.apache.log.output.test.RevolvingFileStrategyTestCase \
+		org.apache.log.output.test.OutputTargetTestCase \
+		org.apache.log.output.test.DBTargetTestCase \
+		org.apache.log.util.test.UtilTestCase \
+		org.apache.log.test.LoggerListenerTestCase \
+		org.apache.log.test.WrappingTargetTestCase \
+		org.apache.log.test.InheritanceTestCase
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+	use doc && java-pkg_dojavadoc "${JAVADOC_DIR}"
+	use source && java-pkg_dosrc "${SRC_DIR}/*"
+}
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild
new file mode 100644
index 000000000000..751b51706a37
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/log4j
+	java-virtuals/jms
+	java-virtuals/javamail
+	=dev-java/servletapi-2.4*"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+# Doesn't like 1.6 changes to JDBC
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		=dev-java/junit-3*
+		dev-java/ant-junit
+	)
+	${COMMON_DEP}"
+
+java_prepare() {
+	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
+
+	mkdir -p target/lib || die
+	cd target/lib || die
+	java-pkg_jar-from servletapi-2.4
+	java-pkg_jar-from jms
+	java-pkg_jar-from --virtual javamail
+	java-pkg_jar-from log4j
+	java-pkg_filter-compiler jikes
+}
+
+src_test() {
+	java-pkg_jar-from --into target/lib junit
+	ANT_TASKS="ant-junit" eant 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/avalon-logkit-2.1-r6.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild
new file mode 100644
index 000000000000..3ccdb1b53faf
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/log4j:0
+	java-virtuals/jms:0
+	java-virtuals/javamail:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	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"
+
+EANT_GENTOO_CLASSPATH="javamail,jms,log4j,servlet-api-2.5"
+
+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/avalon-logkit-2.1-r7.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild
new file mode 100644
index 000000000000..6c817eaa10bd
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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
+	java-virtuals/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"
+
+EANT_GENTOO_CLASSPATH="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/avalon-logkit-2.1-r8.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
new file mode 100644
index 000000000000..334dbee94b1a
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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"
+
+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-java6.patch b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch
new file mode 100644
index 000000000000..07c4930d3a1d
--- /dev/null
+++ b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch
@@ -0,0 +1,17 @@
+# Patch by Vlastimil Babka <caster@gentoo.org>
+# Straightforward compatilibity with java6 interface extensions
+--- src/java/org/apache/log/output/db/DefaultDataSource.java.orig	2009-11-06 18:03:16.000000000 +0100
++++ src/java/org/apache/log/output/db/DefaultDataSource.java	2009-11-06 18:04:05.000000000 +0100
+@@ -149,4 +149,12 @@
+     {
+         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);
++    }
+ }
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..250f2d1940ea
--- /dev/null
+++ b/dev-java/avalon-logkit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
new file mode 100644
index 000000000000..fdd3843675de
--- /dev/null
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -0,0 +1 @@
+DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 SHA256 1abecd12d48174dbf6fb0f39623ac954c7f0309870f18cca25afc870aeae2512 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54 WHIRLPOOL fe8fdaa4942cf444f12867213bf6cc3897b2b79aebd818d41af677b8a9e69fa55466b93c74a50831345ddbe0c3413af2ede132c730dd0bbbcd9b2493e9697d79
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..9a251f880751
--- /dev/null
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~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..904a29a18fa0
--- /dev/null
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86 ~x86-fbsd ~x86-freebsd ~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..c61248a4b1f7
--- /dev/null
+++ b/dev-java/backport-util-concurrent/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..7e1832effb82
--- /dev/null
+++ b/dev-java/balloontip/Manifest
@@ -0,0 +1 @@
+DIST balloontip_1.2.1.zip 822609 SHA256 d2905d5ec8ce7058a10ccd8881f0444e7703239e252bfc14f427084f64e8f208 SHA512 566e38767627b73324415b329d4f3e06e37572431bb34a022cbc81daf6057f9ab20da673702b2084a0026b70e7135aa8ae83f074ecea0c5a785e5006136ac91b WHIRLPOOL d896c8b9342b5087ee787d2caed0f2071948d23a5c434369042dfd20328957e906b363056b6fcb3e5aad59e1ba4bd5ad2df7830bfb14cc70881aa2f992c105a0
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..40c0424ac0f0
--- /dev/null
+++ b/dev-java/balloontip/balloontip-1.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5"
+DEPEND=">=virtual/jdk-1.5"
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/balloontip/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/base64/Manifest b/dev-java/base64/Manifest
new file mode 100644
index 000000000000..68a42490ce38
--- /dev/null
+++ b/dev-java/base64/Manifest
@@ -0,0 +1 @@
+DIST base64-2.3.7.zip 50473 SHA256 28003fa44f7fc96f247a0da6e7cb451cce0423456ef8652c6f52a91df0e39edb SHA512 11411f7a75ecb67d54cf1f2de253fcb18437205d4e3b6a1ddd7ad84564f4a0881f14200c7c700521b232b857ff13ea22224a192cbbc226c278fe8c88ff8d4b07 WHIRLPOOL 0338691bb35e09fa04254366898740bac58b2d827a5860d18ee685111b81dc897c4424b0ecd1b6e1dd655cebad6cf0f448cbee302309e033b768354acc46aa15
diff --git a/dev-java/base64/base64-2.3.7.ebuild b/dev-java/base64/base64-2.3.7.ebuild
new file mode 100644
index 000000000000..e47c1b1497d6
--- /dev/null
+++ b/dev-java/base64/base64-2.3.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 versionator
+
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="A Base64 encoder written in java"
+HOMEPAGE="http://iharder.sourceforge.net/current/java/base64/"
+SRC_URI="mirror://sourceforge/iharder/${PN}/${MY_PV}/${PN^}-v${PV}.zip -> ${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/${PN^}-v${PV}"
+JAVA_SRC_DIR="${S}"
+
+src_prepare() {
+	rm -r "${S}"/api || die
+	mkdir -p "${S}/net/iharder" || die
+	cp "${S}"/*.java "${S}/net/iharder" || die
+	sed -i '1i package net.iharder;' "${S}"/net/iharder/*.java || die
+}
+
+src_compile() {
+	local build_dir="${S}/build"
+	mkdir ${build_dir} || die
+	ejavac -nowarn -d ${build_dir} $(find -name "*.java")
+	javadoc -d api -quiet *.java || die "javadoc failed"
+}
+
+src_install() {
+	jar cf "${PN}.jar" -C "${S}/build" . || die "jar failed"
+	java-pkg_dojar "${PN}.jar"
+
+	use doc && java-pkg_dohtml -r api/
+	use source && java-pkg_dosrc *.java
+}
diff --git a/dev-java/base64/metadata.xml b/dev-java/base64/metadata.xml
new file mode 100644
index 000000000000..f19ab613be34
--- /dev/null
+++ b/dev-java/base64/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">iharder</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
new file mode 100644
index 000000000000..79f320e6ee59
--- /dev/null
+++ b/dev-java/batik/Manifest
@@ -0,0 +1 @@
+DIST batik-src-1.8.tar.gz 14970684 SHA256 0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b WHIRLPOOL fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46
diff --git a/dev-java/batik/batik-1.8-r1.ebuild b/dev-java/batik/batik-1.8-r1.ebuild
new file mode 100644
index 000000000000..7294a5aa44ee
--- /dev/null
+++ b/dev-java/batik/batik-1.8-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 x86 ppc ppc64 ~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:0 )
+	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
+	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)
+
+	cd "${S}"/"${P}/lib" || die
+
+	# batik-all-1.8.jar is a all-in-one jar that contains all other jars.
+	# We don't want to package it.
+	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.8-r2.ebuild b/dev-java/batik/batik-1.8-r2.ebuild
new file mode 100644
index 000000000000..3de7fc018655
--- /dev/null
+++ b/dev-java/batik/batik-1.8-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86 ~ppc ~ppc64 ~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:0 )
+	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
+	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/metadata.xml b/dev-java/batik/metadata.xml
new file mode 100644
index 000000000000..d44ab745e7a9
--- /dev/null
+++ b/dev-java/batik/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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..980e9ef3146e
--- /dev/null
+++ b/dev-java/bcel/Manifest
@@ -0,0 +1,3 @@
+DIST BCEL_6_0_RC3.tar.gz 929878 SHA256 74a4a75cc7aea8dab4c17c6ff6c00c2c19411942974b4bd6871e6984235101a0 SHA512 05ccf95ebf6b374fb112296509b4011d741acf2315b331aa971f8c3bc6be2f73b39592721a8c769b6b9d631e78e348c124c56f567adc2338ed5508d5ec3bed77 WHIRLPOOL 6bd53b49a7b8b6cfd422b3249461c1ec685855e0e5dd33c7b3d1eac04f8d61f1cd14b357d1d560002fadec1ab21c1a2b0abaae553340e0b055c6446cc4d5a3ce
+DIST bcel-5.2-src.tar.gz 261455 SHA256 68039d59a38379d7b65ea3fc72276c43ba234776460e14361af35771bcaab295 SHA512 c8c1d5250b0d8c2f194038551afbe322bd65cde2990277eb6b30e2cd8cc0af2576946afdbcd011b3804386a09fbbc2ae10fd20ae72a24232630b077e79b8847b WHIRLPOOL fae7334f7735e5f5be924bc35c434a2e6ea2ca85d1e038c7ffe6b4636ae9dd2e839c3d775cb17c054a48655c8539802d4db75fcb5e178c51eea2ad2cc9f152e1
+DIST findbugs-bcel-5.2_p20070531.patch.bz2 7190 SHA256 43d049134de3eab3914fe850f4ddd89cd304ab21d87ca2669153a24f734f7981 SHA512 84bf652cac3992fa3311af4962c0ae064c3f18dda43c91afc256592631f2597815bf07f92b3071680e3cef327b06530f689cf3320fb5ebf6342dc5eaf5d7a953 WHIRLPOOL 6d1d2b3e2d045c7368b4ef7fcd6bc13ce337e60910e24998359df5cccb489fd1077d96c7e7ac763b5041b8b38fe5d4194d1ccf1cc1f7ac68b625076e28c0abe3
diff --git a/dev-java/bcel/bcel-5.2-r2.ebuild b/dev-java/bcel/bcel-5.2-r2.ebuild
new file mode 100644
index 000000000000..3277c61cf912
--- /dev/null
+++ b/dev-java/bcel/bcel-5.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="The Byte Code Engineering Library: analyze, create, manipulate Java class files"
+HOMEPAGE="http://commons.apache.org/bcel/"
+SRC_URI="mirror://apache/jakarta/${PN}/source/${P}-src.tar.gz
+	findbugs? ( http://dev.gentoo.org/~fordfrog/distfiles/findbugs-${P}_p20070531.patch.bz2 )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="-findbugs"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+ANT_OPTS="-Xmx256m"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}"-build.xml.patch
+	if use findbugs; then
+		# Remove next line if no longer needed. Removes build.xml from patch.
+		patch -d "${WORKDIR}" -p0 < "${FILESDIR}"/findbugs-${P}_p20070531.patch.patch || die "Failed to patch"
+
+		EPATCH_OPTS="-p7" epatch "${WORKDIR}"/findbugs-${P}_p20070531.patch
+	fi
+}
+
+src_install() {
+	java-pkg_newjar ./target/${P}.jar
+	dodoc README.txt || die
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/bcel/bcel-5.2-r3.ebuild b/dev-java/bcel/bcel-5.2-r3.ebuild
new file mode 100644
index 000000000000..8fe233f3c176
--- /dev/null
+++ b/dev-java/bcel/bcel-5.2-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="The Byte Code Engineering Library: analyze, create, manipulate Java class files"
+HOMEPAGE="http://commons.apache.org/bcel/"
+SRC_URI="mirror://apache/jakarta/${PN}/source/${P}-src.tar.gz
+	findbugs? ( http://dev.gentoo.org/~fordfrog/distfiles/findbugs-${P}_p20070531.patch.bz2 )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="-findbugs"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+ANT_OPTS="-Xmx256m"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}"-build.xml.patch
+	if use findbugs; then
+		# Remove next line if no longer needed. Removes build.xml from patch.
+		patch -d "${WORKDIR}" -p0 < "${FILESDIR}"/findbugs-${P}_p20070531.patch.patch || die "Failed to patch"
+
+		EPATCH_OPTS="-p7" epatch "${WORKDIR}"/findbugs-${P}_p20070531.patch
+	fi
+}
+
+src_install() {
+	java-pkg_newjar ./target/${P}.jar
+	dodoc README.txt || die
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
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..2b8581b3b4c4
--- /dev/null
+++ b/dev-java/bcel/bcel-6.0_rc3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/files/bcel-5.2-build.xml.patch b/dev-java/bcel/files/bcel-5.2-build.xml.patch
new file mode 100644
index 000000000000..2f365afb6b78
--- /dev/null
+++ b/dev-java/bcel/files/bcel-5.2-build.xml.patch
@@ -0,0 +1,29 @@
+Remove test from jar target and set the encoding for javadocs.
+
+--- build.xml	2006-06-03 05:48:22.000000000 +0200
++++ build.xml	2011-04-20 17:04:49.000000000 +0200
+@@ -56,7 +56,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}">
+     </jar>
+   </target>
+@@ -100,7 +100,7 @@
+     </property>
+     <property name="title" value="jakarta-bcel 5.2 API">
+     </property>
+-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*">
++    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*" encoding="ISO-8859-1">
+       <classpath>
+         <path refid="build.classpath">
+         </path>
+@@ -121,4 +121,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/bcel/files/findbugs-bcel-5.2_p20070531.patch.patch b/dev-java/bcel/files/findbugs-bcel-5.2_p20070531.patch.patch
new file mode 100644
index 000000000000..c3f21eb1c442
--- /dev/null
+++ b/dev-java/bcel/files/findbugs-bcel-5.2_p20070531.patch.patch
@@ -0,0 +1,52 @@
+Removes build.xml from patch
+
+--- findbugs-bcel-5.2_p20070531.patch	2011-04-20 17:16:53.000000000 +0200
++++ findbugs-bcel-5.2_p20070531.patch	2011-04-20 17:17:48.000000000 +0200
+@@ -1,47 +1,3 @@
+-Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/build.xml
+-===================================================================
+---- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/build.xml	(revision 0)
+-+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/build.xml	(revision 0)
+-@@ -0,0 +1,39 @@
+-+<project name="bcel" default="jar">
+-+
+-+	<property name="src.dir" value="src/java"/>
+-+	<property name="classes.dir" value="eclipse"/>
+-+	<property name="jar.dir" value="."/>
+-+
+-+	<target name="jar" depends="clean,classes">
+-+		<!-- Main engine and command line jar file. -->
+-+		<jar destfile="${jar.dir}/bcel.jar" >
+-+			<!-- Compiled classes, properties files. -->
+-+			<fileset dir="${classes.dir}">
+-+				<include name="**/*.class"/>
+-+			</fileset>
+-+		</jar>
+-+   </target>
+-+	
+-+	<!-- Compile Java source files, and copy other files (properties,
+-+		images, html, XSL stylesheets) that need to be part of the codebase. -->
+-+	<target name="classes">
+-+		<mkdir dir="${classes.dir}"/>
+-+		<!-- Compile Java source files. -->
+-+		<javac srcdir="${src.dir}"
+-+						destdir="${classes.dir}"
+-+						source="1.5"
+-+						target="jsr14"
+-+						deprecation="on"
+-+						debug="on">
+-+				</javac>
+-+	</target>
+-+	<!-- Delete generated files. -->
+-+	<target name="clean">
+-+		<delete file="${classes.dir}"/>
+-+		<mkdir dir="${classes.dir}"/>
+-+	</target>
+-+
+-+	
+-+</project>
+-+
+-+<!-- vim:set ts=4: -->
+ Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/AbstractLocalVariableTable.java
+ ===================================================================
+ --- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/AbstractLocalVariableTable.java	(revision 0)
diff --git a/dev-java/bcel/metadata.xml b/dev-java/bcel/metadata.xml
new file mode 100644
index 000000000000..4fc74595c959
--- /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>
+  <herd>java</herd>
+  <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>
+  <use>
+    <flag name="findbugs">Include performance patch for findbugs package.</flag>
+  </use>
+  <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..d8a89f23e640
--- /dev/null
+++ b/dev-java/bcmail/Manifest
@@ -0,0 +1,4 @@
+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
diff --git a/dev-java/bcmail/bcmail-1.38-r3.ebuild b/dev-java/bcmail/bcmail-1.38-r3.ebuild
new file mode 100644
index 000000000000..1bb25d7e3ac1
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.38-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+COMMON_DEPEND="dev-java/bcprov:${SLOT}
+		=dev-java/junit-3.8*
+		dev-java/sun-jaf
+		java-virtuals/javamail"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	unpack ./src.zip
+}
+
+src_compile() {
+	mkdir "${S}/classes"
+
+	find org -name "*.java" > "${T}/src.list"
+	ejavac -d "${S}/classes" \
+		-classpath $(java-pkg_getjars bcprov-${SLOT},junit,sun-jaf,javamail) \
+		"@${T}/src.list"
+
+	cd "${S}/classes"
+	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar "${S}/${PN}.jar"
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcmail/bcmail-1.38-r4.ebuild b/dev-java/bcmail/bcmail-1.38-r4.ebuild
new file mode 100644
index 000000000000..a8bfef406eeb
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.38-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/bcprov:${SLOT}
+	dev-java/junit:0
+	dev-java/sun-jaf:0
+	dev-java/oracle-javamail:0
+"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	junit
+	sun-jaf
+	bcprov-${SLOT}
+	oracle-javamail
+"
+
+src_unpack() {
+	default
+	cd "${S}"
+	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-r2.ebuild b/dev-java/bcmail/bcmail-1.45-r2.ebuild
new file mode 100644
index 000000000000..622c2b6758a3
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.45-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+COMMON_DEPEND="dev-java/bcprov:1.45
+		=dev-java/junit-3.8*
+		dev-java/sun-jaf
+		java-virtuals/javamail"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+src_compile() {
+	mkdir "${S}/classes"
+
+	find org -name "*.java" > "${T}/src.list"
+	ejavac -d "${S}/classes" \
+		-classpath $(java-pkg_getjars bcprov-1.45,junit,sun-jaf,javamail) \
+		"@${T}/src.list"
+
+	cd "${S}/classes"
+	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar "${S}/${PN}.jar"
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcmail/bcmail-1.45-r3.ebuild b/dev-java/bcmail/bcmail-1.45-r3.ebuild
new file mode 100644
index 000000000000..adb6f9172403
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.45-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="1.45"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/bcprov:${SLOT}
+	dev-java/junit:0
+	dev-java/sun-jaf:0
+	dev-java/oracle-javamail:0
+"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	junit
+	sun-jaf
+	bcprov-${SLOT}
+	oracle-javamail
+"
+
+src_unpack() {
+	default
+	cd "${S}"
+	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-r1.ebuild b/dev-java/bcmail/bcmail-1.50-r1.ebuild
new file mode 100644
index 000000000000..a615264ec63f
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.50-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND="dev-java/bcprov:0[test?]
+		dev-java/bcpkix:0[test?]
+		dev-java/sun-jaf:0
+		dev-java/junit:0
+		dev-java/oracle-javamail:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	junit
+	bcprov
+	bcpkix
+	sun-jaf
+	oracle-javamail
+"
+
+# 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() {
+	JAVA_RM_FILES=(
+		org/bouncycastle/mail/smime/test/*
+		org/bouncycastle/mail/smime/examples/CreateSignedMail.java
+	)
+}
+
+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.ebuild b/dev-java/bcmail/bcmail-1.50.ebuild
new file mode 100644
index 000000000000..d8298f467ced
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.50.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+COMMON_DEPEND=">=dev-java/bcprov-${PV}:0[test?]
+		~dev-java/bcpkix-${PV}:0[test?]
+		dev-java/sun-jaf:0
+		java-virtuals/javamail:0"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? ( dev-java/junit:0 )
+	${COMMON_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# 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() {
+	mkdir "${S}"/classes
+
+	if use test ; then
+		java-pkg_jar-from --build-only junit
+	fi
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="$(java-pkg_getjars bcprov,bcpkix,sun-jaf,javamail)"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	cd "${S}"/classes
+	jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:bcpkix.jar:junit.jar"
+
+	java -cp ${cp} org.bouncycastle.mail.smime.test.AllTests | tee mail.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcmail/bcmail-1.52-r1.ebuild b/dev-java/bcmail/bcmail-1.52-r1.ebuild
new file mode 100644
index 000000000000..a615264ec63f
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.52-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND="dev-java/bcprov:0[test?]
+		dev-java/bcpkix:0[test?]
+		dev-java/sun-jaf:0
+		dev-java/junit:0
+		dev-java/oracle-javamail:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	junit
+	bcprov
+	bcpkix
+	sun-jaf
+	oracle-javamail
+"
+
+# 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() {
+	JAVA_RM_FILES=(
+		org/bouncycastle/mail/smime/test/*
+		org/bouncycastle/mail/smime/examples/CreateSignedMail.java
+	)
+}
+
+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.ebuild b/dev-java/bcmail/bcmail-1.52.ebuild
new file mode 100644
index 000000000000..dcc7f07fa345
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.52.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+CDEPEND=">=dev-java/bcprov-${PV}:0[test?]
+		~dev-java/bcpkix-${PV}:0[test?]
+		dev-java/sun-jaf:0
+		java-virtuals/javamail:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/junit:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# 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() {
+	mkdir "${S}"/classes
+
+	if use test; then
+		java-pkg_jar-from --build-only junit
+	fi
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="$(java-pkg_getjars bcprov,bcpkix,sun-jaf,javamail)"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	cd "${S}"/classes
+	jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:bcpkix.jar:junit.jar"
+
+	java -cp ${cp} org.bouncycastle.mail.smime.test.AllTests | tee mail.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcmail/metadata.xml b/dev-java/bcmail/metadata.xml
new file mode 100644
index 000000000000..c8910f13df43
--- /dev/null
+++ b/dev-java/bcmail/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..30f4138c83d3
--- /dev/null
+++ b/dev-java/bcpg/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/bcpg/bcpg-1.50.ebuild b/dev-java/bcpg/bcpg-1.50.ebuild
new file mode 100644
index 000000000000..0d1560abd9a9
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.50.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~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"
+
+COMMON_DEPEND="
+	>=dev-java/bcprov-${PV}:0[test?]"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? ( dev-java/junit:0 )
+	${COMMON_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes
+
+	if use test ; then
+		java-pkg_jar-from --build-only junit
+	fi
+
+	java-pkg_jar-from bcprov
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="bcprov.jar"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+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_dojar "${S}"/${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcpg/bcpg-1.52.ebuild b/dev-java/bcpg/bcpg-1.52.ebuild
new file mode 100644
index 000000000000..d2d42daa186d
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.52.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~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-${PV}:0[test?]"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/junit:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes
+
+	if use test; then
+		java-pkg_jar-from --build-only junit
+	fi
+
+	java-pkg_jar-from bcprov
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="bcprov.jar"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+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_dojar "${S}"/${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcpg/metadata.xml b/dev-java/bcpg/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/bcpg/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
new file mode 100644
index 000000000000..2350c07b18d2
--- /dev/null
+++ b/dev-java/bcpkix/Manifest
@@ -0,0 +1,2 @@
+DIST bcpkix-jdk15on-150.tar.gz 1149901 SHA256 0be5bb948ec481b3d1f30ee80ef593b298b3782697f9eeee5c74cf270689b520 SHA512 17c5a9aa8c04defab46987063f847ee5fdedfc42d51e29ecad5053e3df5895c2c01899edb9222c3dab3ecf204eac9744249163dc2c1572fa2becaaf0924d2eb3 WHIRLPOOL 07197f1271ffc965479badcfd6b75450e5b0744f93031dd3721406dcac04c3f360b0d537cde3efa0f44f9ac06b4427a60f00743bfacd8dc7cf0a3d70193d5b32
+DIST bcpkix-jdk15on-152.tar.gz 1214022 SHA256 518205ea86f215a79267b7a64ea7ce29261f4983be1d3c2f6b6aa533092ce400 SHA512 a30f08aa6ae646219012b6e4763e57bd9021358ddc7d5ea588deb808a5555f67cc212a7d8cdc2a552922f550989d88965ba204521dd5bd9b17cfdb9ed09c3b5f WHIRLPOOL e9f855dc2571643fafaaa2167ba9afb5c34691966d86e6e712a5411467d47bcdac5fa15f5a3f736eb05092c25190e42c2fb40bbbce42d7dadd6fdce63fc8451a
diff --git a/dev-java/bcpkix/bcpkix-1.50.ebuild b/dev-java/bcpkix/bcpkix-1.50.ebuild
new file mode 100644
index 000000000000..8a49e4edcb80
--- /dev/null
+++ b/dev-java/bcpkix/bcpkix-1.50.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Needs further investigation.
+#
+#  - java.lang.RuntimeException: java.security.NoSuchProviderException:
+#    JCE cannot authenticate the provider BC
+#
+#  - error: package org.bouncycastle.util.test does not exist
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-java/bcprov-${PV}:0[test?]"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? ( dev-java/junit:0 )
+	${COMMON_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes
+
+	if use test ; then
+		java-pkg_jar-from --build-only junit
+	fi
+
+	java-pkg_jar-from bcprov
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="bcprov.jar"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:junit.jar"
+	local pkg="org.bouncycastle"
+
+	java -cp ${cp} ${pkg}.tsp.test.AllTests | tee tsp.tests
+	java -cp ${cp} ${pkg}.pkcs.test.AllTests | tee pkcs.tests
+	java -cp ${cp} ${pkg}.openssl.test.AllTests | tee openssl.tests
+	java -cp ${cp} ${pkg}.mozilla.test.AllTests | tee mozilla.tests
+	java -cp ${cp} ${pkg}.eac.test.AllTests | tee eac.tests
+	java -cp ${cp} ${pkg}.dvcs.test.AllTests | tee dvcs.tests
+	java -cp ${cp} ${pkg}.cms.test.AllTests | tee cms.tests
+	java -cp ${cp} ${pkg}.cert.test.AllTests | tee cert.tests
+	java -cp ${cp} ${pkg}.cert.ocsp.test.AllTests | tee cert.ocsp.tests
+	java -cp ${cp} ${pkg}.cert.crmf.test.AllTests | tee cert.crmf.tests
+	java -cp ${cp} ${pkg}.cert.cmp.test.AllTests | tee cert.cmp.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcpkix/bcpkix-1.52.ebuild b/dev-java/bcpkix/bcpkix-1.52.ebuild
new file mode 100644
index 000000000000..29e07b8c8749
--- /dev/null
+++ b/dev-java/bcpkix/bcpkix-1.52.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Needs further investigation.
+#
+#  - java.lang.RuntimeException: java.security.NoSuchProviderException:
+#    JCE cannot authenticate the provider BC
+#
+#  - error: package org.bouncycastle.util.test does not exist
+RESTRICT="test"
+
+CDEPEND="
+	>=dev-java/bcprov-${PV}:0[test?]"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/junit:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes
+
+	if use test ; then
+		java-pkg_jar-from --build-only junit
+	fi
+
+	java-pkg_jar-from bcprov
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="bcprov.jar"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+src_test() {
+	local cp="${PN}.jar:bcprov.jar:junit.jar"
+	local pkg="org.bouncycastle"
+
+	java -cp ${cp} ${pkg}.tsp.test.AllTests | tee tsp.tests
+	java -cp ${cp} ${pkg}.pkcs.test.AllTests | tee pkcs.tests
+	java -cp ${cp} ${pkg}.openssl.test.AllTests | tee openssl.tests
+	java -cp ${cp} ${pkg}.mozilla.test.AllTests | tee mozilla.tests
+	java -cp ${cp} ${pkg}.eac.test.AllTests | tee eac.tests
+	java -cp ${cp} ${pkg}.dvcs.test.AllTests | tee dvcs.tests
+	java -cp ${cp} ${pkg}.cms.test.AllTests | tee cms.tests
+	java -cp ${cp} ${pkg}.cert.test.AllTests | tee cert.tests
+	java -cp ${cp} ${pkg}.cert.ocsp.test.AllTests | tee cert.ocsp.tests
+	java -cp ${cp} ${pkg}.cert.crmf.test.AllTests | tee cert.crmf.tests
+	java -cp ${cp} ${pkg}.cert.cmp.test.AllTests | tee cert.cmp.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcpkix/metadata.xml b/dev-java/bcpkix/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/bcpkix/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
new file mode 100644
index 000000000000..e5c853a7692a
--- /dev/null
+++ b/dev-java/bcprov/Manifest
@@ -0,0 +1,7 @@
+DIST bcprov-jdk14-138.tar.gz 3374082 SHA256 15a8099fca68fde937cdfc87ae486498a7c12c7d1ebaca9f26aa31b7ad11d413 SHA512 a320a49ca775a5d0dfb8aa7c7fd900384e4e789df2e11be2bfd84cd3ce0ba1d755a680f1d09d3030b178c7d7c52a469601f40b023ac402e6523731d8098793e1 WHIRLPOOL d08c4401003b1b217594f4ebe4bb55a0ff03df72dff45c84e05b605341aaf3af3b6f5824e179547df3c6777cade20891cdcdd79d52df8e20cbfdb6186fd871f8
+DIST bcprov-jdk15-140.tar.gz 3494846 SHA256 4284e5b4eef0ae410aa1e65868058230a86c5cc591a47b391c87d4a18e913bbf SHA512 22cbbaa81709c8dcf28ceb0e984ca6181b835fb20f4381a2123291b638d07b987572ddf58d33ae07f7cb7dca9f1a67e3b6a1c0467cb2e0dca7625b622517ddb6 WHIRLPOOL 76c7973f3b4668ac438a0fed38b893b5eee8810aa91c0e43309063f064021e637190a1238d0e8f03c5d8303f91c50cb6beba22fd6dc712985c8b114ba2b75cea
+DIST bcprov-jdk15-145.tar.gz 3427337 SHA256 7751a677d2cf7f8f9494a9b80c884e88de63be3be6fd9fccecee854196c611e2 SHA512 789ae99942e7d565ee58b2411f1ac089a999c4b947d81d640850190ff80d8aa27448d401deff5f44d9ebb4b75f492cf58a6d1d7bcab78198872bea6e98c9f7c3 WHIRLPOOL bb30f3c4192aef793d1193ce4a85f7aa801dca5ae5c0e17807e8c0d549bf883424985025b157266fc5b504a8892e37494295f780c736903d484c5cee70b5bc33
+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
diff --git a/dev-java/bcprov/bcprov-1.38-r2.ebuild b/dev-java/bcprov/bcprov-1.38-r2.ebuild
new file mode 100644
index 000000000000..38f288d55309
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.38-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# The src_unpack find needs a new find
+# https://bugs.gentoo.org/show_bug.cgi?id=182276
+DEPEND=">=virtual/jdk-1.4
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+IUSE="userland_GNU"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	unpack ./src.zip
+
+	# so that we don't need junit
+	echo "Removing testcases' sources:"
+	find . -path '*test/*.java' -print -delete \
+		|| die "Failed to delete testcases."
+	find . -name '*Test*.java' -print -delete \
+		|| die "Failed to delete testcases."
+}
+
+src_compile() {
+	mkdir "${S}/classes"
+
+	find . -name "*.java" > "${T}/src.list"
+	ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list"
+
+	cd "${S}/classes"
+	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar "${S}/${PN}.jar"
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcprov/bcprov-1.38-r3.ebuild b/dev-java/bcprov/bcprov-1.38-r3.ebuild
new file mode 100644
index 000000000000..887278148fc1
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.38-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# The src_unpack find needs a new find
+# https://bugs.gentoo.org/show_bug.cgi?id=182276
+DEPEND=">=virtual/jdk-1.4
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+IUSE="userland_GNU"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	unpack ./src.zip
+
+	# so that we don't need junit
+	echo "Removing testcases' sources:"
+	find . -path '*test/*.java' -print -delete \
+		|| die "Failed to delete testcases."
+	find . -name '*Test*.java' -print -delete \
+		|| die "Failed to delete testcases."
+}
+
+src_compile() {
+	mkdir "${S}/classes"
+
+	find . -name "*.java" > "${T}/src.list"
+	ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list"
+
+	cd "${S}/classes"
+	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar "${S}/${PN}.jar"
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcprov/bcprov-1.40-r1.ebuild b/dev-java/bcprov/bcprov-1.40-r1.ebuild
new file mode 100644
index 000000000000..ac913873e99a
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.40-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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.40"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+# The src_unpack find needs a new find
+# https://bugs.gentoo.org/show_bug.cgi?id=182276
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+IUSE="userland_GNU"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+
+	# so that we don't need junit
+	echo "Removing testcases' sources:"
+	find . -path '*test/*.java' -print -delete \
+		|| die "Failed to delete testcases."
+	find . -name '*Test*.java' -print -delete \
+		|| die "Failed to delete testcases."
+}
+
+src_compile() {
+	mkdir "${S}/classes"
+
+	find . -name "*.java" > "${T}/src.list"
+	ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list"
+
+	cd "${S}/classes"
+	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar "${S}/${PN}.jar"
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcprov/bcprov-1.45-r1.ebuild b/dev-java/bcprov/bcprov-1.45-r1.ebuild
new file mode 100644
index 000000000000..0cea3e9359f7
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.45-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# The src_unpack find needs a new find
+# https://bugs.gentoo.org/show_bug.cgi?id=182276
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+IUSE="userland_GNU"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+
+	# so that we don't need junit
+	echo "Removing testcases' sources:"
+	find . -path '*test/*.java' -print -delete \
+		|| die "Failed to delete testcases."
+	find . -name '*Test*.java' -print -delete \
+		|| die "Failed to delete testcases."
+}
+
+src_compile() {
+	mkdir "${S}/classes"
+
+	find . -name "*.java" > "${T}/src.list"
+	ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list"
+
+	cd "${S}/classes"
+	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar "${S}/${PN}.jar"
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcprov/bcprov-1.45.ebuild b/dev-java/bcprov/bcprov-1.45.ebuild
new file mode 100644
index 000000000000..4dd1d5ec6d04
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.45.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# The src_unpack find needs a new find
+# https://bugs.gentoo.org/show_bug.cgi?id=182276
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+IUSE="userland_GNU"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+
+	# so that we don't need junit
+	echo "Removing testcases' sources:"
+	find . -path '*test/*.java' -print -delete \
+		|| die "Failed to delete testcases."
+	find . -name '*Test*.java' -print -delete \
+		|| die "Failed to delete testcases."
+}
+
+src_compile() {
+	mkdir "${S}/classes"
+
+	find . -name "*.java" > "${T}/src.list"
+	ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list"
+
+	cd "${S}/classes"
+	jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar "${S}/${PN}.jar"
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcprov/bcprov-1.48-r1.ebuild b/dev-java/bcprov/bcprov-1.48-r1.ebuild
new file mode 100644
index 000000000000..0948f5b7f768
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.48-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# The src_unpack find needs a new find
+# https://bugs.gentoo.org/show_bug.cgi?id=182276
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+IUSE="userland_GNU"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+java_prepare() {
+	# This should eventually split the tests
+	# and call them separately, it's not clean
+	# to just throw the tests away.
+	einfo "Removing testcases' sources:"
+	find . -path '*test/*.java' -print -delete \
+		|| die "Failed to delete testcases."
+	find . -name '*Test*.java' -print -delete \
+		|| die "Failed to delete testcases."
+
+	mkdir "${S}"/classes || die
+}
+
+src_compile() {
+	find . -name "*.java" > "${T}"/src.list
+	ejavac -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
+
+	cd "${S}"/classes || die
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcprov/bcprov-1.49-r2.ebuild b/dev-java/bcprov/bcprov-1.49-r2.ebuild
new file mode 100644
index 000000000000..fa1a02fc3166
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.49-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Needs further investigation.
+# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
+RESTRICT="test"
+
+# The src_unpack find needs a new find
+# https://bugs.gentoo.org/show_bug.cgi?id=182276
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	app-arch/unzip
+	test? ( dev-java/junit:4 )"
+RDEPEND=">=virtual/jre-1.5"
+
+IUSE="userland_GNU"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes || die
+
+	if use test ; then
+		java-pkg_jar-from --build-only junit-4
+	fi
+}
+
+src_compile() {
+	find . -name "*.java" > "${T}"/src.list
+
+	local cp
+	if use test ; then
+		cp="-cp junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+src_test() {
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcprov/bcprov-1.49-r3.ebuild b/dev-java/bcprov/bcprov-1.49-r3.ebuild
new file mode 100644
index 000000000000..3e23923799af
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.49-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Needs further investigation.
+# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
+RESTRICT="test"
+
+# The src_unpack find needs a new find
+# https://bugs.gentoo.org/show_bug.cgi?id=182276
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	app-arch/unzip
+	test? ( dev-java/junit:4 )"
+RDEPEND=">=virtual/jre-1.5"
+
+IUSE="userland_GNU"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes || die
+
+	if use test ; then
+		java-pkg_jar-from --build-only junit-4
+	fi
+}
+
+src_compile() {
+	find . -name "*.java" > "${T}"/src.list
+
+	local cp
+	if use test ; then
+		cp="-cp junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+src_test() {
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcprov/bcprov-1.50.ebuild b/dev-java/bcprov/bcprov-1.50.ebuild
new file mode 100644
index 000000000000..6a541955b7de
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.50.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Needs further investigation.
+# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
+RESTRICT="test"
+
+# The src_unpack find needs a new find
+# https://bugs.gentoo.org/show_bug.cgi?id=182276
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	app-arch/unzip
+	test? ( dev-java/junit:4 )"
+RDEPEND=">=virtual/jre-1.5"
+
+IUSE="userland_GNU"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes || die
+
+	if use test ; then
+		java-pkg_jar-from --build-only junit-4
+	fi
+}
+
+src_compile() {
+	find . -name "*.java" > "${T}"/src.list
+
+	local cp
+	if use test ; then
+		cp="-cp junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+src_test() {
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcprov/bcprov-1.52.ebuild b/dev-java/bcprov/bcprov-1.52.ebuild
new file mode 100644
index 000000000000..c2e5a3c31a5c
--- /dev/null
+++ b/dev-java/bcprov/bcprov-1.52.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Needs further investigation.
+# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
+RESTRICT="test"
+
+# The src_unpack find needs a new find
+# https://bugs.gentoo.org/show_bug.cgi?id=182276
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	userland_GNU? (
+		sys-apps/findutils
+	)
+	test? (
+		dev-java/junit:4
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+IUSE="userland_GNU"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	cd "${S}" || die
+	unpack ./src.zip
+}
+
+java_prepare() {
+	mkdir "${S}"/classes || die
+
+	if use test; then
+		java-pkg_jar-from --build-only junit-4
+	fi
+}
+
+src_compile() {
+	find . -name "*.java" > "${T}"/src.list
+
+	local cp
+	if use test ; then
+		cp="-cp junit.jar"
+	else
+		sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes"
+	fi
+
+	ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list
+
+	cd "${S}"/classes || die
+
+	jar -cf "${S}"/${PN}.jar * || die "Failed to create jar."
+}
+
+src_test() {
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests
+	java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests
+
+	grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcprov/metadata.xml b/dev-java/bcprov/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/bcprov/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/bctsp/Manifest b/dev-java/bctsp/Manifest
new file mode 100644
index 000000000000..fd5ee77a66da
--- /dev/null
+++ b/dev-java/bctsp/Manifest
@@ -0,0 +1 @@
+DIST bctsp-jdk15-145.tar.gz 100494 SHA256 1bd01deef63cb95affed9e0653bef8a3392aaf5857f4e03f00481b2e82e3d4c4 SHA512 8e06598b6286502a6cf908f60b9bcae134dca070869c58e408746470e1f4f80ad8bca8c6f2fe5265fed051b5ddbeb710154ae7bf3a50fff2980c6b562ba6a606 WHIRLPOOL 5b453c1403a8251ec7a2eafd43f4c96c14e241396f248ca17bf533a9fd8142812845b168bb07c36aaf1b038da40c8e2c93646c24d6d717bb4e9e38de8600e677
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..ad001c777c09
--- /dev/null
+++ b/dev-java/bctsp/bctsp-1.45-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+COMMON_DEPEND="
+	dev-java/bcprov:1.45
+	dev-java/bcmail:1.45"
+
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.5
+	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..82a57ccd5243
--- /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>
+<herd>java</herd>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/dev-java/beansbinding/Manifest b/dev-java/beansbinding/Manifest
new file mode 100644
index 000000000000..0cfaf19a9bf4
--- /dev/null
+++ b/dev-java/beansbinding/Manifest
@@ -0,0 +1 @@
+DIST beansbinding-1.2.1-src.zip 236905 SHA256 ed77bd6e0351bb00832dd4248cb4a6a69f5ccd08cf41f2f3806ae3732b7f0aa4 SHA512 f617f0b5068c416bcaaa46fe141e9b8b1fec128403738093b205451f9bcd624d2588b9b77e0c67f6de97490f44a4cf7c5e58b1728d5d7d921bd861e3dfffb415 WHIRLPOOL 5545a5a3ee19c3b0170d4e57ebb8f39c58ec7599995db9e516caa9f5fd952dc89e5f8091f7ee2073689986e2d240d283bdb53b48ab8cdf6abe4bb72761062d62
diff --git a/dev-java/beansbinding/beansbinding-1.2.1-r1.ebuild b/dev-java/beansbinding/beansbinding-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..946df38da70b
--- /dev/null
+++ b/dev-java/beansbinding/beansbinding-1.2.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Implementation of JSR295"
+HOMEPAGE="https://beansbinding.dev.java.net"
+SRC_URI="https://beansbinding.dev.java.net/files/documents/6779/73673/${P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+# https://bugs.gentoo.org/show_bug.cgi?id=249740
+# Quite weird. Should look into why this is happening.
+JAVA_PKG_FILTER_COMPILER="ecj-3.5 ecj-3.4 ecj-3.3 ecj-3.2"
+
+java_prepare() {
+	# Avoid the usual "Javadoc returned 1" error.
+	java-ant_xml-rewrite \
+		-f nbproject/build-impl.xml \
+		-c -e javadoc \
+		-a failonerror \
+		-v "false"
+}
+
+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/beansbinding/beansbinding-1.2.1.ebuild b/dev-java/beansbinding/beansbinding-1.2.1.ebuild
new file mode 100644
index 000000000000..baf239dd5349
--- /dev/null
+++ b/dev-java/beansbinding/beansbinding-1.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Implementation of JSR295"
+HOMEPAGE="https://beansbinding.dev.java.net"
+SRC_URI="https://beansbinding.dev.java.net/files/documents/6779/73673/${P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+# https://bugs.gentoo.org/show_bug.cgi?id=249740
+# Quite weird. Should look into why this is happening.
+JAVA_PKG_FILTER_COMPILER="ecj-3.5 ecj-3.4 ecj-3.3 ecj-3.2"
+
+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/beansbinding/metadata.xml b/dev-java/beansbinding/metadata.xml
new file mode 100644
index 000000000000..6f5f1773935d
--- /dev/null
+++ b/dev-java/beansbinding/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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..ba85c34e0bec
--- /dev/null
+++ b/dev-java/blowfishj/Manifest
@@ -0,0 +1 @@
+DIST blowfishj-2.14-src.tar.gz 33726 SHA256 d49ff16dbf320f8988886507c0065312b4660d4dfdbffb894db7ff7d6f5bfaa9 SHA512 3f508be61b494eddf6f276e21c7979d1f6a46dac19e8256f7451f3a434cd1d7df34c268aa2c13b7370129c84f289f331f47456c400ac31a9f0996fefeae12aec WHIRLPOOL 04cc5516fab856f45269bbbd7b0cce31331f9e6586023f14442228aa7f9bd5b39c731dd73c34460eaf60d995312cf7b118fb38c10d7ae2f7c4a27574fabd1260
diff --git a/dev-java/blowfishj/blowfishj-2.14-r1.ebuild b/dev-java/blowfishj/blowfishj-2.14-r1.ebuild
new file mode 100644
index 000000000000..82e4c81b75c1
--- /dev/null
+++ b/dev-java/blowfishj/blowfishj-2.14-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86"
+IUSE="doc test source"
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( =dev-java/junit-3* dev-java/ant-junit ) "
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	java-ant_ignore-system-classes
+	mkdir -p target/lib
+	cd target/lib
+	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/blowfishj-2.14-r2.ebuild b/dev-java/blowfishj/blowfishj-2.14-r2.ebuild
new file mode 100644
index 000000000000..d423e69c95a6
--- /dev/null
+++ b/dev-java/blowfishj/blowfishj-2.14-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( =dev-java/junit-3* dev-java/ant-junit ) "
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	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/blowfishj-2.14-r3.ebuild b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
new file mode 100644
index 000000000000..dfa8b48baf47
--- /dev/null
+++ b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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..0df99acfebe9
--- /dev/null
+++ b/dev-java/blowfishj/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..cad265698532
--- /dev/null
+++ b/dev-java/bnd-junit/Manifest
@@ -0,0 +1 @@
+DIST bndlib-2.1.0.tar.gz 123217291 SHA256 5e4c3c5d786acc1044103f57f4769acf54ea7d247f58f3c6a7b7769fb37df30f SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e WHIRLPOOL 3df261dec93655d2f4e483952b58d531fdf1936c505552f013f9447ac7fc8100e51f2412fd66224fe7871fa68fe1a6ec86c9c2787ffbfc65c8dc9863bac31fe5
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..69a61b78a010
--- /dev/null
+++ b/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f74b561cfceb
--- /dev/null
+++ b/dev-java/bnd-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>
+  <herd>java</herd>
+  <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..cad265698532
--- /dev/null
+++ b/dev-java/bndlib/Manifest
@@ -0,0 +1 @@
+DIST bndlib-2.1.0.tar.gz 123217291 SHA256 5e4c3c5d786acc1044103f57f4769acf54ea7d247f58f3c6a7b7769fb37df30f SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e WHIRLPOOL 3df261dec93655d2f4e483952b58d531fdf1936c505552f013f9447ac7fc8100e51f2412fd66224fe7871fa68fe1a6ec86c9c2787ffbfc65c8dc9863bac31fe5
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..9ed0303cb76e
--- /dev/null
+++ b/dev-java/bndlib/bndlib-2.1.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f74b561cfceb
--- /dev/null
+++ b/dev-java/bndlib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..bd604ff74d25
--- /dev/null
+++ b/dev-java/boilerpipe/Manifest
@@ -0,0 +1 @@
+DIST boilerpipe-1.2.0-src.tar.gz 46279 SHA256 b87ce6e374081a417bf54016fda504b174445c6c9a275c73735c00b85f7080b4 SHA512 db9349213debab932d2470e46f1e80366d6a6ca99e016b6f9ed4887881eecd4132e9aef29b8e4fe8282d1375d60b88a99d9aa43e249d6b673739ec017d2472a6 WHIRLPOOL 422427bb061895a2b5d34f0fd0a18bce524bb97acb5500127df4323a5cf36a1e4ad0a1d802988e22371039a44ee142ebdd8995277d6109dee71dbb0459e4550d
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..bba9e7be3849
--- /dev/null
+++ b/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Boilerplate Removal and Fulltext Extraction from HTML pages"
+HOMEPAGE="https://code.google.com/p/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-1.9.10: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..4128863055b4
--- /dev/null
+++ b/dev-java/boilerpipe/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>
+		<email>ercpe@gentoo.org</email>
+		<name>Johann Schmitz (ercpe)</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/dev-java/browserlauncher2/Manifest b/dev-java/browserlauncher2/Manifest
new file mode 100644
index 000000000000..26987b4e8d80
--- /dev/null
+++ b/dev-java/browserlauncher2/Manifest
@@ -0,0 +1 @@
+DIST BrowserLauncher2-all-1_3.jar 186442 SHA256 45445b2eeaddf70a0f79f4b3c45cffe097bbc16ac76ec59ab9224562ccda2bbd SHA512 529195a94b757578afb3863c6b53cf16584097c659c576167fcbf86897cc484d80092c8d6e409ba1fdec69cb4f4a42b65c89c881663ae64bbc0a0a496309da5f WHIRLPOOL df45cef7d159c38101d66ec86b8a965cb1bb28f0d0e3c8a289059c3be01d83573e2a352d950b730eaced3210df19e2a9d1904e9ea444ae8250f91010a2626777
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..d23cf65850cd
--- /dev/null
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="BrowserLauncher2 is 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 ppc 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/browserlauncher2-1.3.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3.ebuild
new file mode 100644
index 000000000000..5c3e88be4e8e
--- /dev/null
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator eutils java-pkg-2 java-ant-2
+
+MY_PV="$(replace_all_version_separators _)"
+MY_PN="BrowserLauncher2"
+
+DESCRIPTION="BrowserLauncher2 is 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 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	find . -name "*.class" -exec rm -v {} \;
+	# 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..698f4bd621e1
--- /dev/null
+++ b/dev-java/browserlauncher2/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..9bd40a9f5d19
--- /dev/null
+++ b/dev-java/bsf/Manifest
@@ -0,0 +1 @@
+DIST bsf-src-2.4.0.tar.gz 299749 SHA256 5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43 WHIRLPOOL 95ef77a21ad3ac013d354222655b3d4ff42ef7cd154f8529d8798c6b226385adc231edc5daa1bf2575111765fe2ae376d9071c496da050ab9ce73a569330ee84
diff --git a/dev-java/bsf/bsf-2.4.0-r1.ebuild b/dev-java/bsf/bsf-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..5bfdfc3fd626
--- /dev/null
+++ b/dev-java/bsf/bsf-2.4.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="1"
+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 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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"
+
+COMMON_DEP="dev-java/commons-logging:0
+	dev-java/xalan:0
+	python? ( >=dev-java/jython-2.1-r5:0 )
+	javascript? ( dev-java/rhino:1.6 )
+	tcl? ( dev-java/jacl:0 )"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v lib/*.jar || die
+	rm samples/*/*.class || die
+
+	java-ant_ignore-system-classes
+	java-ant_rewrite-classpath
+
+	# somebody forgot to add them to source tarball... fetched from svn
+	cp "${FILESDIR}/${P}-build-properties.xml" build-properties.xml || die
+}
+
+src_compile() {
+	local pkgs="commons-logging,xalan"
+	local antflags="-Dxalan.present=true"
+	if use python; then
+		antflags="${antflags} -Djython.present=true"
+		pkgs="${pkgs},jython"
+	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
+}
+
+# does not have any, overwrite the one from java-pkg-2
+src_test() {
+	true;
+}
+
+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/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
new file mode 100644
index 000000000000..7185636500e5
--- /dev/null
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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="dev-java/commons-logging:0
+	dev-java/xalan:0
+	python? ( dev-java/jython:2.7 )
+	javascript? ( dev-java/rhino:1.6 )
+	tcl? ( dev-java/jacl:0 )"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+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..abc882c6cece
--- /dev/null
+++ b/dev-java/bsf/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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..d0f694b078b5
--- /dev/null
+++ b/dev-java/bsh/Manifest
@@ -0,0 +1,2 @@
+DIST beanshell-icon.png 29784 SHA256 a3df458c6e892ec328e8865f081da8c3f3d9ff4c979ecb701a57fc7cedacdef9 SHA512 731cc0e39e69ef84230e2cea8f9eaf00f80b607c70d83f767d600d8f76fae024516e9b97a988bfcb1ad963da279a6b97ad2559bb8213dc9aaa23c65aa5946d45 WHIRLPOOL 018f8915426bb77bcb62e9f811a51436c6467e01b4d24fc4e2ddb92a3635c18ab1ba7f3154e74fdaccd1621a81b7fc735e53b7cb09caffcd8c103f5462e71e77
+DIST bsh-2.0b4-src.jar 1636723 SHA256 beaa29a8bcbd00db2563a5a9f0fdcfa8ae268e959880baef0a59167ff1729f8e SHA512 867e960420f8ad0f49ffa1c7cb291ddc64e75dc20f91bd33b91151e9ba96033250b94efbf8e3d4b8d4f8c7193017efcb88840536080809ecb45e2ee0fb8e9040 WHIRLPOOL 1dc8f6d3600ca22fbf993ccb6aafa3954b1d2127f0940cbe84468aa8f323ad69b02c2a3619435ee0e6e1024e1784e57e138f781314ac735f01b909629e074109
diff --git a/dev-java/bsh/bsh-2.0_beta4-r4.ebuild b/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
new file mode 100644
index 000000000000..706b616c6e94
--- /dev/null
+++ b/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+MY_PV=${PV/_beta/b}
+MY_DIST=${PN}-${MY_PV}-src.jar
+
+DESCRIPTION="BeanShell: A small embeddable Java source interpreter"
+HOMEPAGE="http://www.beanshell.org"
+SRC_URI="http://www.beanshell.org/${MY_DIST} mirror://gentoo/beanshell-icon.png"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bsf readline"
+# some tests fail but ant doesn't fail
+RESTRICT="test"
+
+RDEPEND=">=virtual/jdk-1.4
+	java-virtuals/servlet-api:3.0
+	readline? ( dev-java/libreadline-java:0 )"
+DEPEND="${RDEPEND}
+	bsf? ( dev-java/bsf:2.3 )"
+
+S=${WORKDIR}/BeanShell-${MY_PV}
+
+src_unpack() {
+	jar xf "${DISTDIR}"/${MY_DIST} || die "failed to unpack"
+}
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.jar' -delete || die
+
+	epatch "${FILESDIR}/bsh${MY_PV}-build.patch"
+	use readline && epatch "${FILESDIR}/bsh2-readline.patch"
+
+	java-pkg_jar-from --into lib servlet-api-3.0
+	use readline && java-pkg_jar-from --into lib libreadline-java
+	use bsf && java-pkg_jar-from --into lib --build-only bsf-2.3
+}
+
+src_compile() {
+	eant $(use bsf && echo -Dexclude-bsf=) jarall $(use_doc)
+}
+
+src_test() {
+	eant test
+}
+
+src_install() {
+	java-pkg_newjar dist/${P/_beta/b}.jar
+
+	java-pkg_dolauncher bsh-console --main bsh.Console
+	java-pkg_dolauncher bsh-interpreter --main bsh.Interpreter
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/bsh
+
+	newicon "${DISTDIR}"/beanshell-icon.png beanshell.png
+
+	make_desktop_entry bsh-console "BeanShell Prompt" beanshell
+}
diff --git a/dev-java/bsh/files/bsh2-readline.patch b/dev-java/bsh/files/bsh2-readline.patch
new file mode 100644
index 000000000000..f6aa7d4aee7d
--- /dev/null
+++ b/dev-java/bsh/files/bsh2-readline.patch
@@ -0,0 +1,151 @@
+--- BeanShell/src/bsh/Interpreter.java~	2003-09-03 19:56:58.000000000 -0400
++++ BeanShell/src/bsh/Interpreter.java	2004-01-25 09:59:41.730059108 -0500
+@@ -38,6 +38,13 @@
+ import java.lang.reflect.Method;
+ import java.lang.reflect.InvocationTargetException;
+ 
++import bsh.util.BshCompleter;
++import bsh.util.NameCompletionTable;
++import bsh.classpath.ClassManagerImpl;
++import org.gnu.readline.Readline;
++import org.gnu.readline.ReadlineLibrary;
++import org.gnu.readline.ReadlineReader;
++
+ /**
+ 	The BeanShell script interpreter.
+ 
+@@ -394,10 +401,59 @@
+ 			else
+ 				src = System.in;
+ 
+-            Reader in = new CommandLineReader( new InputStreamReader(src));
+-            Interpreter interpreter = 
+-				new Interpreter( in, System.out, System.err, true );
+-        	interpreter.run();
++            Reader in = null;
++            boolean usingReadline = false;
++            String backingLib = System.getProperty("bsh.console.readlinelib"); System.out.println("backingLib is " + backingLib);
++            if (backingLib != null && backingLib.length() > 0) {
++                try {
++                    File history = new File(System.getProperty("user.home") +
++                                            File.separator + ".bsh_history");
++                    if (!history.exists()) {
++                        try {
++                            history.createNewFile();
++                        } catch(IOException ioe) {
++                            debug("Unable to create history  " + history.getAbsolutePath());
++                        }
++                    }
++                    ReadlineLibrary lib = ReadlineLibrary.byName(backingLib);
++                    // should I wrap CommandLineReader around it?
++                    if (history.canWrite() && history.canRead()) {
++                        in = new ReadlineReader("bsh % ", history,lib);
++                    } else {
++                        in = new ReadlineReader("bsh % ",lib);
++                        debug("Unable to read/write history  " + history.getAbsolutePath());
++                    }
++                } catch (IOException ioe) {
++                    System.err.println("Unable to invoke ReadlineReader " +
++                                       "due to: " + ioe);
++                }
++            }
++            if (in == null)
++                in = new CommandLineReader( new InputStreamReader(src));
++            else
++                usingReadline = true;
++            Interpreter interpreter =
++                new Interpreter( in, System.out, System.err, true );
++            if (usingReadline) {
++                NameCompletionTable nct = new NameCompletionTable();
++                nct.add(interpreter.getNameSpace());
++
++                /** ClassManager does a lot of chatting to the stdout,
++                 *  so this has been commented out for the time being
++                 **/
++
++//              try {
++//                  BshClassManager bcm = BshClassManager.getClassManager();
++//                      if (bcm != null) {
++//                          nct.add(((ClassManagerImpl)bcm).getClassPath());
++//                      }
++//                  } catch(ClassPathException cpe) {
++//                      debug("classpath exception in name compl:" + cpe);
++//                  }
++
++                Readline.setCompleter(new BshCompleter(nct));
++            }
++            interpreter.run();
+         }
+     }
+ 
+@@ -445,7 +501,7 @@
+                 System.err.flush();
+                 Thread.yield();  // this helps a little
+ 
+-                if ( interactive )
++                if ( interactive && !(in instanceof ReadlineReader))
+                     print( getBshPrompt() );
+ 
+                 eof = Line();
+@@ -548,10 +604,17 @@
+             }
+         }
+ 
+-		if ( interactive && exitOnEOF )
+-			System.exit(0);
++        if ( interactive && exitOnEOF ) {
++            /* should be done for all streams in general, but this
++             * ensures that the history for readline is flushed */
++            try {
++                in.close();
++            } catch (IOException ioe) {
++            }
++	
++            System.exit(0);
+     }
+-
++   }
+ 	// begin source and eval
+ 
+ 	/**
+--- /dev/null	2003-10-19 02:52:03.000000000 -0400
++++ BeanShell/src/bsh/util/BshCompleter.java	2004-01-25 10:14:10.184458217 -0500
+@@ -0,0 +1,38 @@
++package bsh.util;
++
++import org.gnu.readline.ReadlineCompleter;
++
++/**
++ * An adapter for org.gnu.readline's ReadlineCompleter interface to map to
++ * BeanShell's NameCompleter interface.
++ *
++ * @see org.gnu.readline.ReadlineReader
++ * @version $Revision: 1.1 $
++ * @author Shane Celis <shane@terraspring.com>
++ **/
++public class BshCompleter implements ReadlineCompleter {
++
++    private NameCompletion completer;
++
++    /**
++     * Constructs a <code>ReadlineCompleter</code> out of a
++     * <code>NameCompleter</code> object.
++     **/
++    public BshCompleter(NameCompletion completer) {
++        this.completer = completer;
++    }
++
++    /**
++     * Returns String of completion if unambiguous, otherwise null
++     **/
++    public String completer(String text, int state) {
++        // Not sure what state is used for in ReadlineCompleter
++        String[] completions = completer.completeName(text);
++        if (completions.length == 1 && state == 0) {
++            return completions[0];
++        } else {
++            return null;        // ambiguous result
++        }
++    }
++
++}
diff --git a/dev-java/bsh/files/bsh2.0b4-build.patch b/dev-java/bsh/files/bsh2.0b4-build.patch
new file mode 100644
index 000000000000..3899d78cc648
--- /dev/null
+++ b/dev-java/bsh/files/bsh2.0b4-build.patch
@@ -0,0 +1,53 @@
+--- build.xml	2005-06-22 18:01:39.000000000 +0200
++++ build.xml	2005-06-22 18:02:48.000000000 +0200
+@@ -108,49 +108,7 @@
+ 
+ <!-- Begin Targets -->
+ 
+-	<!-- The javacc targets could be smarter... -->
+-	<target name="checkjjt">
+-		<uptodate property="jjtree.notRequired" 
+-				targetfile="${src-dir}/bsh/bsh.jj"
+-		>
+-			<srcfiles dir="${src-dir}/bsh" includes="bsh.jjt"/>
+-		</uptodate>
+-	</target>
+-	<target name="checkjj">
+-		<uptodate property="javacc.notRequired" 
+-				targetfile="${src-dir}/bsh/Parser.java"
+-		>
+-			<srcfiles dir="${src-dir}/bsh" includes="bsh.jj"/>
+-		</uptodate>
+-	</target>
+-
+-	<!-- Create bsh.jj when bsh.jjt changes. -->
+-	<target name="jjtree" unless="jjtree.notRequired" depends="checkjjt">
+-		<java classname="jjtree"
+-			fork="yes"
+-			failonerror="yes" >
+-			<arg 
+-				line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jjt"/>
+-			<classpath>
+-				<fileset refid="lib-fileset"/>
+-			</classpath>
+-		</java>
+-	</target>
+-
+-	<!-- Create Parser.java when bsh.jj changes. -->
+-	<target name="javacc" unless="javacc.notRequired" depends="checkjj">
+-		<java classname="javacc"
+-			fork="yes"
+-			failonerror="yes"
+-			classpath="${javacc-lib}">
+-			<arg line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jj"/>
+-			<classpath>
+-				<fileset refid="lib-fileset"/>
+-			</classpath>
+-		</java>
+-	</target>
+-
+-	<target name="compile" depends="jjtree,javacc,builddir">
++	<target name="compile" depends="builddir">
+ 		<!-- exclude the ${excludes} as well as anything under a "bak" dir -->
+ 		<!--compiler="${build-compiler}"-->
+ 		<javac srcdir="${src-dir}:${test-src-dir}:${bsf-src-dir}:${classgen-src-dir}"
diff --git a/dev-java/bsh/metadata.xml b/dev-java/bsh/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/bsh/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/burlap/Manifest b/dev-java/burlap/Manifest
new file mode 100644
index 000000000000..20e9b15b1177
--- /dev/null
+++ b/dev-java/burlap/Manifest
@@ -0,0 +1 @@
+DIST burlap-3.0.8.tar.bz2 19835 SHA256 4cdb276c9c2a33379a7cd3dfe41abde503b6745bdd47e4d08c91b2ae382ebca1 SHA512 2670686dffba16108cb825147bd483a8240142256ce30f79180e34cbbfaa957bcbdd26adaa34dc5f7027f835f8202b0d640e84b5b3f9829f4636e838b5411ad1 WHIRLPOOL 4f2f9798b03d4ab3e295fb52fde3928319c924e67dc307941ea1001dd1fc3bf305892d23b8e6ad477dd46c7ab559e96f86aa23d56224a87bccab2b8e42442972
diff --git a/dev-java/burlap/burlap-3.0.8-r3.ebuild b/dev-java/burlap/burlap-3.0.8-r3.ebuild
new file mode 100644
index 000000000000..ac7b757e5fbc
--- /dev/null
+++ b/dev-java/burlap/burlap-3.0.8-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+
+inherit base java-pkg-2 java-ant-2
+
+DESCRIPTION="The Burlap web service protocol"
+HOMEPAGE="http://www.caucho.com/burlap/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="Apache-1.1"
+SLOT="3.0"
+KEYWORDS="amd64 x86"
+
+IUSE="doc source"
+
+COMMON_DEP="java-virtuals/servlet-api:2.3
+	dev-java/hessian:${PV}
+	dev-java/caucho-services:3.0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	dev-java/ant-core
+	source? ( app-arch/zip )
+	${COMMON_DEP}"
+
+PATCHES=( "${FILESDIR}"/3.0.8-java5.patch )
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+src_compile() {
+	eant jar $(use_doc) -Dclasspath=$(java-pkg_getjars servlet-api-2.3,hessian-3.0.8,caucho-services-3.0)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	use doc && java-pkg_dojavadoc dist/doc/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/burlap/files/3.0.8-java5.patch b/dev-java/burlap/files/3.0.8-java5.patch
new file mode 100644
index 000000000000..02fe38f096b8
--- /dev/null
+++ b/dev-java/burlap/files/3.0.8-java5.patch
@@ -0,0 +1,28 @@
+diff -uNr burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxyFactory.java burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxyFactory.java
+--- burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxyFactory.java	2006-08-15 10:47:30.000000000 +0200
++++ burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxyFactory.java	2006-08-15 10:48:19.000000000 +0200
+@@ -202,7 +202,7 @@
+   {
+     BurlapProxy handler = new BurlapProxy(this, new URL(url));
+ 
+-    return Proxy.newProxyInstance(api.getClassLoader(),
++    return java.lang.reflect.Proxy.newProxyInstance(api.getClassLoader(),
+                                   new Class[] { api,
+                                                 BurlapRemoteObject.class },
+                                   handler);
+diff -uNr burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxy.java burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxy.java
+--- burlap-3.0.8.orig/src/com/caucho/burlap/client/BurlapProxy.java	2006-08-15 10:47:30.000000000 +0200
++++ burlap-3.0.8/src/com/caucho/burlap/client/BurlapProxy.java	2006-08-15 10:48:08.000000000 +0200
+@@ -94,10 +94,10 @@
+     if (methodName.equals("equals") &&
+         params.length == 1 && params[0].equals(Object.class)) {
+       Object value = args[0];
+-      if (value == null || ! Proxy.isProxyClass(value.getClass()))
++      if (value == null || ! java.lang.reflect.Proxy.isProxyClass(value.getClass()))
+         return new Boolean(false);
+ 
+-      BurlapProxy handler = (BurlapProxy) Proxy.getInvocationHandler(value);
++      BurlapProxy handler = (BurlapProxy) java.lang.reflect.Proxy.getInvocationHandler(value);
+ 
+       return new Boolean(_url.equals(handler.getURL()));
+     }
diff --git a/dev-java/burlap/metadata.xml b/dev-java/burlap/metadata.xml
new file mode 100644
index 000000000000..a33fead60afb
--- /dev/null
+++ b/dev-java/burlap/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+		The Burlap web service protocol makes web services usable without
+		requiring a large framework, and without learning yet another
+		alphabet soup of protocols.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/byaccj/Manifest b/dev-java/byaccj/Manifest
new file mode 100644
index 000000000000..89c0c363db8c
--- /dev/null
+++ b/dev-java/byaccj/Manifest
@@ -0,0 +1 @@
+DIST byaccj1.15_src.tar.gz 53646 SHA256 4d6ba21fa5bc4ec4b1be9eb6e6efbb367eb6df2577fd0eaff60be9c6614f6609 SHA512 6423ecca70d21dd0c1dd8366361f6c4420536e099090b18738013fbb6e8e0710ee739e51dfd7f603a64f8761f48cdd1d8dc7844d1b5ec6b792535254d290addc WHIRLPOOL 81846717ba6f7b19ddb3a8368f9ef26bc77b17b1862797b2b725e1ef504119a5904cefed314610f20c6161789583aca524c8439f813b95e514c6edda579cb6f9
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..d2477b29c143
--- /dev/null
+++ b/dev-java/byaccj/byaccj-1.15-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..02d618cd67cf
--- /dev/null
+++ b/dev-java/byaccj/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">byaccj</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/bytecode/Manifest b/dev-java/bytecode/Manifest
new file mode 100644
index 000000000000..96e648decfba
--- /dev/null
+++ b/dev-java/bytecode/Manifest
@@ -0,0 +1 @@
+DIST bytecode-20081007.tar.bz2 29112 SHA256 fbcbecc957675128d1ae5d34288ecab8d8086cc2949b503ac1800b64e2ed556a SHA512 92462eec8c1f18bd3075c4cdb1bbb791bf4254f8d5808898f977089a0f188a062b907412178a10d04f261fa8b0fd33f97c4e8a641899f4bb4f5e9cc2aa1dd0b0 WHIRLPOOL 815c531bd058feef6a4c180183bf9220e599fff3a180782b565d56ecb13d6d994e6114483e4f36f81650f5e61a993137a3324f04b8390c60796007d3878cf58b
diff --git a/dev-java/bytecode/bytecode-20081007.ebuild b/dev-java/bytecode/bytecode-20081007.ebuild
new file mode 100644
index 000000000000..364877e87052
--- /dev/null
+++ b/dev-java/bytecode/bytecode-20081007.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Biojava bytecode manipulation library"
+HOMEPAGE="http://biojava.org"
+SRC_URI="http://dev.gentoo.org/~serkan/distfiles/${P}.tar.bz2"
+# svn export svn://code.open-bio.org/biojava/bytecode/trunk -r {20081007}
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4"
+
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="package"
+EANT_DOC_TARGET="javadocs"
+
+src_prepare() {
+	mkdir {tests,demos,resources} || die
+}
+
+src_install() {
+	java-pkg_dojar ant-build/${PN}.jar
+	use doc && java-pkg_dojavadoc ant-build/docs
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/bytecode/metadata.xml b/dev-java/bytecode/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/bytecode/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/bytelist/Manifest b/dev-java/bytelist/Manifest
new file mode 100644
index 000000000000..325a10c826b5
--- /dev/null
+++ b/dev-java/bytelist/Manifest
@@ -0,0 +1 @@
+DIST bytelist-1.0.10.tar.gz 15619 SHA256 b4e9b598d178c0d54e2d89cc36eb0f663fbd35aa3583dbb1b60f65768ba23cb8 SHA512 fb522a43d5cac8a4804f64caa38fb9ab793a0f0688a69987f3be6f2245a4a2c9739a0d807f88be947c0bd7f908c069a2f8092cc4d5314c3fddb6541d9db70f7c WHIRLPOOL c66c4bd63fd538a02aca3f226a2ce24e87515af995d34ead687f4978bd9423c74d8e9e8a1d0cb77584bb6c9c759bc53ee67f1348875cde7f6185018541575844
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..6d066f4ac330
--- /dev/null
+++ b/dev-java/bytelist/bytelist-1.0.10.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JRuby support library"
+HOMEPAGE="http://jruby.codehaus.org/"
+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 ppc 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..9ef38f82b2b4
--- /dev/null
+++ b/dev-java/bytelist/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <maintainer>
+    <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..938fec84276b
--- /dev/null
+++ b/dev-java/c3p0/Manifest
@@ -0,0 +1,2 @@
+DIST c3p0-0.9.1.2-codegen.tar.bz2 15434 SHA256 c8c920d7cc240e07276525d861f88128f6403e1a123e2526796caa440b9c9025 SHA512 4b20c5307f98dfaf82676d21ec9ade0251c043322b544acea912dbc6a866773180c548aa32764fb73894daa9115ae9eec702846a2112f620e90d1e462c879075 WHIRLPOOL 6df9184ef6c1385217e74dd0a5dd21dffce37be80e7f3bc418a3b83d9062e793f20ef436d641e8f03b7b5a2bcf3ce71d19f1b09dae1660c2f103942a6aa2f1c4
+DIST c3p0-0.9.1.2.src.tgz 380118 SHA256 b837a5668a7fb0cb2338dbe26867ecc91c6e9ea030440107becb999a9a8724d3 SHA512 a33c413b5471d56d72224e3ad74996828854a2a0227bc674d5956612db517348de1f36695d16ab4cbb38827bddbe03952a5518205296fc35ecbd11b536b5aa32 WHIRLPOOL 864fd5eb470024c1f6072a886ba62732d0c1e06ae3f0cc3235b071112f0d4a20b820d4e3b68194e8af0be07567b38f219d2dc8e597f3e5d6b01afa21fb5882b9
diff --git a/dev-java/c3p0/c3p0-0.9.1.2.ebuild b/dev-java/c3p0/c3p0-0.9.1.2.ebuild
new file mode 100644
index 000000000000..373723055f2e
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit java-pkg-2 java-ant-2
+
+SRC_P="${P}.src"
+
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+DESCRIPTION="Library for augmenting traditional (DriverManager-based) JDBC drivers with JNDI-bindable DataSources"
+HOMEPAGE="http://c3p0.sourceforge.net/"
+# how to package the generated sources:
+# 1) comment out the sed build.xml calls below and compile with forced sun-jdk-1.5
+# 2) go to the ${WORKDIR}
+# 3) tar -cjf c3p0-0.9.1.2-codegen.tar.bz2 c3p0-0.9.1.2.src/build/codegen/
+SRC_URI="mirror://sourceforge/${PN}/${SRC_P}.tgz
+	mirror://gentoo/c3p0-0.9.1.2-codegen.tar.bz2"
+# Does not like Java 1.6's JDBC API
+COMMON_DEPEND="dev-java/log4j"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+S="${WORKDIR}/${SRC_P}"
+
+src_prepare() {
+	echo "j2ee.jar.base.dir=${JAVA_HOME}" > build.properties
+	echo "log4j.jar.file=$(java-pkg_getjar log4j log4j.jar)" >> build.properties
+
+	java-ant_rewrite-bootclasspath 1.5
+	# don't generate sources, use the pregenerated from gentoo mirrors
+	# since generator uses reflection, it's not as simple as javac bootclasspath rewrite
+	sed -i 's/depends="codegen"//' build.xml
+	sed -i 's/depends="codegen,/depends="init,/' build.xml
+}
+
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_newjar build/${P}.jar
+	dodoc README-SRC
+	use doc && java-pkg_dojavadoc build/apidocs
+	use source && java-pkg_dosrc src/classes/com
+}
diff --git a/dev-java/c3p0/metadata.xml b/dev-java/c3p0/metadata.xml
new file mode 100644
index 000000000000..b8f3288b7250
--- /dev/null
+++ b/dev-java/c3p0/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">c3p0</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/cacao/Manifest b/dev-java/cacao/Manifest
new file mode 100644
index 000000000000..aa6afd790388
--- /dev/null
+++ b/dev-java/cacao/Manifest
@@ -0,0 +1 @@
+DIST cacao-0.99.4.tar.bz2 2876200 SHA256 1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56 SHA512 f53d07acad7541d761383239776ec5423a66fb9963ad587d3fcddf7257625b51dd8f2ccd2ff8279ea3f148291b26fad1e02d57b529bd0cafe14ecd5ad82767b4 WHIRLPOOL c472c0966184c5bb48fa86ec41d78fbbcb6d2a27dc7177e12606cf7f26a7fe4e941bfa1b2c52d3845d879d08994c7404c1fd3ac515463662cd28305814d5ac26
diff --git a/dev-java/cacao/cacao-0.99.4.ebuild b/dev-java/cacao/cacao-0.99.4.ebuild
new file mode 100644
index 000000000000..b0f52bd8eaf6
--- /dev/null
+++ b/dev-java/cacao/cacao-0.99.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools eutils flag-o-matic java-pkg-2 java-vm-2
+
+DESCRIPTION="Cacao Java Virtual Machine"
+HOMEPAGE="http://www.cacaojvm.org/"
+SRC_URI="http://www.complang.tuwien.ac.at/cacaojvm/download/${P}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+CLASSPATH_SLOT=0.98
+COMMON_DEPEND="
+	dev-java/gnu-classpath:${CLASSPATH_SLOT}
+	|| ( dev-java/eclipse-ecj dev-java/ecj-gcj )
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-java/junit:4
+		${AUTOTOOLS_DEPEND}
+	)
+"
+
+CLASSPATH_DIR=/usr/gnu-classpath-${CLASSPATH_SLOT}
+
+src_prepare() {
+	if use test; then
+		sed -ie "s:/usr/share/java/junit4.jar:$(java-config -p junit-4):" \
+			./tests/regression/bugzilla/Makefile.am \
+			./tests/regression/base/Makefile.am || die "sed failed"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# A compiler can be forced with the JAVAC variable if needed
+	unset JAVAC
+	append-flags -fno-strict-aliasing
+	econf --bindir=/usr/${PN}/bin \
+		--libdir=/usr/${PN}/lib \
+		--datarootdir=/usr/${PN}/share \
+		--disable-dependency-tracking \
+		--with-java-runtime-library-prefix=${CLASSPATH_DIR}
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodir /usr/bin
+	dosym /usr/${PN}/bin/cacao /usr/bin/cacao || die
+	dodoc AUTHORS ChangeLog* NEWS README || die "failed to install docs"
+
+	for files in ${CLASSPATH_DIR}/bin/g*; do
+		dosym $files \
+			/usr/${PN}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die
+	done
+
+	dodir /usr/${PN}/jre/lib
+	dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip /usr/${PN}/jre/lib/rt.jar
+	dodir /usr/${PN}/lib
+	dosym ${CLASSPATH_DIR}/share/classpath/tools.zip /usr/${PN}/lib/tools.jar
+
+	dosym /usr/bin/ecj /usr/${PN}/bin/javac || die
+
+	local libarch="${ARCH}"
+	[ ${ARCH} == x86 ] && libarch="i386"
+	[ ${ARCH} == x86_64 ] && libarch="amd64"
+	dodir /usr/${PN}/jre/lib/${libarch}/client
+	dodir /usr/${PN}/jre/lib/${libarch}/server
+	dosym /usr/${PN}/lib/libjvm.so /usr/${PN}/jre/lib/${libarch}/client/libjvm.so
+	dosym /usr/${PN}/lib/libjvm.so /usr/${PN}/jre/lib/${libarch}/server/libjvm.so
+	dosym ${CLASSPATH_DIR}/lib/classpath/libjawt.so /usr/${PN}/jre/lib/${libarch}/libjawt.so
+	set_java_env
+}
diff --git a/dev-java/cacao/files/0.93-no-exec-stack.patch b/dev-java/cacao/files/0.93-no-exec-stack.patch
new file mode 100644
index 000000000000..cac6e71240ae
--- /dev/null
+++ b/dev-java/cacao/files/0.93-no-exec-stack.patch
@@ -0,0 +1,13 @@
+diff -ur cacao-0.93.old/src/vm/jit/i386/asmpart.S cacao-0.93/src/vm/jit/i386/asmpart.S
+--- cacao-0.93.old/src/vm/jit/i386/asmpart.S	2005-12-21 12:31:29.808539216 +0200
++++ cacao-0.93/src/vm/jit/i386/asmpart.S	2005-12-21 12:33:06.350862552 +0200
+@@ -40,6 +40,9 @@
+ 
+ #include "vm/jit/methodheader.h"
+ 
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+ 
+ /* define it like the risc way */
+ 
diff --git a/dev-java/cacao/files/cacao.env b/dev-java/cacao/files/cacao.env
new file mode 100644
index 000000000000..52d41f13b6e8
--- /dev/null
+++ b/dev-java/cacao/files/cacao.env
@@ -0,0 +1,18 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="CACAO @PV@"
+JAVA_HOME=/usr/@PN@
+JDK_HOME=/usr/@PN@
+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/cacao/metadata.xml b/dev-java/cacao/metadata.xml
new file mode 100644
index 000000000000..d3217b40c8af
--- /dev/null
+++ b/dev-java/cacao/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<longdescription>
+CACAO is started out as a research JIT compiler for Java to explore new 
+implementation techniques. It is now a full-blown Java Virtual Machine
+based on GNU Classpath.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/cal10n/Manifest b/dev-java/cal10n/Manifest
new file mode 100644
index 000000000000..0dcad5b23a19
--- /dev/null
+++ b/dev-java/cal10n/Manifest
@@ -0,0 +1 @@
+DIST cal10n-api-0.8.1-sources.jar 35685 SHA256 d0343194580289dc879d4cae27dad115a5bb120ad2b8128136727ac7b6804682 SHA512 b6bb8ee7744fb878da1968a6524fa2b95d55c55e0f5e7413e7afd854eae226050cd4209e7489ce4f1fae6f2adb501781048f75ddcb2ad8c6b69595ff053422a7 WHIRLPOOL 68976a4a5c85560cd604a8b1888d8dca4c34a1ab5ddd632b91fda577c65d5bec53a0e292c6a5c2db4d043b17fc29116b218baf9a7a7348019b117bcf0b20044f
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..3c3d00e5c0f4
--- /dev/null
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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..604e0a4238bb
--- /dev/null
+++ b/dev-java/cal10n/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/castor/Manifest b/dev-java/castor/Manifest
new file mode 100644
index 000000000000..14c25c47fe3d
--- /dev/null
+++ b/dev-java/castor/Manifest
@@ -0,0 +1,2 @@
+DIST castor-0.9.9.1-src.tgz 6794995 SHA256 df569ab985714477956e68ed497ac1fa9fde5f95a8bc0264ee2d31125a970f81 SHA512 d3150af0fdccf4c477b401fe24c7b429d7573693f697f7e6e2e88a13573ca9aa43749c8ee0d381e5a4fd9cc729719f04cc6efadb3c20426a609fa8217bbc45da WHIRLPOOL 01aa718cc1d819103dbf2c6d52f2301e8144ee941ff7d4e3c5c9548898c7a1e7c3587982183851569c67032b612efdb79ac3068bd72546f5251b405b9df5a41a
+DIST castor-1.1.1-src.tgz 9067936 SHA256 f39f96e7f42cbe429ea8050e2f600783cd04c3b07642486a8c1e23dcf2a1cfda SHA512 ec066a227e71c1884e168dea8f7a3bfbfd3275e4c7b83a07e9673b3f84dc52c734c337694bd725de1db5c7a803cc2dadbdd3d1f7507fadc93687d5c05e3a26d5 WHIRLPOOL 2d5312a5ae2ab6bb86b960d3f9c2cc6e6d9de823ed3b0ce6ffa03570ffcf931b59b67d4ef2e5ddf32f6ae1f791b2e0e7ca51935379a0b54f30959ad844768367
diff --git a/dev-java/castor/castor-0.9.9.1-r7.ebuild b/dev-java/castor/castor-0.9.9.1-r7.ebuild
new file mode 100644
index 000000000000..f7fb899498a9
--- /dev/null
+++ b/dev-java/castor/castor-0.9.9.1-r7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Data binding framework for Java"
+SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz"
+HOMEPAGE="http://www.castor.org"
+LICENSE="Exolab"
+KEYWORDS="amd64 x86"
+SLOT="0.9"
+IUSE=""
+
+COMMON_DEP=">=dev-java/commons-logging-1.0.4
+	dev-java/jakarta-oro:2.0
+	dev-java/jakarta-regexp:1.3
+	dev-java/ldapsdk:4.1
+	dev-java/xerces:1.3
+	dev-java/cglib:3
+	java-virtuals/transaction-api"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+java_prepare() {
+	# TODO this should be filed upstream
+	epatch "${FILESDIR}/0.9.5.3-jikes.patch"
+
+	# Does not like Java 1.6's JDBC API
+	java-ant_rewrite-bootclasspath 1.5 src/build.xml
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+	#FIXME: uses these bundled classes
+	rm -v tests/*.jar || die
+	java-pkg_jar-from --build-only ant-core ant.jar
+	#Only used by examples and tests and we aren't building them
+	#java-pkg_jar-from adaptx-0.9
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from cglib-2
+	java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar
+	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
+	java-pkg_jar-from xerces-1.3
+	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
+	java-pkg_jar-from transaction-api
+
+	# Remove special characters
+	cd ../
+
+	ebegin 'Removing special characters'
+	perl -i'' -npe 's/S.bastien/Sebastien/g;' src/main/org/exolab/castor/types/DateTimeBase.java
+	perl -i'' -npe 's/.actual value./actual value/g;' src/main/org/exolab/castor/xml/schema/reader/ImportUnmarshaller.java
+	eend $?
+}
+
+EANT_BUILD_XML="src/build.xml"
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar
+	java-pkg_newjar dist/${P}-xml.jar ${PN}-xml.jar
+
+	use doc && java-pkg_dojavadoc build/doc/javadoc
+	use examples && java-pkg_doexamples src/examples
+	use source && java-pkg_dosrc src/main/org
+}
diff --git a/dev-java/castor/castor-1.1.1-r3.ebuild b/dev-java/castor/castor-1.1.1-r3.ebuild
new file mode 100644
index 000000000000..e14091c63af4
--- /dev/null
+++ b/dev-java/castor/castor-1.1.1-r3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Data binding framework for Java"
+HOMEPAGE="http://www.castor.org"
+SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz"
+
+#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+# svn co https://svn.codehaus.org/castor/castor/tags/1.0.3/ castor-1.0.3
+# cd castor-1.0.3
+# mvn ant:ant
+# do some magic to build.xml
+# rm lib/*
+# cd ../
+# tar cjvf castor-1.0.3.tar.bz2 --exclude=.svn castor-1.0.3
+
+LICENSE="Exolab"
+SLOT="1.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# tests and full documentation when support will be added
+#	dev-java/log4j
+#	~dev-java/servletapi-2.4
+#	dev-java/junit"
+
+CDEPEND="dev-java/cglib:3
+	dev-java/commons-logging
+	=dev-java/jakarta-oro-2.0*
+	=dev-java/jakarta-regexp-1.3*
+	java-virtuals/transaction-api
+	=dev-java/ldapsdk-4.1*
+	dev-java/ant-core"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	java-ant_rewrite-classpath "${S}/anttask/build.xml"
+
+	cd "${S}/lib"
+	rm -v *.jar tests/*.jar
+	java-pkg_jar-from cglib-3 cglib.jar
+	java-pkg_jar-from commons-logging \
+		commons-logging-api.jar	commons-logging-1.1.jar
+	java-pkg_jar-from jakarta-oro-2.0
+	java-pkg_jar-from jakarta-regexp-1.3
+	java-pkg_jar-from transaction-api
+	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
+	java-pkg_jar-from ant-core ant.jar
+
+	# These are only used for tests or documentation
+	#java-pkg_jar-from junit
+	#java-pkg_jar-from adaptx-0.9
+	#java-pkg_jar-from log4j
+	#java-pkg_jar-from servletapi-2.4 servlet-api.jar
+	use doc && mkdir "${S}/bin/lib"
+	java-pkg_filter-compiler jikes
+}
+
+#src_prepare() {
+#	# http://jira.codehaus.org/browse/CASTOR-2008
+#	epatch "${FILESDIR}/1.1.1-jdk-1.4.patch"
+#}
+
+# clean target is borked
+# http://jira.codehaus.org/browse/CASTOR-2009
+EANT_BUILD_XML="src/build.xml"
+EANT_GENTOO_CLASSPATH="ant-core"
+
+# Needs for example mockejb which is not packaged yet
+#src_test() {
+#	cd "${S}"/src/
+#	eant tests
+#}
+
+src_install() {
+	cd dist
+	for jar in *.jar; do
+		java-pkg_newjar ${jar} ${jar//-${PV}}
+	done
+	cd ..
+	dodoc src/etc/CHANGELOG || die
+	java-pkg_register-ant-task
+	use source && java-pkg_dosrc */main/java/org
+	use doc && java-pkg_dojavadoc build/doc/javadoc
+	use examples && java-pkg_doexamples src/examples
+}
diff --git a/dev-java/castor/files/0.9.5.3-jikes.patch b/dev-java/castor/files/0.9.5.3-jikes.patch
new file mode 100644
index 000000000000..ed5ee06e152e
--- /dev/null
+++ b/dev-java/castor/files/0.9.5.3-jikes.patch
@@ -0,0 +1,28 @@
+diff -uprN castor-0.9.5.3.orig/src/main/org/exolab/castor/xml/Namespaces.java castor-0.9.5.3/src/main/org/exolab/castor/xml/Namespaces.java
+--- castor-0.9.5.3.orig/src/main/org/exolab/castor/xml/Namespaces.java	2005-03-27 21:30:49.181296264 +0200
++++ castor-0.9.5.3/src/main/org/exolab/castor/xml/Namespaces.java	2005-03-27 21:32:44.977692536 +0200
+@@ -475,14 +475,14 @@ public final class Namespaces {

+         public static final int URI = 0;

+         public static final int PREFIX = 1;

+ 

+-        private Namespace _namespace = null;

++        private org.exolab.castor.xml.Namespaces.Namespace _namespace = null;

+         private int _returnType = URI;

+ 

+-        NamespaceEnumerator(Namespace namespace) {

++        NamespaceEnumerator(org.exolab.castor.xml.Namespaces.Namespace namespace) {

+             _namespace = namespace;

+         }

+         

+-        NamespaceEnumerator(Namespace namespace, int returnType) {

++        NamespaceEnumerator(org.exolab.castor.xml.Namespaces.Namespace namespace, int returnType) {

+             _namespace = namespace;

+             _returnType = returnType;

+         }

+@@ -505,4 +505,4 @@ public final class Namespaces {

+         

+     } //-- class: NamespaceEnumerator

+ 

+-} //-- class: Namespaces
+\ No newline at end of file
++} //-- class: Namespaces

diff --git a/dev-java/castor/files/1.1.1-jdk-1.4.patch b/dev-java/castor/files/1.1.1-jdk-1.4.patch
new file mode 100644
index 000000000000..b2da71002139
--- /dev/null
+++ b/dev-java/castor/files/1.1.1-jdk-1.4.patch
@@ -0,0 +1,18 @@
+diff -ru castor-1.1.1.old/src/main/java/org/exolab/castor/mapping/loader/Types.java castor-1.1.1/src/main/java/org/exolab/castor/mapping/loader/Types.java
+--- castor-1.1.1.old/src/main/java/org/exolab/castor/mapping/loader/Types.java	2007-06-09 16:54:52.000000000 +0300
++++ castor-1.1.1/src/main/java/org/exolab/castor/mapping/loader/Types.java	2007-06-09 16:56:57.000000000 +0300
+@@ -500,11 +500,11 @@
+         new TypeInfo( "boolean",     java.lang.Boolean.TYPE,

+                       java.lang.Boolean.class,    true,     Boolean.FALSE ),

+         new TypeInfo( "double",      java.lang.Double.TYPE,

+-                      java.lang.Double.class,     true,     new Double( 0 ) ),

++                      java.lang.Double.class,     true,     new Double( 0.0 ) ),

+         new TypeInfo( "float",       java.lang.Float.TYPE,

+-                      java.lang.Float.class,      true,     new Float( 0 ) ),

++                      java.lang.Float.class,      true,     new Float( 0.0f ) ),

+         new TypeInfo( "big-decimal", null,

+-                      java.math.BigDecimal.class, true,     new BigDecimal( 0 ) ),

++                      java.math.BigDecimal.class, true,     new BigDecimal( 0.0 ) ),

+         new TypeInfo( "byte",        java.lang.Byte.TYPE,

+                       java.lang.Byte.class,       true,     new Byte( (byte) 0 ) ),

+         new TypeInfo( "date",        null,

diff --git a/dev-java/castor/metadata.xml b/dev-java/castor/metadata.xml
new file mode 100644
index 000000000000..d32e442fcf0c
--- /dev/null
+++ b/dev-java/castor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+Castor is an Open Source data binding framework for Java[tm]. It's the shortest
+path between Java objects, XML documents and relational tables. Castor provides
+Java-to-XML binding, Java-to-SQL persistence, and more.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/caucho-services/Manifest b/dev-java/caucho-services/Manifest
new file mode 100644
index 000000000000..0955f4c35829
--- /dev/null
+++ b/dev-java/caucho-services/Manifest
@@ -0,0 +1 @@
+DIST caucho-services-3.0.8.tar.bz2 6992 SHA256 efbd2922a6c94666ba75b3f10ef332f272651a4c758e5d136450d0fde677a0cb SHA512 2dc095b2e7a388f8e13d01a1a191184575cf71fe178fe5d208375a1306277a4643ddbe9747a2fb0fc824721903b3da5d668dfe2b8f33857f9c97038557d15615 WHIRLPOOL 909529f129fd2c065f376c07124bb0b8ff9da937ee792428bacf7dca4178a2eb8a0a57190511e889cea223b7f23be22a3d3e604e4cb8c99194afd750485c33b4
diff --git a/dev-java/caucho-services/caucho-services-3.0.8-r2.ebuild b/dev-java/caucho-services/caucho-services-3.0.8-r2.ebuild
new file mode 100644
index 000000000000..500fb4e6c42d
--- /dev/null
+++ b/dev-java/caucho-services/caucho-services-3.0.8-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The com.caucho.services package used by dev-java/hessian and dev-java/burlap"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="Apache-1.1"
+SLOT="3.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="java-virtuals/servlet-api:2.3"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+
+src_compile() {
+	eant jar -Dservletapi=$(java-pkg_getjars servlet-api-2.3) $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	use doc && java-pkg_dohtml -r dist/doc/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/caucho-services/metadata.xml b/dev-java/caucho-services/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/caucho-services/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/cdegroot-db/Manifest b/dev-java/cdegroot-db/Manifest
new file mode 100644
index 000000000000..a4974fff5b62
--- /dev/null
+++ b/dev-java/cdegroot-db/Manifest
@@ -0,0 +1 @@
+DIST com.cdegroot.db-0.08.tar.gz 154705 SHA256 9866cbd5b6bd67e12fbdf5b6dd3a911b657e211f776e3dd4b65e5c1343f63110 SHA512 c8a6a6a46add440499dce42f27876cadfb9d247f4e7f8852e94cc20ca9afacb400f91f884760bf3659bad46979ddd5a65f6dda4bd5416da14d89a93ff5b447d1 WHIRLPOOL a25a29f891d4bc9f4bdc8c1aabf6856396c67cf7373d07b4e25c4a801e62f460db30490be5cb8f6c0deec85c4216432afdf95f44baf9fc6d997da567ec7d27ad
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..4bda64badecc
--- /dev/null
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 x86 ppc64 ppc"
+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/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..c150ff045858
--- /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
+--- src.orig/db/com/cdegroot/db/hash/EntryPage.java	2005-02-06 00:40:17.191151504 +0100
++++ 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
+--- src.orig/db/com/cdegroot/db/recman/BlockIo.java	2005-02-06 00:40:17.192151352 +0100
++++ 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
+--- src.orig/db/com/cdegroot/db/recman/BlockView.java	2005-02-06 00:40:17.193151200 +0100
++++ 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
+--- src.orig/db/com/cdegroot/db/recman/Magic.java	2005-02-06 00:40:17.193151200 +0100
++++ 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
+--- src.orig/db/com/cdegroot/db/recman/PageHeader.java	2005-02-06 00:40:17.193151200 +0100
++++ 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
+--- src.orig/db/com/cdegroot/db/recman/RecordFile.java	2005-02-06 00:40:17.193151200 +0100
++++ 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..838c00a4a448
--- /dev/null
+++ b/dev-java/cdegroot-db/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
new file mode 100644
index 000000000000..9a77655db8fa
--- /dev/null
+++ b/dev-java/cdi-api/Manifest
@@ -0,0 +1 @@
+DIST cdi-api-1.2-sources.jar 139331 SHA256 110dd88693b1745812a3f1c05f78d91aae1efa3cece5a08a5befd9dada51ed8c SHA512 b24a16cc208cd865f561ecdc7590ddcdb08c2e83f8fea75eefa0e52598461cc98c804dfeeacb360278ddfbf5508e72f381b1379e19efe91f3c89b0e255b3cb9a WHIRLPOOL abbf8754528ad7ffe505ae6f25d4920843c2d9bd4c03f7f4424aef35863d8780e6acd7c38e0dc65bad633b8e3f2ec289ba22e417381c1cef90a578a72dd07ef9
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..27f363be44f8
--- /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
+# $Id$
+
+EAPI=5
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/cdi-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
new file mode 100644
index 000000000000..fa4a7fb9dd4d
--- /dev/null
+++ b/dev-java/cglib/Manifest
@@ -0,0 +1,2 @@
+DIST cglib-src-3.0.jar 1537863 SHA256 40f8cc721f80b820207f0061b10ad51151f577b2d7d94d93f19a85aa2551e674 SHA512 7791c36ed1908ddbc35a0bf1f4f54c3554b0fe4f707b318d7d24189fb513d8712335f2e41f90065e8eb102657d53699cc709a1b9f7a12a8f924c6a755969a829 WHIRLPOOL d9e4f80e7cbe1bc39aad654e437347551e13c66bcc3139f8991e870c123bdd83603a26b9d5a07a902c2fa668ba7cb42285417578b836e195f5660b691c6ddc79
+DIST cglib-src-3.1.jar 1541525 SHA256 386f9a55ae8fed3cf8014f2c20344ce9ce05cd2e4fa467e5e4d8027abb3d62eb SHA512 3b246b37f1c90acaefd4ba64f1f1db0b4d1fa64025f0e4e216ae7955e05701671bf8dc01d19c754286966cc5f8c06d78d02cb4f4500542f4448656768109c13f WHIRLPOOL e3a865296790e1de31889e7624797418392466f7756567382fa9c0b1108d386ee848be2e6b4e96db206101cde8d0320293e58d0b83e0a5a7633afc46b3a37e22
diff --git a/dev-java/cglib/cglib-3.0.ebuild b/dev-java/cglib/cglib-3.0.ebuild
new file mode 100644
index 000000000000..09b8dfa07466
--- /dev/null
+++ b/dev-java/cglib/cglib-3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://cglib.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+# Fails some tests on ppc(64) due to memory-related issues that are
+# probably VM-specific but harmless enough.
+RESTRICT="ppc? ( test ) ppc64? ( test )"
+
+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
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/proxy/net
+	use examples && java-pkg_doexamples --subdir samples src/proxy/samples
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/cglib/cglib-3.1.ebuild b/dev-java/cglib/cglib-3.1.ebuild
new file mode 100644
index 000000000000..7318c56cf756
--- /dev/null
+++ b/dev-java/cglib/cglib-3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86 ~ppc ~ppc64"
+
+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-2.0.2-asm-1.4.3.patch b/dev-java/cglib/files/cglib-2.0.2-asm-1.4.3.patch
new file mode 100644
index 000000000000..f9d47e914d3e
--- /dev/null
+++ b/dev-java/cglib/files/cglib-2.0.2-asm-1.4.3.patch
@@ -0,0 +1,12 @@
+diff -uprN src.orig/test/net/sf/cglib/reflect/TestFastClass.java src/test/net/sf/cglib/reflect/TestFastClass.java
+--- src.orig/test/net/sf/cglib/reflect/TestFastClass.java	2005-01-05 19:33:15.945618576 +0100
++++ src/test/net/sf/cglib/reflect/TestFastClass.java	2005-01-05 19:34:21.957583232 +0100
+@@ -26,7 +26,7 @@ import net.sf.cglib.core.DefaultGenerato
+ import net.sf.cglib.transform.ClassTransformerTee;
+ import net.sf.cglib.transform.NullClassVisitor;
+ import net.sf.cglib.transform.TransformingClassGenerator;
+-import org.objectweb.asm.util.DumpClassVisitor;
++import org.objectweb.asm.util.ASMifierClassVisitor;
+ 
+ public class TestFastClass extends net.sf.cglib.CodeGenTestCase {
+     public static class Simple {
diff --git a/dev-java/cglib/files/cglib-2.2-build.patch b/dev-java/cglib/files/cglib-2.2-build.patch
new file mode 100644
index 000000000000..c1c572dd0c74
--- /dev/null
+++ b/dev-java/cglib/files/cglib-2.2-build.patch
@@ -0,0 +1,47 @@
+--- build.xml.orig	2009-09-02 16:27:55.000000000 +0200
++++ build.xml	2009-09-03 17:24:23.000000000 +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>
+@@ -122,16 +122,7 @@
+     <jar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-${component.version}.jar" >
+       <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-3.1.jar" excludes="META-INF"/>
+-      <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
+-      <include name="**/*"/>
+-      <exclude name="samples/**"/>
+-    </jarjar> 
++    </jar>
+   </target>
+ 
+   <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
+@@ -239,16 +230,7 @@
+           failonerror="${test.failonerror}"
+           fork="yes" 
+           >
+-
+-  <!-- jvmarg value="-Xrunhprof:heap=all,file=debug.txt"/ --> 
+-  <!-- <jvmarg value="-verbose:gc"/> --> 
+-  <!-- <jvmarg value="-verbose:class"/> -->
+-  <!-- <jvmarg value="-Xprof"/> -->
+-  <!-- <jvmarg value="-server"/> -->
+-  <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
+-  <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
+-  <!-- <jvmarg value="-Djava.security.manager" />  -->
+- 
++		<sysproperty key="cglib.debugLocation" value="${debugLocation}"/>
+       <arg value="${test.entry}"/>
+         <classpath>
+           <pathelement path="${build.home}/classes"/>
diff --git a/dev-java/cglib/files/cglib-2.2-no-leak-test.patch b/dev-java/cglib/files/cglib-2.2-no-leak-test.patch
new file mode 100644
index 000000000000..416672a5498e
--- /dev/null
+++ b/dev-java/cglib/files/cglib-2.2-no-leak-test.patch
@@ -0,0 +1,11 @@
+--- src/test/net/sf/cglib/CodeGenTestCase.java.orig	2009-11-20 11:49:04.000000000 +0100
++++ src/test/net/sf/cglib/CodeGenTestCase.java	2009-11-20 11:49:18.000000000 +0100
+@@ -135,7 +135,7 @@
+           
+         }
+         
+-        return true;
++        return false;
+         
+         
+     }
diff --git a/dev-java/cglib/files/cglib-2.2.3-build.patch b/dev-java/cglib/files/cglib-2.2.3-build.patch
new file mode 100644
index 000000000000..15aa07dfa987
--- /dev/null
+++ b/dev-java/cglib/files/cglib-2.2.3-build.patch
@@ -0,0 +1,44 @@
+--- cglib.2.2.3/build.xml
++++ cglib.2.2.3/build.xml
+@@ -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-3.1.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">

+@@ -240,15 +231,7 @@
+           fork="yes" 

+           >

+ 

+-  <!-- jvmarg value="-Xrunhprof:heap=all,file=debug.txt"/ --> 

+-  <!-- <jvmarg value="-verbose:gc"/> --> 

+-  <!-- <jvmarg value="-verbose:class"/> -->

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

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

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

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

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

+- 

++      <sysproperty key="cglib.debugLocation" value="${debugLocation}"/>

+       <arg value="${test.entry}"/>

+         <classpath>

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

diff --git a/dev-java/cglib/files/cglib-3.0-build.xml.patch b/dev-java/cglib/files/cglib-3.0-build.xml.patch
new file mode 100644
index 000000000000..a40c169d8016
--- /dev/null
+++ b/dev-java/cglib/files/cglib-3.0-build.xml.patch
@@ -0,0 +1,36 @@
+diff -Nru /tmp/cglib-3.0.orig/build.xml ./build.xml
+--- /tmp/cglib-3.0.orig/build.xml	2012-08-17 19:21:37.387574672 +0300
++++ ./build.xml	2012-08-17 19:26:58.982564260 +0300
+@@ -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>
+@@ -124,14 +124,6 @@
+       <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.0.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 +238,7 @@
+   <!-- <jvmarg value="-verbose:class"/> -->
+   <!-- <jvmarg value="-Xprof"/> -->
+   <!-- <jvmarg value="-server"/> -->
+-  <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
++  <sysproperty key="cglib.debugLocation" value="${cglib.debugLocation}"/>
+   <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
+   <!-- <jvmarg value="-Djava.security.manager" />  -->
+  
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/files/words.txt b/dev-java/cglib/files/words.txt
new file mode 100644
index 000000000000..263a4396d4ca
--- /dev/null
+++ b/dev-java/cglib/files/words.txt
@@ -0,0 +1,50 @@
+Casuarinaceae
+hylomorphic
+granitize
+biddably
+repulsive
+amphimictical
+trio
+toxodont
+nonreigning
+dragbar
+Moronidae
+unlanguishing
+metabolizable
+Osmerus
+goran
+spiritfulness
+tetrachloromethane
+baobab
+caroline
+radioconductor
+imband
+crinoline
+circummundane
+incontractile
+forerank
+modernization
+meal
+fishman
+underbuy
+pertain
+equiped
+cockal
+unshrined
+Harb
+heterotaxis
+commensurableness
+baggy
+sarcophilous
+tankard
+acervuline
+unverifiably
+premidnight
+strangles
+vitellus
+Socratean
+flock
+scourage
+feverlike
+citharist
+harn
diff --git a/dev-java/cglib/metadata.xml b/dev-java/cglib/metadata.xml
new file mode 100644
index 000000000000..80d7a322ef6b
--- /dev/null
+++ b/dev-java/cglib/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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/charva/Manifest b/dev-java/charva/Manifest
new file mode 100644
index 000000000000..9277d33c89db
--- /dev/null
+++ b/dev-java/charva/Manifest
@@ -0,0 +1 @@
+DIST charva-1.1.4.zip 2100886 SHA256 cc62e83e80efb7ddfab7fa91a09ef61ff8ecc5815def9631ab5ee83a4309f737 SHA512 ebd3c11faa7091f5c7d9265f3da99cba12b4c08bd126c50f2717664756695b8b417f89324f40d5327f591c8f55a3dba8a6cf78d6bb9bffed466a1564c0075b48 WHIRLPOOL 7695ce9135a352b63cccd3c4ac58919d71ce6e6784d264fecdd7dacf40079767938b36f87a63f43ba490a8224890be9f586bfa804c99e13151a4dcf21374f40d
diff --git a/dev-java/charva/charva-1.1.4-r1.ebuild b/dev-java/charva/charva-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..8c7dd2f2ecf1
--- /dev/null
+++ b/dev-java/charva/charva-1.1.4-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+JAVA_PKG_IUSE="doc examples source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="A Java Windowing Toolkit for Text Terminals"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}/charva.zip -> ${P}.zip"
+HOMEPAGE="http://www.pitman.co.za/projects/charva/"
+RDEPEND=">=virtual/jre-1.5
+		sys-libs/ncurses
+		dev-java/commons-logging:0"
+DEPEND=">=virtual/jdk-1.5
+		app-arch/unzip
+		${RDEPEND}"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-respect-flags.patch
+
+	rm -v ./c/lib/*.so || die
+	rm -v java/lib/* || die
+	rm -v java/dist/lib/* || die
+	find . -name "*.class" -print -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-logging"
+EANT_BUILD_TARGET="dist"
+
+src_compile() {
+	java-pkg-2_src_compile
+	cd c/src
+	emake CC="$(tc-getCC)" INCLUDES="$(java-pkg_get-jni-cflags)" -f Makefile.linux.txt
+}
+
+src_install() {
+	java-pkg_dojar ./java/dist/lib/charva.jar
+	use doc && java-pkg_dojavadoc docs/api
+	use examples && java-pkg_doexamples test/src/example
+	use source && java-pkg_dosrc java/src/{charva,charvax}
+
+	java-pkg_doso c/lib/*.so
+}
diff --git a/dev-java/charva/files/charva-respect-flags.patch b/dev-java/charva/files/charva-respect-flags.patch
new file mode 100644
index 000000000000..73d09e9a265e
--- /dev/null
+++ b/dev-java/charva/files/charva-respect-flags.patch
@@ -0,0 +1,27 @@
+--- c/src/Makefile.linux.txt
++++ c/src/Makefile.linux.txt
+@@ -5,14 +5,14 @@
+ SHARED_OBJECT_EXT = so

+ TARGET = libTerminal.${SHARED_OBJECT_EXT}

+ 

+-CC = gcc

++CC ?= gcc

+ # "-D_USE_NCURSESW" was added for handling UTF-8 characters (contributed by Leos Urban)

+-CFLAGS = -fpic -shared -D_USE_NCURSESW_

++CFLAGS += -fpic -shared -D_USE_NCURSESW_

+ 

+ # The file "jni.h" is in ${JAVA_HOME}/include

+ # The file "jni_md.h" (included from jni.h) contains machine-dependent 

+ # type definitions and is in ${JAVA_HOME}/include/${OS}

+-INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS} -I../include

++INCLUDES ?= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS} -I../include

+ 

+ # Changed "-lncurses" to "-lncursesw" (Leos Urban)

+ LIBS = -lncursesw

+@@ -21,5 +21,5 @@
+ all : ${TARGET}

+ 

+ ${TARGET} : Toolkit.c ../include/charva_awt_Toolkit.h Makefile.${OS}.txt

+-	${CC} ${CFLAGS} ${INCLUDES} Toolkit.c ${LIBS} -o ../lib/${TARGET}

++	${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} Toolkit.c ${LIBS} -o ../lib/${TARGET}

+ 

diff --git a/dev-java/charva/metadata.xml b/dev-java/charva/metadata.xml
new file mode 100644
index 000000000000..ec76855e0cb7
--- /dev/null
+++ b/dev-java/charva/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">charva</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/classmate/Manifest b/dev-java/classmate/Manifest
new file mode 100644
index 000000000000..ebf69947d25a
--- /dev/null
+++ b/dev-java/classmate/Manifest
@@ -0,0 +1 @@
+DIST classmate-0.9.0.tar.gz 57752 SHA256 6667a959b282b037aaed328fca3131a89c7649a347a72e1d2d4dd40bc8b393f2 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2 WHIRLPOOL ecfa56a57d07c1486f92c1a635d5b294b9664994504649a5234daff34935c0f42dc590f55ee1fa3a780399a923728a30e083a809871777e68e78deaf3f6dd45c
diff --git a/dev-java/classmate/classmate-0.9.0.ebuild b/dev-java/classmate/classmate-0.9.0.ebuild
new file mode 100644
index 000000000000..8441f7a440da
--- /dev/null
+++ b/dev-java/classmate/classmate-0.9.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple vcs-snapshot
+
+DESCRIPTION="Library for introspecting generic type information of types, member/static methods, fields"
+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.5"
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/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..a983ca93370a
--- /dev/null
+++ b/dev-java/classmate/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..8d96098c554a
--- /dev/null
+++ b/dev-java/cldc-api/Manifest
@@ -0,0 +1 @@
+DIST cldc-api-1.1.tar.bz2 142368 SHA256 5e764d515d1f2b25cd14dd6928e60a54b1693f74c11b23650a586110ff63f51b SHA512 b2baae07c037692b2e9ef418728817b60c39fcef7bbb2ccdfacb5551aef2022d342458434042154cc4b4f82895a427fab2f277b6269fa651ec3bcdb23a771e7e WHIRLPOOL c351a5611f2b58328e73896f47c25e4870ff9864112cbd2af7d11a06188651d9358b84367a65aa85dd261b75b74172e8222747cc63f125c627e6d9d9b0204dd1
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..d4554dc95285
--- /dev/null
+++ b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..838c00a4a448
--- /dev/null
+++ b/dev-java/cldc-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/cocoon/Manifest b/dev-java/cocoon/Manifest
new file mode 100644
index 000000000000..a944626be118
--- /dev/null
+++ b/dev-java/cocoon/Manifest
@@ -0,0 +1 @@
+DIST cocoon-2.1.11-src.tar.gz 48674390 SHA256 4b1d9f8ebd75d6228b3d76802941a8f41bfc0836c21d9d8cab764521c800a60c SHA512 5893f44d2c4ce0e29397da69db3d09f8a10b267b105d899122958b238d7651a4973b1af980e4c9d0e3656fd76d61e7610b57dc694d5d3a2964ea6c58c6df113e WHIRLPOOL 1c6ef78ae6d477da6c67ac2e12418a0a72290750a5ff46d09405d00629dc502b07c0d4c02ae32f1045bd6ce256b109bb7b5e8af8b6725823578b7ea69fb558aa
diff --git a/dev-java/cocoon/cocoon-2.1.11.ebuild b/dev-java/cocoon/cocoon-2.1.11.ebuild
new file mode 100644
index 000000000000..c9baffaae10f
--- /dev/null
+++ b/dev-java/cocoon/cocoon-2.1.11.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Web Publishing Framework for Apache"
+HOMEPAGE="http://cocoon.apache.org/"
+SRC_URI="mirror://apache/cocoon/${P}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+# I know this way of building cocoon is not the best, it will be fixed for
+# cocoon-2.2
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	echo "# Gentoo build properties" > local.build.properties
+	if ! use doc; then
+		echo "exclude.javadocs=true" >> local.build.properties
+		echo "exclude.webapp.javadocs=true" >> local.build.properties
+		echo "exclude.webapp.documentation=true" >> local.build.properties
+		echo "exclude.idldocs=true" >> local.build.properties
+		echo "exclude.webapp.idldocs=true" >> local.build.properties
+	fi
+	java-ant_bsfix_files tools/targets/*-build.xml
+	sed -i -e 's/maxmemory="192m"/maxmemory="384m"/' tools/src/blocks-build.xsl
+}
+
+src_compile() {
+	sh build.sh war standalone-demo javadocs || die
+}
+
+src_install() {
+	java-pkg_dowar build/${PN}/${PN}.war
+	java-pkg_dojar build/${PN}/cocoon.jar
+	java-pkg_jarinto /usr/share/${PN}/lib/core/
+	java-pkg_dojar lib/core/*.jar
+	insinto /usr/share/${PN}/lib
+	doins "${S}/build/${PN}"/cocoon-*.jar "${S}/lib/jars.xml"
+	for i in endorsed optional local; do
+		dodir /usr/share/${PN}/lib/${i}
+		insinto /usr/share/${PN}/lib/${i}
+		doins "${S}/lib/${i}"/*
+	done
+
+	dodoc CREDITS.txt INSTALL.txt KEYS README.txt || die
+
+	use doc && java-pkg_dojavadoc build/cocoon/javadocs
+
+	docinto legal
+	dodoc legal/*
+}
+
+pkg_postinst() {
+	elog "This ebuild does no longer install the Cocoon webapp into"
+	elog "any servlet container anymore. Copy /usr/share/${PN}/webapps/${PN}.war"
+	elog "to your servlet container's webapps directory and restart the"
+	elog "server."
+}
diff --git a/dev-java/cocoon/metadata.xml b/dev-java/cocoon/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/cocoon/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/codemodel/Manifest b/dev-java/codemodel/Manifest
new file mode 100644
index 000000000000..bcd48661e246
--- /dev/null
+++ b/dev-java/codemodel/Manifest
@@ -0,0 +1 @@
+DIST codemodel-2.6-sources.jar 178745 SHA256 c6ce048e40c8581e193957347d8b56aa1fd4a4e8537e240beed26fd31cad6c4b SHA512 f314fcd242d61bf0236b0520e8316df12cc5c068029d3a3a889db5d67ad1f0da37f3a1c09cc73d4709b7735b70f0ce8737365cb01441b3dedc6614f733e932c7 WHIRLPOOL 7d0ba479b245ca353adfa32fb145a642c77836841a823e836dc620a14205ff04c0f188c6f0bcc650fe6b8da9e578ab51824f6b18d68617e4af149649c71ea986
diff --git a/dev-java/codemodel/codemodel-2.6.ebuild b/dev-java/codemodel/codemodel-2.6.ebuild
new file mode 100644
index 000000000000..6f8630b98d3b
--- /dev/null
+++ b/dev-java/codemodel/codemodel-2.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..250f2d1940ea
--- /dev/null
+++ b/dev-java/codemodel/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/cofoja/Manifest b/dev-java/cofoja/Manifest
new file mode 100644
index 000000000000..4095c201d5a9
--- /dev/null
+++ b/dev-java/cofoja/Manifest
@@ -0,0 +1 @@
+DIST cofoja-1.1_p150.tar.bz2 152190 SHA256 934a858aba9af1830b557c3ac8ad692658df1500c88a89d183b37bb5eb61ec09 SHA512 095741da4c59d4fd397f0211dd51bf84ba7080eed658d2ec0a2390b599f1bd4a0426488ea858338822c92b757b155881a26d79f596b3df7517e9f39e290b76fa WHIRLPOOL a9ef9b061c2a152143e66041e49bd0f286b0e4598113b1f41fd9dd8c9ddae050e45341a10242fa3011ea06437062e6a50e750490b4ffb75970726d0f67c27ee9
diff --git a/dev-java/cofoja/cofoja-1.1_p150.ebuild b/dev-java/cofoja/cofoja-1.1_p150.ebuild
new file mode 100644
index 000000000000..f4d07c3e7fa7
--- /dev/null
+++ b/dev-java/cofoja/cofoja-1.1_p150.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Contracts for Java"
+HOMEPAGE="https://code.google.com/p/cofoja/"
+SRC_URI="http://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+CDEPEND="dev-java/asm:4"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="dist"
+EANT_GENTOO_CLASSPATH="asm-4"
+
+java_prepare() {
+	cat << EOF > "${S}"/local.properties
+version=${PV}
+snapshot=false
+debug=false
+EOF
+
+	java-pkg_jar-from --into build asm-4 asm.jar
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/dist/${P}.jar ${PN}.jar
+	use source && java-pkg_dosrc "${S}"/src/com
+}
diff --git a/dev-java/cofoja/metadata.xml b/dev-java/cofoja/metadata.xml
new file mode 100644
index 000000000000..0e703115258c
--- /dev/null
+++ b/dev-java/cofoja/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="google-code">cofoja</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-java/colt/Manifest b/dev-java/colt/Manifest
new file mode 100644
index 000000000000..a369f12f7499
--- /dev/null
+++ b/dev-java/colt/Manifest
@@ -0,0 +1 @@
+DIST colt-1.2.0.tar.gz 2545695 SHA256 da26942314a4ab7ab6dc449460970b4ada464b6594f69cba1b88268effbdddbb SHA512 a5e88e0cf671faeb336241d120daeb1ad90f1e2061827d06c0c2dc507cd3ae2ab45f2b80451aaedca0f5a8b3de66c13533178e3b6352ed8b2df886d25a924ce0 WHIRLPOOL 666b49fe22cd40ca3967523a85d1e6b43a7bbbec9f76b197f633e258e2d148b0743308e09f65fc8aad113020477002512f4224d7b412447f0685f2c44f410aad
diff --git a/dev-java/colt/colt-1.2.0-r2.ebuild b/dev-java/colt/colt-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..39bbe44a2736
--- /dev/null
+++ b/dev-java/colt/colt-1.2.0-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A set of Open Source Libraries for High Performance Scientific and Technical Computing in Java"
+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 ppc ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.4
+		>=dev-java/concurrent-util-1.3.4:0"
+RDEPEND=">=virtual/jre-1.4
+		 >=dev-java/concurrent-util-1.3.4:0"
+
+S="${WORKDIR}/${PN}"
+
+EANT_BUILD_TARGET="javac jar"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="concurrent-util"
+
+java_prepare() {
+	find "${S}" -iname '*.jar' -delete || die
+
+	epatch "${FILESDIR}/${P}-benchmark-no-deprecation.patch"
+}
+
+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/metadata.xml b/dev-java/colt/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/colt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-attributes/Manifest b/dev-java/commons-attributes/Manifest
new file mode 100644
index 000000000000..f612f144d4ae
--- /dev/null
+++ b/dev-java/commons-attributes/Manifest
@@ -0,0 +1 @@
+DIST commons-attributes-2.2-src.tar.gz 98307 SHA256 f24acddd1b82db16052672c255bd57add05107bbb1220264aec6ba10091e7713 SHA512 6030af498f085c56b313f473d3f44fc063608b9e0d7442e2f7fd0ee73c320b84cc334dd75038ab3aaac4b72a54cf12f3e3bddfb7faf3610f0f080c389f370e07 WHIRLPOOL b5a03da8126f8df02977a4318dd7cd6e1ebdb0b15f6932e344abb4b44dc1ee8e98214f3ff01fc0eeaf6b4ff6f47eeb67b4f7b6bc692407283c10f510947b4faf
diff --git a/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild b/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild
new file mode 100644
index 000000000000..0860a7b64641
--- /dev/null
+++ b/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons Attributes enables Java programmers to use C#/.Net-style attributes in their code"
+HOMEPAGE="http://commons.apache.org/attributes/"
+SRC_URI="mirror://apache/commons/attributes/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="dev-java/ant-core:0
+	dev-java/gjdoc:0
+	dev-java/qdox:1.6
+	dev-java/xjavadoc:0"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="ant-core,gjdoc,qdox-1.6"
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	# The generated build.xml is faulty.
+	jar uf target/${PN}-compiler-${PV}.jar -C compiler/src/java \
+		org/apache/commons/attributes/anttasks.properties || die
+}
+
+src_install() {
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-compiler-${PV}.jar ${PN}-compiler.jar
+
+	java-pkg_register-ant-task
+
+	dodoc NOTICE.txt
+	dohtml README.html
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc api/src/java/org compiler/src/java/org
+}
diff --git a/dev-java/commons-attributes/metadata.xml b/dev-java/commons-attributes/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-attributes/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
new file mode 100644
index 000000000000..75c0960b3415
--- /dev/null
+++ b/dev-java/commons-beanutils/Manifest
@@ -0,0 +1,2 @@
+DIST commons-beanutils-1.8.0-src.tar.gz 379586 SHA256 aff3c8c772e4ff32f2d9a37a727a488583372e45535a3d5aad09662691851dcf SHA512 2a3ea0ff09b24517defcd9f15552b1820e87296b9d6f920732a81c3ab10ad927e247d787ba8bd60100dfd6e2222a15d6ee6933217ff57263eaa07ec6ea0f078a WHIRLPOOL 88861f583317325275c72d10aebe104906d117ce4ce0d6cd079cacb2c3bde92a6b8419b87e317e5239cc0351fe3d29942b9e0d8afdb00e4bc86a377b6a35399a
+DIST commons-beanutils-1.8.3-src.tar.gz 383126 SHA256 df6d6a625db8da38b33d018030715130a258c0b493ea39f20c5e8d075b21b4ed SHA512 5cbe2774f097920db3b9dae99e7e6aa3c772826592c6f3b9db1ab9e3cc60631db60f0f9207c2f5335054288830085a6f0bf1da848300144c2a066b3a40e121b3 WHIRLPOOL 5ccf2ffab347db9d7276f64e7a293c1836699024c1fdb7321ec06f2cfd43d22a6e10938bb7637912ff22fe17417a534ac55266a16b81ef5fe85b9dfd0184fcab
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.8.0.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.8.0.ebuild
new file mode 100644
index 000000000000..e8de4ae2663c
--- /dev/null
+++ b/dev-java/commons-beanutils/commons-beanutils-1.8.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+COMMON_DEP="
+	>=dev-java/commons-collections-2.1:0
+	>=dev-java/commons-logging-1.0.2:0"
+RDEPEND=">=virtual/jre-1.4
+	!<=dev-java/commons-betwixt-0.7-r1:0.7
+	!dev-java/commons-beanutils-collections
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:0
+		dev-java/commons-collections[test-framework]
+	)
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	rm -vr src/java/org/apache/commons/collections/ || die
+	# from pom.xml:
+	# <!-- This test case is known to fail, and there isn't any proposed fix
+	#   -  so we will just exclude it until someone comes up with a solution.
+	# -->
+	rm -v ./src/test/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java || die
+	JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
+}
+
+EANT_GENTOO_CLASSPATH="commons-logging,commons-collections"
+
+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
+	java-pkg_newjar dist/${PN}-core-${PV}.jar ${PN}-core.jar
+	java-pkg_newjar dist/${PN}-bean-collections-${PV}.jar ${PN}-bean-collections.jar
+
+	dodoc README.txt RELEASE-NOTES.txt || die
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.8.3.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.8.3.ebuild
new file mode 100644
index 000000000000..e4546344a36c
--- /dev/null
+++ b/dev-java/commons-beanutils/commons-beanutils-1.8.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:0
+		dev-java/commons-collections[test-framework]
+	)
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	rm -vr src/main/java/org/apache/commons/collections/ || die
+	# from pom.xml:
+	# <!-- This test case is known to fail, and there isn't any proposed fix
+	#   -  so we will just exclude it until someone comes up with a solution.
+	# -->
+	JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
+}
+
+EANT_GENTOO_CLASSPATH="commons-logging,commons-collections"
+
+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
+	java-pkg_newjar dist/${PN}-core-${PV}.jar ${PN}-core.jar
+	java-pkg_newjar dist/${PN}-bean-collections-${PV}.jar ${PN}-bean-collections.jar
+
+	dodoc README.txt 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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-beanutils/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-betwixt/Manifest b/dev-java/commons-betwixt/Manifest
new file mode 100644
index 000000000000..708956527a6f
--- /dev/null
+++ b/dev-java/commons-betwixt/Manifest
@@ -0,0 +1 @@
+DIST commons-betwixt-0.8-src.tar.gz 359821 SHA256 86db2d772c5ffe134a96a6d79410896ec7ec75ed6d8824b39a5be6d2df384af2 SHA512 9d82807b13b7c0dfedf2def35c80bd7467cafbec1a3a5a4e188d56ed4940c43238c12fd7f334ce0a3ff990c60af4cf94ba42adbcb7bbb21a2775ed7762fb0668 WHIRLPOOL 9641342f7f2317520465fa0b7e8f65d26023f3054d458b755d31855690f6e776895de5dba2e7bf450e89bba4956718bd5ce7de9b5efe138abd877d1ff68ee6e0
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..dc349c8e6b73
--- /dev/null
+++ b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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.6-noget.patch b/dev-java/commons-betwixt/files/commons-betwixt-0.6-noget.patch
new file mode 100644
index 000000000000..18ed111f1614
--- /dev/null
+++ b/dev-java/commons-betwixt/files/commons-betwixt-0.6-noget.patch
@@ -0,0 +1,27 @@
+--- build.xml.orig	2005-03-29 00:13:46.324523008 +0200
++++ build.xml	2005-03-29 00:14:15.329113640 +0200
+@@ -45,7 +45,7 @@
+       </equals>
+     </condition>
+   </target>
+-  <target name="compile" description="o Compile the code" depends="get-deps">
++  <target name="compile" description="o Compile the code">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+@@ -67,7 +67,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="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+     </jar>
+   </target>
+@@ -187,4 +187,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-betwixt/files/commons-betwixt-0.7-notests.patch b/dev-java/commons-betwixt/files/commons-betwixt-0.7-notests.patch
new file mode 100644
index 000000000000..b0581b23f40a
--- /dev/null
+++ b/dev-java/commons-betwixt/files/commons-betwixt-0.7-notests.patch
@@ -0,0 +1,25 @@
+diff -ru commons-betwixt-0.7-src/build.xml commons-betwixt-0.7-src-patched/build.xml
+--- commons-betwixt-0.7-src/build.xml	2005-07-25 17:24:03.000000000 -0400
++++ commons-betwixt-0.7-src-patched/build.xml	2005-12-14 23:53:30.000000000 -0500
+@@ -86,11 +86,11 @@
+       </fileset>
+     </copy>
+   </target>
+-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
++  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test" unless="notest">
+     <fail message="There were test failures.">
+     </fail>
+   </target>
+-  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
++  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests" unless="notest">
+     <mkdir dir="${testreportdir}">
+     </mkdir>
+     <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+@@ -185,4 +185,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ No newline at end of file
++</project>
+Only in commons-betwixt-0.7-src-patched: target
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..392662d241d0
--- /dev/null
+++ b/dev-java/commons-betwixt/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+
+<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..5fc02c6d8927
--- /dev/null
+++ b/dev-java/commons-chain/Manifest
@@ -0,0 +1 @@
+DIST commons-chain-1.2-src.zip 316195 SHA256 6c13dd2c5fddffc6e955a702eb8767d9ebb8e3aa1f8d696bf2933a77a8c13ad3 SHA512 454cc3c00deb78f0c07e01ea5e2be9ea1210b7a0162e2490e5aba0df0788e1661aed88e4c4ac83e9f2046f62bdf063ecb7af7d3d49b7e87056aded1d5c1dad4b WHIRLPOOL aa2b6e2253493289f0e4599af71c1bf1361aa4cf17720f1498d6b991fee1bad963db6d307ab052b2b99f9d2e073d967e06ee54b45debf045b558a20ae24593d7
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..39cccd08e661
--- /dev/null
+++ b/dev-java/commons-chain/commons-chain-1.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="1.2"
+KEYWORDS="~amd64 ~x86"
+
+# Too many missing imports from javax.servlet.* which cause the
+# "compile-tests" target to fail compiling.
+# I gave up on it 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..7303cef96964
--- /dev/null
+++ b/dev-java/commons-chain/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
new file mode 100644
index 000000000000..3e0b5bcc93db
--- /dev/null
+++ b/dev-java/commons-cli/Manifest
@@ -0,0 +1 @@
+DIST commons-cli-1.2-src.tar.gz 68594 SHA256 b589cd675866aec12a068e0717f2bd52ead6128c43ba1612a8815db1df7f6e67 SHA512 61759cf0c791c4308b4df6a6c163b4abbb5e07909ba4904ad6565f6453ecad2ecbdc2d2df3e113b469f0d621866dfd7de07b857949ca7607c02c8ec75740eb80 WHIRLPOOL f89a34ca0f66b83643f54a976793f08d8d77b90f886fdc991e091495186050fb6424d04da10affb072367bbffb96faaf763cebf782d7fd11366c84678e826019
diff --git a/dev-java/commons-cli/commons-cli-1.2.ebuild b/dev-java/commons-cli/commons-cli-1.2.ebuild
new file mode 100644
index 000000000000..ab0241aa4a4e
--- /dev/null
+++ b/dev-java/commons-cli/commons-cli-1.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Upstream switched to Maven as a build system. Current build.xml file was generated by running mvn ant:ant
+# A bit of tweaking was required unfortunately
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A Java library for working with the command line arguments and options"
+HOMEPAGE="http://commons.apache.org/cli/"
+MY_P="${P}-src"
+SRC_URI="mirror://apache/commons/cli/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RESTRICT=""
+
+RDEPEND=">=virtual/jre-1.4"
+# Blocking junit for https://bugs.gentoo.org/show_bug.cgi?id=215659
+DEPEND=">=virtual/jdk-1.4
+	!<dev-java/junit-3.8.2
+	test? ( dev-java/ant-junit )"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_unpack() {
+	unpack ${A}
+	cp "${FILESDIR}/build-${PV}.xml" "${S}/build.xml"
+}
+
+src_install() {
+	java-pkg_newjar "target/${P}.jar"
+
+	dodoc README.txt RELEASE-NOTES.txt || die
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/java/org
+}
+
+# org.apache.commons.cli.ParserTestCase should not be ran, so we removed this class in build.xml
+
+src_test() {
+	ANT_TASKS="ant-junit"
+	eant -Djunit.present="true" test
+}
diff --git a/dev-java/commons-cli/files/build-1.2.xml b/dev-java/commons-cli/files/build-1.2.xml
new file mode 100644
index 000000000000..a6752eee3daa
--- /dev/null
+++ b/dev-java/commons-cli/files/build-1.2.xml
@@ -0,0 +1,257 @@
+<?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/27/09 6:50 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="commons-cli-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-cli-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/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.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>
+  </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="**/ParserTestCase.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="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/"/>
+    </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"/>
+
+  <!-- ====================================================================== -->
+  <!-- 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://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="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/commons-cli/metadata.xml b/dev-java/commons-cli/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-cli/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
new file mode 100644
index 000000000000..f1653aed1859
--- /dev/null
+++ b/dev-java/commons-codec/Manifest
@@ -0,0 +1 @@
+DIST commons-codec-1.7-src.tar.gz 291251 SHA256 816b5a9ae9ee67b918cb1864d0a24fbbc24ab1875992b6fc46ada6d62435e38a SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6 WHIRLPOOL edc4caaf6ef56fd9c1a7437dacf873be53802eccbcb1f6035163946c07e3f4373e0698f069f00a8ad2bb5562a2c6a1ab909eccfccd6a527ce51dcedd2bd2bbfc
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..312298663560
--- /dev/null
+++ b/dev-java/commons-codec/commons-codec-1.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..4ddd96d6ead4
--- /dev/null
+++ b/dev-java/commons-codec/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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..0eb13b01eea7
--- /dev/null
+++ b/dev-java/commons-collections/Manifest
@@ -0,0 +1 @@
+DIST commons-collections-3.2.1-src.tar.gz 609930 SHA256 9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0 WHIRLPOOL ec31406560a1156e8e8780e3cc1d5be2b614b26e8dc3c04a80ee758d4d42c353c2eaf6f5f41057d3f9735063cb81143005bd63d7b552b73f1e2acc5fa644766d
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..b20947a640b5
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test-framework"
+
+CDEPEND="
+	test-framework? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	# Check for VM version.
+	java-pkg_is-vm-version-ge 1.8
+	if [[ $? -eq 0 ]]; then
+		einfo "You are running a JVM greater or equal than version 1.8."
+		epatch "${FILESDIR}"/${P}-Java-8.patch
+	fi
+}
+
+src_compile() {
+	local antflags
+	if use test-framework; then
+		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
+		#no support for installing two sets of javadocs via dojavadoc atm
+		#use doc && antflags="${antflags} tf.javadoc"
+	fi
+	eant jar $(use_doc) ${antflags}
+}
+
+src_test() {
+	if [[ "${ARCH}" = "ppc" ]]; then
+		einfo "Tests are disabled on ppc"
+	else
+		ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	use test-framework && \
+		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
+			${PN}-testframework.jar
+
+	dodoc README.txt || die
+	java-pkg_dohtml *.html || die
+	if use doc; then
+		java-pkg_dojavadoc build/docs/apidocs
+		#use test-framework && java-pkg_dojavadoc build/docs/testframework
+	fi
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-collections/commons-collections-3.2.1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1.ebuild
new file mode 100644
index 000000000000..6e9154277fe5
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test-framework"
+
+COMMON_DEP="test-framework? ( =dev-java/junit-3.8* )"
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${P}-src"
+
+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/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..e6724cbe148d
--- /dev/null
+++ b/dev-java/commons-collections/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..99045263e539
--- /dev/null
+++ b/dev-java/commons-compress/Manifest
@@ -0,0 +1,2 @@
+DIST commons-compress-1.4.1-src.tar.gz 3228776 SHA256 b4f34aa03df917b785479e147381eea86c5c17e9067ddf8c27301ff6cd0aa91c SHA512 e1d327f084a79924938698ae16fa6edaaa73072b083109bbd8ccaa636268c05c387e7c2117b5df8f6b91b143495add9cc7da17c1bd3c989f91c910a9d68f6bdb WHIRLPOOL 50565e7342fa363814ed2f347d1daa1ee59dd28cefcd9e494850edcf47899b8684312996dd60b90236a4f2aacce8a920ace37cca5d1d22ad9f63f6696c8e7452
+DIST commons-compress-1.8.1-src.tar.gz 8476056 SHA256 aa1221643331d9de5c8155b032c7fde23fc8cf3d962155092de89c44d4978412 SHA512 4e4f9633cc3c470970a8da41344a819ff63430a46e219e93896dbe2374738349f78942cff93ad8d348599cfc2dd7d014ae4ff3b09d76a924bb11ca1c4a2c05ea WHIRLPOOL 2d7f3230f47186a72b4b31efd10c5dfd68488d263e26d97b6e715b2b2eab3e22ae3e5946d232ca014aa2a3d14f3abf87ce97bf2e70c7c06788c4093df4156aef
diff --git a/dev-java/commons-compress/commons-compress-1.4.1.ebuild b/dev-java/commons-compress/commons-compress-1.4.1.ebuild
new file mode 100644
index 000000000000..12176cdfe021
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.4.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND="dev-java/xz-java"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}
+	test? (	dev-java/junit:4
+		dev-java/hamcrest-core
+		dev-java/ant-junit:0 )"
+
+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="junit-4 hamcrest-core xz-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/commons-compress-1.8.1-r1.ebuild b/dev-java/commons-compress/commons-compress-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..ce1dd1b3894c
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.8.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND="dev-java/xz-java"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}
+	test? (	dev-java/junit:4
+		dev-java/hamcrest-core:1.3
+		dev-java/ant-junit:0 )"
+
+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="junit-4 hamcrest-core-1.3 xz-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/commons-compress-1.8.1.ebuild b/dev-java/commons-compress/commons-compress-1.8.1.ebuild
new file mode 100644
index 000000000000..d52a6db08966
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.8.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-java/xz-java"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}
+	test? (	dev-java/junit:4
+		dev-java/hamcrest-core
+		dev-java/ant-junit:0 )"
+
+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="junit-4 hamcrest-core xz-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..fed3658eec53
--- /dev/null
+++ b/dev-java/commons-compress/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>
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/dev-java/commons-configuration/Manifest b/dev-java/commons-configuration/Manifest
new file mode 100644
index 000000000000..c423c4c6171e
--- /dev/null
+++ b/dev-java/commons-configuration/Manifest
@@ -0,0 +1 @@
+DIST commons-configuration-1.6-src.tar.gz 559621 SHA256 3874f0c7227874474e538c41f28e2d11584eff3c14323985a1f92da97841cf5b SHA512 5d82b844cf39162976820d030d05afeeec1151aa33bf4353f9ca844e552c55ea26daa1b74158baa31d0677e311e9dd83a1d9721c8d5f4e23d21068c4ca2eeb01 WHIRLPOOL 5ae3d17fbd32d3445e04a8f8eb3ad91e59ae3220cee0f17bb27176a18d2c1ff79e2099b90d828268b8bc3ddeeaacb4fed57df722ad7b0cca97dbe4d5a45d30f6
diff --git a/dev-java/commons-configuration/commons-configuration-1.6-r1.ebuild b/dev-java/commons-configuration/commons-configuration-1.6-r1.ebuild
new file mode 100644
index 000000000000..00ab9c1d6a7b
--- /dev/null
+++ b/dev-java/commons-configuration/commons-configuration-1.6-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+
+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
+COMMON_DEPENDS="
+	>=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:2.5
+	dev-java/ant-core:0"
+
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEPENDS}"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEPENDS}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Tweak build classpath and don't automatically run tests
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	java-ant_rewrite-classpath
+}
+
+EANT_GENTOO_CLASSPATH="
+	commons-beanutils:1.7
+	commons-codec
+	commons-collections
+	commons-digester
+	commons-jxpath
+	commons-lang:2.1
+	commons-logging
+	servlet-api:2.5
+	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/commons-configuration-1.6-r2.ebuild b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
new file mode 100644
index 000000000000..9b2053d295df
--- /dev/null
+++ b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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/commons-configuration-1.6.ebuild b/dev-java/commons-configuration/commons-configuration-1.6.ebuild
new file mode 100644
index 000000000000..91b467e6a118
--- /dev/null
+++ b/dev-java/commons-configuration/commons-configuration-1.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+
+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
+COMMON_DEPENDS="
+	>=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
+	dev-java/servletapi:2.4
+	dev-java/ant-core:0"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPENDS}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPENDS}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Tweak build classpath and don't automatically run tests
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	java-ant_rewrite-classpath
+}
+
+EANT_GENTOO_CLASSPATH="
+	commons-beanutils-1.7
+	commons-codec
+	commons-collections
+	commons-digester
+	commons-jxpath
+	commons-lang-2.1
+	commons-logging
+	servletapi-2.4
+	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_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-configuration/files/commons-configuration-1.4-gentoo.patch b/dev-java/commons-configuration/files/commons-configuration-1.4-gentoo.patch
new file mode 100644
index 000000000000..19b68cd697bb
--- /dev/null
+++ b/dev-java/commons-configuration/files/commons-configuration-1.4-gentoo.patch
@@ -0,0 +1,26 @@
+--- 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">

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

+     </unjar>

+   </target>

+-</project>
+\ Chybí znak konce řádku na konci souboru
++</project>

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..8f76559d3618
--- /dev/null
+++ b/dev-java/commons-configuration/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..bf43975345bf
--- /dev/null
+++ b/dev-java/commons-daemon/Manifest
@@ -0,0 +1,3 @@
+DIST commons-daemon-1.0.15-src.tar.gz 291128 SHA256 11ee57d2c6b281589c1497b2f88180553f06d5ac1560ce1841e05f89f0342432 SHA512 f20cc8796978fb09b6ecc8d99bb3c8b271b097d74c1f99b286cde213631e7f50a4104f5db2c354f9624ba8b037502d81e327c581b38253b9b216aa2172016e40 WHIRLPOOL 6b3b5f5d12fc9fd15345e71a7bf41f88605b00f9bc0ab5ab5fca3752f4bae1adf6ae6b2c3781a68b00d0609c51cb5cb2f4e399effa40f08be0c5dacc2e230d65
+DIST commons-daemon-1.0.7-src.tar.gz 233291 SHA256 cd782d29b85ac5fadc4b4cf6c3f86248cb31f258f020bd9b5479919effcea8b9 SHA512 2a6b3c94ba41e89576d7803c80a0a380cf073af34d45e7afd0e529942ab632264ee013aa91022905f62cb9cd92462b15cc81206565664f47ecac77c2d4565284 WHIRLPOOL 470dc894beba3b73553768267f5f0eb2ad8bdc419811907bbb23dcdf2f05f1ce4ce060a07ed1e4b6e26c81016e46d93c7b3712b3d5e8a10e38281e2f8e537896
+DIST commons-daemon-1.0.9-src.tar.gz 233786 SHA256 20aef955914f730209b432a0d2c7dd03384ae4b821eeee78964210046c63e040 SHA512 13bbf1a0671b29913b82116cbe44977b5eb9fecf8475a2ce0022e1639564808498b03ab6c87704c5e38661baadabc50a6d91e6847e62c8e4987e6fc0c834ed37 WHIRLPOOL a2008fb7e5f6ad2bc84b84315ef26731c5b7b307dfc6c2ba74743e6ef71f20dabc805d4bbb779ecac979ab7a3ba61414aacba55132c5abd685ca305968ce52de
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..9eb9baaede61
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+WANT_AUTOCONF=2.5
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils 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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="kernel_linux"
+
+COMMON_DEP="kernel_linux? ( sys-libs/libcap )"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+
+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/commons-daemon-1.0.7.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.7.ebuild
new file mode 100644
index 000000000000..cb0ff226b4ef
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.0.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+WANT_AUTOCONF=2.5
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils 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 ppc ppc64 x86 ~x86-fbsd"
+IUSE="kernel_linux"
+
+COMMON_DEP="
+	kernel_linux? ( sys-libs/libcap )"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+
+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/java/* src/native/unix/native
+}
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild
new file mode 100644
index 000000000000..294fa0646ae8
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.0.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+WANT_AUTOCONF=2.5
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils 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 ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="kernel_linux"
+
+COMMON_DEP="
+	kernel_linux? ( sys-libs/libcap )"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-daemon/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest
new file mode 100644
index 000000000000..644dfb9bd3ec
--- /dev/null
+++ b/dev-java/commons-dbcp/Manifest
@@ -0,0 +1,2 @@
+DIST commons-dbcp-1.4-src.tar.gz 932507 SHA256 f5f10846e79fc71121fe7402c61d71575506b01b59e719e974ebc4d99e6df283 SHA512 70f32ea36bae46290dc376e6040539562de98906810bd4e1985667c336e6215dc5536278000fee5d9f200cc4b97ea0a6cff74a871e962b61203741814a9c5e7b WHIRLPOOL c917bd417d95e7fc2448c87d949f440ad829ea794b943e707a23154fafaf9eeccaa2900ae7ccb27cf03c56d7e0727177e56c47f157ee85ab1be7c67d18702b26
+DIST commons-dbcp2-2.1-src.tar.gz 580017 SHA256 e1a75021dc3a5314cfa0a0c65bf0bf3d8f95a289b833cf5e391149cf29367708 SHA512 830fb550cee5f9c79fad830d8b3e56417aa9dfed26093fd366693260f5b4d821baa592e60c7f5997766276049a90eacd5854b8422803825154fedee56d46409d WHIRLPOOL d4efd240eae5d891c98ad3a2fa76756fabdfa93bc17ec9d4e0b046f6dcb8e61579acfb899f338131472960aaddf25457d3a82ca00486242097319e9f7617462a
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild
new file mode 100644
index 000000000000..fd5f18906c70
--- /dev/null
+++ b/dev-java/commons-dbcp/commons-dbcp-1.4-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Jakarta component providing database connection pooling API"
+HOMEPAGE="http://commons.apache.org/dbcp/"
+SRC_URI="mirror://apache/commons/dbcp/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/commons-pool:0
+	java-virtuals/transaction-api:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+	virtual/jdk:1.6
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_BUILD_TARGET="build-jar"
+EANT_GENTOO_CLASSPATH="commons-pool,transaction-api"
+
+src_test() {
+	# depend on not packaged geronimo #348853
+	rm -v src/test/org/apache/commons/dbcp/managed/TestBasicManagedDataSource.java || die
+	rm -v src/test/org/apache/commons/dbcp/managed/TestManagedDataSource.java || die
+	rm -v src/test/org/apache/commons/dbcp/managed/TestManagedDataSourceInTx.java || die
+
+	# fails :(
+	rm -v src/test/org/apache/commons/dbcp/TestJndi.java || die
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}*.jar
+	dodoc README.txt RELEASE-NOTES.txt
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
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..b10d48760f88
--- /dev/null
+++ b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="~x86 ~amd64 ~x86-fbsd ~x86-freebsd ~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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-dbcp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-dbutils/Manifest b/dev-java/commons-dbutils/Manifest
new file mode 100644
index 000000000000..4be4cdd0ba94
--- /dev/null
+++ b/dev-java/commons-dbutils/Manifest
@@ -0,0 +1 @@
+DIST commons-dbutils-1.1-src.tar.gz 60062 SHA256 645f79936bb90c5ed02fd4d1ddbc15b23e22a468ab0df22771f2b78fe8d49a59 SHA512 03859d0ddc65b1f0254f71e9de371f131a81dc839de6bea938a0547b63759d18a9e957f44ac887b7ae9ea85ee3aeea90ffd8f03069c670ec7b700fe8b6e45fe2 WHIRLPOOL b4b3e670b30101657c0d57fcf33993cdca89838135f147b54c63ac4bbced6fe1ed1218af36e95bec60e856c73a9d47fbfc1eecdbbd55dd7e476f6883fd94f3fd
diff --git a/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild b/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild
new file mode 100644
index 000000000000..3a63ce873b14
--- /dev/null
+++ b/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit base 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.4
+	test? ( dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=( "${FILESDIR}/1.1-tests.patch" )
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+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/commons-dbutils/files/1.1-tests.patch b/dev-java/commons-dbutils/files/1.1-tests.patch
new file mode 100644
index 000000000000..a2036d4180e1
--- /dev/null
+++ b/dev-java/commons-dbutils/files/1.1-tests.patch
@@ -0,0 +1,12 @@
+diff -ur commons-dbutils-1.1-src.old/build.xml commons-dbutils-1.1-src/build.xml
+--- commons-dbutils-1.1-src.old/build.xml	2008-02-13 22:18:49.000000000 +0200
++++ commons-dbutils-1.1-src/build.xml	2008-02-13 22:18:59.000000000 +0200
+@@ -62,7 +62,7 @@
+       </classpath>
+     </javac>
+   </target>
+-  <target name="jar" description="o Create the jar" depends="compile,test">
++  <target name="jar" description="o Create the jar" depends="compile">
+     <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+     </jar>
+   </target>
diff --git a/dev-java/commons-dbutils/metadata.xml b/dev-java/commons-dbutils/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/commons-dbutils/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
new file mode 100644
index 000000000000..98d3f5a38889
--- /dev/null
+++ b/dev-java/commons-digester/Manifest
@@ -0,0 +1,3 @@
+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
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..12a832860b1c
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 within the system"
+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 ppc 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..7acefe402e94
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 within the system"
+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 ppc 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..a0978683ea83
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 within the system"
+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 x86 ppc ppc64"
+
+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-build.xml-jar-target.patch b/dev-java/commons-digester/files/1.8-build.xml-jar-target.patch
new file mode 100644
index 000000000000..316d2e2a54b1
--- /dev/null
+++ b/dev-java/commons-digester/files/1.8-build.xml-jar-target.patch
@@ -0,0 +1,47 @@
+--- build.xml.orig	2007-12-26 13:43:35.000000000 +1300
++++ build.xml	2007-12-26 13:47:32.000000000 +1300
+@@ -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,20 +258,22 @@
+     </javadoc>

+   </target>

+ 

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

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

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

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

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

++         manifest="${build.home}/conf/MANIFEST.MF"/>

++  </target>

+ 

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

++  <target name="dist" depends="jar,javadoc"

+    description="Create binary distribution">

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

+     <copy      file="LICENSE.txt"

+               todir="${dist.home}"/>

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

+     <copy      file="RELEASE-NOTES.txt"

+               todir="${dist.home}"/>

+     <copy      file="NOTICE.txt"

+               todir="${dist.home}"/>

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

+-            basedir="${build.home}/classes"

+-           manifest="${build.home}/conf/MANIFEST.MF"/>

+   </target>

+ 

+ 

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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-digester/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-discovery/Manifest b/dev-java/commons-discovery/Manifest
new file mode 100644
index 000000000000..cb4e1258bc82
--- /dev/null
+++ b/dev-java/commons-discovery/Manifest
@@ -0,0 +1 @@
+DIST commons-discovery-0.4-src.tar.gz 78453 SHA256 596242302be4f0502073f5a934c608289bba6221591e7dbea53ce629f67498a3 SHA512 337db71167534785471b540bd89107a16e146bee4094ed746feb68fd1efa7697c0f629f24e63fb760f6c664d98f35d97ee71ca114a26d17ae078bf27459b1705 WHIRLPOOL 7608a0d99955c464b7a62fab615a6ec5b8a782c59c2dacb2440d2a5f6e681ec998583ffa4af51bdbb08a88c4f66bc4ecf736969a67ca7ff53da3eae6b482031e
diff --git a/dev-java/commons-discovery/commons-discovery-0.4.ebuild b/dev-java/commons-discovery/commons-discovery-0.4.ebuild
new file mode 100644
index 000000000000..efa00477e4b5
--- /dev/null
+++ b/dev-java/commons-discovery/commons-discovery-0.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons Discovery: Service Discovery component"
+HOMEPAGE="http://commons.apache.org/discovery/"
+SRC_URI="mirror://apache/jakarta/commons/discovery/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc source test"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/commons-logging"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	dev-java/ant-core
+	source? ( app-arch/zip )
+	test? ( =dev-java/junit-3* )"
+
+S="${WORKDIR}/${P}-src/"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# https://issues.apache.org/jira/browse/DISCOVERY-10
+	epatch "${FILESDIR}/0.4-jar-target.patch"
+}
+
+src_compile() {
+	java-pkg-2_src_compile \
+		-Dlogger.jar="$(java-pkg_getjar commons-logging commons-logging.jar)"
+}
+
+src_test() {
+	eant test.discovery \
+		-Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" \
+		-Dlogger.jar="$(java-pkg_getjar commons-logging commons-logging.jar)"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	dodoc NOTICE.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-discovery/files/0.4-jar-target.patch b/dev-java/commons-discovery/files/0.4-jar-target.patch
new file mode 100644
index 000000000000..7cc3c983efe6
--- /dev/null
+++ b/dev-java/commons-discovery/files/0.4-jar-target.patch
@@ -0,0 +1,41 @@
+Index: build.xml
+===================================================================
+--- build.xml	(revision 498103)
++++ build.xml	(working copy)
+@@ -175,23 +175,26 @@
+     </javadoc>
+   </target>
+ 
++  <target name="jar" depends="compile"
++   description="Create the jar file">
++    <mkdir      dir="${build.home}/classes/META-INF"/>
++    <copy      file="LICENSE.txt"
++             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
++    <copy      file="NOTICE.txt"
++             tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
++    <mkdir      dir="${dist.home}"/>
++    <jar   jarfile="${dist.home}/${component.name}.jar"
++           basedir="${build.home}/classes"
++          manifest="${build.home}/conf/MANIFEST.MF"/>
++  </target>
+ 
+-  <target name="dist" depends="compile,javadoc"
++  <target name="dist" depends="jar,javadoc"
+    description="Create binary distribution">
+     <!-- TODO: top level files like LICENSE and README -->
+-    <mkdir      dir="${dist.home}"/>
+     <copy      file="LICENSE.txt"
+               todir="${dist.home}"/>
+     <copy      file="NOTICE.txt"
+               todir="${dist.home}"/>
+-    <mkdir      dir="${build.home}/classes/META-INF"/>
+-    <copy      file="LICENSE.txt"
+-             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+-    <copy      file="NOTICE.txt"
+-             tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+-    <jar    jarfile="${dist.home}/${component.name}.jar"
+-            basedir="${build.home}/classes"
+-           manifest="${build.home}/conf/MANIFEST.MF"/>
+   </target>
+ 
+ <!-- ========== Testing section ======================================== -->
diff --git a/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff b/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff
new file mode 100644
index 000000000000..b55e10f5a0c2
--- /dev/null
+++ b/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff
@@ -0,0 +1,51 @@
+--- build.xml.orig	2005-04-17 16:14:52.000000000 +0200
++++ build.xml	2005-04-17 16:14:57.000000000 +0200
+@@ -14,13 +14,15 @@
+   <property file="../build.properties"/>             <!-- Commons local     -->

+   <property file="${user.home}/build.properties"/>   <!-- User local        -->

+ 

++  <!-- The base directory for compilation targets -->

++  <property name="build.home"              value="target"/>

+ 

+ <!-- ========== External Dependencies ===================================== -->

+ 

+ 

+   <!-- The directories corresponding to your necessary dependencies -->

+-  <property name="junit.jar"               value="../../junit3.7/junit.jar"/>

+-  <property name="logger.jar"               value="../../jakarta-commons/logging/target/commons-logging.jar"/>

++  <property name="junit.jar"               value="${build.home}/lib/junit.jar"/>

++  <property name="logger.jar"               value="${build.home}/lib/commons-logging.jar"/>

+ 

+ 

+ <!-- ========== Component Declarations ==================================== -->

+@@ -38,8 +40,6 @@
+   <!-- The current version number of this component -->

+   <property name="component.version"       value="0.2"/>

+ 

+-  <!-- The base directory for compilation targets -->

+-  <property name="build.home"              value="target"/>

+ 

+   <!-- The base directory for component configuration files -->

+   <property name="conf.home"               value="src/conf"/>

+@@ -116,6 +116,7 @@
+ 

+  

+   <target name="compile" depends="prepare" description="Compile shareable components">

++ 

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

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

+              debug="${compile.debug}"

+@@ -163,10 +164,10 @@
+    description="Create binary distribution">

+     <!-- TODO: top level files like LICENSE and README -->

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

+-    <copy      file="../LICENSE"

+-              todir="${dist.home}"/>

++    <!--<copy      file="LICENSE"

++              todir="${dist.home}"/>-->

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

+-    <copy      file="../LICENSE"

++    <copy      file="LICENSE.txt"

+              tofile="${build.home}/classes/META-INF/LICENSE.txt"/>

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

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

diff --git a/dev-java/commons-discovery/metadata.xml b/dev-java/commons-discovery/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-discovery/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
new file mode 100644
index 000000000000..d676bfedf9bb
--- /dev/null
+++ b/dev-java/commons-el/Manifest
@@ -0,0 +1 @@
+DIST commons-el-1.0-src.tar.gz 64009 SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6 SHA512 51bee4a33816b2c7416f55bd2efe1e663350ca0b30b2b5a8f89154c51596df8481c736fa13576a9dad69b2da113728050c2c9b6f50125d38a36f45e4b82e2e83 WHIRLPOOL 5f019e0dac1211f713a8b3dd8818277c6241af133d3dc460e355332da40c58357e4d606e28301e770fe7dbf30f19885ba57f252e90cdd8923fbe258bec052ab6
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..d1e8a031ccef
--- /dev/null
+++ b/dev-java/commons-el/commons-el-1.0-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-el/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
new file mode 100644
index 000000000000..01c9fb25ffa1
--- /dev/null
+++ b/dev-java/commons-fileupload/Manifest
@@ -0,0 +1 @@
+DIST commons-fileupload-1.3-src.tar.gz 137105 SHA256 4bf3bfbaf7c25bbe6d0e2dc6a47479e16d42ec1b0365037ed508eeac276e8dc5 SHA512 dbaaef89eb8b4be3555f0736919234b42217e8b6a021dcd99c11d18462b39b10ba92e25bafda51d1b1fcc306c9becf3fb124d03debb66922ab5442197f6360d2 WHIRLPOOL 37803f31084977e4d58d4ea67a7e50de7a0c9988f6787e7e296e95678d94b05b502e36196d5e6af420e3fde0e3a11d94d9b5e2e2781c06d0f04130f9418ca6b1
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..7e24da2d6ee8
--- /dev/null
+++ b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Add robust, 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 ppc ppc64 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/files/commons-fileupload-1.2.1-gentoo.patch b/dev-java/commons-fileupload/files/commons-fileupload-1.2.1-gentoo.patch
new file mode 100644
index 000000000000..852de25cd2a3
--- /dev/null
+++ b/dev-java/commons-fileupload/files/commons-fileupload-1.2.1-gentoo.patch
@@ -0,0 +1,45 @@
+--- build.xml.orig	2008-06-21 20:06:11.000000000 +0200
++++ build.xml	2008-06-21 20:07:03.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+   <property name="defaulttargetdir" value="${basedir}/target">
+   </property>
+-  <property name="libdir" value="${user.home}/.maven/repository">
++  <property name="libdir" value="target/lib">
+   </property>
+   <property name="classesdir" value="${basedir}/target/classes">
+   </property>
+@@ -74,7 +74,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">
+@@ -94,7 +94,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}">
+     </jar>
+   </target>
+@@ -172,7 +172,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>
+@@ -295,4 +295,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ Chybí znak konce řádku na konci souboru
++</project>
diff --git a/dev-java/commons-fileupload/metadata.xml b/dev-java/commons-fileupload/metadata.xml
new file mode 100644
index 000000000000..43fc180bed4c
--- /dev/null
+++ b/dev-java/commons-fileupload/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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-grant/Manifest b/dev-java/commons-grant/Manifest
new file mode 100644
index 000000000000..350c40a728c7
--- /dev/null
+++ b/dev-java/commons-grant/Manifest
@@ -0,0 +1 @@
+DIST jakarta-commons-grant-1.0.b5.cvs20040118-4jpp.src.rpm 11651 SHA256 c6cc1cd6b51668ba18f6fab17863d4f3bc9889a20a0f70261dbf00fd08ec482d SHA512 4f18e337d853ac150524bc56ade1864c7622bd4fda6ddae37857410340b3b9155850b6c2279636345e762a4d6bf13a2d7c91861d5dc5f2d2d91942ba30d8b58b WHIRLPOOL ea18dbe3f95b63d7501146bdad805f35a900e3a21ed4e37e8e1e55e3ff38d64fc115682821aadf4e1391ee2162e7d4af406da4cd4d542402f4ae2bacc48bc7fa
diff --git a/dev-java/commons-grant/commons-grant-1.0.ebuild b/dev-java/commons-grant/commons-grant-1.0.ebuild
new file mode 100644
index 000000000000..0d75a479fc22
--- /dev/null
+++ b/dev-java/commons-grant/commons-grant-1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Note: Upstream is dead... only place to find is on the ibiblio maven repo
+# and on jpackage.org
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils rpm
+MY_PN="jakarta-${PN}"
+SNAPSHOT_DATE="20040118"
+MY_PV="${PV%%_*}.b5.cvs${SNAPSHOT_DATE}"
+MY_PV="${MY_PV//_beta/.b}"
+MY_P="${MY_PN}-${MY_PV}"
+JPACKAGE_REVISION="4"
+
+DESCRIPTION="A small collection of hacks to make using Ant in an embedded envinronment much easier"
+# This link seems dead, but I don't have anywhere else to turn
+HOMEPAGE="http://jakarta.apache.org/commons/sandbox/grant/"
+SRC_URI="mirror://jpackage/1.6/generic/free/SRPMS/${MY_P}-${JPACKAGE_REVISION}jpp.src.rpm"
+
+DEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3
+	dev-java/ant-core"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc source"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack(){
+	rpm_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}_beta5-gentoo.diff
+
+	mkdir -p target/lib
+	cd target/lib
+	java-pkg_jar-from ant-core
+}
+
+src_install(){
+	java-pkg_newjar target/${PN}-1.0-beta-4.jar ${PN}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
+
+#No unit tests although the target exists
+#src_test() {
+#	eant test || die "Test failed"
+#}
diff --git a/dev-java/commons-grant/files/commons-grant-1.0_beta5-gentoo.diff b/dev-java/commons-grant/files/commons-grant-1.0_beta5-gentoo.diff
new file mode 100644
index 000000000000..98e6a97965bd
--- /dev/null
+++ b/dev-java/commons-grant/files/commons-grant-1.0_beta5-gentoo.diff
@@ -0,0 +1,38 @@
+*** build.xml.orig	Thu Nov 11 17:24:13 2004
+--- build.xml	Thu Nov 11 17:25:02 2004
+***************
+*** 20,29 ****
+    <target name="init" description="o Initializes some properties">
+      <mkdir dir="${libdir}">
+      </mkdir>
+!     <condition property="noget">
+        <equals arg2="only" arg1="${build.sysclasspath}">
+        </equals>
+!     </condition>
+    </target>
+    <target name="compile" description="o Compile the code" depends="get-deps">
+      <mkdir dir="${classesdir}">
+--- 20,30 ----
+    <target name="init" description="o Initializes some properties">
+      <mkdir dir="${libdir}">
+      </mkdir>
+!     <!--<condition property="noget">
+        <equals arg2="only" arg1="${build.sysclasspath}">
+        </equals>
+!     </condition>-->
+!     <property name="noget" value="true"></property>
+    </target>
+    <target name="compile" description="o Compile the code" depends="get-deps">
+      <mkdir dir="${classesdir}">
+***************
+*** 111,114 ****
+      <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+      </unjar>
+    </target>
+! </project>
+\ No newline at end of file
+--- 112,115 ----
+      <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+      </unjar>
+    </target>
+! </project>
diff --git a/dev-java/commons-grant/metadata.xml b/dev-java/commons-grant/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-grant/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-graph/Manifest b/dev-java/commons-graph/Manifest
new file mode 100644
index 000000000000..e8bbd79bd05a
--- /dev/null
+++ b/dev-java/commons-graph/Manifest
@@ -0,0 +1 @@
+DIST graph2-0.8.1.cvs20040118.tar.gz 42653 SHA256 916e3ca83376acd9ca64ee87988c8a19dc86c6468d087ede82d1e05c14a5a142 SHA512 110f2365b9568a4059233c6c6e75aec1a52b4fdd9110d55f0a6b79df324f047bde87d49134d8ba73417223919ddce972dd4a3c86841f843dd0109ebb17177083 WHIRLPOOL e3cd70bc98187a4f581bfa60125cfbfd0490264582d8fe4f536f7ecfd12a2f8228b1ff64db5414f8fa95ea976be5db08a054eecbb86e098cba62cc8cedd6f4c1
diff --git a/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild b/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild
new file mode 100644
index 000000000000..7a80de01da26
--- /dev/null
+++ b/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+MY_PN=graph2
+MY_PV=${PV%%_*}.cvs${PV##*_p}
+MY_P=${MY_PN}-${MY_PV}
+API_PV=${PV%%_*}
+DESCRIPTION="A toolkit for managing graphs and graph based data structures"
+# There doesn't seem to be a real home page, so we'll point to a viewcvs
+HOMEPAGE="http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/graph2/"
+# this was extracted from a source rpm at jpackage
+SRC_URI="mirror://gentoo/distfiles/${MY_P}.tar.gz"
+COMMON_DEP="
+	dev-java/commons-collections
+	dev-java/jdepend"
+DEPEND=">=virtual/jdk-1.3
+	test? ( dev-java/ant-junit )
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEP}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S=${WORKDIR}/${MY_P}
+
+src_unpack(){
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+	mkdir -p target/lib
+	cd target/lib
+	java-pkg_jar-from commons-collections
+	java-pkg_jar-from jdepend
+}
+
+src_install(){
+	java-pkg_newjar target/${PN}-${API_PV}.jar ${PN}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
+
+src_test() {
+	cd "${S}/target/lib"
+	java-pkg_jar-from junit
+	cd "${S}"
+	ANT_TASKS="ant-junit" eant test
+}
diff --git a/dev-java/commons-graph/files/commons-graph-0.8.1_p20040118-gentoo.diff b/dev-java/commons-graph/files/commons-graph-0.8.1_p20040118-gentoo.diff
new file mode 100644
index 000000000000..c7ffe457a11e
--- /dev/null
+++ b/dev-java/commons-graph/files/commons-graph-0.8.1_p20040118-gentoo.diff
@@ -0,0 +1,19 @@
+diff -ru graph2-0.8.1.cvs20040118/build.xml graph2-0.8.1.cvs20040118-patched/build.xml
+--- graph2-0.8.1.cvs20040118/build.xml	2003-02-18 09:45:49.000000000 -0500
++++ graph2-0.8.1.cvs20040118-patched/build.xml	2005-09-04 22:44:31.000000000 -0400
+@@ -46,7 +47,7 @@
+       </classpath>
+     </javac>
+   </target>
+-  <target name="jar" description="o Create the jar" depends="compile,test">
++  <target name="jar" description="o Create the jar" depends="compile">
+     <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+     </jar>
+   </target>
+@@ -162,4 +163,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-graph/metadata.xml b/dev-java/commons-graph/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-graph/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
new file mode 100644
index 000000000000..df45d63ce887
--- /dev/null
+++ b/dev-java/commons-httpclient/Manifest
@@ -0,0 +1 @@
+DIST commons-httpclient-3.1-src.tar.gz 1882664 SHA256 f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490 WHIRLPOOL ea95a7fd7d6dbe0dd2326b12274629eba611014e0d2461dbd75500d3f18188d30962bf132c2a7fea98e51a81aaf44cbe097f27d8b3894a5626680ea893ea51e1
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..53634338ea40
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..5fdcd222f17f
--- /dev/null
+++ b/dev-java/commons-httpclient/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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-io/Manifest b/dev-java/commons-io/Manifest
new file mode 100644
index 000000000000..faeff6ca9739
--- /dev/null
+++ b/dev-java/commons-io/Manifest
@@ -0,0 +1,2 @@
+DIST commons-io-2.0.1-src.tar.gz 280920 SHA256 32be3e626618b49c2e2fb268bd2101d7ae38438131df4560fc800bd2f26fdff8 SHA512 0e01d12c46707ff254b8aa3b31fe8d027e7bafd34a2c2c96b8867084bbe43c763d03f773189ec17ffc6525ad8d022009cb64cdf288a401194e8c0ebbe5d99ee2 WHIRLPOOL 4e34102bdf9b025165f25d09287ce446f838a92c990db099f5a9356cad994b88b9916c089f2ffcb7ceeeb5250b22daace637b7df5a3526711923824d0dc3f8f1
+DIST commons-io-2.4-src.tar.gz 330961 SHA256 961c8b41a891933c2d662d8e490667243ac82422668d1ccdd7bfedfdb944bb58 SHA512 69ac5f7b8de952d8b519ad89d4e9a33a9d269af0e68b735c0180ee8853a30e2a09147ceac362626a2fb3a041bd46eca094be2661ff280c1bab54a0548cae0aee WHIRLPOOL 4db6be6dbba4e3c9f67c471eff709ade22594ef1cea759da5651fa5788b1bcfeca689621eb3ff7ca52dca0229b096d597e9f5cb969ebcc7a06ff18f28ccc3551
diff --git a/dev-java/commons-io/commons-io-2.0.1.ebuild b/dev-java/commons-io/commons-io-2.0.1.ebuild
new file mode 100644
index 000000000000..13f5365330b9
--- /dev/null
+++ b/dev-java/commons-io/commons-io-2.0.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_P="${P}-src"
+DESCRIPTION="Commons-IO contains 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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	java-ant_ignore-system-classes
+	java-ant_rewrite-classpath
+	# 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"
+}
+
+EANT_EXTRA_ARGS="-Duser.home=${T}"
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]]; then
+		ANT_OPTS="-Djava.io.tmpdir=${T} -Duser.home=${T}" \
+		ANT_TASKS="ant-junit" \
+			eant test \
+			-Dgentoo.classpath="$(java-pkg_getjars junit)" \
+			-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 ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt NOTICE.txt || die
+	use doc && java-pkg_dojavadoc target/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
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..ff7b7e00d683
--- /dev/null
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_P=${P}-src
+DESCRIPTION="Commons-IO contains 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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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_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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-io/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
new file mode 100644
index 000000000000..c29e323f4ee6
--- /dev/null
+++ b/dev-java/commons-jelly/Manifest
@@ -0,0 +1 @@
+DIST commons-jelly-1.0-src.tar.gz 174769 SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1 SHA512 a72ae2dc8eea3fc19838f386dca38807a16326a3a93f483219212844f8ec033088b7721c78a4370f78a06cbee0c685144a2b16f171d54134822d06f653bcef35 WHIRLPOOL 3e92b517ce621cda2477354a1342c59d7cf7756edbc3c7746c262f5cdca5d015976979e35056dc2f588de37f4b882f21929e8c7a095251b1eba5857115659d2c
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
new file mode 100644
index 000000000000..cefc4203e371
--- /dev/null
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+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=""
+
+COMMON_DEP="
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/commons-discovery:0
+	dev-java/commons-jexl:1.0
+	dev-java/commons-lang:0
+	dev-java/commons-logging:0
+	dev-java/dom4j:1
+	dev-java/jakarta-jstl:0
+	dev-java/jaxen:1.1
+	dev-java/junit:0
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	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,jakarta-jstl
+	jaxen-1.1,junit,servlet-api-2.5"
+
+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/commons-jelly-1.0-r6.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild
new file mode 100644
index 000000000000..0aca10135cfe
--- /dev/null
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+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=""
+
+COMMON_DEP="
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/commons-discovery:0
+	dev-java/commons-jexl:1.0
+	dev-java/commons-lang:0
+	dev-java/commons-logging:0
+	dev-java/dom4j:1
+	dev-java/tomcat-jstl-spec:1.2.5
+	dev-java/jaxen:1.1
+	dev-java/junit:0
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	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-1.2.5
+	jaxen-1.1,junit,servlet-api-2.5"
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-jelly/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-jexl/Manifest b/dev-java/commons-jexl/Manifest
new file mode 100644
index 000000000000..17e7e980b74f
--- /dev/null
+++ b/dev-java/commons-jexl/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/commons-jexl/commons-jexl-1.1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1.ebuild
new file mode 100644
index 000000000000..8f01544149cb
--- /dev/null
+++ b/dev-java/commons-jexl/commons-jexl-1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils 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-3*"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )
+	${CDEPEND}"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# https://issues.apache.org/jira/browse/JEXL-31
+	epatch "${FILESDIR}/1.1-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..b38d155d2ab1
--- /dev/null
+++ b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	>=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"
+
+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_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/*
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-jexl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
new file mode 100644
index 000000000000..4917a3bb4618
--- /dev/null
+++ b/dev-java/commons-jxpath/Manifest
@@ -0,0 +1 @@
+DIST commons-jxpath-1.3-src.tar.gz 285339 SHA256 da314198d75c6da660e2603bd1543a8f5d0b640c5144b748e62e59afc278efe6 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152 WHIRLPOOL de683fa0e2d985cb57b434af224d2cca73d215d9429b97dc940933fb4a042638227b8fb342d81a1407faf740d1a42c3d5869fc2f78307e558fffb6dd97f36e97
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild
new file mode 100644
index 000000000000..2cf74452bf68
--- /dev/null
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+CDEPEND="dev-java/commons-beanutils:1.7
+	java-virtuals/servlet-api:2.5
+	dev-java/jdom:1.0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/commons-collections:0
+		dev-java/commons-logging:0
+	)
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	mkdir -p "${S}/target/lib"
+	cd "${S}/target/lib"
+	java-pkg_jar-from commons-beanutils-1.7
+	java-pkg_jar-from servlet-api-2.5
+	java-pkg_jar-from jdom-1.0
+}
+
+src_prepare() {
+	# Don't automatically run tests
+	sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
+}
+
+src_test() {
+	# this one needs mockrunner #259027
+	rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java || die
+	java-pkg_jar-from --into target/lib \
+		commons-collections,commons-logging,junit
+	ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3.ebuild
new file mode 100644
index 000000000000..69d4fe4da459
--- /dev/null
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+COMMON_DEPEND="dev-java/commons-beanutils:1.7
+	dev-java/servletapi:2.4
+	dev-java/jdom:1.0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit
+		dev-java/commons-collections
+		dev-java/commons-logging
+	)
+	${COMMON_DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Don't automatically run tests
+	sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
+
+	mkdir -p "${S}/target/lib"
+	cd "${S}/target/lib"
+	java-pkg_jar-from commons-beanutils-1.7
+	java-pkg_jar-from servletapi-2.4
+	java-pkg_jar-from jdom-1.0
+}
+
+src_test() {
+	# this one needs mockrunner #259027
+	rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java || die
+	java-pkg_jar-from --into target/lib \
+		commons-collections,commons-logging,junit
+	ANT_TASKS="ant-junit" eant 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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-jxpath/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
new file mode 100644
index 000000000000..67eb5c03a27c
--- /dev/null
+++ b/dev-java/commons-lang/Manifest
@@ -0,0 +1,4 @@
+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-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
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..5e37f87f865c
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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.6.ebuild b/dev-java/commons-lang/commons-lang-2.6.ebuild
new file mode 100644
index 000000000000..e7c5e719a63f
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-2.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+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"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit:0 )"
+RDEPEND=">=virtual/jre-1.4"
+
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+
+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..17df9a25ca58
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~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..6b5a021629c8
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~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/metadata.xml b/dev-java/commons-lang/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-lang/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-launcher/Manifest b/dev-java/commons-launcher/Manifest
new file mode 100644
index 000000000000..ce4e487a540e
--- /dev/null
+++ b/dev-java/commons-launcher/Manifest
@@ -0,0 +1 @@
+DIST commons-launcher-1.1-src.tar.gz 76558 SHA256 cc52afb97ea4a224d7d9c82e96c30725a290bd6cd44586e8a10c3d145bd3b83a SHA512 87f275ea1dbd08394c173da21023cb761175ff222fbe0ed6553fa6ca34eef775b57561227279216082556a8dd37593c9699a3e0c059bf3da98dbd2f1d3f58ddd WHIRLPOOL 0da4e77cb9166c806a4285b2efbbc5dadb79c26fd6254c4e2d6b818a19c5e675c52854538d0d73d30711ec6862cfa3cabfbc9b2bebdab2d650835cafece28fc0
diff --git a/dev-java/commons-launcher/commons-launcher-1.1-r1.ebuild b/dev-java/commons-launcher/commons-launcher-1.1-r1.ebuild
new file mode 100644
index 000000000000..8f2170e75fe2
--- /dev/null
+++ b/dev-java/commons-launcher/commons-launcher-1.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="examples doc source"
+
+inherit base java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons-launcher eliminates the need for a batch or shell script to launch a Java class"
+HOMEPAGE="http://commons.apache.org/launcher/"
+SRC_URI="mirror://apache/jakarta/${PN/-//}/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/ant-core"
+
+S=${WORKDIR}/${PN}
+
+# https://issues.apache.org/jira/browse/LAUNCHER-7
+PATCHES=( "${FILESDIR}/1.1-javadoc.patch" )
+
+src_compile() {
+	java-ant_rewrite-classpath "${S}/build.xml"
+	EANT_GENTOO_CLASSPATH="ant-core" java-pkg-2_src_compile
+}
+
+# Standard commons build.xml but no tests actually implemented
+src_test() { :; }
+
+src_install() {
+	java-pkg_dojar dist/bin/*.jar || die "java-pkg_dojar died"
+	dodoc README.txt NOTICE.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use examples && java-pkg_doexamples example
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-launcher/files/1.1-javadoc.patch b/dev-java/commons-launcher/files/1.1-javadoc.patch
new file mode 100644
index 000000000000..d83229a744eb
--- /dev/null
+++ b/dev-java/commons-launcher/files/1.1-javadoc.patch
@@ -0,0 +1,24 @@
+diff -ur src.old/java/org/apache/commons/launcher/types/ArgumentSet.java src/java/org/apache/commons/launcher/types/ArgumentSet.java
+--- src.old/java/org/apache/commons/launcher/types/ArgumentSet.java	2004-02-28 13:52:20.000000000 +0200
++++ src/java/org/apache/commons/launcher/types/ArgumentSet.java	2007-05-05 16:26:13.000000000 +0300
+@@ -18,7 +18,7 @@
+ 

+ 

+ /**

+- * A class that represents a set of nested <arg> elements.

++ * A class that represents a set of nested &lt;arg&gt; elements.

+  *

+  * @author Patrick Luby

+  */

+diff -ur src.old/java/org/apache/commons/launcher/types/ConditionalArgument.java src/java/org/apache/commons/launcher/types/ConditionalArgument.java
+--- src.old/java/org/apache/commons/launcher/types/ConditionalArgument.java	2004-02-28 14:43:31.000000000 +0200
++++ src/java/org/apache/commons/launcher/types/ConditionalArgument.java	2007-05-05 16:26:50.000000000 +0300
+@@ -24,7 +24,7 @@
+ import org.apache.tools.ant.types.Path;

+ 

+ /**

+- * A class that represents nested <arg> or <jvmarg> elements. This class

++ * A class that represents nested &lt;arg&gt; or &lt;jvmarg&gt; elements. This class

+  * provides the same functionality as the class that represents these same

+  * elements in a "java" task. In addition, this class supports conditional "if"

+  * and "unless" attributes.

diff --git a/dev-java/commons-launcher/metadata.xml b/dev-java/commons-launcher/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-launcher/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
new file mode 100644
index 000000000000..69ad80af84a4
--- /dev/null
+++ b/dev-java/commons-logging/Manifest
@@ -0,0 +1,2 @@
+DIST commons-logging-1.1.1-src.tar.gz 190670 SHA256 b49a79fa78ebfae15dc46ae6f0144fee6b94ab608a25518c54609d3419909eb2 SHA512 ccba6cb8078807219dfe4a771c2e6f5569190b52ca00a605a0445b53697d9162c62237fc34ead2960146603b018769f406fe9e47b2eefe0d0fb6ad993c669974 WHIRLPOOL b28ad3dcad851ccbe7fffe9968426b67fb3b6a372de85aa6adb055db5f3eaf621d63f81b9bf74dd6d4958fd681b29272898fc6907b5681a431af0772f876ec16
+DIST commons-logging-1.2-src.tar.gz 188536 SHA256 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 WHIRLPOOL fe31832404d9071d73fba940021ab664998ffa9867a88c2078918547cc6a23a06339f33f5d74f8b6ea5aaeeb86cd94c0aef6c6195e454a651b8fc492a1a6b5f8
diff --git a/dev-java/commons-logging/commons-logging-1.1.1.ebuild b/dev-java/commons-logging/commons-logging-1.1.1.ebuild
new file mode 100644
index 000000000000..d7ce03301051
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.1.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="1"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different 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 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="avalon-logkit log4j servletapi avalon-framework"
+
+COMMON_DEP="
+	avalon-logkit? ( dev-java/avalon-logkit:1.2 )
+	log4j? ( dev-java/log4j:0 )
+	servletapi? ( java-virtuals/servlet-api:2.3 )
+	avalon-framework? ( dev-java/avalon-framework:4.2 )"
+# ATTENTION: Add this when log4j-1.3 is out
+#	=dev-java/log4j-1.3*
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src/"
+
+RESTRICT="!servletapi? ( test )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	# TODO file upstream -nichoj
+	epatch "${FILESDIR}/${P}-servletapi.patch"
+
+	# bug 200918
+	java-ant_ignore-system-classes
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties
+	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
+	# ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
+	#echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
+	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
+	use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties
+	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
+	java-pkg_filter-compiler jikes ecj-3.2
+
+	if use test && ! use servletapi; then
+		eerror "Tests need use servletapi, tests not executed"
+	fi
+}
+
+EANT_BUILD_TARGET="compile"
+
+src_install() {
+	java-osgi_newjar-fromfile "target/${P}-SNAPSHOT.jar" "${FILESDIR}/${P}-manifest" "Apache Commons Logging"
+	java-pkg_newjar target/${PN}-api-${PV}-SNAPSHOT.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}-SNAPSHOT.jar ${PN}-adapters.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml PROPOSAL.html STATUS.html || die
+	use doc && java-pkg_dojavadoc target/docs/
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/commons-logging/commons-logging-1.2.ebuild b/dev-java/commons-logging/commons-logging-1.2.ebuild
new file mode 100644
index 000000000000..e1edb14bb5de
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different 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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="avalon-logkit log4j servletapi avalon-framework"
+
+COMMON_DEP="
+	avalon-logkit? ( dev-java/avalon-logkit:1.2 )
+	log4j? ( dev-java/log4j:0 )
+	servletapi? ( java-virtuals/servlet-api:2.3 )
+	avalon-framework? ( dev-java/avalon-framework:4.2 )"
+# ATTENTION: Add this when log4j-1.3 is out
+#	=dev-java/log4j-1.3*
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEP}
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src/"
+
+RESTRICT="!servletapi? ( test )"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	# TODO file upstream -nichoj
+	epatch "${FILESDIR}/${P}-servletapi.patch"
+
+	# bug 200918
+	java-ant_ignore-system-classes
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties
+	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
+	# ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
+	#echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
+	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
+	use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties
+	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
+	java-pkg_filter-compiler jikes ecj-3.2
+
+	if use test && ! use servletapi; then
+		eerror "Tests need use servletapi, tests not executed"
+	fi
+}
+
+EANT_BUILD_TARGET="compile"
+
+src_install() {
+	java-osgi_newjar "target/${P}.jar" "org.apache.commons.logging" "Apache Commons Logging" "org.apache.commons.logging;version=\"${PV}\", org.apache.commons.logging.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
+}
diff --git a/dev-java/commons-logging/files/commons-logging-1.1-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.1-gentoo.patch
new file mode 100644
index 000000000000..06ac54cdb79f
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.1-gentoo.patch
@@ -0,0 +1,27 @@
+--- build.xml.original	2006-10-01 18:15:11.000000000 +0200
++++ build.xml	2006-10-01 18:36:46.000000000 +0200
+@@ -772,5 +772,23 @@
+       One or more unit tests failed.
+     </fail>
+   </target>
+-
++  <target name="javadoc" description="o Generate javadoc" depends="">
++    <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" private="true" destdir="${build.home}/docs" author="true" version="true" sourcepath="src/java" 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.1-manifest b/dev-java/commons-logging/files/commons-logging-1.1-manifest
new file mode 100644
index 000000000000..09d24e8e88a7
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.1-manifest
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Vendor: %vendorName
+Bundle-Localization: plugin
+Bundle-SymbolicName: org.apache.commons.logging
+Bundle-Version: 1.1
+Export-Package: org.apache.commons.logging;version="1.1",org.apache.commons.logging.impl;version="1.1"
diff --git a/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch
new file mode 100644
index 000000000000..0045cd195b0f
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch
@@ -0,0 +1,47 @@
+diff -ru commons-logging-1.1-src/build.xml commons-logging-1.1-src-patched/build.xml
+--- commons-logging-1.1-src/build.xml	2006-05-09 17:45:08.000000000 -0400
++++ commons-logging-1.1-src-patched/build.xml	2006-10-20 01:16:51.000000000 -0400
+@@ -274,6 +274,10 @@
+                classpathref="compile.classpath"
+                classname="org.apache.log.Logger"/>
+ 
++	<available property="servletapi.present"
++		   	   classpathref="compile.classpath"
++			   classname="javax.servlet.ServletContextEvent"/>
++
+     <available property="avalon-framework.present"
+                classpathref="compile.classpath"
+                classname="org.apache.avalon.framework.logger.Logger"/>
+@@ -303,6 +307,13 @@
+     -->
+   </target>
+   
++  <target name="servletapi-warning" unless='servletapi.present' depends="init,discovery">
++    <echo>
++    *** WARNING ***
++    ServletAPI not found: Cannot Build ServletContextCleaner
++	</echo>
++  </target>
++
+   <target name="logkit-warning" unless='logkit.present' depends='init,discovery'>
+     <echo>
+     *** WARNING ***
+@@ -332,7 +343,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"/>
+@@ -360,6 +371,8 @@
+     
+       <exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
+ 
++	  <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"
++	  		   unless="servletapi.present"/>
+       <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
+                unless="jdk.1.4.present"/>
+       <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
+Only in commons-logging-1.1-src-patched/: target
diff --git a/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch
new file mode 100644
index 000000000000..6d468735d0e7
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch
@@ -0,0 +1,26 @@
+--- build.xml.orig	2008-02-06 16:09:59.000000000 +0100
++++ build.xml	2008-02-06 16:10:48.000000000 +0100
+@@ -785,4 +785,23 @@
+     </fail>

+   </target>

+ 

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

++    <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" private="true" destdir="${build.home}/docs" author="true" version="true" sourcepath="src/java" 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.1.1-manifest b/dev-java/commons-logging/files/commons-logging-1.1.1-manifest
new file mode 100644
index 000000000000..382da7a047e5
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.1.1-manifest
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Vendor: %vendorName
+Bundle-Localization: plugin
+Bundle-SymbolicName: org.apache.commons.logging
+Bundle-Version: 1.1.1
+Export-Package: org.apache.commons.logging;version="1.1.1",org.apache.commons.logging.impl;version="1.1.1"
diff --git a/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch
new file mode 100644
index 000000000000..2c29fa544019
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch
@@ -0,0 +1,46 @@
+--- build.xml.orig2	2008-02-06 16:13:45.000000000 +0100
++++ build.xml	2008-02-06 16:16:48.000000000 +0100
+@@ -276,6 +276,11 @@
+                classpathref="compile.classpath"

+                classname="org.apache.log.Logger"/>

+ 

++	<available property="servletapi.present"

++		   	   classpathref="compile.classpath"

++			   classname="javax.servlet.ServletContextEvent"/>

++

++

+     <available property="avalon-framework.present"

+                classpathref="compile.classpath"

+                classname="org.apache.avalon.framework.logger.Logger"/>

+@@ -312,6 +317,13 @@
+     </echo>

+   </target>

+   

++  <target name="servletapi-warning" unless='servletapi.present' depends="init,discovery">

++    <echo>

++    *** WARNING ***

++    ServletAPI not found: Cannot Build ServletContextCleaner

++	</echo>

++  </target>

++

+   <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>

+     <echo>

+     *** WARNING ***

+@@ -334,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"/>

+@@ -362,6 +374,8 @@
+     

+       <exclude name="org/apache/commons/logging/impl/Log4J*.java"/>

+ 

++	  <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"

++	  		   unless="servletapi.present"/>

+       <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/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..47d5d795f1ab
--- /dev/null
+++ b/dev-java/commons-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>
+  <herd>java</herd>
+  <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..921e6392af6a
--- /dev/null
+++ b/dev-java/commons-math/Manifest
@@ -0,0 +1,2 @@
+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
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..a4500068dc28
--- /dev/null
+++ b/dev-java/commons-math/commons-math-2.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d4780c89924d
--- /dev/null
+++ b/dev-java/commons-math/commons-math-3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7303cef96964
--- /dev/null
+++ b/dev-java/commons-math/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-modeler/Manifest b/dev-java/commons-modeler/Manifest
new file mode 100644
index 000000000000..653505cf0b19
--- /dev/null
+++ b/dev-java/commons-modeler/Manifest
@@ -0,0 +1 @@
+DIST commons-modeler-2.0.1-src.tar.gz 116785 SHA256 e10a7ac6b6827cba25f40fed43380051023097244fe34b012227aabd5d01e8f0 SHA512 8d1b0c34c63201b6eddece2211c68f549ee95e37b1a458e27a4b56b3750573bd54c803b1182a7afa2e4d0ac9a164f6afce0c05aab6aab6f1a6fefae7d7a7b216 WHIRLPOOL 6ffaac2d167c1acccb11fa2de547cbc922ac04b49ef828b00296d04dad384f9cc59b96e8b836a9d67ee26abc27097298ecb52d0b80103070e09774b4b8bb0612
diff --git a/dev-java/commons-modeler/commons-modeler-2.0.1.ebuild b/dev-java/commons-modeler/commons-modeler-2.0.1.ebuild
new file mode 100644
index 000000000000..b93f78c1399c
--- /dev/null
+++ b/dev-java/commons-modeler/commons-modeler-2.0.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+JAVA_PKG_IUSE="doc source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A lib to make the setup of Java Management Extensions easier"
+SRC_URI="mirror://apache/commons/modeler/source/${P}-src.tar.gz"
+HOMEPAGE="http://commons.apache.org/modeler/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# Provides ant tasks for ant to use
+RDEPEND=">=virtual/jre-1.4
+	dev-java/mx4j-core:3.0
+	>=dev-java/commons-logging-1.0.3:0
+	commons-digester? ( >=dev-java/commons-digester-1.4.1:0 )"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	source? ( app-arch/zip )
+	test? ( dev-java/junit:0 )"
+
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+IUSE="commons-digester"
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Setup the build environment
+	use commons-digester && echo "commons-digester.jar=$(java-pkg_getjar commons-digester commons-digester.jar)" >> build.properties
+	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
+	echo "jmx.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j.jar)" >> build.properties
+
+	# This is something the build.xml tries to run. Could of course package it
+	# separately using dolauncher. Use the demo target for this.
+	#use examples && echo "jmxtools.jar=$(java-pkg_getjar mx4j-tools-3.0 mx4j-tools.jar)" >> build.properties
+
+	mkdir dist || die
+}
+
+EANT_BUILD_TARGET="prepare jar"
+
+src_test() {
+	eant test -Djunit.jar=$(java-pkg_getjar --build-only junit junit.jar)
+}
+
+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
+}
diff --git a/dev-java/commons-modeler/metadata.xml b/dev-java/commons-modeler/metadata.xml
new file mode 100644
index 000000000000..6b2a1753c60d
--- /dev/null
+++ b/dev-java/commons-modeler/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <use>
+    <flag name="commons-digester">Add support for the commons-digester based Mbeans Descriptor source</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
new file mode 100644
index 000000000000..763e6549f985
--- /dev/null
+++ b/dev-java/commons-net/Manifest
@@ -0,0 +1,2 @@
+DIST commons-net-1.4.1-src.tar.gz 229198 SHA256 fdea779f261f70b9bbec40121c830b11e3e63b6188f662f95505045ff8d44add SHA512 6ac697536eff947cd0aa828c887e9cc4046c49a593c760bbc59db7e04cf0d7456e84d22504cfa2f6915315dc061e3499382f05bd7740bf79a532a4d9d42c0da8 WHIRLPOOL 44d984c71212f7bb282a671dcd8a463f5ddf9c798f8d676b5587e2341d21a1ed681f7ca6bc91f74162008fe24fc34912aec2dba67fce6f58a3b6b3d2b129b3dc
+DIST commons-net-3.2-src.tar.gz 378351 SHA256 f9fd207a28dc357a6a515c69fb83009836b7426d6c25095d70148a6cea7d1df1 SHA512 2152b0c524320702c336b21308bb8166e00487938430b83e08d65b836ab775c372c9251957c674e0bccff6815fc3ed3bdb7113a0d2a140c53f64c2f557eef2ba WHIRLPOOL 45b80205a519795652dc6708c85b1ebe52172e9c8ffe7e01a581cd6e9ebfb4a57cdb43bba30a6b25720c72c4bbce6eda8892fe272baad6b120d6231a05c41bf2
diff --git a/dev-java/commons-net/commons-net-1.4.1-r1.ebuild b/dev-java/commons-net/commons-net-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..5e68dfbb5899
--- /dev/null
+++ b/dev-java/commons-net/commons-net-1.4.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source" # junit
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+DESCRIPTION="The purpose of the library is to provide fundamental protocol access, not higher-level abstractions"
+HOMEPAGE="http://commons.apache.org/net/"
+SRC_URI="mirror://apache/jakarta/commons/net/source/${MY_P}.tar.gz"
+
+# dev-java/oro had a package move to jakarta-oro so depend on a version
+# that oro did not have. Most likely the cause of https://bugs.gentoo.org/show_bug.cgi?id=183595
+COMMON_DEP="
+	>=dev-java/jakarta-oro-2.0.8-r2"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEP}
+	"
+DEPEND=">=virtual/jdk-1.3
+	${COMMON_DEP}"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# disabling unit tests:
+# http://issues.apache.org/bugzilla/show_bug.cgi?id=37985
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir -p target/lib
+	cd target/lib
+	java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar
+
+	cd "${S}"
+	# always disable tests
+	sed -i 's/depends="compile,test"/depends="compile"/' build.xml || die "Failed to disable junit"
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use examples && java-pkg_doexamples src/java/examples
+	use source && java-pkg_dosrc src/java/org
+}
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..450521068ad4
--- /dev/null
+++ b/dev-java/commons-net/commons-net-3.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="The purpose of the library is to provide fundamental protocol access, not higher-level abstractions"
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-net/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-pool/Manifest b/dev-java/commons-pool/Manifest
new file mode 100644
index 000000000000..ac72aec77aa6
--- /dev/null
+++ b/dev-java/commons-pool/Manifest
@@ -0,0 +1,2 @@
+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
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..4f29826e7f21
--- /dev/null
+++ b/dev-java/commons-pool/commons-pool-1.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..8b4cd3da85c7
--- /dev/null
+++ b/dev-java/commons-pool/commons-pool-2.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-pool/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-primitives/Manifest b/dev-java/commons-primitives/Manifest
new file mode 100644
index 000000000000..b74ef90f594f
--- /dev/null
+++ b/dev-java/commons-primitives/Manifest
@@ -0,0 +1 @@
+DIST commons-primitives-1.0-src.tar.gz 172369 SHA256 96927b484b8cac7e33612469099e7bbd7139cbc79666d5612a32c997fa671ac4 SHA512 239752a615f3a88049d6c85326a67462362869eda421ab76975c0906d811c970c871042769d851a4341c8a06b501d6b12fd1feba74d83007b2dd73370c5b3195 WHIRLPOOL 725644e8ef915e77313dabf6f397a54b857265bcf9d284b4444457d3872e6982cad3670101f1e1576158b1ceebf809348bb2dec2cecec87796a22595ace03129
diff --git a/dev-java/commons-primitives/commons-primitives-1.0-r2.ebuild b/dev-java/commons-primitives/commons-primitives-1.0-r2.ebuild
new file mode 100644
index 000000000000..76411ef52b5d
--- /dev/null
+++ b/dev-java/commons-primitives/commons-primitives-1.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The Jakarta-Commons Primitives Component"
+HOMEPAGE="http://commons.apache.org/primitives/"
+SRC_URI="mirror://apache/jakarta/commons/primitives/source/${P}-src.tar.gz"
+DEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+# Would need an old version of commons-collections and this would be the
+# only user. Trunk works against the latest version so hopefully they will
+# have a new release at some point.
+RESTRICT="test"
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-primitives/metadata.xml b/dev-java/commons-primitives/metadata.xml
new file mode 100644
index 000000000000..72db416dc3ba
--- /dev/null
+++ b/dev-java/commons-primitives/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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-transaction/Manifest b/dev-java/commons-transaction/Manifest
new file mode 100644
index 000000000000..c56d85d71a73
--- /dev/null
+++ b/dev-java/commons-transaction/Manifest
@@ -0,0 +1 @@
+DIST commons-transaction-1.2-src.tar.gz 868372 SHA256 9ba7fd4b48f6a5b9ffbc8069ddcf2d9a3dd53bae269809cb55fd1569a832bc8f SHA512 397a3da012ac1220c6f0c8fd7adf744f5e08658a202639b5232496455597b53cba61afdf0f7fbb5e9ebad1d16162270157c892e316993714461f8bfd51791bff WHIRLPOOL 09a6790ef7641a20117abc66eeeb94ea0f048951f790aa2cc380f3be06ae480fb8beca489dcf9db74b2f4a5d5df0b367a57d1669e9888bac278d991586375c17
diff --git a/dev-java/commons-transaction/commons-transaction-1.2.ebuild b/dev-java/commons-transaction/commons-transaction-1.2.ebuild
new file mode 100644
index 000000000000..5b19f143a136
--- /dev/null
+++ b/dev-java/commons-transaction/commons-transaction-1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A library of utility classes commonly used in transactional Java programming"
+SRC_URI="mirror://apache/commons/transaction/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/commons-codec:0
+	java-virtuals/transaction-api
+	dev-java/log4j:0
+	dev-java/commons-logging:0
+	dev-java/glassfish-connector-api:0"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	rm -v *.jar lib/*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-codec,log4j,transaction-api,commons-logging,glassfish-connector-api"
+EANT_DOC_TARGET="javadocs"
+EANT_EXTRA_ARGS="-Djta.present=true -Djca.present=true -Dservlet.present=true"
+
+src_install() {
+	java-pkg_newjar dist/lib/${P}.jar ${PN}.jar
+
+	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
+	dohtml -r xdocs/* || die
+	use doc && java-pkg_dojavadoc build/doc/apidocs
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-transaction/metadata.xml b/dev-java/commons-transaction/metadata.xml
new file mode 100644
index 000000000000..89a65435ed4c
--- /dev/null
+++ b/dev-java/commons-transaction/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+		Commons Transaction aims at providing lightweight, standardized, well
+		tested and efficient implementations of utility classes commonly used
+		in transactional Java programming.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
new file mode 100644
index 000000000000..efbd71d1babe
--- /dev/null
+++ b/dev-java/commons-validator/Manifest
@@ -0,0 +1 @@
+DIST commons-validator-1.4.0-src.tar.gz 222421 SHA256 e75554dbbe1681ccf3e556917a2311c509ff5c7fb9a473be03bdeb8215df5436 SHA512 35005d5ada8a1070cdd02f78464886e16157a05f895e3abfe2dcd51fa4b443d9ee359bb54a40e13ed463b757a77a64669c89cd9b914051a4ab1c745be3526d98 WHIRLPOOL 2932f8df70d9a89a51c218baac93fa5c199d0a2316147032416cba8f2100d29a508bc61603fc777eed7408b5bb265d40f4a7449354ec0227a8adf11471c4d8fd
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..b33072655c42
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.4.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/files/validator-1.3.build.xml.patch b/dev-java/commons-validator/files/validator-1.3.build.xml.patch
new file mode 100644
index 000000000000..98d048e0b6ce
--- /dev/null
+++ b/dev-java/commons-validator/files/validator-1.3.build.xml.patch
@@ -0,0 +1,38 @@
+--- build.xml.o	2006-10-21 18:12:49.000000000 +0200
++++ build.xml	2006-10-21 18:29:18.000000000 +0200
+@@ -122,11 +122,12 @@
+ 

+   <!-- Construct compile classpath -->

+   <path id="compile.classpath">

+-    <pathelement location="${build.home}/classes"/>

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

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

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

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

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

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

++    <pathelement path="${commons-digester.jar}"/>

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

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

++    <pathelement path="${oro.jar}"/>

+     <path refid="downloaded.lib.classpath"/>

+   </path>

+ 

+@@ -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/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..838c00a4a448
--- /dev/null
+++ b/dev-java/commons-validator/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
new file mode 100644
index 000000000000..d29b90f0446d
--- /dev/null
+++ b/dev-java/commons-vfs/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/commons-vfs/commons-vfs-1.0.ebuild b/dev-java/commons-vfs/commons-vfs-1.0.ebuild
new file mode 100644
index 000000000000..0818ef639ddd
--- /dev/null
+++ b/dev-java/commons-vfs/commons-vfs-1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/jakarta/${PN/-//}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/commons-logging
+	dev-java/commons-net
+	=dev-java/commons-httpclient-3*
+	dev-java/jsch
+	dev-java/commons-collections
+	dev-java/ant-core"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/1.0-noget.patch"
+	java-ant_rewrite-classpath
+	java-ant_ignore-system-classes
+}
+
+EANT_GENTOO_CLASSPATH="
+	commons-logging
+	commons-net
+	commons-httpclient-3
+	jsch
+	commons-collections
+	ant-core
+"
+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
+	dodoc *.txt || die
+	use doc && java-pkg_dojavadoc ./dist/docs/api
+	use source && java-pkg_dosrc ./core/src/main/java
+}
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..ebef964920ed
--- /dev/null
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/1.0-noget.patch b/dev-java/commons-vfs/files/1.0-noget.patch
new file mode 100644
index 000000000000..d1a6b5620fd5
--- /dev/null
+++ b/dev-java/commons-vfs/files/1.0-noget.patch
@@ -0,0 +1,20 @@
+--- build.xml.orig	2007-02-11 00:21:37.000000000 +0200
++++ build.xml	2007-02-11 00:21:55.000000000 +0200
+@@ -86,7 +86,7 @@
+       </and>
+     </condition>
+   </target>
+-  <target name="compile" description="o Compile the code" depends="get-deps">
++  <target name="compile" description="o Compile the code">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+@@ -191,7 +191,7 @@
+       </classpath>
+     </javac>
+   </target>
+-  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
++  <target name="javadoc" description="o Generate javadoc">
+     <mkdir dir="${javadocdir}">
+     </mkdir>
+     <tstamp>
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..6f34aa065948
--- /dev/null
+++ b/dev-java/commons-vfs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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/concurrent-util/Manifest b/dev-java/concurrent-util/Manifest
new file mode 100644
index 000000000000..0acab4d0ba8a
--- /dev/null
+++ b/dev-java/concurrent-util/Manifest
@@ -0,0 +1 @@
+DIST gentoo-concurrent-util-1.3.4.tar.bz2 136648 SHA256 3cf419c3eeb6623fd189c24d005c61edde4d7f6350599e5837de879a0fd95f62 SHA512 8c77eb49bb8cc38f626011653005c36342717d3cd2eab3657d8cc9b38dcb11e1a18aa6bac713ed4b1bc7acd2500be35b95a207c5dee3b691c7763b7f30e3f714 WHIRLPOOL 95a448a8b4ee839b59049634ca65c6499fde5a0f13800331228371a499e0d7c4e59a8e6eae54430c856045e3acf38e81b25e2946acfad317dccb1a19d4c3968e
diff --git a/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild b/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..7098deb03c5e
--- /dev/null
+++ b/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Utility classes commonly encountered in concurrent Java programming"
+HOMEPAGE="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"
+SRC_URI="mirror://gentoo/gentoo-concurrent-util-1.3.4.tar.bz2"
+
+LICENSE="public-domain sun-concurrent-util MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND=">=virtual/jre-1.2"
+DEPEND=">=virtual/jdk-1.2"
+
+EANT_DOC_TARGET="doc"
+
+src_install() {
+	java-pkg_dojar build/lib/concurrent.jar
+	use source && java-pkg_dosrc src/java/*
+
+	if use doc ; then
+		cd build
+		java-pkg_dojavadoc javadoc
+		insinto /usr/share/doc/${PF}/demo
+		doins demo/*
+	fi
+}
diff --git a/dev-java/concurrent-util/metadata.xml b/dev-java/concurrent-util/metadata.xml
new file mode 100644
index 000000000000..444ba069e86e
--- /dev/null
+++ b/dev-java/concurrent-util/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+		Doug Lea's concurrency utilities provide standardized, efficient
+		versions of utility classes commonly encountered in concurrent Java
+		programming.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/constantine/Manifest b/dev-java/constantine/Manifest
new file mode 100644
index 000000000000..a49d39b2ef5a
--- /dev/null
+++ b/dev-java/constantine/Manifest
@@ -0,0 +1,2 @@
+DIST constantine-0.6.tar.bz2 35684 SHA256 1d4cf61f15d508de1f5f4058a12529cfbe60f4056f167056f24e515695d39733 SHA512 16063f59a868ca6f629dcf9e42957edaebc9c5db21a6d856040420b943a127c89e7b1979e5ba051b26eabfb67fb70abd0ab6d2f5f6109d0fefbffbe716c0c980 WHIRLPOOL 42a4ac393889eab46ba133e86afd19ad90d3921abbe4c2c6871480d1747429f5bde46ec3d0a08ee3e1ffa885e3c4e40cf06b787b47976b56c7fc46124d62dcf2
+DIST constantine-0.7.tar.gz 65563 SHA256 5600c264d3f32a48342e4b00643a8a8a543f15c6107a1c1be024e328a74e59b1 SHA512 2694caae29bae1a3e1d765ac02c4014bc6fd3dac8370feb5d12f43119c057fc2a2e75b0aa37eec0164bf8a82a1bafb0f41565f397b956ae53a52f7cb803508c7 WHIRLPOOL 6a7c3ae5b0423690005656c69897d82244d05ea27056c4dbe4229390b648bce23775b699e8d719f347ea602e76313af5e19d47e932637fd919fb2fa2b64142d6
diff --git a/dev-java/constantine/constantine-0.6.ebuild b/dev-java/constantine/constantine-0.6.ebuild
new file mode 100644
index 000000000000..b22a2a7156d9
--- /dev/null
+++ b/dev-java/constantine/constantine-0.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source test"
+inherit base java-pkg-2 java-ant-2
+
+DESCRIPTION="Provides Java values for common platform C constants"
+HOMEPAGE="http://kenai.com/projects/constantine"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/ant-junit4 )"
+
+src_compile() {
+	# ecj doesn't like some cast for some reason
+	java-pkg_force-compiler javac
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use source && java-pkg_dosrc src/*
+}
+
+src_test() {
+	ANT_TASKS="ant-junit4" eant test -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
+}
diff --git a/dev-java/constantine/constantine-0.7.ebuild b/dev-java/constantine/constantine-0.7.ebuild
new file mode 100644
index 000000000000..c6ebc92c4e9d
--- /dev/null
+++ b/dev-java/constantine/constantine-0.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source test"
+inherit base java-pkg-2 java-ant-2
+
+DESCRIPTION="Provides Java values for common platform C constants"
+HOMEPAGE="http://github.com/wmeissner/jnr-constants"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/ant-junit4 )"
+
+src_compile() {
+	# ecj doesn't like some cast for some reason
+	java-pkg_force-compiler javac
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use source && java-pkg_dosrc src/*
+}
+
+src_test() {
+	ANT_TASKS="ant-junit4" eant test -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
+}
diff --git a/dev-java/constantine/metadata.xml b/dev-java/constantine/metadata.xml
new file mode 100644
index 000000000000..ba09c8509174
--- /dev/null
+++ b/dev-java/constantine/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..efb146ff3346
--- /dev/null
+++ b/dev-java/cortado/Manifest
@@ -0,0 +1 @@
+DIST cortado-0.6.0.tar.gz 233854 SHA256 37a708bfceba5b7b0b544456bb3857f708c83734dfb3f3f1ababcc602b923e85 SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da WHIRLPOOL 56f92611743f03c7349b9f40360c3f4bd915cb4fc79cf7ef2597c91113b15f0084c24e83fbc0f8967f3560971b1b04cc70751ff42852c4e10322b3f944371a16
diff --git a/dev-java/cortado/cortado-0.6.0.ebuild b/dev-java/cortado/cortado-0.6.0.ebuild
new file mode 100644
index 000000000000..3c61568b356f
--- /dev/null
+++ b/dev-java/cortado/cortado-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+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 x86"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+EANT_BUILD_TARGET=stripped
+
+src_prepare() {
+	echo "#!/bin/sh" > scripts/get-revision
+	echo "echo ${PV}"    >> scripts/get-revision
+}
+
+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..ff5db0ba4080
--- /dev/null
+++ b/dev-java/cortado/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</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/cos/Manifest b/dev-java/cos/Manifest
new file mode 100644
index 000000000000..524f6a52aebc
--- /dev/null
+++ b/dev-java/cos/Manifest
@@ -0,0 +1 @@
+DIST cos-05Nov2002.zip 372387 SHA256 96f9959e8252eddacce24b592a9c4c1dbf0082749115d7e75619504f70df1d90 SHA512 971d54bc39af883bd199aabc05f47872f206d75552f4b8809ba0f25dd5494b562e108eb85cdaf39151fd290e37f5959ef501ac502114bba69a1752cb0732cfed WHIRLPOOL 60c150c57d6029f20f834f9a00cc956a2bed6d7adc9b3786af5cecd643a1893081989045c13d15fd8c1cb23f653c4a295c7dd0d6a47e8f7711da6ed6721f30ff
diff --git a/dev-java/cos/cos-20021105-r3.ebuild b/dev-java/cos/cos-20021105-r3.ebuild
new file mode 100644
index 000000000000..797750afad9a
--- /dev/null
+++ b/dev-java/cos/cos-20021105-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=05Nov2002
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="The com.oreilly.servlet package is a class library for servlet developers"
+HOMEPAGE="http://servlets.com/cos/"
+SRC_URI="http://servlets.com/${PN}/${MY_P}.zip"
+
+LICENSE="cos"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="${JAVA_PKG_IUSE}"
+
+RDEPEND=">=virtual/jre-1.4
+	java-virtuals/servlet-api:2.3"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip:0
+	${RDEPEND}"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	rm -r lib classes *.war || die
+
+	# TODO: Not sure how to fix the compilation error for this class;
+	# so, we'll just delete it for now...
+	rm src/com/oreilly/servlet/CacheHttpServlet.java || die
+
+	cp "${FILESDIR}"/build-${PV}.xml build.xml || die
+
+	cat > build.properties <<-EOF
+		classpath=$(java-pkg_getjars servlet-api-2.3)
+	EOF
+}
+
+src_compile() {
+	eant -Dproject.name=${PN} jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	dodoc readme.txt license.txt
+
+	use doc && java-pkg_dojavadoc dist/doc/api
+	use source && java-pkg_dosrc src/com
+}
diff --git a/dev-java/cos/files/build-20021105.xml b/dev-java/cos/files/build-20021105.xml
new file mode 100644
index 000000000000..4153ebfa4868
--- /dev/null
+++ b/dev-java/cos/files/build-20021105.xml
@@ -0,0 +1,54 @@
+<?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="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <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}"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+         <fileset dir="${build}"/>
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+      <javadoc destdir="${dist}/doc/api">
+      	<fileset dir="${src}"/>
+      </javadoc>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/cos/metadata.xml b/dev-java/cos/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/cos/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
new file mode 100644
index 000000000000..578f75c8e641
--- /dev/null
+++ b/dev-java/cpptasks/Manifest
@@ -0,0 +1,2 @@
+DIST cpptasks-1.0b4.tar.gz 879715 SHA256 3472af7389c5a7daaff48a054c2b9f10994b55352025b8a2249a7dfcebca14c8 SHA512 6e12ac6f4a96d36b50e3f0d105038feef16e70f0980959671245bc88dbd170a9dd42b39b884a0b2f6e7d055b9588462d0a290587919605e8503979cc575aede5 WHIRLPOOL c4f264e275201aacf732a73fb52f2aad02b26581ca4572d30ab4ab768ff29a66f5c01f617efa38a49ac93b779d63711aa479e2143c6b01b443c4fe1c973fd3bd
+DIST cpptasks-1.0b5.tar.gz 902930 SHA256 d181cee0c4e28bed202f8bf582dc42bbc824c7712ea29c7b17f036fc7cdfc209 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c WHIRLPOOL 1eb3a0726d43a40453a7a70c89b2fdf8880979a52f8dac6cab9a01800184c72d084d603a647804dd6a55a162a20fd2102818fb415336e21beeb010bd3b7eb196
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta4-r2.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta4-r2.ebuild
new file mode 100644
index 000000000000..ee4d19e8cba1
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta4-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-${PV/_beta/b}"
+DESCRIPTION="Ant tasks to compile various source languages and produce executables, shared and static libraries"
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="doc source examples"
+
+RDEPEND=">=virtual/jre-1.4
+	 >=dev-java/ant-core-1.7
+	 >=dev-java/xerces-2.7"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# https://sourceforge.net/tracker/index.php?func=detail&aid=829906&group_id=36177&atid=416920
+	# https://bugs.gentoo.org/show_bug.cgi?id=156596
+	epatch "${FILESDIR}/1.0b4-profiling.patch"
+
+	cd "${S}"
+	# in svn but missing from the release
+	cp "${FILESDIR}/antlib.xml" src/net/sf/antcontrib/cpptasks/antlib.xml || die
+	rm -v *.jar || die
+	java-ant_rewrite-classpath
+}
+
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
+EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
+
+#The actual files for testing are not part of the release
+#src_test() {
+#	eant run-tests
+#}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_register-ant-task
+
+	dodoc NOTICE || die
+	use doc && java-pkg_dojavadoc build/api
+	use examples && dodoc samples/*
+	use source && java-pkg_dosrc src/net
+
+}
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..fc0d20719617
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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, shared and static libraries"
+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 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/ant-core:0
+	dev-java/xerces:2"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4"
+
+S="${WORKDIR}/${P/_beta/b}"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+# Doesn't apply any longer.
+#	# https://sourceforge.net/tracker/index.php?func=detail&aid=829906&group_id=36177&atid=416920
+#	# https://bugs.gentoo.org/show_bug.cgi?id=156596
+#	epatch "${FILESDIR}/1.0b4-profiling.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
+EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
+
+# TODO
+#src_test() {
+#	eant run-tests
+#}
+
+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/files/1.0b4-profiling.patch b/dev-java/cpptasks/files/1.0b4-profiling.patch
new file mode 100644
index 000000000000..6795ecd59fcd
--- /dev/null
+++ b/dev-java/cpptasks/files/1.0b4-profiling.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/attachment.cgi?id=102974
+https://sourceforge.net/tracker/index.php?func=detail&aid=829906&group_id=36177&atid=416920
+
+diff -ur cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
+--- cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java	2006-11-29 13:05:30.000000000 +0100
++++ cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java	2006-11-29 13:14:00.000000000 +0100
+@@ -35,7 +35,7 @@
+     private static String[] linkerOptions = new String[]{"-bundle",
+             "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s",
+             "-static", "-shared", "-symbolic", "-Xlinker",
+-            "--export-all-symbols", "-static-libgcc",};
++            "--export-all-symbols", "-static-libgcc", "-pg", };
+     private static final GccLinker dllLinker = new GccLinker("gcc", objFiles,
+             discardFiles, "lib", ".so", false, new GccLinker("gcc", objFiles,
+                     discardFiles, "lib", ".so", true, null));
+diff -ur cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
+--- cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java	2006-11-29 13:05:30.000000000 +0100
++++ cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java	2006-11-29 13:13:21.000000000 +0100
+@@ -41,7 +41,7 @@
+             ".lib", ".dll", ".so", ".sl"};
+     private static String[] linkerOptions = new String[]{"-bundle", "-dylib",
+             "-dynamic", "-dynamiclib", "-nostartfiles", "-nostdlib",
+-            "-prebind", "-s", "-static", "-shared", "-symbolic", "-Xlinker"};
++            "-prebind", "-s", "-static", "-shared", "-symbolic", "-Xlinker", "-pg" };
+     private static final GppLinker instance = new GppLinker("gcc", objFiles,
+             discardFiles, "", "", false, null);
+     private static final GppLinker machDllLinker = new GppLinker("gcc",
diff --git a/dev-java/cpptasks/files/antlib.xml b/dev-java/cpptasks/files/antlib.xml
new file mode 100644
index 000000000000..5f8af42ad557
--- /dev/null
+++ b/dev-java/cpptasks/files/antlib.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+ <!--
+ *
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  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.
+ -->
+ <antlib>
+   <taskdef resource="cpptasks.tasks" />
+   <typedef resource="cpptasks.types" />
+ </antlib>
+ 
\ No newline at end of file
diff --git a/dev-java/cpptasks/metadata.xml b/dev-java/cpptasks/metadata.xml
new file mode 100644
index 000000000000..9452de6d1452
--- /dev/null
+++ b/dev-java/cpptasks/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">ant-contrib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/css-validator/Manifest b/dev-java/css-validator/Manifest
new file mode 100644
index 000000000000..7b915f8943af
--- /dev/null
+++ b/dev-java/css-validator/Manifest
@@ -0,0 +1 @@
+DIST css-validator-20120222.tar.bz2 27482733 SHA256 41c80ccc808c20e4f66d493ed365c9be9f77e787f5c0f5f3ba7060c520bac207 SHA512 a7f392028cdf5a8befa95b7c2b7bc4f832cc9212c9ec92d3021e357ca41f48464c6944ec0ecf7105d924dbb07c80c0c1b7b97191c7e9496ca30253e0329da02d WHIRLPOOL 291ed5f7f401f87d70e20d39f947038adbb9d0097023b8e30af14a3fd576d5981c5be35340294ca29e64721823de90436fb429ecf1d556ac7e57941d9a29d158
diff --git a/dev-java/css-validator/css-validator-20120222.ebuild b/dev-java/css-validator/css-validator-20120222.ebuild
new file mode 100644
index 000000000000..7f4d8ac04703
--- /dev/null
+++ b/dev-java/css-validator/css-validator-20120222.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+# How to create the release tarball:
+# $ export CVSROOT=":pserver:anonymous@dev.w3.org:/sources/public"
+# $ cvs login
+# $ cvs get 2002/css-validator
+# $ cd 2002
+# $ tar jcf css-validator-$(date "+%Y%m%d") css-validator --exclude=CVS
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets"
+HOMEPAGE="http://jigsaw.w3.org/css-validator/DOWNLOAD.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEP="java-virtuals/servlet-api:2.5
+	dev-java/velocity
+	dev-java/commons-lang:2.1
+	dev-java/tagsoup
+	dev-java/jigsaw
+	dev-java/xerces:2
+	dev-java/htmlparser
+	"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+EANT_BUILD_TARGET="jar war"
+EANT_DOC_TARGET="javadoc"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	rm -f tmp/*.jar
+	mkdir -p "${S}/lib" || die "mkdir failed"
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	java-pkg_jarfrom --into lib/ servlet-api-2.5
+	java-pkg_jarfrom --into lib/ velocity
+	java-pkg_jarfrom --into lib/ commons-lang-2.1
+	java-pkg_jarfrom --into lib/ tagsoup
+	java-pkg_jarfrom --into lib/ jigsaw
+	java-pkg_jarfrom --into lib/ xerces-2
+	java-pkg_jarfrom --into lib/ htmlparser
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+
+	use source && java-pkg_dosrc org
+	if use doc; then
+		java-pkg_dojavadoc javadoc
+
+		insinto "/usr/share/${PN}"
+		doins "${PN}.war"
+		einfo "Documentation for ${PN} has been installed as:"
+		einfo "    /usr/share/${PN}/${PN}.war"
+		einfo "You need to deploy this file using one of:"
+		einfo "  * www-servers/tomcat"
+		einfo "  * www-servers/resin"
+	fi
+}
diff --git a/dev-java/css-validator/files/css-validator-20120222-build.xml.patch b/dev-java/css-validator/files/css-validator-20120222-build.xml.patch
new file mode 100644
index 000000000000..faedcd04396c
--- /dev/null
+++ b/dev-java/css-validator/files/css-validator-20120222-build.xml.patch
@@ -0,0 +1,37 @@
+Index: build.xml
+===================================================================
+RCS file: /sources/public/2002/css-validator/build.xml,v
+retrieving revision 1.23
+diff -u -r1.23 build.xml
+--- build.xml	1 Nov 2011 07:51:20 -0000	1.23
++++ build.xml	22 Feb 2012 23:57:47 -0000
+@@ -75,10 +75,10 @@
+     <copy file="tmp/htmlparser-1.3.1/htmlparser-1.3.1.jar" tofile="lib/htmlparser-1.3.1.jar"/>
+   </target>
+ 
+-	<target name="build" description="Builds the validator" depends="prepare">
++	<target name="build" description="Builds the validator">
+ 		<mkdir dir="./build"/>
+ 		<javac classpathref="build.class.path" destdir="./build" encoding="UTF-8"
+-           debug="yes" includes="org/w3c/**" srcdir="." source="1.6" target="1.6"/>
++           includes="org/w3c/**" srcdir="."/>
+ 		<copy todir="./build">
+       <fileset dir="./">
+         <include name="org/**"/>
+@@ -91,7 +91,7 @@
+ 	<target name="jigsaw" description="Builds the validator for Jigsaw" depends="prepare">
+ 		<mkdir dir="./build"/>
+ 		<javac classpathref="build.class.path" destdir="." encoding="UTF-8"
+-           debug="yes" source="1.6" target="1.6">
++           >
+ 			<src path="./org/w3c"/>
+ 		</javac>
+ 	</target>
+@@ -99,6 +99,7 @@
+ 	<target name="javadoc" description="Generates API docs">
+ 		<mkdir dir="./javadoc"/>
+ 		<javadoc 
++			classpathref="build.class.path"
+ 			packagenames="org.w3c.*"
+ 			sourcepath="./"
+ 			destdir="./javadoc"
diff --git a/dev-java/css-validator/metadata.xml b/dev-java/css-validator/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/css-validator/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest
new file mode 100644
index 000000000000..749cede2973f
--- /dev/null
+++ b/dev-java/cssparser/Manifest
@@ -0,0 +1 @@
+DIST cssparser-0.9.16-sources.jar 243889 SHA256 e21b075401a7a17fd3316a392631b77c245f8217d9da90e89fd926436098f151 SHA512 dac0f322d21c6f2ae65128ab83a6de9eb93f5c152e9e6f42de3e18b9be23d73083f42af50eeaa415da400c297fad34381ddd0f626b7aafa89c97a8b46a0d61b4 WHIRLPOOL 0c73080c9bf916eddc694de40da8a8b8ae543cf7863179f33649f3a38c95a7304d6ad98a79d78621225767c430ca1409063209b5012870557027554611648562
diff --git a/dev-java/cssparser/cssparser-0.9.16.ebuild b/dev-java/cssparser/cssparser-0.9.16.ebuild
new file mode 100644
index 000000000000..6a4d934f019d
--- /dev/null
+++ b/dev-java/cssparser/cssparser-0.9.16.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+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"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/sac:0"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/cssparser/metadata.xml b/dev-java/cssparser/metadata.xml
new file mode 100644
index 000000000000..84b2b66a12cc
--- /dev/null
+++ b/dev-java/cssparser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+		<email>monsieurp@gentoo.org</email>
+	</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..955ed5109914
--- /dev/null
+++ b/dev-java/db4o-jdk11/Manifest
@@ -0,0 +1 @@
+DIST db4o-jdk11-7.4.tar.bz2 319812 SHA256 dab30480bf79e6cfad7f2026d980f4bddc9dcb47a62f5a63c4f2bda863f7d584 SHA512 6624fcbd54f8607c253b69686ef5b600b12a59548e102755fd660264c3e7daec6b114272434d11060801907a9edcbfc38ca1cc6948464afe0ab35206d8fc8532 WHIRLPOOL 80ba115830ed273e92bda5bb12c183adc73680e45ac5fe4ba66f2774ffb707a57bc53bed065ab3dcd26e1af11c2989f15e5422dd3d8f1ba0426372ccf0d28e74
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..161da65f9a36
--- /dev/null
+++ b/dev-java/db4o-jdk11/db4o-jdk11-7.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..21237a6e3ed0
--- /dev/null
+++ b/dev-java/db4o-jdk11/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>
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/db4o-jdk12/Manifest b/dev-java/db4o-jdk12/Manifest
new file mode 100644
index 000000000000..38fb3d6ca7b3
--- /dev/null
+++ b/dev-java/db4o-jdk12/Manifest
@@ -0,0 +1 @@
+DIST db4o-jdk12-7.4.tar.bz2 91496 SHA256 a2ddd61aa7314e8d086b538d94ffac546f4f46c65cf2538d8c2988330d3fd24e SHA512 25873dc599e465e605842a114e376c884f0a7f7fb8ff6784d6f7742056d002fb9bc246508f1c7fc4597e952818f3c2588181617484542b1177b9b60b3af9c43d WHIRLPOOL 56b6447fcd3c52ff2d7d635509bfa5054bbfcfec78bcfade8dc995c147a06fda6a65c1ba6d6fdd145f4a537808726e7aa9331453f7ca5b66c5f8dd5fc3980077
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..a1b0d7b0441e
--- /dev/null
+++ b/dev-java/db4o-jdk12/db4o-jdk12-7.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..21237a6e3ed0
--- /dev/null
+++ b/dev-java/db4o-jdk12/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>
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/db4o-jdk5/Manifest b/dev-java/db4o-jdk5/Manifest
new file mode 100644
index 000000000000..74faf0bad5c0
--- /dev/null
+++ b/dev-java/db4o-jdk5/Manifest
@@ -0,0 +1 @@
+DIST db4o-jdk5-7.4.tar.bz2 64939 SHA256 0f2c7d8e3a0ff374fbdbb942abac498d6a733ab6c0e23fb00e6ce571bbbc339c SHA512 10e70550731a512166a2deb492257eece74c6920a88c2cc56c633ab4a6306563de4121a734dd523fa6ab0dbb6110d3c4cfb06b28c490a625558fc6f5374d18c6 WHIRLPOOL d15b948920d239e11a19729e93daf77638996f44574a3dce887ad003304afad280d5f3315646c86f4ff4386db84618bedd63f0d7d1b915665be32a76c43d3edb
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..8a1420bd5358
--- /dev/null
+++ b/dev-java/db4o-jdk5/db4o-jdk5-7.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..21237a6e3ed0
--- /dev/null
+++ b/dev-java/db4o-jdk5/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>
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/dbunit/Manifest b/dev-java/dbunit/Manifest
new file mode 100644
index 000000000000..227398c9e44c
--- /dev/null
+++ b/dev-java/dbunit/Manifest
@@ -0,0 +1 @@
+DIST dbunit-2.4.5-sources.jar 509812 SHA256 a31762bcf4d41e24a33cbb20043f9c0bbcccab099a8bb11f29fb88fd6af2b9c0 SHA512 9f6f43337d020aa8c8066e6a12efa3d3fc4256b0bc3ed3d330ddbd155a6430accea03e45987ecb44c747a4844c7c49e36549317c63b3cd456896d0e5bc508b5d WHIRLPOOL 6e230abde0d9792dda3f83f549a0df960a8f7bcb4e3541f4c279bdb3b3b64c4aef7281326d4beb25770b5e6205f8a247a02698d94e84237299ba4da4d5fb3133
diff --git a/dev-java/dbunit/dbunit-2.4.5.ebuild b/dev-java/dbunit/dbunit-2.4.5.ebuild
new file mode 100644
index 000000000000..5149316d6aeb
--- /dev/null
+++ b/dev-java/dbunit/dbunit-2.4.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="DbUnit is a JUnit extension targeted for database-driven projects"
+HOMEPAGE="http://dbunit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE="${JAVA_PKG_IUSE}"
+
+COMMON_DEP="dev-java/slf4j-api:0
+			dev-java/poi:3.2
+			dev-java/commons-collections:0
+			dev-java/ant-core:0
+			dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/slf4j-nop:0
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip:0
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	# Upstream no longer provides a build file.
+	cp -v "${FILESDIR}"/build-2.4.xml build.xml || die
+}
+
+EANT_GENTOO_CLASSPATH="poi-3.2,junit,slf4j-api,commons-collections,ant-core"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_install() {
+	# slf4j needed for runtime
+	java-pkg_register-optional-dependency slf4j-nop
+	java-pkg_register-optional-dependency slf4j-log4j12
+
+	java-pkg_dojar "${S}"/dist/"${PN}.jar"
+
+	use doc && java-pkg_dojavadoc build/javadoc
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/dbunit/files/build-2.4.xml b/dev-java/dbunit/files/build-2.4.xml
new file mode 100644
index 000000000000..dd786c562e3e
--- /dev/null
+++ b/dev-java/dbunit/files/build-2.4.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+
+<project name="dbunit" default="jar" basedir=".">
+	<!-- some properties -->
+	<property name="src.dir" value="org/dbunit" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="build/javadoc" />
+	<property name="lib.dir" value="lib"/>
+	<property name="dist.dir" value="dist" />
+	<property name="jarfile" value="${dist.dir}/dbunit.jar" />
+	<property name="pkg" value="${package.name}"/>
+	<property name="target.jdk" value="1.5" />
+
+
+	<available file="${lib}" type="dir" property="libdir.exists"/>
+
+
+	<!-- init -->
+	<target name="init">		
+		<tstamp/>
+		<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}"
+			classpath="${gentoo.classpath}">
+		</javac>
+	</target>
+
+	<!-- build the jar file -->
+	<target name="jar" depends="compile">
+		<jar jarfile="${jarfile}" basedir="${build.dir}" />
+	</target>
+	
+	<!-- generate javadocs -->
+	<target name="javadoc" depends="init">
+		<javadoc sourcepath="."
+			packagenames="org.*"
+           		destdir="${docs.dir}"
+           		author="true"
+           		version="true"
+           		use="true"
+           		windowtitle="${ant.project.name} API" 
+			doctitle="${ant.project.name} Docs" 
+			private="no" />
+	</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/dbunit/files/build.xml b/dev-java/dbunit/files/build.xml
new file mode 100644
index 000000000000..4ee7b6da225f
--- /dev/null
+++ b/dev-java/dbunit/files/build.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+
+<project name="dbunit" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="src/java" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="docs" />
+	<property name="dist.dir" value="dist" />
+	<property name="jarfile" value="${dist.dir}/dbunit.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}"
+			source="${target.jdk}"
+			target="${target.jdk}">
+			<classpath>
+				<fileset dir="lib">
+					<include name="**/*.jar" />
+				</fileset>	
+			</classpath>
+		</javac>
+	</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="org.*"
+           		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>
+
+</project>
diff --git a/dev-java/dbunit/metadata.xml b/dev-java/dbunit/metadata.xml
new file mode 100644
index 000000000000..01d4dd9b4580
--- /dev/null
+++ b/dev-java/dbunit/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+		DBUnit is a JUnit extension targeted for database-driven projects
+		that, puts your database into a known state between test runs.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">dbunit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/dbus-java/Manifest b/dev-java/dbus-java/Manifest
new file mode 100644
index 000000000000..392306e41c2a
--- /dev/null
+++ b/dev-java/dbus-java/Manifest
@@ -0,0 +1 @@
+DIST dbus-java-2.7.tar.gz 145450 SHA256 be404ea36284d938646192d0ee42e146853064217d4e3aaf89b56bd351ebca33 SHA512 15b44b877ce123948b07aa67bdf73e1fbf6bf2de89d09647dd11d33fc6beb76509b61b73e8a8c5f6331300ac0d9760d7e715b4b9467307f13cfc94b5c856eaa3 WHIRLPOOL 5f2df9de628fbd1178baf5cca75b34f4845db6a8d998901123ec8f93e9cb8b7e0c274de4c75b5a1352c263092c790bb4f78d8cbde6db6d41fecf4b733c038666
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..10b2a16f5679
--- /dev/null
+++ b/dev-java/dbus-java/dbus-java-2.7-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2
+
+DESCRIPTION="Java bindings for the D-Bus messagebus"
+HOMEPAGE="http://dbus.freedesktop.org/"
+SRC_URI="http://dbus.freedesktop.org/releases/dbus-java/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 ppc 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/TestSignalInterface2-2.5.1.java b/dev-java/dbus-java/files/TestSignalInterface2-2.5.1.java
new file mode 100644
index 000000000000..d5c9ac521c4e
--- /dev/null
+++ b/dev-java/dbus-java/files/TestSignalInterface2-2.5.1.java
@@ -0,0 +1,45 @@
+/*
+   D-Bus Java Implementation
+   Copyright (c) 2005-2006 Matthew Johnson
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of either the GNU Lesser General Public License Version 2 or the
+   Academic Free Licence Version 2.1.
+
+   Full licence texts are included in the COPYING file with this program.
+*/
+package org.freedesktop.dbus.test;
+
+import org.freedesktop.DBus.Description;
+import org.freedesktop.dbus.DBusInterface;
+import org.freedesktop.dbus.DBusInterfaceName;
+import org.freedesktop.dbus.DBusMemberName;
+import org.freedesktop.dbus.DBusSignal;
+import org.freedesktop.dbus.UInt32;
+import org.freedesktop.dbus.exceptions.DBusException;
+
+import java.util.List;
+
+/**
+ * A sample signal with two parameters
+ */
+@Description("Test interface containing signals")
+@DBusInterfaceName("some.other.interface.Name")
+public interface TestSignalInterface2 extends DBusInterface
+{
+   @Description("Test basic signal")
+   public static class TestRenamedSignal extends DBusSignal
+   {
+      public final String value;
+      public final UInt32 number;
+      /**
+       * Create a signal.
+       */
+      public TestRenamedSignal(String path, String value, UInt32 number) throws DBusException
+      {
+         super(path, value, number);
+         this.value = value;
+         this.number = number;
+      }
+   }
+}
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-2.6-disconnectfix.patch b/dev-java/dbus-java/files/dbus-java-2.6-disconnectfix.patch
new file mode 100644
index 000000000000..73825676ddb7
--- /dev/null
+++ b/dev-java/dbus-java/files/dbus-java-2.6-disconnectfix.patch
@@ -0,0 +1,21 @@
+diff --git a/org/freedesktop/dbus/Error.java b/org/freedesktop/dbus/Error.java
+index 16e1126..9db1e07 100644
+--- a/org/freedesktop/dbus/Error.java
++++ b/org/freedesktop/dbus/Error.java
+@@ -17,6 +17,7 @@ import java.util.Vector;
+ import org.freedesktop.dbus.exceptions.DBusException;
+ import org.freedesktop.dbus.exceptions.DBusExecutionException;
+ import org.freedesktop.dbus.exceptions.MessageFormatException;
++import org.freedesktop.dbus.exceptions.NotConnected;
+ 
+ import cx.ath.matthew.debug.Debug;
+ 
+@@ -79,6 +80,7 @@ public class Error extends Message
+    @SuppressWarnings("unchecked")
+    private static Class<? extends DBusExecutionException> createExceptionClass(String name)
+    {
++      if (name == "org.freedesktop.DBus.Local.Disconnected") return NotConnected.class;
+       Class<? extends DBusExecutionException> c = null;
+       do {
+          try {
+
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..250f2d1940ea
--- /dev/null
+++ b/dev-java/dbus-java/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/disruptor/Manifest b/dev-java/disruptor/Manifest
new file mode 100644
index 000000000000..4f9f2aeacf8d
--- /dev/null
+++ b/dev-java/disruptor/Manifest
@@ -0,0 +1 @@
+DIST disruptor-3.2.0-sources.jar 74768 SHA256 ad503e6379f6d319b55dc7e2d80aba20cd788b37283f23068056af77d510b764 SHA512 9ad2ba752860d68e3a08c46910cd96c2d43a24860cda1fe9f58f86e3de57a90c2abded43a8457a2751a9199fabe40370bbd9ccef0e982913ae8d2127a92e6b2e WHIRLPOOL 1e6ce2e4ed65980054ad9a4ae639c4e49e3ba4d630c3bea69b9c37099991e622e09544acc2fce091eb870d8f7f68f8b3611e90b0e96f6f4cb716fff8e946f60f
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..2e359e8a16db
--- /dev/null
+++ b/dev-java/disruptor/disruptor-3.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5"
+DEPEND=">=virtual/jdk-1.5"
diff --git a/dev-java/disruptor/metadata.xml b/dev-java/disruptor/metadata.xml
new file mode 100644
index 000000000000..4c16b6dfec73
--- /dev/null
+++ b/dev-java/disruptor/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..38909305747d
--- /dev/null
+++ b/dev-java/dnsjava/Manifest
@@ -0,0 +1 @@
+DIST dnsjava-2.1.6.tar.gz 1087908 SHA256 2503f5fb343ebc5b87c4ea3d67070305ff61d8d8c26636f62abb33e507104e76 SHA512 0d30504190aabbb176cc914834eb26a2f5522741c4473dbbf32f16e1d62fe39cf244a3ddd543b88d3a1e595afa9c6509e42d1418205677aa6523c6d11c49f497 WHIRLPOOL 60915c62b36a907928696e0afb3529ed46332013f07feea155158075fcc32a3bcfb50ddd3977f876ec7ad3203572ef54ff30f761925b6d96cca6e51fa7939f19
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..98fb0df84cb2
--- /dev/null
+++ b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.4"
+DEPEND=">=virtual/jdk-1.4
+		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/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..c76c83864bd7
--- /dev/null
+++ b/dev-java/dnsjava/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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">http://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..fed26d1479da
--- /dev/null
+++ b/dev-java/dom4j/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild b/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
new file mode 100644
index 000000000000..1a72d74f13a0
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java library for working with XML"
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jaxme:0
+	dev-java/relaxng-datatype:0
+	dev-java/xpp2:0
+	dev-java/xpp3:0
+	dev-java/xsdlib:0
+	java-virtuals/stax-api:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junitperf:0
+	)"
+
+java_prepare() {
+	# Circular deps with jaxen #212993
+	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
+
+	# Add missing methods to compile on Java 5 #137970
+	epatch "${WORKDIR}/${P}-java5.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_BUILD_TARGET="clean package"
+EANT_GENTOO_CLASSPATH="jaxme,relaxng-datatype,stax-api,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"
+
+src_test() {
+	# Needs X11
+	rm -v src/test/org/dom4j/bean/BeansTest.java || die
+	# Fails with a 1.6 JDK for some reason
+	rm -v src/test/org/dom4j/io/StaxTest.java || die
+	# Fails with a 1.7 JDK for some reason
+	rm -v src/test/org/dom4j/rule/RuleTest.java || die
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	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..c2307b378c9f
--- /dev/null
+++ b/dev-java/dom4j/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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/dsiutils/Manifest b/dev-java/dsiutils/Manifest
new file mode 100644
index 000000000000..c26c8879f343
--- /dev/null
+++ b/dev-java/dsiutils/Manifest
@@ -0,0 +1 @@
+DIST dsiutils-1.0.10-src.tar.gz 267700 SHA256 d3eda619ab7f897f9c0aeb4065a5866dc8fa17afbb83e15750f7972bb87444d0 SHA512 32cb9cde72056bbcdfd842011252772ccd3ceb226e44972f5388352ebab9a5ae66d97d4af00078f95033d6ed99fd6a12b82cbd1679a72e1e59ca95409c6e9e35 WHIRLPOOL ece0c1a8f75e24a7291750013a1a7c39d8bd4f0242dc159463547159dc58165e245daae72bb8b54fd9a623701fdab5ccef24819fc9ddce8315329e1d06e13b82
diff --git a/dev-java/dsiutils/dsiutils-1.0.10-r2.ebuild b/dev-java/dsiutils/dsiutils-1.0.10-r2.ebuild
new file mode 100644
index 000000000000..186a075f94bb
--- /dev/null
+++ b/dev-java/dsiutils/dsiutils-1.0.10-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Mish Mash of classes that were initially distributed with mg4j (amount others)"
+HOMEPAGE="http://dsiutils.dsi.unimi.it/"
+SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/commons-io:1
+	dev-java/jsap:0
+	dev-java/log4j:0
+	dev-java/commons-collections:0
+	dev-java/colt:0
+	dev-java/fastutil:5.0
+	dev-java/commons-configuration:0
+	dev-java/commons-lang:2.1
+	dev-java/junit:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+# Failes to build with jdk7 #423519
+DEPEND="${COMMON_DEP}
+	|| ( virtual/jdk:1.6 virtual/jdk:1.5 )
+	test? (
+		dev-java/emma:0
+		dev-java/ant-junit:0
+		dev-java/ant-trax:0
+	)"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="commons-io-1,jsap,log4j,commons-collections,colt,fastutil-5.0,commons-configuration,commons-lang-2.1,junit"
+
+EANT_TEST_TARGET="junit"
+EANT_TEST_ANT_TASKS="ant-trax"
+EANT_TEST_EXTRA_ARGS="-Djar.base=/usr/share/emma/lib"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/it
+}
diff --git a/dev-java/dsiutils/metadata.xml b/dev-java/dsiutils/metadata.xml
new file mode 100644
index 000000000000..706df8c78e0e
--- /dev/null
+++ b/dev-java/dsiutils/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+		The DSI utilities are a mish mash of classes accumulated during the last
+		ten years in projects developed at the DSI (Dipartimento di Scienze
+		dell'Informazione, e.g., Information Sciences Department) of the
+		Università degli Studi di Milano. They were originally distributed in
+		several projects (mainly in MG4J) but we finally decided to gather all
+		the material in a single place.
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-java/dtdparser/Manifest b/dev-java/dtdparser/Manifest
new file mode 100644
index 000000000000..88adaa137184
--- /dev/null
+++ b/dev-java/dtdparser/Manifest
@@ -0,0 +1 @@
+DIST dtdparser-1.21.tgz 138335 SHA256 67fb4af8aa48733b027724c1244e614d9621724efa47e2c9ddb69edecc8dd034 SHA512 1b96991a2a2486fbbf0a9847fec3f1528153508f5380c3066ba34b410a9d42a480c4b821535ea2304d6c674526229cf74e6d28a32312df431aa852a9436c03aa WHIRLPOOL 94721ab2021efcdce97e21357f951a55dc7105a7d7a41cbf8735302babd20637a3c0195af3f266a16d25d73987441d043b8812c7da1009c8bb81e2ec87febf54
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..e86238f67644
--- /dev/null
+++ b/dev-java/dtdparser/dtdparser-1.21-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/files/buildfile.patch b/dev-java/dtdparser/files/buildfile.patch
new file mode 100644
index 000000000000..da5c253ed3a3
--- /dev/null
+++ b/dev-java/dtdparser/files/buildfile.patch
@@ -0,0 +1,36 @@
+diff -uprN dtdparser-1.21.old/build.xml dtdparser-1.21/build.xml
+--- dtdparser-1.21.old/build.xml	2002-07-29 14:06:51.000000000 +0200
++++ dtdparser-1.21/build.xml	2004-12-24 13:13:02.626325296 +0100
+@@ -12,7 +12,7 @@
+   <property name="src" value="source"/>
+   <property file="product.properties"/>
+   <property name="prod.distbase" value="${prod.name}-${prod.version.major}.${prod.version.minor}"/>
+-  <property name="prod.jar" value="${prod.distbase}/${prod.name}${prod.version.major}${prod.version.minor}.jar"/>
++  <property name="prod.jar" value="${prod.distbase}/${prod.name}.jar"/>
+   <property name="doc" value="${prod.distbase}/doc"/>
+ 
+   <!--
+@@ -40,8 +40,11 @@
+   </target>
+ 
+   <target name="compile">
+-    <javac srcdir="${src}" destdir="${lib}"
+-           deprecation="on">
++    <javac srcdir="${src}" 
++    	destdir="${lib}"
++        deprecation="off"
++	source="1.3"
++	target="1.3">
+       <classpath refid="default.classpath"/>
+     </javac>
+   </target>
+@@ -94,4 +97,9 @@
+     <delete dir="${lib}"/>
+   </target>
+ 
++  <target name="sourcezip">   
++	  <zip destfile="${dist}/dtdparser-src.zip">
++		<zipfileset dir="${src}" />
++   	</zip>
++  </target>
+ </project>
diff --git a/dev-java/dtdparser/metadata.xml b/dev-java/dtdparser/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/dtdparser/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/dynalang/Manifest b/dev-java/dynalang/Manifest
new file mode 100644
index 000000000000..4f53b81ce23b
--- /dev/null
+++ b/dev-java/dynalang/Manifest
@@ -0,0 +1 @@
+DIST dynalang-mop-0.4.tgz 227338 SHA256 b241b763d8178f7ba74123ed6145df4f255f78df39757665f3569e3ccd11d5cb SHA512 b7501fbc44ae29e10cf3eb55002420d88d83226f790861f43f59aaddc0cd1bd5021fed207d831d5c3adb14ceab01dc17ff53cd31cb6a93c0fc00240b8e3e9797 WHIRLPOOL ad5f558a105a78625d7c7c55b1c7f7b185aae30fb7ab917e27aedfa083ee99191223fb76ea22f3f573da576655d8612ccf21bba807a6488ae5344ce9705c22d4
diff --git a/dev-java/dynalang/dynalang-0.4.ebuild b/dev-java/dynalang/dynalang-0.4.ebuild
new file mode 100644
index 000000000000..70afdbd2ada9
--- /dev/null
+++ b/dev-java/dynalang/dynalang-0.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+JAVA_PKG_IUSE="doc source"
+JAVA_PKG_BSFIX="off"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-mop-${PV}"
+
+DESCRIPTION="Library for implementation of interoperable metaobject protocols for dynamic languages"
+HOMEPAGE="http://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.5"
+DEPEND=">=virtual/jdk-1.5
+	test? (
+		dev-java/emma:0
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+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..6929334e2d85
--- /dev/null
+++ b/dev-java/dynalang/files/build.xml
@@ -0,0 +1,180 @@
+<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.

+-->

+<!-- $Id$ -->
+	<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..028fe36423df
--- /dev/null
+++ b/dev-java/dynalang/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..0a005cf0bb64
--- /dev/null
+++ b/dev-java/easymock-classextension/Manifest
@@ -0,0 +1 @@
+DIST easymockclassextension-3.2.zip 155678 SHA256 4f16c1a4359d194364ef2a152e8b2547ffee03e72824bf351781bffdb9f272c3 SHA512 bb6fa5cf69e3b07bb2e7d7d27b7186176a2b34e2250ab2945633ec55e49230ffeabc0dffed64bda84bf7f7e30b5846408536f9902b915b751fa3e3405e4b72b0 WHIRLPOOL bd824f57cf2840c3c08b09aba0999978128259e681390caa14c8bdcf298e52ca3268214b60e07b0fdc5efe014c4dde4b90bd72b39f4be54ce70cab445262cc7a
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..6f33f2032313
--- /dev/null
+++ b/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN=${PN/-}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Provides 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..5a7239683c94
--- /dev/null
+++ b/dev-java/easymock-classextension/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..ad46f066ffe6
--- /dev/null
+++ b/dev-java/easymock/Manifest
@@ -0,0 +1,2 @@
+DIST easymock-3.2.zip 970922 SHA256 3ada340522b94d549a887774d42aaea008fb0aabc6f7e649ad6d23399bc7b80c SHA512 472b0f7183f48dcbd60996a78a69f3be0c9c5762856bf827d9a721b3ff03fca2fb68d3baae970a1de3eee0f293d02b3d9dba3c5634575ba395200e67f767ba3b WHIRLPOOL 5bf9dc61bf4716b88d72cbf80553b2629f7e55ffcd00821e74d8fcdb58160d1a494008d75f39a17ef2319c0bb913ae666f7c7e7d45394f6ad69d032d9e125442
+DIST easymock-3.3.1.zip 1015625 SHA256 06332d947698e615e00baa5441e54f03423912079d81733dc089e57cae138a36 SHA512 0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46 WHIRLPOOL 61e68261374caa1c7a879c28c329e8f3f6a5f067b57bb3c3eb79405b978544e0f3924b5cbe63cdee35964284d3ea602bb039d68461c73869783cf5e555a2d245
diff --git a/dev-java/easymock/easymock-3.2-r1.ebuild b/dev-java/easymock/easymock-3.2-r1.ebuild
new file mode 100644
index 000000000000..4f1e6c5b48dd
--- /dev/null
+++ b/dev-java/easymock/easymock-3.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Provides 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 x86"
+IUSE=""
+
+CDEPEND="dev-java/junit:4
+	dev-java/objenesis:0
+	dev-java/cglib:3"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+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
+
+	use examples && java-pkg_doexamples examples
+}
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..9625ed75b284
--- /dev/null
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Provides 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 ~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.2-no-android.patch b/dev-java/easymock/files/3.2-no-android.patch
new file mode 100644
index 000000000000..18c4a00dc45f
--- /dev/null
+++ b/dev-java/easymock/files/3.2-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/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..5a7239683c94
--- /dev/null
+++ b/dev-java/easymock/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..b10d733e2f1c
--- /dev/null
+++ b/dev-java/easyneurons/Manifest
@@ -0,0 +1 @@
+DIST neuroph_2.3_nb.zip 8257618 SHA256 b126485f212e16f8c0162b35dcbbb25eb66da1ae1523bc5bd420d8bd82cf0faa SHA512 f2d6c87862435fe5217259842b3d9829780fe82dc87a682bc3ce38ecb708968b2458bf2d8631daeba209ccb9ca8e7c74fd1e5dd3c6ca606cf8b9ce4ea23db485 WHIRLPOOL 60366565c900deb2034e0d2d6527b23339486ebbe81ec203622be3bcea50b6dfe3ab001f2c0c82733f599aaaff60c812231f4742883506729a62a15fdc5bcdd9
diff --git a/dev-java/easyneurons/easyneurons-2.3.ebuild b/dev-java/easyneurons/easyneurons-2.3.ebuild
new file mode 100644
index 000000000000..4720d8d51494
--- /dev/null
+++ b/dev-java/easyneurons/easyneurons-2.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b88f3d4a8c7c
--- /dev/null
+++ b/dev-java/easyneurons/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..a5903c7ac382
--- /dev/null
+++ b/dev-java/echo2/Manifest
@@ -0,0 +1 @@
+DIST NextApp_Echo2-2.1.1.tgz 5372814 SHA256 73c0325d019a7df92270c0f3eebef07c2a4fa42a58e588d3bb2cfbd7c1869ce2 SHA512 bad6d9a6411c6a6fe24edbd88960a5e1179f65e95a26e51610eb0b601e3941dcc82b052a385c6fd429291c524bb722a081f39bf3704b7b403ad98582c8273f26 WHIRLPOOL dac80215f7c2d33ab790b9a5a56b9f2b360e42942676faec58061f55cada7e9b530bc6bea24188b9cb6d15638898705e4dffd54c45e757d97d4e272c292530f6
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..26e55743f4ba
--- /dev/null
+++ b/dev-java/echo2/echo2-2.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7303cef96964
--- /dev/null
+++ b/dev-java/echo2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ecj-gcj/Manifest b/dev-java/ecj-gcj/Manifest
new file mode 100644
index 000000000000..336699623f8e
--- /dev/null
+++ b/dev-java/ecj-gcj/Manifest
@@ -0,0 +1,4 @@
+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
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..f972c2e690c9
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 prefix toolchain-funcs
+
+MY_PN="ecj"
+DMF="R-${PV}-201002111343"
+
+DESCRIPTION="A 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 ~ppc ~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..b52411139980
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 prefix toolchain-funcs
+
+MY_PN="ecj"
+DMF="R-${PV}-201006080911"
+
+DESCRIPTION="A 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 ~ppc ~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..9b8687c05489
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 prefix toolchain-funcs
+
+MY_PN="ecj"
+DMF="R-${PV}-201209141800"
+
+DESCRIPTION="A 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 ~ppc ~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..6b3405c76e98
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 prefix toolchain-funcs
+
+MY_PN="ecj"
+DMF="R-${PV}-201502041700"
+
+DESCRIPTION="A 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 ~ppc ~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 100755
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..b16b316310ca
--- /dev/null
+++ b/dev-java/ecj-gcj/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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..952214bc4e1c
--- /dev/null
+++ b/dev-java/eclipse-ecj/Manifest
@@ -0,0 +1,4 @@
+DIST ecjsrc-3.7.2.jar 1366333 SHA256 755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32 WHIRLPOOL 399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
+DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
+DIST ecjsrc-4.4.1.jar 1759152 SHA256 ba3a471d000ae983498a0f398955e2f09d8c1093880c9f37544d47e5460ff82a SHA512 27086c4c6d35a07f38e2c5ae3d34314fcdfe8b03fd1bbd3e652acd10195a0ec4a20b312f4cc0d0e8204b824eb230d1730a2aef9d886896b81f26b93eff1ae2d1 WHIRLPOOL 1b1da40f61ea5b3768e48dd7b9685b9405e35f3b5019acaeae937335f521819743cb7bacd5a7603ea72a20fe1310c6e28fb57d6c64e46b2035b70335029b2937
+DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 WHIRLPOOL 5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
new file mode 100644
index 000000000000..d10c95b7c558
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-201202080800"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="3.7"
+IUSE="+ant userland_GNU"
+
+COMMON_DEP="
+	app-eselect/eselect-java"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	|| ( virtual/jdk:1.7 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
+
+	# upstream build.xml excludes this
+	rm META-INF/eclipse.inf
+}
+
+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 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/ \( -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 @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/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+		-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.2.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
new file mode 100644
index 000000000000..a5826b335fde
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild
new file mode 100644
index 000000000000..859409908e93
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="ecj"
+DMF="R-${PV}-201409250400"
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.4"
+IUSE="+ant userland_GNU"
+
+COMMON_DEP="
+	app-eselect/eselect-java"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+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.6
+JAVA_PKG_WANT_TARGET=1.6
+
+java_prepare() {
+	# These have their own package.
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -fr org/eclipse/jdt/internal/antadapter || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find -name "*.properties" -or -name "*.rsc" -or -name "*.props" \
+		 -or -wholename "*/META-INF/*" | xargs jar uvf "${S}/${PN}.jar" || 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
+
+	java-pkg_newjar ${PN}.jar ${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..1e6a3e8f0903
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~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/metadata.xml b/dev-java/eclipse-ecj/metadata.xml
new file mode 100644
index 000000000000..2b50537a62dd
--- /dev/null
+++ b/dev-java/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>
+<herd>java</herd>
+<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..ae8c8fdc309b
--- /dev/null
+++ b/dev-java/eclipsito/Manifest
@@ -0,0 +1 @@
+DIST eclipsito-0_pre20130713.tar.xz 162972 SHA256 2ac637b26a30263777d2c92912e0607a26d379f14a9c1a4a3cd28a9960b15c10 SHA512 b238692950bc93059fb16df8e6301669583185976ae4f12519d1917a13fea2b53c5b3462f2da61d63025019eee10037a3a96b2ac742545d61b80f2ab7964d41b WHIRLPOOL b2dbecf2d0c80f851d0c4253c6aa8b9657e5f39802a30d5385231c985c406702ebeca92645969c8bbf6cf11fb3ebb2fa77b755a46a3e99fd26f45b40efedee48
diff --git a/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild b/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
new file mode 100644
index 000000000000..4488566d6ca4
--- /dev/null
+++ b/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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..838c00a4a448
--- /dev/null
+++ b/dev-java/eclipsito/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ecs/Manifest b/dev-java/ecs/Manifest
new file mode 100644
index 000000000000..f6d55a3aafb8
--- /dev/null
+++ b/dev-java/ecs/Manifest
@@ -0,0 +1 @@
+DIST ecs-1.4.2-src.tar.gz 3435157 SHA256 8e98da4dd0ed5498bdfac1ec7a4bfa429348d1c8733ed189e67923d98adb2a31 SHA512 b7004f9364a24dd9ec8f963f69279471cc2e39fdc81d1c97dc4881cf65ee16f5f4342129b7bdda12994b69edff23944cb12f5d4b4ec140bf962e3a4f9f4e1bb4 WHIRLPOOL 202a8f9f4b81d0714f59b2817a317b85a95e5233efb4832fb787d988126b5d2b8fca46eeb7828f71fef9efea953de80d81c769e1dfa77dbd5b052dc78b750c38
diff --git a/dev-java/ecs/ecs-1.4.2-r1.ebuild b/dev-java/ecs/ecs-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..a23b03cc22af
--- /dev/null
+++ b/dev-java/ecs/ecs-1.4.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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=""
+
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/jakarta-regexp-1.3*
+	>=dev-java/xerces-2.7"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	rm -v lib/*.jar || die
+	rm -v build/*.jar || die
+	rm -v ecs*.jar || die
+
+	java-ant_bsfix_one build/build-ecs.xml
+
+	cd "${S}/lib"
+	java-pkg_jar-from xerces-2 xercesImpl.jar xerces.jar
+	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
+}
+
+EANT_BUILD_XML="build/build-ecs.xml"
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_newjar bin/${P}.jar
+
+	dodoc AUTHORS ChangeLog README || die
+	use doc && java-pkg_dojavadoc docs/*
+	use source && java-pkg_dosrc src/java/*
+}
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..7e80592f8405
--- /dev/null
+++ b/dev-java/ecs/ecs-1.4.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils 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/jakarta-regexp:1.3
+	dev-java/xerces:2"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso8859-1"
+JAVA_SRC_DIR="src/java"
+JAVA_GENTOO_CLASSPATH="xerces-2,jakarta-regexp-1.3"
+
+java_prepare() {
+	find "${S}" -name "*.jar" -delete || die
+	epatch "${FILESDIR}"/${PV}*.patch
+}
diff --git a/dev-java/ecs/files/1.4.2-java7-enum.patch b/dev-java/ecs/files/1.4.2-java7-enum.patch
new file mode 100644
index 000000000000..08632aef8b9b
--- /dev/null
+++ b/dev-java/ecs/files/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..838c00a4a448
--- /dev/null
+++ b/dev-java/ecs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/edtftpj/Manifest b/dev-java/edtftpj/Manifest
new file mode 100644
index 000000000000..f66085af62c1
--- /dev/null
+++ b/dev-java/edtftpj/Manifest
@@ -0,0 +1 @@
+DIST edtftpj-2.0.4.zip 1314543 SHA256 e24e1b883254ed28312412ddabb07fab0d9022fcedb78901c804b94c659c3666 SHA512 6af25752e794ece897fe0758dd373f583c7960b5ffe01eefe2947bcd0ab73619876c6ae2557f5ce3e039839a6b41581d29be6c2fee568ddc2bb668216ae04e3e WHIRLPOOL 93b1c380ed61feeae50f1e975c9485802a54de9ddc362b396ff0db70f844138c0198b4a5e94592a1a50c38058911457e6a882a39a1a15560697535422d39ef5e
diff --git a/dev-java/edtftpj/edtftpj-2.0.4.ebuild b/dev-java/edtftpj/edtftpj-2.0.4.ebuild
new file mode 100644
index 000000000000..168d6dc0c43b
--- /dev/null
+++ b/dev-java/edtftpj/edtftpj-2.0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples 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://www.enterprisedt.com"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/junit-3.8*"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${RDEPEND}"
+
+java_prepare() {
+	find . '(' -name '*.class' -o -name '*.jar' ')' -print -delete
+
+	rm doc/LICENSE.TXT || die "Failed to remove LICENSE.TXT"
+}
+
+src_compile() {
+	cd src || die
+
+	eant jar -Dftp.classpath=$(java-pkg_getjars junit) $(use_doc javadocs)
+}
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+
+	use doc && java-pkg_dojavadoc build/doc/api
+	use source && java-pkg_dosrc src/com
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/edtftpj/metadata.xml b/dev-java/edtftpj/metadata.xml
new file mode 100644
index 000000000000..78e4b70b2dfe
--- /dev/null
+++ b/dev-java/edtftpj/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..7a79ab44c1dc
--- /dev/null
+++ b/dev-java/ehcache/Manifest
@@ -0,0 +1,2 @@
+DIST ehcache-1.1.tgz 228733 SHA256 b1709cdb27a7dee9c3f6beb8967a2f64549d9cc32af7867f8fa43b0d5b4bf226 SHA512 15d37d4a2579fe1b720b87954a135307af34c42c6a925b13cca0f8d861e92c3802696480e3a8c3e478e905f0a231b0d93c135ff75fb934e7a968ba790713d9d5 WHIRLPOOL c32e92bae557e20cab01421104da3cba7f02654c8f262403fcd1f93598afb62570a14aadc3989a07a6de68ba8a34ad8dc04402b3a6a4f62f6fddc291e7aed34a
+DIST ehcache-1.2.4.tgz 1330344 SHA256 47b5dad87d8c75773e66aef471b1b464118956f8ce3bf9ca0e0292f020a20a64 SHA512 a8d3e7c47eeeab568fbe2f4b923db96cf0f93d8ae0f727aa107b0ce5c5abd035a3967ea58617ff10e9c81109dcb8d904cbad86ec2c77d9be159e1a0a2c44d4ed WHIRLPOOL ed7913a200c45119f565912118b1b7c9e9e6ffc29fe8e227c7eca3d66f2333636d214af6e39ba9cf41c6eb0cf4568e26e1b511c06b66b3abdde8a6cba814178e
diff --git a/dev-java/ehcache/ehcache-1.1-r1.ebuild b/dev-java/ehcache/ehcache-1.1-r1.ebuild
new file mode 100644
index 000000000000..bd6ead79108b
--- /dev/null
+++ b/dev-java/ehcache/ehcache-1.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+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-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc"
+
+COMMON_DEPEND="
+		dev-java/commons-collections
+		dev-java/concurrent-util
+		dev-java/commons-logging"
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON_DEPEND}
+		>=dev-java/ant-core-1.5"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	unzip ${P}-src.zip || die
+	rm *.jar
+	rm -rf src/net/sf/ehcache/hibernate
+}
+
+src_compile() {
+	mkdir "${S}"/classes
+	cd "${S}"/src
+
+	ejavac -d "${S}"/classes \
+		-classpath 	$(java-pkg_getjars commons-logging,commons-collections) \
+		$(find . -name "*.java")
+
+	cd "${S}"/classes
+	jar cf "${S}"/${P}.jar * || die
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/${P}.jar ${PN}.jar
+	dodoc *.txt ehcache.xml ehcache.xsd
+	if use doc ; then
+		unzip ${P}-javadoc.zip || die
+		java-pkg_dohtml -r docs
+	fi
+}
diff --git a/dev-java/ehcache/ehcache-1.1-r2.ebuild b/dev-java/ehcache/ehcache-1.1-r2.ebuild
new file mode 100644
index 000000000000..2737962129e4
--- /dev/null
+++ b/dev-java/ehcache/ehcache-1.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+COMMON_DEPEND="
+		dev-java/commons-collections:0
+		dev-java/concurrent-util:0
+		dev-java/commons-logging:0"
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/zip
+		${COMMON_DEPEND}
+		>=dev-java/ant-core-1.5"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="commons-collections,concurrent-util,commons-logging"
+
+java_prepare() {
+	unzip ${P}-src.zip || die
+	rm *.jar || die
+	rm -rf src/net/sf/ehcache/hibernate || die
+}
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..2a2cfde97c6d
--- /dev/null
+++ b/dev-java/ehcache/ehcache-1.2.4-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d6477b931e02
--- /dev/null
+++ b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging,servlet-api-2.5"
+
+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/files/build.xml-1.2.4-r2 b/dev-java/ehcache/files/build.xml-1.2.4-r2
new file mode 100644
index 000000000000..468cd44b52aa
--- /dev/null
+++ b/dev-java/ehcache/files/build.xml-1.2.4-r2
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<project name="ehcache" default="jar" basedir=".">
+  <path id="globalClassPath">
+    <fileset dir="lib/" includes="*.jar"/>
+  </path>
+  <target name="compile">
+    <mkdir dir="classes"/>
+    <javac srcdir="src" destdir="classes/" classpathref="globalClassPath"/>
+    <copy todir="classes/">
+      <fileset dir="." includes="ehcache-failsafe.xml"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="ehcache.jar">
+      <fileset dir="classes" includes="**/*.class"/>
+      <fileset dir="classes" includes="**/*.xml"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/ehcache/metadata.xml b/dev-java/ehcache/metadata.xml
new file mode 100644
index 000000000000..fbc3b22c98e8
--- /dev/null
+++ b/dev-java/ehcache/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..30c7e24e776c
--- /dev/null
+++ b/dev-java/emma/Manifest
@@ -0,0 +1 @@
+DIST emma-2.0.5312-src.zip 421109 SHA256 2c6cd6177f2cf4b011ac23c3d301be3655ef1fb276b523d5a5155064917a9833 SHA512 d99b7ff1c4682a97f714f74cc6142bb766cde47bcb33932dc466f1e505e836883f01faa0a959dad77c0837fca3ae744754e0fcdc34d7a8d14720b0b7ce90ee4b WHIRLPOOL bc91a3e681c4926058600382387c775cdf615abd5ad0e50e245aab28a82855519ff4ee0a3b3e74cfce909dfce405e64ab1d8e90177526b6a6247eeaf27630c57
diff --git a/dev-java/emma/emma-2.0.5312-r2.ebuild b/dev-java/emma/emma-2.0.5312-r2.ebuild
new file mode 100644
index 000000000000..aa5d87cc9a0a
--- /dev/null
+++ b/dev-java/emma/emma-2.0.5312-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# No support for javadocs in build.xml
+EAPI=2
+JAVA_PKG_IUSE="source"
+
+inherit base java-pkg-2 java-ant-2
+
+DESCRIPTION="a 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 ppc ppc64 x86 ~x86-fbsd"
+
+IUSE="+launcher"
+
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/ant-core-1.7.0
+	launcher? ( !sci-biology/emboss )"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+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
+}
+
+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..45e018e0f406
--- /dev/null
+++ b/dev-java/emma/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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/exolabcore/Manifest b/dev-java/exolabcore/Manifest
new file mode 100644
index 000000000000..8454bf969959
--- /dev/null
+++ b/dev-java/exolabcore/Manifest
@@ -0,0 +1 @@
+DIST exolabcore-20050205.tar.bz2 118062 SHA256 43b7b62a7c1534fcc3a50ad7f1e745036989762435f307fcbca29940148f25ab SHA512 90919e8bbddc65cc19e8d22eef5872fd58dcae077798ce689f6ff7c5d02e9a675b42db94e4c92f4d4300210ae14e385b2619349eb0e7f3a16bc325ba3b502448 WHIRLPOOL 112c257aa9f33b171bcf621c853ff9183b458b1ebbc8352e9f6d8ce5ae48ec26466190a69524a81caf1f90f5f2ce4cebf1da872e69d9da466ea0d984427d502f
diff --git a/dev-java/exolabcore/exolabcore-0.3.7_p20050205-r2.ebuild b/dev-java/exolabcore/exolabcore-0.3.7_p20050205-r2.ebuild
new file mode 100644
index 000000000000..025fc96c657b
--- /dev/null
+++ b/dev-java/exolabcore/exolabcore-0.3.7_p20050205-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+WANT_ANT_TASKS="dev-java/exolabtools:0"
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_DATE="${PV##*_p}"
+MY_PV="${PV%%_p*}"
+MY_P="${PN}-${MY_DATE}"
+
+DESCRIPTION="Exolab Build Tools"
+HOMEPAGE="http://openjms.cvs.sourceforge.net/openjms/exolabcore/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="Exolab"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+COMMON_DEP="
+	dev-java/cdegroot-db
+	dev-java/commons-logging"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	java-virtuals/jdk-with-com-sun
+	${COMMON_DEP}
+	dev-java/exolabtools
+	test? (
+		dev-java/jakarta-oro:2.0
+		dev-java/commons-cli
+		dev-java/log4j
+		=dev-java/junit-3.8*
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}/src"
+	epatch "${FILESDIR}/${P}-buildfile.patch"
+	epatch "${FILESDIR}/0.3.7_p20050205-r1-tests-junit.patch"
+
+	cd "${S}/lib"
+	java-pkg_jar-from cdegroot-db-1
+	java-pkg_jar-from commons-logging
+}
+
+src_compile() {
+	cd "${S}/src"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	cd "${S}/lib"
+	java-pkg_jar-from junit
+	java-pkg_jar-from commons-cli-1
+	java-pkg_jar-from log4j
+	java-pkg_jar-from jakarta-oro-2.0
+
+	cd "${S}/src"
+	eant tests
+	cd ..
+	local deps
+	deps="junit,commons-cli-1,log4j,cdegroot-db-1,commons-logging,jakarta-oro-2.0"
+	java -cp "build/classes:build/tests:$(java-pkg_getjars ${deps})" \
+		org.exolab.core.test.CoreTestSuite -execute || die "Tests failed"
+}
+
+src_install() {
+	java-pkg_newjar dist/${PN}-${MY_PV}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc build/doc/javadoc
+	use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/exolabcore/files/0.3.7_p20050205-r1-tests-junit.patch b/dev-java/exolabcore/files/0.3.7_p20050205-r1-tests-junit.patch
new file mode 100644
index 000000000000..02d1b56c3400
--- /dev/null
+++ b/dev-java/exolabcore/files/0.3.7_p20050205-r1-tests-junit.patch
@@ -0,0 +1,12 @@
+diff -ur src.old/tests/unit/org/exolab/core/test/CoreTestSuite.java src/tests/unit/org/exolab/core/test/CoreTestSuite.java
+--- src.old/tests/unit/org/exolab/core/test/CoreTestSuite.java	2007-02-14 20:39:01.000000000 +0200
++++ src/tests/unit/org/exolab/core/test/CoreTestSuite.java	2007-02-14 20:39:21.000000000 +0200
+@@ -177,7 +177,7 @@
+     
+                 // execute the test suite and print the results
+                 TestResult results = harness.execute(suite);
+-                harness.getTestRunner().print(results);
++                //harness.getTestRunner().print(results);
+             }
+         } else {
+             usage();
diff --git a/dev-java/exolabcore/files/exolabcore-0.3.7_p20050205-buildfile.patch b/dev-java/exolabcore/files/exolabcore-0.3.7_p20050205-buildfile.patch
new file mode 100644
index 000000000000..947a020b78d6
--- /dev/null
+++ b/dev-java/exolabcore/files/exolabcore-0.3.7_p20050205-buildfile.patch
@@ -0,0 +1,34 @@
+--- build.xml.orig	2005-02-05 23:16:58.615050576 +0100
++++ build.xml	2005-02-05 23:28:15.778106144 +0100
+@@ -6,8 +6,6 @@
+   <!-- ==================================================================== -->
+   <!--                        Custom task defs                              -->
+   <!-- ==================================================================== -->
+-  <taskdef name="increment" classname="org.exolab.tools.ant.Increment" />
+-  <taskdef name="subst" classname="org.exolab.tools.ant.Substitute" />
+ 
+ 
+   <!-- ==================================================================== -->
+@@ -37,15 +35,14 @@
+   <!--                The classpath used to build the project               -->
+   <!-- ==================================================================== -->
+   <path id="project.class.path">
+-    <pathelement path="${lib.dir}/${project.jar.jdbm}" />
+-    <pathelement path="${lib.dir}/${project.jar.jnet}" />
+-    <pathelement path="${lib.dir}/${project.jar.jsse}" />
+-    <pathelement path="${lib.dir}/${project.jar.junit}" />
+-    <pathelement path="${lib.dir}/${project.jar.log4j}" />
+-    <pathelement path="${lib.dir}/${project.jar.logging}" />
+-    <pathelement path="${lib.dir}/${project.jar.cli}" />
+-    <pathelement path="${classes.dir}" />
++  	<fileset dir="${lib.dir}">
++  		<include name="**/*.jar" />
++        </fileset>
++    	<pathelement path="${classes.dir}" />
+   </path>
++  
++  <taskdef name="increment" classname="org.exolab.tools.ant.Increment" classpathref="project.class.path"/>
++  <taskdef name="subst" classname="org.exolab.tools.ant.Substitute" classpathref="project.class.path" />
+ 
+ 
+   <!-- ==================================================================== -->
diff --git a/dev-java/exolabcore/metadata.xml b/dev-java/exolabcore/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/exolabcore/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/exolabtools/Manifest b/dev-java/exolabtools/Manifest
new file mode 100644
index 000000000000..dbd9d5f808e1
--- /dev/null
+++ b/dev-java/exolabtools/Manifest
@@ -0,0 +1 @@
+DIST exolabtools-20050205.tar.bz2 13172 SHA256 a59b8345b7591c652f386ef5a02639b8b41a67e0f219774c3f271ce5821e5969 SHA512 9976b58db4a13efe64edd7d8b3ae897b4eeb6b939602fb9edd3dc913da587fca49864c346659976e8f7d18d5392a7977efed0a8b800b67b0483c67fac6e9bf53 WHIRLPOOL 8040df795253dc1931c44425135a984030b7bd974192e7cca9551d601c7f7464a3fba5f9a356db8920dc518c70ddac8197dee983acda22bf0d87e515e92a24ab
diff --git a/dev-java/exolabtools/exolabtools-1.0_p20050205-r1.ebuild b/dev-java/exolabtools/exolabtools-1.0_p20050205-r1.ebuild
new file mode 100644
index 000000000000..76baccf7fd31
--- /dev/null
+++ b/dev-java/exolabtools/exolabtools-1.0_p20050205-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P=${P/-1.0_p/-}
+
+DESCRIPTION="Exolab Build Tools"
+HOMEPAGE="http://openjms.cvs.sourceforge.net/openjms/tools/src/main/org/exolab/tools/ant/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="Exolab"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/jakarta-oro-2.0*
+	dev-java/ant-core"
+
+DEPEND=">=virtual/jdk-1.4
+	=dev-java/jakarta-oro-2.0*"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_unpack() {
+	unpack "${A}"
+
+	cd "${S}/src/etc"
+	mv JARS JARS.upstream || die
+	echo "project.jar.oro=jakarta-oro.jar" > JARS
+	echo "project.jar.ant=ant.jar" >> JARS
+
+	cd "${S}/lib"
+	java-pkg_jar-from jakarta-oro-2.0
+	java-pkg_jar-from ant-core
+}
+
+src_compile() {
+	cd src
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_newjar dist/${PN}-1.0.jar ${PN}.jar
+
+	dodoc src/etc/CHANGELOG src/etc/VERSION || die
+
+	use doc && java-pkg_dojavadoc build/doc
+	use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/exolabtools/metadata.xml b/dev-java/exolabtools/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/exolabtools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/fastinfoset/Manifest b/dev-java/fastinfoset/Manifest
new file mode 100644
index 000000000000..9e0ad5a6b14d
--- /dev/null
+++ b/dev-java/fastinfoset/Manifest
@@ -0,0 +1,2 @@
+DIST FastInfoset-1.2.11-sources.jar 255054 SHA256 5d5ffc5002d78edf3c838cc60567447f5dfd3b22fda623afe15a4bd44c92c4f4 SHA512 a1e850e4b235bf767a168dacdaf61f4e1261b6cb50387c3f3cda575f87bed5cf3974c9d04a273baf1aeb47bfa1851aab95432a3890b8bd99f3672c88f0205e3a WHIRLPOOL e20edda9a8d2314cb66c450442260683e701fc5c9fd40ca228c1adf4eacc1967e5ea36423021404df42d396f9b6b562d0a6a727859aa85a53a3976d0e5155ae7
+DIST FastInfoset_src_1.2.1.zip 296557 SHA256 7a72fd95990235b5d07e153e77ca8c372840529b6f2a70e8b66f2da8c0e73d07 SHA512 cc97222787068db91058c997995261d10bac25a35e63fc40d87704bdc9857bb1624e3adaeaa4ff008295cc39e3519354b23a1ebcb43e430864526ddf08b23c36 WHIRLPOOL b5ac27bb5d6e78b9a1d27d8db6196021cf6b5d3a131d6fb0449918a04c7e6bc311d9a4a76a50ddb5e9f4bba25b6337a15a4bf71f2203835443a603b898140151
diff --git a/dev-java/fastinfoset/fastinfoset-1.2.1-r1.ebuild b/dev-java/fastinfoset/fastinfoset-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..374eee8ae4e9
--- /dev/null
+++ b/dev-java/fastinfoset/fastinfoset-1.2.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Fast Infoset"
+HOMEPAGE="https://fi.dev.java.net/"
+SRC_URI="https://fi.dev.java.net/files/documents/2634/45735/FastInfoset_src_${PV}.zip"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="java-virtuals/stax-api"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	mkdir src lib
+	mv com org src/ || die
+
+	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die
+
+	cd "${S}/lib"
+	java-pkg_jar-from --virtual stax-api
+
+}
+
+src_install() {
+
+	java-pkg_newjar fi.jar
+
+	use source && java-pkg_dosrc src/*
+
+}
diff --git a/dev-java/fastinfoset/fastinfoset-1.2.1-r2.ebuild b/dev-java/fastinfoset/fastinfoset-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..a25841aa43cb
--- /dev/null
+++ b/dev-java/fastinfoset/fastinfoset-1.2.1-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Fast Infoset specifies a standardized binary encoding for the XML Information Sets"
+HOMEPAGE="https://fi.java.net/"
+SRC_URI="https://fi.dev.java.net/files/documents/2634/45735/FastInfoset_src_${PV}.zip"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~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/fastinfoset-1.2.11.ebuild b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
new file mode 100644
index 000000000000..02b4efc784ba
--- /dev/null
+++ b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="FastInfoset"
+
+DESCRIPTION="Fast Infoset 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 ppc 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/files/build.xml-1.2.1 b/dev-java/fastinfoset/files/build.xml-1.2.1
new file mode 100644
index 000000000000..15dcdf616a76
--- /dev/null
+++ b/dev-java/fastinfoset/files/build.xml-1.2.1
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<project name="fi" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac debug="false" srcdir="src" destdir="build">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="fi.jar">
+      <fileset dir="build" includes="**/*.class"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/fastinfoset/metadata.xml b/dev-java/fastinfoset/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/fastinfoset/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/fastutil/Manifest b/dev-java/fastutil/Manifest
new file mode 100644
index 000000000000..e3c8907eb13c
--- /dev/null
+++ b/dev-java/fastutil/Manifest
@@ -0,0 +1,4 @@
+DIST fastutil-4.3.1-src.tar.gz 203660 SHA256 90f07cf08c8926451041e52452c3ba486f3000bfbade1d2fa3531fab0d09db4e SHA512 afedd592a891a0ed7a06780f8f1e0bbcdd0f1da6aee8536628e8a61f6dfc0787a23d69e68e1543fcfa9bc410571114a44499f5b302e30796c19f5a5841354a81 WHIRLPOOL b98f8f0a26b78e546bf491ab4fde3ddff8f226f4cf92d6098dddbcc365f419f02cca40b250371b5244ec5713722bcce8830a559430fbe46d24747d8ef4085852
+DIST fastutil-4.4.2-src.tar.gz 213196 SHA256 dff9d53db666a3ad6d1cb88166b05a0d38333fbb3ecd79edcbe968d38da795e7 SHA512 cb438044ee63a89e4e655a41448924d5ac1f61f48839480fc5ba2c08b6317e3e4b0f66b2581ebff73bcb7d865123539ad09029670d7e5d46664f61fe593c503b WHIRLPOOL ea834078c5c189574fd3e79f8b1189c674b31f005404f22701c1209204c7840ff340b471c521d84bd0325f8bf735bac9eb590c927134e7194f36e32925d0ac4f
+DIST fastutil-5.1.3-src.tar.gz 238461 SHA256 fe95b3f66306003bdda1de018120150790205760065d7e31aa8c207c25c3a188 SHA512 67f7ac65afbfd9e5adc415ea65a3b2f334752008e994c7e1ecac334b06a98edad73da549245e39c79709df683f4384c1d0c76f7e8a8cdd428407d547ce0eea47 WHIRLPOOL 2533487909428345f35eebb845f33267f6cd81140206e721eeca1f3f7f94926dc2af9b03dcbdde35799a089ad174e5dd6a052251820558a907579e223ec3b01a
+DIST fastutil-6.5.4-src.tar.gz 376688 SHA256 bc2cc6abb168856c43b9c5f6b468b1cfba4657efd0623a7d7e7800a9e01d966e SHA512 3b75d423ce9e4bb883f1baa910ed59b9ad2fc1ddf52da970f7d40eef6e0044618ce6aeaaa9daf873a256a966cd5bf850004feec21a8e7abf05cc6ac7eb6dd3fb WHIRLPOOL 5ec84a84c9be5dbfb53d69a557b0b26c0658b06b9234da4ed1614afff8ceafbcf3fe38a6b775fdc91202ad0301e2aebb70566dcd8cbae81c3828b7f18be5146d
diff --git a/dev-java/fastutil/fastutil-4.3.1-r1.ebuild b/dev-java/fastutil/fastutil-4.3.1-r1.ebuild
new file mode 100644
index 000000000000..6759ceacf797
--- /dev/null
+++ b/dev-java/fastutil/fastutil-4.3.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+SRC_URI="http://fastutil.dsi.unimi.it/${P}-src.tar.gz"
+HOMEPAGE="http://fastutil.dsi.unimi.it"
+LICENSE="LGPL-2.1"
+SLOT="4.3"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+src_compile() {
+	emake sources || die "failed to make sources"
+	# bug 162650 and #175578 and #183356
+	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
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc java/it
+
+}
diff --git a/dev-java/fastutil/fastutil-4.4.2-r1.ebuild b/dev-java/fastutil/fastutil-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..903af50feaee
--- /dev/null
+++ b/dev-java/fastutil/fastutil-4.4.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+SRC_URI="http://fastutil.dsi.unimi.it/${P}-src.tar.gz"
+HOMEPAGE="http://fastutil.dsi.unimi.it"
+LICENSE="LGPL-2.1"
+SLOT="4.4"
+IUSE=""
+KEYWORDS="amd64 ppc x86"
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+src_compile() {
+	make sources || die "failed to make sources"
+	# bug 162650 and #175578 and #183356
+	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 || die
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc java/it
+}
diff --git a/dev-java/fastutil/fastutil-5.1.3.ebuild b/dev-java/fastutil/fastutil-5.1.3.ebuild
new file mode 100644
index 000000000000..4c8f21c6bd3b
--- /dev/null
+++ b/dev-java/fastutil/fastutil-5.1.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+SRC_URI="http://fastutil.dsi.unimi.it/${P}-src.tar.gz"
+HOMEPAGE="http://fastutil.dsi.unimi.it"
+LICENSE="LGPL-2.1"
+SLOT="5.0"
+IUSE=""
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+src_compile() {
+	emake sources || die "failed to make 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 || die
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc java/it
+}
diff --git a/dev-java/fastutil/fastutil-6.5.4.ebuild b/dev-java/fastutil/fastutil-6.5.4.ebuild
new file mode 100644
index 000000000000..0dea5bc60e73
--- /dev/null
+++ b/dev-java/fastutil/fastutil-6.5.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+SRC_URI="http://fastutil.dsi.unimi.it/${P}-src.tar.gz"
+HOMEPAGE="http://fastutil.dsi.unimi.it"
+
+LICENSE="Apache-2.0"
+SLOT="6.5"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+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
+
+	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..7303cef96964
--- /dev/null
+++ b/dev-java/fastutil/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
new file mode 100644
index 000000000000..d85a1e356a5b
--- /dev/null
+++ b/dev-java/fec/Manifest
@@ -0,0 +1 @@
+DIST fec-1.0.4.tar.bz2 611131 SHA256 978d0ef609ec334ea85e3f70e46a94f6c2cc04393b590a2addfc74e03634b8dd SHA512 45e33fc4b71fcd78a7c5310f2b58df8b83a988500d0de7efebbeade712f5c93d57bbe63fd7dc148ccb1cc6418fc9c79e27be6fe0512e2294c289b192c01ab871 WHIRLPOOL cef5de5b24ddc33f6a85581cd149d3c5887f8f49843df5918158d137b263a58b888149fe68e293bc697db0b7b74e3952fabc1842f8b8f80932de379f2c7bf0d2
diff --git a/dev-java/fec/fec-1.0.4-r1.ebuild b/dev-java/fec/fec-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..089e66f337cb
--- /dev/null
+++ b/dev-java/fec/fec-1.0.4-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="Forword error correction libs"
+HOMEPAGE="http://www.onionnetworks.com/developers/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND="dev-java/log4j
+	dev-java/concurrent-util"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEPEND}"
+EANT_BUILD_TARGET="jars"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	sed -i -e 's/build.compiler=jikes/#build.compiler=jikes/g' build.properties || die
+	sed -i -e 's/test.lib/lib/g' build.properties || die
+	epatch "${FILESDIR}"/${P}-{libfec8path,build,soname}.patch
+
+	eant clean
+	cd lib || die
+	rm -v *.jar || die
+	java-pkg_jar-from log4j
+	java-pkg_jar-from concurrent-util concurrent.jar concurrent-jaxed.jar
+	cd "${S}" || die
+	unzip -q common-20020926.zip || die
+	cd common-20020926 || die
+	eant clean
+	cp -r src/com ../src/ || die
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	cd "${S}"/src/csrc
+	append-flags -fPIC
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die
+}
+
+#there seem to be unit tests, but they are in such a state.
+
+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..3920dcec4c7d
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-build.patch
@@ -0,0 +1,32 @@
+Index: csrc/Makefile
+===================================================================
+--- src/csrc.orig/Makefile
++++ src/csrc/Makefile
+@@ -28,11 +28,8 @@ fec8-jinterf.o: fec-jinterf.c
+ 		-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 @@ fec16-jinterf.o: fec-jinterf.c
+ 		-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..503db7c837eb
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
@@ -0,0 +1,29 @@
+--- src/com/onionnetworks/fec/Native8Code.java	2009-08-21 02:37:00.515004583 +0200
++++ src/com/onionnetworks/fec/Native8Code.java.new	2009-08-21 02:37:57.829254678 +0200
+@@ -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);
++       File path = new File("/usr/lib/libfec8.so");
++       System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
++       System.load(path.getAbsolutePath());
+             initFEC();
+-        } else {
+-            System.out.println("Unable to find native library for fec8 for platform "+NativeDeployer.OS_ARCH);
+-            System.out.println(path);
+-        }
+     }
+ 
+     public Native8Code(int k, int n) {
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/files/libfec8path.patch b/dev-java/fec/files/libfec8path.patch
new file mode 100644
index 000000000000..928e3fec62d3
--- /dev/null
+++ b/dev-java/fec/files/libfec8path.patch
@@ -0,0 +1,27 @@
+--- src/com/onionnetworks/fec/Native8Code.java	2002-09-30 20:19:24.000000000 +0200
++++ src/com/onionnetworks/fec/Native8Code.java.new	2008-03-24 01:38:35.000000000 +0100
+@@ -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,13 +22,9 @@
+     private int code;
+     
+     static {
+-        String path = NativeDeployer.getLibraryPath
+-            (Native8Code.class.getClassLoader(),"fec8");
+-        if (path != null) {
+-            System.load(path);
+-        } else {
+-            System.out.println("Unable to find native library for fec8");
+-        }
++	File path = new File("/usr/lib/libfec8.so");
++	System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
++	System.load(path.getAbsolutePath());
+     }
+     
+     public Native8Code(int k, int n) {
diff --git a/dev-java/fec/metadata.xml b/dev-java/fec/metadata.xml
new file mode 100644
index 000000000000..21237a6e3ed0
--- /dev/null
+++ b/dev-java/fec/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>
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/felix-bundlerepository/Manifest b/dev-java/felix-bundlerepository/Manifest
new file mode 100644
index 000000000000..df5b3358e2e8
--- /dev/null
+++ b/dev-java/felix-bundlerepository/Manifest
@@ -0,0 +1 @@
+DIST org.apache.felix.bundlerepository-1.6.6-source-release.tar.gz 163337 SHA256 cdf1a16e2cd1779f403d58225666c6eee6e4018e9775d195f227b77ae9a88da4 SHA512 a457dacf0b15a54aad9290a3620b4dee503bb7d06eac1e2e9b151613caafdd53b104e8266b10321d04d0fb400df6f9f2131ed03f48bf166205903aa69f260b46 WHIRLPOOL 9d0fea404c7f34b3ed6b5f4edfaf610a01915a2d069b4324f78537233011fc1ef57251ffda5c80b0400cb3283f1c6f863df049bcb8643646158178b2ede337ec
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..1dbff6813c73
--- /dev/null
+++ b/dev-java/felix-bundlerepository/felix-bundlerepository-1.6.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${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..838c00a4a448
--- /dev/null
+++ b/dev-java/felix-bundlerepository/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/felix-gogo-command/Manifest b/dev-java/felix-gogo-command/Manifest
new file mode 100644
index 000000000000..da1fe4f46717
--- /dev/null
+++ b/dev-java/felix-gogo-command/Manifest
@@ -0,0 +1 @@
+DIST org.apache.felix.gogo.command-0.12.0-project.tar.gz 26454 SHA256 f74d036b7d289ab628d8ade36127cecd332d2383f9500f8fc905f9b80fd09a8c SHA512 8d7afa4b34be6460df9e1e91ecc42b34ecfc1888f5574add206a3c6fbc54647672e34d4f3a4e59eb39f8b2b9fd94b468647c0e95d5fc04649ab7a283e172a061 WHIRLPOOL 443415eba35fd07c3874d58803c628fc4e6f7f2670612a8b711a1cd765bb451d5bd0a55b917c54f054a538969342470b0afe60e89b549d1f6d707aa14eaed99d
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..e157c9c5410c
--- /dev/null
+++ b/dev-java/felix-gogo-command/felix-gogo-command-0.12.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${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..838c00a4a448
--- /dev/null
+++ b/dev-java/felix-gogo-command/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/felix-gogo-runtime/Manifest b/dev-java/felix-gogo-runtime/Manifest
new file mode 100644
index 000000000000..15fc2b4ab0d1
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/Manifest
@@ -0,0 +1 @@
+DIST org.apache.felix.gogo.runtime-0.10.0-project.tar.gz 69837 SHA256 474e62ffbb5b5f6d0d3aa22086ee2ae76122ceb8c2eeb19a042e20046dfdb6d4 SHA512 a71100796e400103cf9d46fcdb7bf45b5d1d180328db27900915c1771650297c9135589dc91e4c2194634b4312ea7c064b71496a7e11e9a3393bdc6eeb70e03d WHIRLPOOL 9667ce09ee913339c8a76fbe3f0da157707a2fef43214ef99fe13bb86e1633c4ef573bf81c629655c6451a88288924569501d13671f5a8d2058d941be98838b0
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..73cebd7d9cff
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5
+	dev-java/osgi-compendium:0
+	dev-java/osgi-core-api:0"
+
+RDEPEND=">=virtual/jre-1.5"
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/felix-gogo-runtime/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/felix-shell/Manifest b/dev-java/felix-shell/Manifest
new file mode 100644
index 000000000000..b4689091bc8c
--- /dev/null
+++ b/dev-java/felix-shell/Manifest
@@ -0,0 +1 @@
+DIST org.apache.felix.shell-1.4.3-source-release.tar.gz 75190 SHA256 daea2ae1cd3e28dbbcf5da964ffa5b6cb37ccc102dc070b878203900e8bf292a SHA512 fe1b3927789a18626715e52a634fa069fdd1505f425a48d76ec6abbb181f511ff5a3af176c70f634241830b185d32cd7eb71a271d62a754366141cd959cb54a4 WHIRLPOOL 6836e3503a26b887997786f2214b32eca527b9b28b98fb9a54179be756fd15f1d41a531ae54bfada956a7a8e66444464b0cd6203b240fb7c283059ae2a90f422
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..57d4c6dd2198
--- /dev/null
+++ b/dev-java/felix-shell/felix-shell-1.4.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5
+	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.5"
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/felix-shell/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/felix-utils/Manifest b/dev-java/felix-utils/Manifest
new file mode 100644
index 000000000000..74c8f4161afc
--- /dev/null
+++ b/dev-java/felix-utils/Manifest
@@ -0,0 +1 @@
+DIST org.apache.felix.utils-1.2.0-source-release.tar.gz 36109 SHA256 281872667d5968875f5f5b12878145c7f184ffb89d3ddf8ad757070e0722105c SHA512 4b3a16abc92963c16c363791423483c14eb02792cc65d58a884777c6be25b05a226492280cf2f77183ad5b86cb5710076a118a58af34f6c717273bfdf93bc171 WHIRLPOOL a9422c4fda79d1ba32cfff923d911a4e91fab463c8de0b870f43daf683222f86963690834df1d37a67f3cba4849a1f85433f7239abd100abfa1c6ef3a1d6b91c
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..235bf21e41f3
--- /dev/null
+++ b/dev-java/felix-utils/felix-utils-1.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5
+	dev-java/felix-gogo-runtime:0
+	dev-java/osgi-compendium:0
+	dev-java/osgi-core-api:0"
+
+RDEPEND=">=virtual/jre-1.5"
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/felix-utils/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/flute/Manifest b/dev-java/flute/Manifest
new file mode 100644
index 000000000000..936582ecd2d6
--- /dev/null
+++ b/dev-java/flute/Manifest
@@ -0,0 +1 @@
+DIST flutejava-1.3.zip 270464 SHA256 57abb83e042088a1956d6d92933ff84d6d3839e0b8477b90d77ebce5cbe3e78b SHA512 eff6ee0e863a18ba4a6d4758550cb3df9fdf1a76aadee33d14cef7b067ada06e66841a51511b8cd7f9af6c34b7e229312b223170f95d9003343ba1c0aa75ff32 WHIRLPOOL c09983d49a8a715b9283fc67d0cd7058f4cd21e311e73f986b78ce5633cfa72438740efb1c48c4c4ee4da6479000382d0b7e23cbe6a15c3c34c424c4b0aae6ac
diff --git a/dev-java/flute/files/1.3-rename-enum.patch b/dev-java/flute/files/1.3-rename-enum.patch
new file mode 100644
index 000000000000..03e251a02f9c
--- /dev/null
+++ b/dev-java/flute/files/1.3-rename-enum.patch
@@ -0,0 +1,15 @@
+diff --git a/flute-1.3/org/w3c/flute/parser/Parser.java b/flute-1.3/org/w3c/flute/parser/Parser.java
+index 3048834..55fec8b 100644
+--- a/flute-1.3/org/w3c/flute/parser/Parser.java
++++ b/flute-1.3/org/w3c/flute/parser/Parser.java
+@@ -3497,8 +3497,8 @@ Token language;
+         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 enumeration = jj_expentries.elements(); enumeration.hasMoreElements();) {
++        int[] oldentry = (int[])(enumeration.nextElement());
+         if (oldentry.length == jj_expentry.length) {
+           exists = true;
+           for (int i = 0; i < jj_expentry.length; i++) {
diff --git a/dev-java/flute/files/build.xml b/dev-java/flute/files/build.xml
new file mode 100644
index 000000000000..2ba349baece8
--- /dev/null
+++ b/dev-java/flute/files/build.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<project name="flute" default="jar">
+	<!-- some properties -->
+	<property name="src" value="src" />
+	<property name="build" value="build" />
+	<property name="dist" value="dist"/>
+
+	<property name="jarfile" value="${ant.project.name}.jar"/>
+
+   <property file="build.properties"/>
+
+	<!-- init -->
+   <target name="init">
+      <tstamp/>
+	   <mkdir dir="${dist}"/>
+	   <mkdir dir="${build}"/>
+   </target>	
+
+	<!-- compile everything -->
+   <target name="compile" depends="init">
+      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
+   </target>
+
+	<!-- build the jar file -->
+   <target name="jar" depends="compile">
+      <jar jarfile="${dist}/${jarfile}" basedir="${build}"/>
+   </target>
+	
+	<!-- clean up -->
+   <target name="clean">
+	   <delete dir="${build}"/>
+	   <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/flute/flute-1.3-r1.ebuild b/dev-java/flute/flute-1.3-r1.ebuild
new file mode 100644
index 000000000000..eea4cf96bc6c
--- /dev/null
+++ b/dev-java/flute/flute-1.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Flute is an implementation for SAC"
+HOMEPAGE="http://www.w3.org/Style/CSS/SAC/"
+SRC_URI="http://www.w3.org/2002/06/flutejava-${PV}.zip"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="dev-java/sac"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}
+	app-arch/unzip"
+
+src_unpack() {
+	unpack ${A}
+
+	cp "${FILESDIR}/build.xml" "${S}"
+
+	cd "${S}"
+	rm -v flute.jar || die
+
+	mkdir src
+	mv org src
+	echo "classpath=$(java-pkg_getjars sac)" > "${S}"/build.properties
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar "${S}"/dist/flute.jar
+
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc "${S}"/src/*
+}
diff --git a/dev-java/flute/flute-1.3-r2.ebuild b/dev-java/flute/flute-1.3-r2.ebuild
new file mode 100644
index 000000000000..1e7aec1235c7
--- /dev/null
+++ b/dev-java/flute/flute-1.3-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="sac"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Flute is an implementation for SAC"
+HOMEPAGE="http://www.w3.org/Style/CSS/SAC/"
+SRC_URI="http://www.w3.org/2002/06/flutejava-${PV}.zip"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="dev-java/sac"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}
+	app-arch/unzip"
+
+java_prepare() {
+	rm -v flute.jar || die
+	epatch "${FILESDIR}"/${PV}-rename-enum.patch
+	cp "${FILESDIR}/build.xml" "${S}" || die
+	mkdir src || die
+	mv org src || die
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar "${S}"/dist/flute.jar
+
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc "${S}"/src/*
+}
diff --git a/dev-java/flute/metadata.xml b/dev-java/flute/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/flute/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/flyingsaucer/Manifest b/dev-java/flyingsaucer/Manifest
new file mode 100644
index 000000000000..4593bdacc0bb
--- /dev/null
+++ b/dev-java/flyingsaucer/Manifest
@@ -0,0 +1 @@
+DIST flyingsaucer-R7final-src.zip 7058444 SHA256 d4539358ae08b5278334ec66beea78a821c9e6fba1db6159317e4c94fb2bf135 SHA512 14c26a10f3493f3b9fc1fe5d3d11591cf4c09d781d1d2cccf5de15d4b5a0108f8780e168c32968338b82c7929cb083cc47aab539c53d140860505ff0e05f9135 WHIRLPOOL 742e2e0bab959e77d8363fec4e9dd234746b25c56401fee4e0796476411ab0b071ee682366b82ca0350ee66e62b60a5116ed3aa81a33ff1ecaded98cd74a5de3
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..2ad2cd284d9d
--- /dev/null
+++ b/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7cac896c1d96
--- /dev/null
+++ b/dev-java/flyingsaucer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+
+	<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..fb65326be258
--- /dev/null
+++ b/dev-java/fontbox/Manifest
@@ -0,0 +1,2 @@
+DIST FontBox-0.1.0.zip 6300997 SHA256 83f8d121753589f4b2a558bdb028b3ebbad0a6c07cf1bc0be6d0dd6bf9091aa0 SHA512 56f5c5a86339a9842953cd722f61b1546fd769875f91ce512fdec6d43d145dac63c37d45e2b9466b69bb6ea8f76e12aad25b86db9e3a29560528f16930acd9e1 WHIRLPOOL 70a74788bed28f2386cc66a2d22b9c1cb7cb396a012ae4a2291872e8c6616b9bbb585ccf128f80cb0cb4719979058671d250fdccdf04628dd06d94695075b8fc
+DIST pdfbox-1.7.1-src.zip 9167805 SHA256 805c6b893ff10216cc826aa44e7a2eaf35bb43ca8ed19896c43132d253d3145e SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0 WHIRLPOOL 438fcd6f2d0128b972dfd5be83b2bc455daf9f126ac5b7a6a5de8a41e29f482b462e8e48e07a21ac1e896de4daa5ffed2eee400ec96ac93fbbce25fef99b0ade
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-0.1.0.ebuild b/dev-java/fontbox/fontbox-0.1.0.ebuild
new file mode 100644
index 000000000000..bd0591b57ca5
--- /dev/null
+++ b/dev-java/fontbox/fontbox-0.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An open source Java library for parsing font files"
+HOMEPAGE="http://www.fontbox.org/"
+MY_PN=FontBox
+MY_P=${MY_PN}-${PV}
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+		dev-java/ant-core
+		app-arch/unzip
+		source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v lib/*.jar
+}
+
+EANT_BUILD_TARGET="package"
+
+#These are not in the zip
+#Probably only in CVS
+#src_test() {
+#	eant junit
+#}
+
+src_install() {
+	java-pkg_newjar ./lib/${MY_P}.jar ${PN}.jar
+	mv docs/javadoc . || die
+	dohtml -r docs/*
+	use doc && java-pkg_dojavadoc javadoc/
+	mv javadoc docs
+	use source && java-pkg_dosrc src/org
+}
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..a76a66d439a7
--- /dev/null
+++ b/dev-java/fontbox/fontbox-1.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/metadata.xml b/dev-java/fontbox/metadata.xml
new file mode 100644
index 000000000000..881262b01871
--- /dev/null
+++ b/dev-java/fontbox/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+
+	<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>
+</pkgmetadata>
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
new file mode 100644
index 000000000000..a8f5451b53c9
--- /dev/null
+++ b/dev-java/fop/Manifest
@@ -0,0 +1 @@
+DIST fop-2.0-src.zip 26381859 SHA256 70da9622ce25891d989b8ab25692738c5dd6eb2de6ee9b9300d5487f0378d2ec SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a WHIRLPOOL cfd0ec06fba6fe089fb0bea803668e8c89f80eddd198efda20573274ea0cfa750248f12b50827ab89571a4923f51b307d241ff0a4f236cf4a6e28ea49c8d1ac7
diff --git a/dev-java/fop/fop-2.0-r1.ebuild b/dev-java/fop/fop-2.0-r1.ebuild
new file mode 100644
index 000000000000..826c826ef09a
--- /dev/null
+++ b/dev-java/fop/fop-2.0-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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 x86 ppc ppc64 ~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
+
+	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..250f2d1940ea
--- /dev/null
+++ b/dev-java/fop/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/forehead/Manifest b/dev-java/forehead/Manifest
new file mode 100644
index 000000000000..fc2532ca05fd
--- /dev/null
+++ b/dev-java/forehead/Manifest
@@ -0,0 +1 @@
+DIST forehead-1.0_beta5.tbz2 15665 SHA256 2dd7e239a1a1f2913a3c815a54ceb1a1429540b24a1e42ead21c3b056d7d226a SHA512 1558b0d26a4df210dfd188839e4feb8a8b2369fb514c82f99fdd337cec3520e3555ce7999e2bb11459de4ea04db0820d729c9ebf762fd5bbd91ef56a30c6f0be WHIRLPOOL cdce92bbdcf7d4036d3e68ad7ed819849bf7d941bedaf1c1880c3f364fd2ea73d179cf594e63a56aa2bf5225778ff64d0d07d3d5b6d6f630b2b125d26ea17b70
diff --git a/dev-java/forehead/files/build.xml b/dev-java/forehead/files/build.xml
new file mode 100644
index 000000000000..8500031afabb
--- /dev/null
+++ b/dev-java/forehead/files/build.xml
@@ -0,0 +1,26 @@
+<project name="forehead" default="jar" basedir=".">
+   <property name="src" value="src"/>
+   <property name="build" value="build"/>
+   <property name="dest" value="dest"/>
+   <property name="docs" value="docs"/>
+   <property name="packages" value="com.werken.forehead.*"/>
+   
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${build}"/>
+      <mkdir dir="${dest}"/>
+      <mkdir dir="${docs}"/>
+   </target>
+
+   <target name="compile" depends="init">
+      <javac srcdir="${src}" destdir="${build}"/>
+   </target>
+
+   <target name="jar" depends="compile">
+      <jar destfile="${dest}/forehead-${version}.jar" basedir="${build}"/>
+   </target>
+
+   <target name="javadoc" depends="compile,jar">
+      <javadoc packagenames="${packages}" sourcepath="${src}/java" destdir="${docs}"/>
+   </target>
+</project>
diff --git a/dev-java/forehead/forehead-1.0_beta5-r1.ebuild b/dev-java/forehead/forehead-1.0_beta5-r1.ebuild
new file mode 100644
index 000000000000..098cbb878168
--- /dev/null
+++ b/dev-java/forehead/forehead-1.0_beta5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A framework to assist in controlling the run-time ClassLoader"
+HOMEPAGE="http://forehead.werken.com"
+SRC_URI="mirror://gentoo/forehead-${PV}.tbz2"
+
+LICENSE="Werken-1.1.1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.3
+		dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.3"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Copy over the new build.xml
+	cp "${FILESDIR}"/build.xml "${S}" || die
+}
+
+src_compile() {
+	eant jar -Dversion=${PV} $(use_doc)
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/dest/forehead-${PV}.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/{java,misc}
+}
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..432221e3c430
--- /dev/null
+++ b/dev-java/forehead/forehead-1.0_beta5-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+LICENSE="Werken-1.1.1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
+
+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..604e0a4238bb
--- /dev/null
+++ b/dev-java/forehead/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/freehep-export/Manifest b/dev-java/freehep-export/Manifest
new file mode 100644
index 000000000000..d7c477f7620c
--- /dev/null
+++ b/dev-java/freehep-export/Manifest
@@ -0,0 +1 @@
+DIST freehep-export-2.1.1-sources.jar 11634 SHA256 c82928fb1c5bf8e6f2787a6847230f071904350d59ea6e9bf3e13d8b3f2ba3cb SHA512 32ef3c5b7a8a741af7ebaff0a9043f4211ba7a2369e6d3c3100240dffce37c0f38c39fbae1b0ca206f0546407ab94ee1b795c7004dbdbacd1d48039f3762e301 WHIRLPOOL b61bc5058796c912dbccc2dd887f3e64105280115ae074b0ae751d91d06e634817c2cef820fae2cc235a3779ebc2e72bbece7630c10295ac419346bc1530e396
diff --git a/dev-java/freehep-export/freehep-export-2.1.1.ebuild b/dev-java/freehep-export/freehep-export-2.1.1.ebuild
new file mode 100644
index 000000000000..ea5b69ceb9f1
--- /dev/null
+++ b/dev-java/freehep-export/freehep-export-2.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Export and Save As Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-swing-2.0.3
+	dev-java/freehep-misc-deps
+	dev-java/freehep-util"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-swing,freehep-misc-deps,freehep-util"
diff --git a/dev-java/freehep-export/metadata.xml b/dev-java/freehep-export/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-export/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphics2d/Manifest b/dev-java/freehep-graphics2d/Manifest
new file mode 100644
index 000000000000..8bded0a230e0
--- /dev/null
+++ b/dev-java/freehep-graphics2d/Manifest
@@ -0,0 +1 @@
+DIST freehep-graphics2d-2.1.1-sources.jar 85104 SHA256 08a34bd74c4b263a3ccdae1d3e578f52a57473bbb248eaeac5b39c165f57a281 SHA512 18c93af064cdf4edb2d5cbdc7ed7eae57dbe472720bf197b7ea35fc884b3ece6dfb383e4e56d86b7d1c78ca1f5427f471d862dbc82d5538c2e1848b665376c36 WHIRLPOOL d0f21489f84dd96254c9b997148c685fc7caeb11c78b06d3bf6947db32f364a60d9b3007ada381445c99ecccb172217e5e44427ba1580c20e82f4bc4014e0895
diff --git a/dev-java/freehep-graphics2d/freehep-graphics2d-2.1.1.ebuild b/dev-java/freehep-graphics2d/freehep-graphics2d-2.1.1.ebuild
new file mode 100644
index 000000000000..1949c866684d
--- /dev/null
+++ b/dev-java/freehep-graphics2d/freehep-graphics2d-2.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Graphics 2D Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-util-2.0.2"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-util"
diff --git a/dev-java/freehep-graphics2d/metadata.xml b/dev-java/freehep-graphics2d/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-graphics2d/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-emf/Manifest b/dev-java/freehep-graphicsio-emf/Manifest
new file mode 100644
index 000000000000..e598c6ae3b4a
--- /dev/null
+++ b/dev-java/freehep-graphicsio-emf/Manifest
@@ -0,0 +1 @@
+DIST freehep-graphicsio-emf-2.1.1-sources.jar 131325 SHA256 c7b32d145be3aedf8adfe679359852c5dc8994d3a70b55f32bfeae85ebb3d629 SHA512 d5f971bb9ff8c5860b26e2e6cb02453db7a088349a2ce9840f8375b586f7911f5f1640b8e47e11c1afd8d7f04934f5f68722f276b22e8a0c28ef3d080d329cad WHIRLPOOL 8b505aaee85196dfb4b6912cfdcb9297a979ea1cf236f5a33c2664263d525012b80dad8180038f2427362ef314b637ceeb009fd47980f42e6d956d634873baf4
diff --git a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.1.1.ebuild b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.1.1.ebuild
new file mode 100644
index 000000000000..528bbffab4d0
--- /dev/null
+++ b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Enhanced Metafile Format Driver"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-util-2.0.2
+	>=dev-java/freehep-graphicsio-2.1.1
+	>=dev-java/freehep-graphicsio-tests-2.1.1
+	dev-java/jdom
+	dev-java/junit
+	dev-java/freehep-misc-deps
+	dev-java/freehep-util
+	dev-java/freehep-swing
+	dev-java/freehep-graphics2d
+	dev-java/freehep-io
+	dev-java/freehep-export"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-util,freehep-graphicsio,freehep-graphicsio-tests,jdom-1.0,junit,freehep-misc-deps,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
diff --git a/dev-java/freehep-graphicsio-emf/metadata.xml b/dev-java/freehep-graphicsio-emf/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-graphicsio-emf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-java/Manifest b/dev-java/freehep-graphicsio-java/Manifest
new file mode 100644
index 000000000000..52b1bb4a2416
--- /dev/null
+++ b/dev-java/freehep-graphicsio-java/Manifest
@@ -0,0 +1 @@
+DIST freehep-graphicsio-java-2.1.1-sources.jar 15769 SHA256 4c17cd226f155af13524184107e5da6b1a12817eb16fc92b0f5d90471c46686f SHA512 2418e985671f64b5eb7b433760f7049b91c9542f06d9e610fbb044a8d75be071f88e1e8a1e90e5fb025538841b642315a85afd3a39592e8b3742686348e1181f WHIRLPOOL 563bb0ce94a08cb181aa51d39cb927cff670e22fae8a38006bf5ce34785bfd77a82dbd14a12f3f5d70fa4edc1cbe3fd4ec9c3286195d8ddf9bafdc406e537589
diff --git a/dev-java/freehep-graphicsio-java/freehep-graphicsio-java-2.1.1.ebuild b/dev-java/freehep-graphicsio-java/freehep-graphicsio-java-2.1.1.ebuild
new file mode 100644
index 000000000000..cb7b42fcb9df
--- /dev/null
+++ b/dev-java/freehep-graphicsio-java/freehep-graphicsio-java-2.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Java Driver"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-graphicsio-2.1.1
+	>=dev-java/freehep-graphicsio-tests-2.1.1
+	dev-java/junit
+	dev-java/freehep-util
+	dev-java/freehep-swing
+	dev-java/freehep-graphics2d
+	dev-java/freehep-io
+	dev-java/freehep-export"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-graphicsio,freehep-graphicsio-tests,junit,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
diff --git a/dev-java/freehep-graphicsio-java/metadata.xml b/dev-java/freehep-graphicsio-java/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-graphicsio-java/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-pdf/Manifest b/dev-java/freehep-graphicsio-pdf/Manifest
new file mode 100644
index 000000000000..42509d667277
--- /dev/null
+++ b/dev-java/freehep-graphicsio-pdf/Manifest
@@ -0,0 +1 @@
+DIST freehep-graphicsio-pdf-2.1.1-sources.jar 45381 SHA256 d1aebea3833c8b54c4bdb640a62733f3b02b4afabe19544cb22f65bbaa9d4aaf SHA512 e6e54998b80466d750a6b7bb33d3c1c68903213a474a02d8baf36fedacbab3b8f5c4291b26ba9f0206219b0f3737b14e11d3e97b7a3f25d951a4fda93ea2c2c4 WHIRLPOOL faccf1c0dcd924be2ebb6e4f977e5d6567d65b9350a246c5cd10dd53dd5eb075ea0df79ef0a2d3e79f70860642d47f09afd069a9f6c06f8400f45cadfd8b4256
diff --git a/dev-java/freehep-graphicsio-pdf/freehep-graphicsio-pdf-2.1.1.ebuild b/dev-java/freehep-graphicsio-pdf/freehep-graphicsio-pdf-2.1.1.ebuild
new file mode 100644
index 000000000000..a3c38b08565f
--- /dev/null
+++ b/dev-java/freehep-graphicsio-pdf/freehep-graphicsio-pdf-2.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Portable Document Format Driver"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-graphicsio-2.1.1
+	>=dev-java/freehep-graphicsio-tests-2.1.1
+	dev-java/junit
+	dev-java/freehep-util
+	dev-java/freehep-swing
+	dev-java/freehep-graphics2d
+	dev-java/freehep-io
+	dev-java/freehep-export"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-graphicsio,freehep-graphicsio-tests,junit,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
diff --git a/dev-java/freehep-graphicsio-pdf/metadata.xml b/dev-java/freehep-graphicsio-pdf/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-graphicsio-pdf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-ps/Manifest b/dev-java/freehep-graphicsio-ps/Manifest
new file mode 100644
index 000000000000..01f769e4da93
--- /dev/null
+++ b/dev-java/freehep-graphicsio-ps/Manifest
@@ -0,0 +1 @@
+DIST freehep-graphicsio-ps-2.1.1-sources.jar 35182 SHA256 b30dd04bc787e3d31d1ff72918dba95a51a9720fc7f5f5d285c584749c75ed6b SHA512 af1625aa40a0eb8e5c792d1f02e51e1ac485f250e192fa8b46d6e9c2837376b1dd0bfc4e2727d0a03e40ccdb34b8615330a09593387ff0febd5c846f74964e65 WHIRLPOOL 824057dc44e5b46a6ee139463065a268c1d1a575490bc20ff0c77a2448b789cea88e63eae38410170139e72eb20ede2e32af45ae76bf44e34c3b17f20d3d2cf1
diff --git a/dev-java/freehep-graphicsio-ps/freehep-graphicsio-ps-2.1.1.ebuild b/dev-java/freehep-graphicsio-ps/freehep-graphicsio-ps-2.1.1.ebuild
new file mode 100644
index 000000000000..2930c0b57ad0
--- /dev/null
+++ b/dev-java/freehep-graphicsio-ps/freehep-graphicsio-ps-2.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP (Encapsulated) PostScript Driver"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-graphicsio-2.1.1
+	>=dev-java/freehep-graphicsio-tests-2.1.1
+	dev-java/junit
+	dev-java/freehep-util
+	dev-java/freehep-swing
+	dev-java/freehep-graphics2d
+	dev-java/freehep-io
+	dev-java/freehep-export"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-graphicsio,freehep-graphicsio-tests,junit,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
diff --git a/dev-java/freehep-graphicsio-ps/metadata.xml b/dev-java/freehep-graphicsio-ps/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-graphicsio-ps/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-svg/Manifest b/dev-java/freehep-graphicsio-svg/Manifest
new file mode 100644
index 000000000000..924e092b0648
--- /dev/null
+++ b/dev-java/freehep-graphicsio-svg/Manifest
@@ -0,0 +1 @@
+DIST freehep-graphicsio-svg-2.1.1-sources.jar 16943 SHA256 f9182db42a831634792144e9937c7669f54ca03e79af02441f08833d89cb1647 SHA512 da5959f58ba315d163eeee0b6ca5cb39d2f5b608117091d4257c7f791b16e8626e27c82f59b2ff547258c150b40096d311ecf7d5148e59daaa5e67d94dad2e8f WHIRLPOOL 46cf8fcd83775ac04b32e682d6f734fac797139e1bf8f8e074b57d4683dd2402d8aaf70de00b8b95429bcb9c859090b11a74c33ebcc303429e7f61e07713b611
diff --git a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.1.1.ebuild b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.1.1.ebuild
new file mode 100644
index 000000000000..a75d299b219b
--- /dev/null
+++ b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Scalable Vector Graphics Driver"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/freehep-xml
+	>=dev-java/freehep-graphicsio-2.1.1
+	>=dev-java/freehep-graphicsio-tests-2.1.1
+	dev-java/junit
+	dev-java/freehep-util
+	dev-java/freehep-swing
+	dev-java/freehep-graphics2d
+	dev-java/freehep-io
+	dev-java/freehep-export"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-xml,freehep-graphicsio,freehep-graphicsio-tests,junit,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
diff --git a/dev-java/freehep-graphicsio-svg/metadata.xml b/dev-java/freehep-graphicsio-svg/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-graphicsio-svg/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-swf/Manifest b/dev-java/freehep-graphicsio-swf/Manifest
new file mode 100644
index 000000000000..d57749607b26
--- /dev/null
+++ b/dev-java/freehep-graphicsio-swf/Manifest
@@ -0,0 +1 @@
+DIST freehep-graphicsio-swf-2.1.1-sources.jar 81470 SHA256 f360351e8c35d82beb5a4b77da00a9268c4a59abd84a47c9cc855339a7300504 SHA512 4e0ca9c1cc83e2e06bc578e10807ef094fda789f53796444ea9d81b0bb0730ff53c4fce5c942c9911b8475706ad3e92e94645ce78e2291793d170c28c85c4dc4 WHIRLPOOL b79c9da87063aa7c99dc5e94be23961f0d53f26c931bd264b4fba9cd09417883b979a06ca2653d805c59b8bf1bb8bf07e92770277b1f453e5730ad3178dfce2a
diff --git a/dev-java/freehep-graphicsio-swf/freehep-graphicsio-swf-2.1.1.ebuild b/dev-java/freehep-graphicsio-swf/freehep-graphicsio-swf-2.1.1.ebuild
new file mode 100644
index 000000000000..41697363fd0a
--- /dev/null
+++ b/dev-java/freehep-graphicsio-swf/freehep-graphicsio-swf-2.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP SWF (Flash) Driver"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-graphicsio-2.1.1
+	>=dev-java/freehep-graphicsio-tests-2.1.1
+	dev-java/junit
+	dev-java/freehep-misc-deps
+	dev-java/freehep-util
+	dev-java/freehep-swing
+	dev-java/freehep-graphics2d
+	dev-java/freehep-io
+	dev-java/freehep-export"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-graphicsio,freehep-graphicsio-tests,junit,freehep-misc-deps,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
diff --git a/dev-java/freehep-graphicsio-swf/metadata.xml b/dev-java/freehep-graphicsio-swf/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-graphicsio-swf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio-tests/Manifest b/dev-java/freehep-graphicsio-tests/Manifest
new file mode 100644
index 000000000000..42cdbae1c862
--- /dev/null
+++ b/dev-java/freehep-graphicsio-tests/Manifest
@@ -0,0 +1 @@
+DIST freehep-graphicsio-tests-2.1.1-sources.jar 66076 SHA256 bcde7ffa56ed65195462fec89cb6b17c9701360831e7e0d37e9b4e275d9c5bf9 SHA512 a29110346620c249000e06873a4905c56f71f54f278423edb07d860f13466c71dedcb70affc3ed53d6a9f6e404583aed0feebe944c6b741e755186306b94acb4 WHIRLPOOL d6ed888e90692c047c1799c6e922ab4b5460ca776b55278f6fdfabc0acde34c58149583c2eb263754b06a51e975d8d7fec0a467c2e71f6280ccd03ce82f6d3f1
diff --git a/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.1.1.ebuild b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.1.1.ebuild
new file mode 100644
index 000000000000..06d5c816c354
--- /dev/null
+++ b/dev-java/freehep-graphicsio-tests/freehep-graphicsio-tests-2.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP GraphicsIO Test Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/freehep-export
+	>=dev-java/freehep-graphicsio-2.1.1
+	dev-java/junit
+	dev-java/freehep-misc-deps
+	dev-java/freehep-util
+	dev-java/freehep-swing
+	dev-java/freehep-graphics2d
+	dev-java/freehep-io
+	dev-java/freehep-export"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-export,freehep-graphicsio,junit,freehep-misc-deps,freehep-util,freehep-swing,freehep-graphics2d,freehep-io,freehep-export"
diff --git a/dev-java/freehep-graphicsio-tests/metadata.xml b/dev-java/freehep-graphicsio-tests/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-graphicsio-tests/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-graphicsio/Manifest b/dev-java/freehep-graphicsio/Manifest
new file mode 100644
index 000000000000..2940a9f29930
--- /dev/null
+++ b/dev-java/freehep-graphicsio/Manifest
@@ -0,0 +1 @@
+DIST freehep-graphicsio-2.1.1-sources.jar 636244 SHA256 744fe063505a492fb0fccb0a8890a5cb8a20a9c30276d676ca5bcf6bb2d859bd SHA512 ea6df974c0e7c1fa6ad72dc698434d9c33030a55d0f6cd96b5b5b381ef29ad7d88f25c09581056ef015acfd8a53fb8cb84151fe9748e5d30f8454c1bd14f643e WHIRLPOOL 34fd59acd8556f9b86e72d305db875c81f38b59b82a7618cf1f7b6470bd4fed8eb70a9feaa90591151866972a67c25a4a7f40ca7893c32eb433dabea986265cd
diff --git a/dev-java/freehep-graphicsio/freehep-graphicsio-2.1.1.ebuild b/dev-java/freehep-graphicsio/freehep-graphicsio-2.1.1.ebuild
new file mode 100644
index 000000000000..9fd78da88253
--- /dev/null
+++ b/dev-java/freehep-graphicsio/freehep-graphicsio-2.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP GraphicsIO Base Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-graphics2d-2.1.1
+	dev-java/freehep-export
+	dev-java/freehep-io
+	dev-java/freehep-util
+	dev-java/freehep-swing"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-graphics2d,freehep-export,freehep-io,freehep-util,freehep-swing"
diff --git a/dev-java/freehep-graphicsio/metadata.xml b/dev-java/freehep-graphicsio/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-graphicsio/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-io/Manifest b/dev-java/freehep-io/Manifest
new file mode 100644
index 000000000000..0e3c38942d88
--- /dev/null
+++ b/dev-java/freehep-io/Manifest
@@ -0,0 +1 @@
+DIST freehep-io-2.0.2-sources.jar 58815 SHA256 806f3404bb1d29a68d5bf198611ce1634cb3296f533430edababab35d77b19ea SHA512 a04e39ffeb69c215f897d09e1adeb083477cd54d1ea5e73bbbac7161c54d181db70d690e4684871eaf137ece3c056862f8ab8a460f6de91d3e072ac84d6c1e82 WHIRLPOOL 6b30c46840a99b5e9d13dde5ab474d51ba748ba1b4b2f795a45b1748e6e508ff8acb1a6485ff40fe57ad78e3cf1b733b3f81d1ea6e2f55d8b484b930b67c08f6
diff --git a/dev-java/freehep-io/freehep-io-2.0.2.ebuild b/dev-java/freehep-io/freehep-io-2.0.2.ebuild
new file mode 100644
index 000000000000..b2b594afaead
--- /dev/null
+++ b/dev-java/freehep-io/freehep-io-2.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP I/O Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-util-2.0.1
+	dev-java/junit"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-util,junit"
diff --git a/dev-java/freehep-io/metadata.xml b/dev-java/freehep-io/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-io/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-mcfio/Manifest b/dev-java/freehep-mcfio/Manifest
new file mode 100644
index 000000000000..fef88fdf47f4
--- /dev/null
+++ b/dev-java/freehep-mcfio/Manifest
@@ -0,0 +1 @@
+DIST freehep-mcfio-2.0.1-sources.jar 11234 SHA256 f46536d338a45c0e00ca3375502e72cc46853b0063d1b2f3662b46b2660b0f32 SHA512 e1d8fb8ff369b0209e3660b05383bd4347f5dcdb5845ddba64c4fb9c22840cbeb71bf6e05fb180d98b2c04a5e08c09c443ea6dcf18c790d46fbaf7eca7efbfca WHIRLPOOL 56e0fbfd95c4ba34c7947326470504cb1faa46135a2f042de1874f39a172533671af631117535319d60caca445bee64882ec4362856d1f683cefebf4912993f8
diff --git a/dev-java/freehep-mcfio/freehep-mcfio-2.0.1.ebuild b/dev-java/freehep-mcfio/freehep-mcfio-2.0.1.ebuild
new file mode 100644
index 000000000000..8f7db896b51e
--- /dev/null
+++ b/dev-java/freehep-mcfio/freehep-mcfio-2.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP MCFIO Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-xdr-2.0.3
+	>=dev-java/junit-3.8.2"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-xdr,junit"
diff --git a/dev-java/freehep-mcfio/metadata.xml b/dev-java/freehep-mcfio/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-mcfio/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-misc-deps/Manifest b/dev-java/freehep-misc-deps/Manifest
new file mode 100644
index 000000000000..9afa2c5c2993
--- /dev/null
+++ b/dev-java/freehep-misc-deps/Manifest
@@ -0,0 +1,6 @@
+DIST JAS-1.0.hbook 1691648 SHA256 d71ecf58ac7f9915ea1620d7e8948f81dc6b50fa800bf33f09b90afdaf221e61 SHA512 13199071bd97cb69518cc57419897d22add27e25c4e01077a2447209d5b31aadb50b4b4eed07746e6fff84fef951548e6d78c2694166df77a8362224096e7190 WHIRLPOOL bbf43eed14a9ee00b41814bc2971d1e010adfbf683f803c59c929b178a8e539bdea81efa59265972e33887ddb072c26ac5e6b631b51453d848602affecc17207
+DIST aida-3.3.jar 41867 SHA256 32f971b6ade56fa441e93747a96f69da6e7f5b3ffe6721407f0aee9784d5e3fd SHA512 70f48b5550e7e24725b1928306947cbf343f516371888a09d8b610c681149db6b69dee9fffd453f857c932d947471fb76ee7692009c00de34f40dc7f78445a73 WHIRLPOOL 03c41343f180172d11ea4c2d414307d6b9c08387e1fbdfb32f67714a32e22aecaac4ba1f7a192636fd845aef8f57e3623668b52ec4ccabe04c75b372c3e28976
+DIST jas-plotter-2.2.3.jar 671548 SHA256 986c99b1aa3115d638c832285a37427eeebf98abced89d414727c6b920a8a6b1 SHA512 6e06d896e8059e9bf4c4cd9eb32b8b89024af5415d68def1698f7f33c75ac3dacb2c466c822613abfe90774718c4d45352d350ffd4953d9a9bfe5718171e9c43 WHIRLPOOL ce1adf5afb867da4b192476cbbf3ee0768956c3cea6259b7d01a757dec8e9c55ae7338c794f6903a72b06152ae2b2166db4ce7e3dbc13dbd8fe73d9b6158734c
+DIST openide-lookup-1.9-patched-1.0.jar 64747 SHA256 ce688d226b48f28284550b82fc9d0d6e0f4f94e546df818455b6aeec3eb9dbd4 SHA512 c00f16a954b60bee2181b30fefd6b7b22ae20e1082309e3668df0b46dfa69bb814bab5281b2f4b9b0ede316979870692dd649aa444203af54ead6a593fb091ac WHIRLPOOL 10685deb0ad2c47054c011f9c801111f81ed336622d89d99a657a6a1fdad960c717f03f438e80a3cf39ef68822bc64eed6a3dccd7b88e38be3a4abc8bebab6ee
+DIST pawdemo-1.0.hbook 520192 SHA256 dd7001ce86a60cd7c6b912d1402d726d379e67d3cb70caf1a0f8e1a432c8bd89 SHA512 c936341d504e0bb6224306ddf04bae4133d66ceaaede73b28bc737e976d0e95e5427a1170536829bf4858a8c55867a6a6a67c9deb7410b5c61536ded06ccc807 WHIRLPOOL 947850851eaa85185674f7b276fddc42582ee94a0afb1e5190200664dcf4a0a30379b8698cda1aa222aab10250126b8e0c9d3d69a0b5bb3bef975a7f6a3957e8
+DIST rowwise-1.0.hbook 1384448 SHA256 c766e1353050dbeace6e82663a540c6e0e50a682c868fcc6bc2f715edc4acbb1 SHA512 2a7fc15020524e05ada2830dd4f8b63a7883713150269d4fc98da1f7e46e840a5b2b30814b586edb22835aa2a3f07d1b91884f0d537775cbd281923bd7c1fbbb WHIRLPOOL 0eb44ad786829f2187c42b7819a2e546ba35498be271a5fde1401235d0143fbbeae38707335b293ccb9614614685b1db5730d55f4605d95652b47cd82f508de7
diff --git a/dev-java/freehep-misc-deps/freehep-misc-deps-0.1.ebuild b/dev-java/freehep-misc-deps/freehep-misc-deps-0.1.ebuild
new file mode 100644
index 000000000000..99ee2b4fd495
--- /dev/null
+++ b/dev-java/freehep-misc-deps/freehep-misc-deps-0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+
+inherit java-pkg-2
+
+DESCRIPTION="High Energy Physics Java library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+SRC_URI="http://java.freehep.org/maven2/org/netbeans/openide-lookup/1.9-patched-1.0/openide-lookup-1.9-patched-1.0.jar
+	http://java.freehep.org/maven2/org/freehep/jas-plotter/2.2.3/jas-plotter-2.2.3.jar
+	http://java.freehep.org/maven2/hep/aida/aida/3.3/aida-3.3.jar
+	http://java.freehep.org/maven2/hep/testdata/hbook/JAS/1.0/JAS-1.0.hbook
+	http://java.freehep.org/maven2/hep/testdata/hbook/pawdemo/1.0/pawdemo-1.0.hbook
+	http://java.freehep.org/maven2/hep/testdata/hbook/rowwise/1.0/rowwise-1.0.hbook"
+
+COMMON_DEP=""
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+JAVA_GENTOO_CLASSPATH=""
+
+src_install() {
+	java-pkg_dojar "${DISTDIR}/openide-lookup-1.9-patched-1.0.jar"
+	java-pkg_regjar "/usr/share/${PN}/lib/openide-lookup-1.9-patched-1.0.jar"
+	java-pkg_dojar "${DISTDIR}/jas-plotter-2.2.3.jar"
+	java-pkg_regjar "/usr/share/${PN}/lib/jas-plotter-2.2.3.jar"
+	java-pkg_dojar "${DISTDIR}/aida-3.3.jar"
+	java-pkg_regjar "/usr/share/${PN}/lib/aida-3.3.jar"
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}/JAS-1.0.hbook"
+	doins "${DISTDIR}/pawdemo-1.0.hbook"
+	doins "${DISTDIR}/rowwise-1.0.hbook"
+}
diff --git a/dev-java/freehep-misc-deps/metadata.xml b/dev-java/freehep-misc-deps/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-misc-deps/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-parameterdatabase/Manifest b/dev-java/freehep-parameterdatabase/Manifest
new file mode 100644
index 000000000000..e038fb6d249e
--- /dev/null
+++ b/dev-java/freehep-parameterdatabase/Manifest
@@ -0,0 +1 @@
+DIST freehep-parameterdatabase-2.0-sources.jar 24780 SHA256 4dbc7d7b0323e475df61d86438096f06c2d0c2271047dfaaf7eba426ed8c7925 SHA512 f0df967d856c5dfa5ebbc1097988de0678e42d2a1898cc0120e949b446fec4e825adab48010dbb31d6bba1d3ae301f92abf74045f12e5ab987e14f67ea675c39 WHIRLPOOL fef8264e77e8127d5a4220c34f1966bb8bfc29ec62620d54adcba7dc23e06dfd1203d192424c6a63d1651398cd9449b7dc26d80bea97458c58cdcbb25003bde8
diff --git a/dev-java/freehep-parameterdatabase/freehep-parameterdatabase-2.0.ebuild b/dev-java/freehep-parameterdatabase/freehep-parameterdatabase-2.0.ebuild
new file mode 100644
index 000000000000..94115ad5acef
--- /dev/null
+++ b/dev-java/freehep-parameterdatabase/freehep-parameterdatabase-2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Parameter and Settings Database"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-swing-2.0.3
+	>=dev-java/freehep-xml-2.1.2"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-swing,freehep-xml"
diff --git a/dev-java/freehep-parameterdatabase/metadata.xml b/dev-java/freehep-parameterdatabase/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-parameterdatabase/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-record/Manifest b/dev-java/freehep-record/Manifest
new file mode 100644
index 000000000000..2d837337003a
--- /dev/null
+++ b/dev-java/freehep-record/Manifest
@@ -0,0 +1 @@
+DIST freehep-record-2.0-sources.jar 46489 SHA256 d5c656233aacea65d6e07b2cc4b18b5c1d1e3cf7263e462cc2e0ec6befd8ebd9 SHA512 d6090d60fac9db82ce8d9232cb51fa8a9657982e0efdeff2f317570d29fcd8cbf8df9b498278595cc2b293d14d0c63f9a7b6ba9e774a4a72d96570763bcfae87 WHIRLPOOL af7ac978163e3057737c87af6fda4b303c1a8020608842a9741383126bbf71c6b422cf6baca8b32980470bf03ab3c81be14b4bf2864963bb6b9d4bb82c204796
diff --git a/dev-java/freehep-record/freehep-record-2.0.ebuild b/dev-java/freehep-record/freehep-record-2.0.ebuild
new file mode 100644
index 000000000000..d1ff5624df33
--- /dev/null
+++ b/dev-java/freehep-record/freehep-record-2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Record Manipulation Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/junit"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="junit"
diff --git a/dev-java/freehep-record/metadata.xml b/dev-java/freehep-record/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-record/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-rootio/Manifest b/dev-java/freehep-rootio/Manifest
new file mode 100644
index 000000000000..21344b63b3ba
--- /dev/null
+++ b/dev-java/freehep-rootio/Manifest
@@ -0,0 +1 @@
+DIST freehep-rootio-2.0.9-sources.jar 166875 SHA256 a04c451c5ced3a685c6efa6dd081c90b160aabd8234bbd04c99462a50ac6c68e SHA512 37abb16c0fe66fd06d23b50491cfc9573d8478700d3023bce183c7ee4a5a8ccdc31be4d62f7b3f8c599131fccd348f213c7e6debe2138725434f9ae97bf52f95 WHIRLPOOL ac46c54f4dff489ab879522abe3c17870f223c983486c3cb4edfb1b1ccab2dc38703e9f7d28f126060d7fc23833889fccd4798ba248d1050109081035704ed4e
diff --git a/dev-java/freehep-rootio/freehep-rootio-2.0.9.ebuild b/dev-java/freehep-rootio/freehep-rootio-2.0.9.ebuild
new file mode 100644
index 000000000000..3f6ca6927599
--- /dev/null
+++ b/dev-java/freehep-rootio/freehep-rootio-2.0.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP ROOT IO Reader and Writer"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/bcel-5.2
+	dev-java/freehep-misc-deps
+	>=dev-java/junit-3.8.2"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="bcel,freehep-misc-deps,junit"
diff --git a/dev-java/freehep-rootio/metadata.xml b/dev-java/freehep-rootio/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-rootio/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-rtti/Manifest b/dev-java/freehep-rtti/Manifest
new file mode 100644
index 000000000000..793cbd48d4a5
--- /dev/null
+++ b/dev-java/freehep-rtti/Manifest
@@ -0,0 +1 @@
+DIST freehep-rtti-2.0.1-sources.jar 12867 SHA256 11326221f5b721bc9c455c221645fa7934300364bc289c3d15937e0e3df1e05a SHA512 4b6e76ecb46cef83884d3eefb60af5f4efed181364ff8a07f23dab1422752af8eada2f4c8b988fb3934ae847d39e38d8194ade9ac9435b09eaadc077fb82e423 WHIRLPOOL 382bf6e8058b228dcfa5ea814f0d829a9de7bfdf6fd78d83218dae6149e0317d6b43904892ad01a8f3e9cb125ef360ffde6a93f23aef9081e4e8365739d695cc
diff --git a/dev-java/freehep-rtti/freehep-rtti-2.0.1.ebuild b/dev-java/freehep-rtti/freehep-rtti-2.0.1.ebuild
new file mode 100644
index 000000000000..98dcb801f57b
--- /dev/null
+++ b/dev-java/freehep-rtti/freehep-rtti-2.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - Runtime Type Identification Object Model and API"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/bcel"
+
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="bcel"
diff --git a/dev-java/freehep-rtti/metadata.xml b/dev-java/freehep-rtti/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-rtti/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-sio/Manifest b/dev-java/freehep-sio/Manifest
new file mode 100644
index 000000000000..97d413ea7809
--- /dev/null
+++ b/dev-java/freehep-sio/Manifest
@@ -0,0 +1 @@
+DIST freehep-sio-2.0-sources.jar 5523 SHA256 733a3723c5cfb4fafbd077da54f2f7c2b733a379294a64e904816455bf66f258 SHA512 35cded48b7c5c4248277b05e1748d1b7cb5eec005a5f72a658c6fb5c6d848b816189701ea732c4dd5c15aa580fcb2717485e39ffa15ceb00ae6eaf730c8d8ea8 WHIRLPOOL eb5266d32fc34cdad1400864d18094be09dbc911606b7627ac27f80fba22ee5801f98e5f706fe3c2b8288a84243fca6296b894274ddc2ff7aed771adfa63a339
diff --git a/dev-java/freehep-sio/freehep-sio-2.0.ebuild b/dev-java/freehep-sio/freehep-sio-2.0.ebuild
new file mode 100644
index 000000000000..272c0f22af0d
--- /dev/null
+++ b/dev-java/freehep-sio/freehep-sio-2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP SIO Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-xdr-2.0.3
+	>=dev-java/junit-3.8.2"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-xdr,junit"
diff --git a/dev-java/freehep-sio/metadata.xml b/dev-java/freehep-sio/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-sio/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-stdhep/Manifest b/dev-java/freehep-stdhep/Manifest
new file mode 100644
index 000000000000..197071a61fbd
--- /dev/null
+++ b/dev-java/freehep-stdhep/Manifest
@@ -0,0 +1 @@
+DIST freehep-stdhep-2.0.2-sources.jar 8262 SHA256 a7006a8fbedd2af4fd35048ceb9d69e44d4aa7b70364d1882ddb7a8c0c80ce53 SHA512 81db0afd70f435ca5495e24557b6490240440fb98c10d4cf113e5d45a0b0fb7be3695ba4f9102ca29a6c042cfd842c606766ff18070d699c82cb24125a01abe4 WHIRLPOOL be19d7a1102fab6f4e6dc7f9991710ec52f7479ad193070b01b8f4493a0d1a19e09721f2254af9768d4243cb1a758f18ebe71655de155e3ec304762d4c096a3b
diff --git a/dev-java/freehep-stdhep/freehep-stdhep-2.0.2.ebuild b/dev-java/freehep-stdhep/freehep-stdhep-2.0.2.ebuild
new file mode 100644
index 000000000000..3cba7ed5416e
--- /dev/null
+++ b/dev-java/freehep-stdhep/freehep-stdhep-2.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP STDHep IO Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-mcfio-2.0.1
+	>=dev-java/junit-3.8.2
+	dev-java/freehep-xdr"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-mcfio,junit,freehep-xdr"
diff --git a/dev-java/freehep-stdhep/metadata.xml b/dev-java/freehep-stdhep/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-stdhep/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-swing/Manifest b/dev-java/freehep-swing/Manifest
new file mode 100644
index 000000000000..70ed02843020
--- /dev/null
+++ b/dev-java/freehep-swing/Manifest
@@ -0,0 +1 @@
+DIST freehep-swing-2.0.3-sources.jar 169216 SHA256 088a054a1550f28523a3a6078b826eaa0242023a869576514c6feb0039525465 SHA512 0e8d61c7c88684b284982c71de66cc2f306af59f1c7617b5acc28794d8a723faa54b69e2ce466abb35278ce70b48db1d89c71f9d9a9eca987538b02bfc17ab22 WHIRLPOOL 685c2a0417278534cc00df84a133588ceca61a2b077a4551895da0cfdaf3eb70063e29401d31707576383c9abbf9175e9366702ee173bf0b0241cc52d930390e
diff --git a/dev-java/freehep-swing/freehep-swing-2.0.3.ebuild b/dev-java/freehep-swing/freehep-swing-2.0.3.ebuild
new file mode 100644
index 000000000000..7196572c2fdf
--- /dev/null
+++ b/dev-java/freehep-swing/freehep-swing-2.0.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Swing Extensions"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/junit
+	>=dev-java/freehep-util-2.0.2"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="junit,freehep-util"
diff --git a/dev-java/freehep-swing/metadata.xml b/dev-java/freehep-swing/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-swing/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-util/Manifest b/dev-java/freehep-util/Manifest
new file mode 100644
index 000000000000..e7ddeca33b7b
--- /dev/null
+++ b/dev-java/freehep-util/Manifest
@@ -0,0 +1 @@
+DIST freehep-util-2.0.2-sources.jar 33758 SHA256 6fa9d0e26235c7a5a1026390a6d60c3506b6b0033a4d9443f0abee5e2390e6d9 SHA512 79b4d793d5bc250ec72a9e690fd47121bbd589fc764eeed7cf77cd20d85c9010057828ea01d231c48e7b2274e3a05361c640c741fce6025044227fd8005c5939 WHIRLPOOL 1099c521ab6e6e4b066932d124018e7e0dcd9ccbaebed4d1534125eae65410a3ff41b3b5b1f0b73a94ce58ca05393c55af24b986aee9d0a428aeb74a4ecd4014
diff --git a/dev-java/freehep-util/freehep-util-2.0.2.ebuild b/dev-java/freehep-util/freehep-util-2.0.2.ebuild
new file mode 100644
index 000000000000..95d494a8d75b
--- /dev/null
+++ b/dev-java/freehep-util/freehep-util-2.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP Utility Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/freehep-misc-deps
+	dev-java/junit"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-misc-deps,junit"
diff --git a/dev-java/freehep-util/metadata.xml b/dev-java/freehep-util/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-util/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-xdr/Manifest b/dev-java/freehep-xdr/Manifest
new file mode 100644
index 000000000000..f15aa0129c2f
--- /dev/null
+++ b/dev-java/freehep-xdr/Manifest
@@ -0,0 +1 @@
+DIST freehep-xdr-2.0.3-sources.jar 6321 SHA256 4d5bd8a7c102f49a095984d40131d318b3dced4f799c50800560a5adaebc79f9 SHA512 aeaf710bec827d171d044fd07aadde02a010522f2eaa24d0160e3792956f6d7086b7cfda61bfbaa2b403c510f2b4e4c5699200c592190d2ef4c422b218711b64 WHIRLPOOL 7cf162cb9ca4e52056b5b0b46a5e7b36f53155ca91b0609db009644c520f13762bd1f4978202c1aebcada95be35464464ed1242ccaba081b3a58962f827fffa9
diff --git a/dev-java/freehep-xdr/freehep-xdr-2.0.3.ebuild b/dev-java/freehep-xdr/freehep-xdr-2.0.3.ebuild
new file mode 100644
index 000000000000..0ad739f25c51
--- /dev/null
+++ b/dev-java/freehep-xdr/freehep-xdr-2.0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP XDR Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/junit-3.8.2"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="junit"
diff --git a/dev-java/freehep-xdr/metadata.xml b/dev-java/freehep-xdr/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-xdr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freehep-xml/Manifest b/dev-java/freehep-xml/Manifest
new file mode 100644
index 000000000000..ef510cad1aea
--- /dev/null
+++ b/dev-java/freehep-xml/Manifest
@@ -0,0 +1 @@
+DIST freehep-xml-2.1.2-sources.jar 146475 SHA256 7b245db620dc1ff0c2b572f3005ff57043bfe78c4f15599f28262bc0d40dd53b SHA512 5e4c0bb8ad099757aa72a925be64dfcf050d5de5a6b7cdc15447a1940bb652254233fff1bb6e94f715e73083058fc5f891ec955a1c7a40343698cb641e6b6c38 WHIRLPOOL 8506a01bcd05fa89b93a180b05486b383e615f051fb14d2a76161056934b7601b675dc0713eac6b56f486395b603cab9c630fe9405d1db4e2a0ab27b48c83012
diff --git a/dev-java/freehep-xml/freehep-xml-2.1.2.ebuild b/dev-java/freehep-xml/freehep-xml-2.1.2.ebuild
new file mode 100644
index 000000000000..864aec918d3e
--- /dev/null
+++ b/dev-java/freehep-xml/freehep-xml-2.1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+GROUP_ID="org.freehep"
+MAVEN2_REPOSITORIES="http://java.freehep.org/maven2"
+
+inherit java-pkg-2 java-mvn-src
+
+DESCRIPTION="High Energy Physics Java library - FreeHEP XML Library"
+HOMEPAGE="http://java.freehep.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/freehep-io-2.0.2
+	>=dev-java/freehep-util-2.0.2
+	>=dev-java/freehep-swing-2.0.3
+	dev-java/jdom
+	dev-java/junit"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+JAVA_GENTOO_CLASSPATH="freehep-io,freehep-util,freehep-swing,jdom-1.0,junit"
diff --git a/dev-java/freehep-xml/metadata.xml b/dev-java/freehep-xml/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/freehep-xml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
new file mode 100644
index 000000000000..de97f1f22035
--- /dev/null
+++ b/dev-java/freemarker/Manifest
@@ -0,0 +1 @@
+DIST freemarker-2.3.13.tar.gz 2136791 SHA256 00b43c28bc5b141e53ad9e56c472f40774b5638f96fc29f3d7cfa97048830eb5 SHA512 9216bc97e74779617ec91916842185472c3cfd4c5625168ddd2f4404237767df44c62d8308af8bed0ab10d72c8835c97daab7fbc1efa80c3e01c861dd334ec3b WHIRLPOOL f46ae311feb122e7ce52d2f4b518216c72135e5e6491d02cbef177fd76b798e7b7fa883a22067225e5a4de2163066696fb34f21708a5d821daf0d82c1460d9cc
diff --git a/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch b/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch
new file mode 100644
index 000000000000..2282b04de165
--- /dev/null
+++ b/dev-java/freemarker/files/freemarker-2.3.10-gentoo.patch
@@ -0,0 +1,54 @@
+diff -Nru freemarker-2.3.10.vanilla/build.xml freemarker-2.3.10/build.xml
+--- freemarker-2.3.10.vanilla/build.xml	2007-05-06 11:46:06.000000000 +0200
++++ freemarker-2.3.10/build.xml	2007-05-06 11:48:55.000000000 +0200
+@@ -55,16 +55,19 @@
+         <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.servlet23}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+ 

+     <path id="compile.jsp2.classpath">

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

+         <pathelement path="${lib.servlet24}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+ 

+     <path id="compile.classpath.testcases">

+@@ -72,6 +75,7 @@
+         <pathelement path="${lib.jython}"/>

+         <pathelement path="${lib.jdom}"/>

+         <pathelement path="${lib.servlet23}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+ 

+     <path id="compile.classpath.javadoc">

+@@ -89,12 +93,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.servlet23}"/>

+         <pathelement path="${lib.dir}/freemarker.jar"/>

+         <pathelement path="${lib.struts}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+     

+     <path id="full.classpath">

+@@ -110,6 +116,7 @@
+         <pathelement path="${lib.logkit}"/>

+         <pathelement path="${lib.log4j}"/>

+         <pathelement path="${java.class.path}"/>

++        <fileset dir="lib" includes="*.jar"/>

+     </path>

+     

+     

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/files/freemarker-jython-2.2.patch b/dev-java/freemarker/files/freemarker-jython-2.2.patch
new file mode 100644
index 000000000000..0d0d387ee1b4
--- /dev/null
+++ b/dev-java/freemarker/files/freemarker-jython-2.2.patch
@@ -0,0 +1,20 @@
+diff -Naur src.orig/freemarker/ext/jython/JythonHashModel.java src/freemarker/ext/jython/JythonHashModel.java
+--- src.orig/freemarker/ext/jython/JythonHashModel.java	2007-04-21 01:06:15.000000000 +1200
++++ src/freemarker/ext/jython/JythonHashModel.java	2008-02-29 18:56:57.000000000 +1300
+@@ -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-r1.ebuild b/dev-java/freemarker/freemarker-2.3.13-r1.ebuild
new file mode 100644
index 000000000000..1921439a5990
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.13-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION=" FreeMarker is a template engine; a generic 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 ~ppc x86"
+IUSE=""
+
+COMMON_DEP="
+	>=dev-java/jython-2.2:0
+	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="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	dev-java/javacc:0"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	# 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
+	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.13-r2.ebuild b/dev-java/freemarker/freemarker-2.3.13-r2.ebuild
new file mode 100644
index 000000000000..9ece82cd09cc
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.13-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION=" FreeMarker is a template engine; a generic 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.
+	find -name '*.jar' -exec rm -v {} + || die
+
+	# 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.13.ebuild b/dev-java/freemarker/freemarker-2.3.13.ebuild
new file mode 100644
index 000000000000..34fae4fb5449
--- /dev/null
+++ b/dev-java/freemarker/freemarker-2.3.13.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION=" FreeMarker is a template engine; a generic 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 ppc x86"
+IUSE=""
+
+COMMON_DEP="dev-java/javacc
+	>=dev-java/jython-2.2:0
+	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"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	# for ecj-3.5
+	java-ant_rewrite-bootclasspath auto
+
+	cd "${S}/lib/"
+	rm -f *.jar
+
+	rm -f "${S}/src/freemarker/testcase/servlets/WEB-INF/taglib2.jar"
+	rm -f "${S}/src/freemarker/testcase/servlets/WEB-INF/lib/taglib-foo.jar"
+}
+
+src_compile() {
+	# BIG FAT WARNING:
+	# clean target removes lib/ directory!!
+	eant clean
+
+	mkdir -p lib/jsp-1.2
+	mkdir -p lib/jsp-2.0
+	mkdir -p lib/jsp-2.1
+	cd lib/
+	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
+	java-pkg_jar-from javacc
+	java-pkg_jar-from juel
+
+	cd "${S}"
+	eant jar $(use_doc) -Djavacc.home=/usr/share/javacc/lib
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+	dodoc README.txt || die
+
+	use doc && java-pkg_dojavadoc build/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/freemarker/metadata.xml b/dev-java/freemarker/metadata.xml
new file mode 100644
index 000000000000..5425ccbe2950
--- /dev/null
+++ b/dev-java/freemarker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">freemarker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/fscript/Manifest b/dev-java/fscript/Manifest
new file mode 100644
index 000000000000..5df49a70c3a4
--- /dev/null
+++ b/dev-java/fscript/Manifest
@@ -0,0 +1 @@
+DIST fscript-1.17.tgz 117300 SHA256 196bf481f1a41fbb4026262aea3664ae9af64d2c75de6c4b79ff633e5a0f9f38 SHA512 9f4280ab1131f7ccdf2564fdb9bf1b6e91b593b5ef2934203a68aae87c3d89adfd73e82d0409d6cddd8685ee7bddb69dd67532c6f13a046381b12faf97d47e50 WHIRLPOOL 806a01b2120e0d9806426f9050513d453818cc343ed8c9723b1138df1217d9d8c6e60bdbe76f562e6218277e2f25f9627306a5863cf386faaf9f59bb33217ac9
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..c93c5fe9ca63
--- /dev/null
+++ b/dev-java/fscript/fscript-1.17-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..86bbc9c8ca2a
--- /dev/null
+++ b/dev-java/fscript/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">fscript</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env b/dev-java/gcj-jdk/files/gcj-jdk.env
new file mode 100644
index 000000000000..beed450e6892
--- /dev/null
+++ b/dev-java/gcj-jdk/files/gcj-jdk.env
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="GCJ @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@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-4.7.4.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild
new file mode 100644
index 000000000000..d3d153f563d9
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib
+
+DESCRIPTION="Java wrappers around GCJ"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-linux"
+SLOT="0"
+IUSE="X"
+
+ECJ_GCJ_SLOT="3.6"
+API_DIFF_PV="4.8.2"
+
+# perl is needed for javac wrapper
+RDEPEND="
+	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-lang/perl
+	~sys-devel/gcc-${PV}[gcj]
+	X? ( ~sys-devel/gcc-${PV}[awt] )"
+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 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 X && 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
+
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert
+
+	set_java_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 http://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/gcj-jdk-4.8.4.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.8.4.ebuild
new file mode 100644
index 000000000000..5c4d31f3fcce
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.8.4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib
+
+DESCRIPTION="Java wrappers around GCJ"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-linux"
+SLOT="0"
+IUSE="X"
+
+ECJ_GCJ_SLOT="4.2"
+API_DIFF_PV="4.8.2"
+
+# perl is needed for javac wrapper
+RDEPEND="
+	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-lang/perl
+	~sys-devel/gcc-${PV}[gcj]
+	X? ( ~sys-devel/gcc-${PV}[awt] )"
+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 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 X && 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
+
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert
+
+	set_java_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 http://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/gcj-jdk-4.9.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
new file mode 100644
index 000000000000..7d30f0231493
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib
+
+DESCRIPTION="Java wrappers around GCJ"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
+SLOT="0"
+IUSE="X"
+
+ECJ_GCJ_SLOT="4.4"
+API_DIFF_PV="4.8.2"
+
+# perl is needed for javac wrapper
+RDEPEND="
+	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
+	dev-lang/perl
+	~sys-devel/gcc-${PV}[gcj]
+	X? ( ~sys-devel/gcc-${PV}[awt] )"
+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 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 X && 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
+
+	local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
+	exeinto ${gcjhome}/bin
+	sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
+		-e "s#@ECJ_JAR@#${ecj_jar}#" \
+		-e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
+		-e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
+		"${FILESDIR}"/javac.in \
+	| newexe - javac
+	assert
+
+	set_java_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 http://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..f988aafbad87
--- /dev/null
+++ b/dev-java/gcj-jdk/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+  <email>gnu_andrew@member.fsf.org</email>
+  <name>Andrew John Hughes</name>
+</maintainer>
+<longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
+</pkgmetadata>
diff --git a/dev-java/gjdoc/Manifest b/dev-java/gjdoc/Manifest
new file mode 100644
index 000000000000..b358cc7eb8b1
--- /dev/null
+++ b/dev-java/gjdoc/Manifest
@@ -0,0 +1 @@
+DIST gjdoc-0.7.9.tar.gz 752491 SHA256 3d07eb7ea85c71614ae1ff8a64f70f9b9df0210194313ac159b71fef63389043 SHA512 462f629650e48a0c15f80ef6cd14656745d3ad8b7424fee425b449a7f206e76c142be3a63ca099166f5e3177d74e2c26a5db33e206013c62ff60242e95f33a81 WHIRLPOOL 9a7f69ff8a92129204f25aff2206864ea219da4a2040637719c46648be95cc6e1d4f4b6941bcd631d25b7f8140caafa700fd621229c7e3637ae5c3f8d0bbc1be
diff --git a/dev-java/gjdoc/files/0.7.9-main-execute.patch b/dev-java/gjdoc/files/0.7.9-main-execute.patch
new file mode 100644
index 000000000000..79a8e5f34730
--- /dev/null
+++ b/dev-java/gjdoc/files/0.7.9-main-execute.patch
@@ -0,0 +1,17 @@
+Index: src/com/sun/tools/javadoc/Main.java
+===================================================================
+RCS file: /sources/classpath/gjdoc/src/com/sun/tools/javadoc/Main.java,v
+retrieving revision 1.3
+diff -u -r1.3 Main.java
+--- src/com/sun/tools/javadoc/Main.java	12 May 2007 10:40:10 -0000	1.3
++++ src/com/sun/tools/javadoc/Main.java	15 Feb 2009 00:32:57 -0000
+@@ -6,4 +6,9 @@
+ 	 {
+ 	 	gnu.classpath.tools.gjdoc.Main.main(args);
+ 	 }
++
++	 public static int execute(String[] args)
++	 {
++		 return gnu.classpath.tools.gjdoc.Main.execute(args);
++	 }
+ }
diff --git a/dev-java/gjdoc/files/gjdoc b/dev-java/gjdoc/files/gjdoc
new file mode 100644
index 000000000000..cfa2b84ec225
--- /dev/null
+++ b/dev-java/gjdoc/files/gjdoc
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+$(java-config --java) -classpath "$(java-config --classpath=gjdoc,antlr):$CLASSPATH" gnu.classpath.tools.gjdoc.Main ${1+"$@"}
diff --git a/dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch b/dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch
new file mode 100644
index 000000000000..a09b745931a7
--- /dev/null
+++ b/dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch
@@ -0,0 +1,56 @@
+Index: gjdoc-0.7.7/configure.ac
+===================================================================
+--- gjdoc-0.7.7.orig/configure.ac
++++ gjdoc-0.7.7/configure.ac
+@@ -101,6 +101,38 @@ AC_SUBST(jni_linkflag)
+ AM_CONDITIONAL([ENABLE_XMLDOCLET], [test x${enable_xmldoclet} = xyes])
+ AM_CONDITIONAL([ENABLE_NATIVE], [test x${enable_native} = xyes])
+ 
++dnl Start testing for cp -u availability
++dnl Fallback to rsync otherwise
++
++AC_MSG_CHECKING([for working cp -u])
++
++: ${TMPDIR=/tmp}
++{
++  tmp=`
++    (umask 077 && mktemp -d "$TMPDIR/fooXXXXXX") 2>/dev/null
++  ` && test -n "$tmp" && test -d "$tmp"
++} || {
++  tmp=$TMPDIR/foo$$-$RANDOM
++  (umask 077 && mkdir "$tmp")
++} || AC_MSG_ERROR([Unable to create a temporary directory])
++
++touch "$tmp/origin"
++if cp -u "$tmp/origin" "$tmp/destination" 2>/dev/null; then
++   AC_MSG_RESULT([yes])
++   CP_U="cp -u"
++else
++   AC_MSG_RESULT([no])
++   AC_CHECK_PROG([CP_U], [rsync], [rsync -u])
++fi
++
++rm -rf "$tmp/origin"
++
++if test "x$CP_U" = "x"; then
++   AC_MSG_ERROR([Unable to find a workign cp -u implementation.])
++fi
++
++AC_SUBST([CP_U])
++
+ AC_CONFIG_FILES([gjdoc.sh src/resources/version.properties], [chmod +x gjdoc.sh])
+ 
+ AC_OUTPUT([Makefile docs/Makefile])
+Index: gjdoc-0.7.7/Makefile.am
+===================================================================
+--- gjdoc-0.7.7.orig/Makefile.am
++++ gjdoc-0.7.7/Makefile.am
+@@ -385,7 +385,7 @@ gjdoc_resources_src = $(patsubst %, $(sr
+ 
+ gnu-classpath-tools-gjdoc-$(VERSION).jar: $(srcdir)/gjdoc.manifest src/resources/version.properties $(gnu_classpath_tools_gjdoc_jar_CLASSES) $(gnu_classpath_tools_gjdoc_jar_GENCLASSES) $(gjdoc_resources_src)
+ 	for res in $(gjdoc_resources) ; \
+-	do  cp -u $(srcdir)/src/resources/$$res $$res ; done
++	do  $(CP_U) $(srcdir)/src/resources/$$res $$res ; done
+ 	$(JAR) cfm $@ $(srcdir)/gjdoc.manifest \
+ 	$(gjdoc_resources) \
+ 	-C src/resources version.properties \
diff --git a/dev-java/gjdoc/gjdoc-0.7.9-r2.ebuild b/dev-java/gjdoc/gjdoc-0.7.9-r2.ebuild
new file mode 100644
index 000000000000..232704c39c67
--- /dev/null
+++ b/dev-java/gjdoc/gjdoc-0.7.9-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="source"
+
+inherit eutils autotools java-pkg-2
+
+DESCRIPTION="A javadoc compatible Java source documentation generator"
+HOMEPAGE="http://www.gnu.org/software/cp-tools/"
+SRC_URI="mirror://gnu/classpath/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+# Possible USE flags.
+#
+# native: to --enable-native
+# doc:    to generate javadoc
+# debug:  There is a debug doclet installed by default but maybe could
+#         have a wrapper that uses it.
+#
+IUSE="xmldoclet"
+
+RDEPEND=">=virtual/jre-1.4
+		>=dev-java/antlr-2.7.1:0[java]"
+
+# Refused to emerge with sun-jdk-1.3* complaining about wanting a bigger stack size
+DEPEND="${RDEPEND}
+		>=virtual/jdk-1.4"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.7.7-gcp.patch"
+	epatch "${FILESDIR}/0.7.9-main-execute.patch"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	# I think that configure will do --enable-native if it finds gcj
+	# so we'll disable it explicitly
+	local myc="--with-antlr-jar=$(java-pkg_getjar antlr antlr.jar) --disable-native"
+	myc="${myc} --disable-dependency-tracking"
+
+	# Does not work with gcc 3.* and without these it tries to use gij
+	# see bug #116804 for details
+
+	# TODO ideally, would respect JAVACFLAGS
+	JAVA="java" JAVAC="javac $(java-pkg_javac-args)" \
+		econf ${myc} \
+		$(use_enable xmldoclet) || die "econf failed"
+}
+
+src_compile() {
+	default # Don't use from java-pkg-2
+}
+
+src_install() {
+	local jars="com-sun-tools-doclets-Taglet gnu-classpath-tools-gjdoc com-sun-javadoc"
+	for jar in ${jars}; do
+		java-pkg_newjar ${jar}-${PV}.jar ${jar}.jar
+	done
+
+	java-pkg_dolauncher ${PN} --main gnu.classpath.tools.gjdoc.Main
+	dodoc AUTHORS ChangeLog NEWS README || die
+
+	cd "${S}"/docs
+	emake DESTDIR="${D}" install || die "Failed to install documentation"
+
+	use source && java-pkg_dosrc "${S}/src"/{com,gnu}
+}
diff --git a/dev-java/gjdoc/metadata.xml b/dev-java/gjdoc/metadata.xml
new file mode 100644
index 000000000000..a247e16439ae
--- /dev/null
+++ b/dev-java/gjdoc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <longdescription lang="en">
+Gjdoc provides a framework for generating documentation in various
+formats from java source files.  It implements all features of the
+traditional javadoc tool version 1.4 - except for one unimplemented
+option (-serialwarn), it is fully command-line compatible and it
+provides a compatible Doclet API (package com.sun.javadoc).
+	</longdescription>
+  <use>
+    <flag name="xmldoclet">Also build support for the xml doclet that generates output in xml instead of the traditional html javadoc.</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/glassfish-connector-api/Manifest b/dev-java/glassfish-connector-api/Manifest
new file mode 100644
index 000000000000..493f09a69f36
--- /dev/null
+++ b/dev-java/glassfish-connector-api/Manifest
@@ -0,0 +1 @@
+DIST glassfish-v2ur2-b04-src.zip 39817113 SHA256 b554e618ed8edddd8f77de15a800b7d374edbfe1814196125c1e9ee7634ba388 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8 WHIRLPOOL c3796120a85b2e370cb9fced56c166a554cd40ee2278c819ee6fa4eadce325373f1d2369cad77746f6e5b871c075d16adfdc9dbfb1bd20194e0f19e6ef0f0719
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..17fa1d83d0f3
--- /dev/null
+++ b/dev-java/glassfish-connector-api/glassfish-connector-api-1.1.2.2.04.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc 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..7303cef96964
--- /dev/null
+++ b/dev-java/glassfish-connector-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/glassfish-deployment-api/Manifest b/dev-java/glassfish-deployment-api/Manifest
new file mode 100644
index 000000000000..493f09a69f36
--- /dev/null
+++ b/dev-java/glassfish-deployment-api/Manifest
@@ -0,0 +1 @@
+DIST glassfish-v2ur2-b04-src.zip 39817113 SHA256 b554e618ed8edddd8f77de15a800b7d374edbfe1814196125c1e9ee7634ba388 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8 WHIRLPOOL c3796120a85b2e370cb9fced56c166a554cd40ee2278c819ee6fa4eadce325373f1d2369cad77746f6e5b871c075d16adfdc9dbfb1bd20194e0f19e6ef0f0719
diff --git a/dev-java/glassfish-deployment-api/files/glassfish-deployment-api-1.2-build.xml.patch b/dev-java/glassfish-deployment-api/files/glassfish-deployment-api-1.2-build.xml.patch
new file mode 100644
index 000000000000..155b6af84b95
--- /dev/null
+++ b/dev-java/glassfish-deployment-api/files/glassfish-deployment-api-1.2-build.xml.patch
@@ -0,0 +1,26 @@
+diff -Nru deployment-api.vanilla/build.xml deployment-api/build.xml
+--- deployment-api.vanilla/build.xml	2009-05-09 15:54:02.000000000 +0100
++++ deployment-api/build.xml	2009-05-09 15:54:44.000000000 +0100
+@@ -70,12 +70,7 @@
+             description="Compile javax/enterprise/deploy sources">  
+      
+         <javac srcdir="${src.dir}" 
+-               destdir="${component.classes.dir}"
+-               debug="${javac.debug}" 
+-               optimize="${javac.optimize}"
+-               source="${javac.source}" 
+-               deprecation="${javac.deprecation}"
+-               failonerror="true">
++               destdir="${component.classes.dir}">
+             <include name="javax/enterprise/deploy/**"/>            
+         </javac>
+     </target>
+@@ -89,7 +84,7 @@
+                      includes="**/LocalStrings.properties"/>
+         </copy>
+ 
+-        <jar jarfile="${javaee.jar}" update="yes">
++        <jar jarfile="deployment-api.jar" update="yes">
+             <fileset dir="${component.classes.dir}">
+                 <include name="javax/enterprise/deploy/**/*.class"/>
+                 <include name="javax/enterprise/deploy/**/*.properties"/>
diff --git a/dev-java/glassfish-deployment-api/glassfish-deployment-api-1.2.ebuild b/dev-java/glassfish-deployment-api/glassfish-deployment-api-1.2.ebuild
new file mode 100644
index 000000000000..137390c02802
--- /dev/null
+++ b/dev-java/glassfish-deployment-api/glassfish-deployment-api-1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV=${PV/./_}
+
+DESCRIPTION="J2EE Application Deployment Specification"
+HOMEPAGE="https://glassfish.dev.java.net/"
+LICENSE="|| ( CDDL GPL-2 )"
+SLOT="1.2"
+
+KEYWORDS="amd64 ppc x86"
+
+GLASSFISH_MAJOR="v2ur2"
+GLASSFISH_MINOR="b04"
+SRC_URI="http://download.java.net/javaee5/${GLASSFISH_MAJOR}/promoted/source/glassfish-${GLASSFISH_MAJOR}-${GLASSFISH_MINOR}-src.zip"
+
+IUSE=""
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/glassfish/deployment-api/"
+EANT_BUILD_TARGET="all"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+}
+
+src_install() {
+	java-pkg_newjar "deployment-api.jar"
+	use source && java-pkg_dosrc src/java/javax
+}
diff --git a/dev-java/glassfish-deployment-api/metadata.xml b/dev-java/glassfish-deployment-api/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/glassfish-deployment-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/glassfish-ejb-api/Manifest b/dev-java/glassfish-ejb-api/Manifest
new file mode 100644
index 000000000000..229871c8a576
--- /dev/null
+++ b/dev-java/glassfish-ejb-api/Manifest
@@ -0,0 +1 @@
+DIST glassfish-ejb-api-3.2.tar.xz 37052 SHA256 99ca1715de72ca845d371ea80734ce8de649ec45b8a5cc43d856c74cdd900cc8 SHA512 1692bbff05242b0af5141b35151ff65f029e19f45c5dac07ed9b706635e3f42d8d512819f38a49b564c9dee51be33c36fb871ea5267000536a0fb1e1b5d6a00a WHIRLPOOL eab989e055f6befcff812ab52f46a2855ddcd80bdbe90f2737bf4b9d5072cdf609dcb53a06a4330918afe7bb13bc970e04ba28e84d060ada65350bdcfa6787e3
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..0f45f4568234
--- /dev/null
+++ b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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..838c00a4a448
--- /dev/null
+++ b/dev-java/glassfish-ejb-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/glassfish-interceptor-api/Manifest b/dev-java/glassfish-interceptor-api/Manifest
new file mode 100644
index 000000000000..2ec8ddc9dd3c
--- /dev/null
+++ b/dev-java/glassfish-interceptor-api/Manifest
@@ -0,0 +1 @@
+DIST glassfish-interceptor-api-3.1.tar.xz 14600 SHA256 b64285dbc80bc6418458927735c7dc7df74f6635d86cdb9a70b0c869f2f4a662 SHA512 674f53d53afb63799c579b0ec177a009178315fb62f027441da14ceb5d6fa07408840ad82aa8fa7be31b53d43b53ff28ffb1617d644c989bc4ac17ce5e626563 WHIRLPOOL f20b4abefab8f9d7c55f3a12e6a41fb60644a8ca580bc6c9ea1772d9c919a8d99bbc86b928af82d7ce279919019107164760bd1e144af8ff4c4b4119fd2fdbb7
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..23cb76bf006b
--- /dev/null
+++ b/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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..838c00a4a448
--- /dev/null
+++ b/dev-java/glassfish-interceptor-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/glassfish-jms-api/Manifest b/dev-java/glassfish-jms-api/Manifest
new file mode 100644
index 000000000000..493f09a69f36
--- /dev/null
+++ b/dev-java/glassfish-jms-api/Manifest
@@ -0,0 +1 @@
+DIST glassfish-v2ur2-b04-src.zip 39817113 SHA256 b554e618ed8edddd8f77de15a800b7d374edbfe1814196125c1e9ee7634ba388 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8 WHIRLPOOL c3796120a85b2e370cb9fced56c166a554cd40ee2278c819ee6fa4eadce325373f1d2369cad77746f6e5b871c075d16adfdc9dbfb1bd20194e0f19e6ef0f0719
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..bafaff368145
--- /dev/null
+++ b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..7303cef96964
--- /dev/null
+++ b/dev-java/glassfish-jms-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/glassfish-persistence/Manifest b/dev-java/glassfish-persistence/Manifest
new file mode 100644
index 000000000000..51b875dd4f65
--- /dev/null
+++ b/dev-java/glassfish-persistence/Manifest
@@ -0,0 +1 @@
+DIST glassfish-9_0-b48-src.zip 35162972 SHA256 05e49f43ede3f272934fbe0d67f3ac2474bcf4695935a7af812517aab88e0c49 SHA512 512ccd1c89a1bbd88ca1e45b1e60693bd3c4a6c6ffa19376febb786eb73556f27bc0ce4f0e760d6d80b0711206f6701e7c7da70ef3a5e0084ad0482246506a48 WHIRLPOOL 3b4524497216aebbc1d9f6544d50ead27aa6af2ea9e5364e0323c60d24327db28057db778f294ee7483dfc98142c595ccec5a3e8d147eb8942cbe545ae6f98b9
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..958d4759b77a
--- /dev/null
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..407583277d87
--- /dev/null
+++ b/dev-java/glassfish-persistence/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <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..f94e1b37ca23
--- /dev/null
+++ b/dev-java/glassfish-servlet-api/Manifest
@@ -0,0 +1 @@
+DIST glassfish-v2-b44-src.zip 35200817 SHA256 331f6a65aa94b9d79f5b0a726d71afc4726032b3e9d62f2c7ab6fc679790e1b7 SHA512 2c236f37c08ec465959e80c90e3a2f8cdf9d143dc93c7a6bbdcc6e015125f167153f6abfaba4390a5d179b43130458b996498d3f1390588477462bd45ea367ee WHIRLPOOL 71c9b9cbcc194ffe03f4a604b570d618f88b7f08955b573f6b218683fba854267ee83915d26d909d8caf92779a2e15752d6fbce6c402d8ca69b108d18042845b
diff --git a/dev-java/glassfish-servlet-api/files/build_xml.patch b/dev-java/glassfish-servlet-api/files/build_xml.patch
new file mode 100644
index 000000000000..033ebd625271
--- /dev/null
+++ b/dev-java/glassfish-servlet-api/files/build_xml.patch
@@ -0,0 +1,12 @@
+--- build.xml	2007-04-27 03:38:38.000000000 -0400
++++ build.xml	2007-04-27 03:39:17.000000000 -0400
+@@ -28,7 +28,9 @@
+              target="dist" inheritAll="false"/>
+         <ant dir="${servlet.api.home}/src/jsr245" 
+              target="dist" inheritAll="false"/>
++<!--
+       <antcall target="prepare-jar"/>
++-->
+     </target>
+ 
+     <!-- build pwc-->
diff --git a/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild b/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild
new file mode 100644
index 000000000000..795b4314ad8c
--- /dev/null
+++ b/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit base java-pkg-2 java-ant-2
+
+MY_PV="${PV/_beta/-b}"
+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://download.java.net/javaee5/trunk/promoted/source/glassfish-v${MY_PV}-src.zip"
+LICENSE="CDDL"
+SLOT="2.5"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/glassfish/servlet-api/"
+
+PATCHES=( "${FILESDIR}/build_xml.patch" )
+
+src_compile() {
+	eant build $(use doc || echo -Ddocs.uptodate=true)
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/src/jakarta-servletapi-5/jsr154/dist/lib/*.jar
+	java-pkg_dojar "${S}"/src/jsr245/dist/lib/*.jar
+
+	use doc && java-pkg_dojavadoc src/jsr245/build/docs/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/glassfish-servlet-api/metadata.xml b/dev-java/glassfish-servlet-api/metadata.xml
new file mode 100644
index 000000000000..0bd86abdd107
--- /dev/null
+++ b/dev-java/glassfish-servlet-api/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..493f09a69f36
--- /dev/null
+++ b/dev-java/glassfish-transaction-api/Manifest
@@ -0,0 +1 @@
+DIST glassfish-v2ur2-b04-src.zip 39817113 SHA256 b554e618ed8edddd8f77de15a800b7d374edbfe1814196125c1e9ee7634ba388 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8 WHIRLPOOL c3796120a85b2e370cb9fced56c166a554cd40ee2278c819ee6fa4eadce325373f1d2369cad77746f6e5b871c075d16adfdc9dbfb1bd20194e0f19e6ef0f0719
diff --git a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild
new file mode 100644
index 000000000000..0cd168f3bf88
--- /dev/null
+++ b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+
+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_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_dojar build/release/*.jar
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/java/javax
+}
diff --git a/dev-java/glassfish-transaction-api/metadata.xml b/dev-java/glassfish-transaction-api/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/glassfish-transaction-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/glassfish-xmlrpc-api/Manifest b/dev-java/glassfish-xmlrpc-api/Manifest
new file mode 100644
index 000000000000..b509251c5154
--- /dev/null
+++ b/dev-java/glassfish-xmlrpc-api/Manifest
@@ -0,0 +1 @@
+DIST glassfish-xmlrpc-api-1.1.1.tar.xz 35180 SHA256 ca8531a5d39b80ba94e13e048fb2bf9e2441910ccc992af6c0d3dd738892fc89 SHA512 7de8d5959c0f9f09cca6a169d4e4293fca378aa497389e9a9a0af953b698322b9bbae6288b8cba2cd34abf58a0d0f4272294dcdf201a84ba5cc14d426843daa8 WHIRLPOOL 830df242d38e29a8a3eade55d5d80f683ac610d355db2725a8a6b7fd74e19d566ea868a90dcb6e824f758a5c163f36d7d053c6759c896b953279ba2c48628475
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..13a9381b6142
--- /dev/null
+++ b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/glassfish-xmlrpc-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/glazedlists/Manifest b/dev-java/glazedlists/Manifest
new file mode 100644
index 000000000000..29e534f6dcd2
--- /dev/null
+++ b/dev-java/glazedlists/Manifest
@@ -0,0 +1,2 @@
+DIST glazedlists-1.7.0-source_java15.zip 879565 SHA256 e3f2370ed80fce8c104f2ac1e820c10b2c691390783e163ec02b2db5e6ab3d36 SHA512 bbf711ee5939486014f5cb9bd6dd6b1e86246f54d21e081285be1dd967ca852dd95d4bd2cf97b32d9fa578c2bb0eecf72951f4ad94e50dea3bd33387a426053f WHIRLPOOL 10a2f361e2dc47b54085ef847478bd281cd56b356245a2371d9803673fccb162c25e4d6963db6d006b737446031848f2aba77f387856e9ac94ca090a0d08edc4
+DIST glazedlists-1.8.0-source_java15.zip 1169436 SHA256 1afbded7118d3026a666622c8a6aa46bc41ae09c9e832125fe3dc3a3dba5d42b SHA512 3fc3f339a248a8aad897409d752464d60b504474ae1e4d99fa7fbb41d767928137711d5d9979154b53d677e42746e2df2dfefdc71fa4a8017ec70ab23dc4b6a5 WHIRLPOOL b5d37cebde2be0a57032be29667763d97b54f3d1a5b48e40e09b5ce09e3ae654776c4d6817c09c018fad7fb0d9bdbdde6b6198e4405250fcc2451d008c90fb40
diff --git a/dev-java/glazedlists/files/glazedlists-1.7.0-build.xml.patch b/dev-java/glazedlists/files/glazedlists-1.7.0-build.xml.patch
new file mode 100644
index 000000000000..a4e715bf8125
--- /dev/null
+++ b/dev-java/glazedlists/files/glazedlists-1.7.0-build.xml.patch
@@ -0,0 +1,116 @@
+--- build.xml.orig	2007-11-04 23:22:54.000000000 +0100
++++ build.xml	2007-11-04 23:23:58.000000000 +0100
+@@ -84,7 +84,7 @@
+             <link href="http://help.eclipse.org/help31/nftopic/org.eclipse.platform.doc.isv/reference/api/"/>
+             <link href="http://www.jdocs.com/formlayout/1.0.4/api/" packagelistloc="extensions/jgoodiesforms/lib"/>
+             <link href="http://nachocalendar.sourceforge.net/doc/"/>
+-            <link href="http://www.jfree.org/jfreechart/javadoc/"/>
++            <link href="http://www.jfree.org/jfreechart/api/javadoc/"/>
+             <link href="http://download.java.net/javadesktop/swinglabs/releases/0.8/docs/api/"/>
+ 
+             <doctitle><![CDATA[<h1>Glazed Lists 1.7.0</h1>]]></doctitle>
+@@ -130,7 +130,7 @@
+ 		description="Compile the default components of the source.">
+ 	</target>
+ 
+-	<target name="compileall" depends="core,migrationkit,swing,io,swt,ktable,jfreechart,issuesbrowser,swinglabs,treetable"
++	<target name="compileall" depends="core,migrationkit,swing,io,treetable"
+ 		description="Compile all components of the source.">
+ 	</target>
+ 
+@@ -178,11 +178,13 @@
+ 
+     <target name="swt" depends="core">
+         <mkdir dir="extensions/swt/lib"/>
++	<!--
+         <java classname="ca.odell.glazedlists.impl.HttpClient">
+             <classpath path="${classes.dir}"/>
+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/25145/swt-api.jar"/>
+             <arg value="extensions/swt/lib/swt-api.jar"/>
+         </java>
++        -->
+         <javac destdir="${classes.dir}" srcdir="extensions/swt/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <fileset dir="extensions/swt/lib/" includes="*.jar"/>
+@@ -207,11 +209,13 @@
+ 
+     <target name="jgoodiesforms" depends="core,swing">
+         <mkdir dir="extensions/jgoodiesforms/lib"/>
++        <!--
+         <java classname="ca.odell.glazedlists.impl.HttpClient">
+             <classpath path="${classes.dir}"/>
+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/27334/forms.jar"/>
+             <arg value="extensions/jgoodiesforms/lib/forms.jar"/>
+         </java>
++        -->
+         <javac destdir="${classes.dir}" srcdir="extensions/jgoodiesforms/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <fileset dir="extensions/jgoodiesforms/lib/" includes="*.jar"/>
+@@ -223,11 +227,13 @@
+         <!-- the swinglabs .jar is Java 1.5+ only, so we do not bother to run
+              this code through our Java 1.5 to Java 1.4 source code translator -->
+         <mkdir dir="extensions/swinglabs/lib"/>
++        <!--
+         <java classname="ca.odell.glazedlists.impl.HttpClient">
+             <classpath path="${classes.dir}"/>
+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/32966/swingx.jar"/>
+             <arg value="extensions/swinglabs/lib/swingx.jar"/>
+         </java>
++        -->
+         <javac destdir="${classes.dir}" srcdir="extensions/swinglabs/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <fileset dir="extensions/swinglabs/lib/" includes="*.jar"/>
+@@ -237,11 +243,13 @@
+ 
+     <target name="nachocalendar" depends="core,swing">
+         <mkdir dir="extensions/nachocalendar/lib"/>
++        <!--
+         <java classname="ca.odell.glazedlists.impl.HttpClient">
+             <classpath path="${classes.dir}"/>
+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/29958/nachocalendar.jar"/>
+             <arg value="extensions/nachocalendar/lib/nachocalendar.jar"/>
+         </java>
++        -->
+         <javac destdir="${classes.dir}" srcdir="extensions/nachocalendar/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <fileset dir="extensions/nachocalendar/lib/" includes="*.jar"/>
+@@ -255,6 +263,7 @@
+ 
+     <target name="jfreechart" depends="swing">
+         <mkdir dir="extensions/jfreechart/lib"/>
++        <!--
+         <java classname="ca.odell.glazedlists.impl.HttpClient">
+             <classpath path="${classes.dir}"/>
+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/26197/jcommon.jar"/>
+@@ -265,6 +274,7 @@
+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/26198/jfreechart.jar"/>
+             <arg value="extensions/jfreechart/lib/jfreechart.jar"/>
+         </java>
++        -->
+         <javac destdir="${classes.dir}" srcdir="extensions/jfreechart/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <fileset dir="extensions/jfreechart/lib/" includes="*.jar"/>
+@@ -535,7 +545,6 @@
+                         <pathelement location="${classes.dir}"/>
+                         <pathelement location="${testclasses.dir}"/>
+                         <fileset dir="extensions" includes="**/*.jar"/>
+-                        <fileset file="${ant.home}/lib/junit.jar"/>
+                     </classpath>
+                     <formatter type="brief" usefile="false"/>
+                     <batchtest>
+@@ -546,15 +555,11 @@
+     </target>
+ 
+     <target name="compiletests" depends="compileall">
+-        <!-- Verify that JUnit is available on the classpath -->
+-		<available classname="junit.framework.TestCase" property="junit.present"/>
+-		<fail unless="junit.present" message="To run this task, install junit.jar and optional.jar into ${ant.home}/lib/ JUnit is available free at http://www.junit.org"/>
+ 		<mkdir dir="${testclasses.dir}"/>
+ 	    <javac destdir="${testclasses.dir}" srcdir="test" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <pathelement location="${classes.dir}"/>
+                 <fileset dir="extensions" includes="**/*.jar"/>
+-                <fileset file="${ant.home}/lib/junit.jar"/>
+             </classpath>
+         </javac>
+     </target>
diff --git a/dev-java/glazedlists/files/glazedlists-1.8.0-build.xml.patch b/dev-java/glazedlists/files/glazedlists-1.8.0-build.xml.patch
new file mode 100644
index 000000000000..624df5ee9c76
--- /dev/null
+++ b/dev-java/glazedlists/files/glazedlists-1.8.0-build.xml.patch
@@ -0,0 +1,57 @@
+--- build.xml.orig	2009-01-25 18:14:28.000000000 -0700
++++ build.xml	2014-02-20 11:22:45.000000000 -0700
+@@ -164,14 +164,18 @@
+ 

+         <mkdir dir="tools"/>

+         <!--download the BND library for creating entries in the manifest.mf file which make it a compliant OSGi bundle. See http://www.osgi.org/ -->

++        <!--

+         <java classname="ca.odell.glazedlists.impl.HttpClient">

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

+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/110958/bnd.jar"/>

+             <arg value="tools/bnd.jar"/>

+         </java>

++        -->

+ 

+         <!-- prepare the bnd task which generates OSGi bundle JARs -->

++        <!--

+         <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="tools/bnd.jar"/>

++        -->

+ 

+         <!-- create a normal jar file -->

+         <jar destfile="${target.dir}/${jar.file}" update="true" index="true">

+@@ -184,13 +188,19 @@
+         </jar>

+ 

+         <!-- use the BND tool to generate an OSGi jar from scratch, using the original JAR file as input -->

++        <!--

+         <bnd classpath="${target.dir}/${jar.file}" output="${target.dir}/${jar.file}.osgi" exceptions="true" files="glazedlists.bnd"/>

++        -->

+ 

+         <!-- delete the original jar file -->

++        <!--

+         <delete file="${target.dir}/${jar.file}"/>

++        -->

+ 

+         <!-- rename the OSGi Bundle to the orignal jar file's name -->

++        <!--

+         <move file="${target.dir}/${jar.file}.osgi" toFile="${target.dir}/${jar.file}"/>

++        -->

+     </target>

+ 

+ 	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

+@@ -201,7 +211,7 @@
+ 		description="Compile the default components of the source.">

+ 	</target>

+ 

+-	<target name="compileall" depends="core,migrationkit,swing,io,calculation,swt,ktable,issuesbrowser,swinglabs,hibernate,icu4j"

++	<target name="compileall" depends="core,migrationkit,swing,io"

+ 		description="Compile all components of the source.">

+ 	</target>

+ 

+@@ -1032,4 +1042,4 @@
+         </delete>

+     </target>

+ 

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

diff --git a/dev-java/glazedlists/glazedlists-1.7.0-r1.ebuild b/dev-java/glazedlists/glazedlists-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..48a85df039ae
--- /dev/null
+++ b/dev-java/glazedlists/glazedlists-1.7.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A toolkit for list transformations"
+HOMEPAGE="http://publicobject.com/glazedlists/"
+SRC_DOCUMENT_ID_JAVA5="1073/38679"
+SRC_URI="https://${PN}.dev.java.net/files/documents/${SRC_DOCUMENT_ID_JAVA5}/${P}-source_java15.zip"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+# TODO: there are extensions, some supported in the java-experimental ebuild
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+# tests seem to be buggy
+RESTRICT="test"
+
+# build file already has correct target version
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# disable autodownloading of dependencies
+	# sort out test targets
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+}
+
+EANT_DOC_TARGET="docs"
+
+src_install() {
+	java-pkg_newjar "target/${PN}_java15.jar"
+
+	if use doc; then
+		dohtml readme.html || die
+		java-pkg_dojavadoc "target/docs/api"
+	fi
+	if use source; then
+		# collect source folders for all the used extensions
+		local source_folders="source/ca extensions/treetable/source/*"
+		java-pkg_dosrc ${source_folders}
+	fi
+}
diff --git a/dev-java/glazedlists/glazedlists-1.8.0.ebuild b/dev-java/glazedlists/glazedlists-1.8.0.ebuild
new file mode 100644
index 000000000000..92583faddaa5
--- /dev/null
+++ b/dev-java/glazedlists/glazedlists-1.8.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A toolkit for list transformations"
+HOMEPAGE="http://www.glazedlists.com/"
+SRC_URI="http://java.net/downloads/${PN}/${P}/${P}-source_java15.zip"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+# TODO: there are extensions, some supported in the java-experimental ebuild
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+JAVA_PKG_BSFIX="off"
+
+# tests seem to be buggy
+RESTRICT="test"
+
+java_prepare() {
+	# disable autodownloading of dependencies
+	# sort out test targets
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+}
+
+EANT_DOC_TARGET="docs"
+
+src_install() {
+	java-pkg_newjar "target/${PN}_java15.jar"
+
+	if use doc; then
+		dohtml readme.html || die
+		java-pkg_dojavadoc "target/docs/api"
+	fi
+	if use source; then
+		# collect source folders for all the used extensions
+		local source_folders="source/ca extensions/treetable/source/*"
+		java-pkg_dosrc ${source_folders}
+	fi
+}
diff --git a/dev-java/glazedlists/metadata.xml b/dev-java/glazedlists/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/glazedlists/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/gnu-classpath-inetlib/Manifest b/dev-java/gnu-classpath-inetlib/Manifest
new file mode 100644
index 000000000000..8f66244d852a
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/Manifest
@@ -0,0 +1,2 @@
+DIST inetlib-1.0.tar.gz 151002 SHA256 f59a46051b01dd01f04d0cc677d95a6c02b3389787d59a63b0f74bef20f887f8 SHA512 f3efa679d4f09d65025b3a903bb94eeced6470fff4414a1a1dc00985f644855bef9aaf5015c24c4321a6088e5ca48ced2177548f11dc84c07b4e5281b9709ede WHIRLPOOL 8f79486a4c11926ab9063a25efe411c39adebe377c93a8bc2484fc09907ed97455f231778d462aaae5fb8830da1d39d9a00cdbdc50e83905df4e9bc1491399d8
+DIST inetlib-1.1.tar.gz 177251 SHA256 2b30cad60f3136b04f9ae4a906da8ac964654dacd3281097ec3558e67c9a51a0 SHA512 0ebc112bc8758ca8da23797d71d91d386896be6105cc1a40448445e59a6cdc43dc5dcd84f8b69332d7b7eaf11efd474588cadcb68f7356f2aa40657aaf62147b WHIRLPOOL 48bc55ac1b102c81f3de0d1e943ff51731e963b5cd9ac080a91a99f3da7ed48966deb034f4c863d722aef0461ff96f153dccb62c1edced5ac7c8c1897bb0b5d6
diff --git a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch
new file mode 100644
index 000000000000..c6db3e2f6956
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.0-jdk15.patch
@@ -0,0 +1,64 @@
+diff -uNr inetlib-1.0.orig/source/gnu/inet/imap/IMAPConnection.java inetlib-1.0/source/gnu/inet/imap/IMAPConnection.java
+--- inetlib-1.0.orig/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 13:18:21.512067374 +0200
++++ inetlib-1.0/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 13:19:07.024373510 +0200
+@@ -45,7 +45,6 @@
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -555,7 +554,7 @@
+           String[] m = new String[] { mechanism };
+           CallbackHandler ch = new SaslCallbackHandler(username, password);
+           // Avoid lengthy callback procedure for GNU Crypto
+-          Properties p = new Properties();
++          HashMap p = new HashMap();
+           p.put("gnu.crypto.sasl.username", username);
+           p.put("gnu.crypto.sasl.password", password);
+           SaslClient sasl = Sasl.createSaslClient(m, null, "smtp",
+diff -uNr inetlib-1.0.orig/source/gnu/inet/pop3/POP3Connection.java inetlib-1.0/source/gnu/inet/pop3/POP3Connection.java
+--- inetlib-1.0.orig/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 13:18:21.531064997 +0200
++++ inetlib-1.0/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 13:20:28.841137790 +0200
+@@ -39,8 +39,8 @@
+ import java.security.MessageDigest;
+ import java.security.NoSuchAlgorithmException;
+ import java.util.ArrayList;
++import java.util.HashMap;
+ import java.util.List;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -220,7 +220,7 @@
+           String[] m = new String[] { mechanism };
+           CallbackHandler ch = new SaslCallbackHandler (username, password);
+           // Avoid lengthy callback procedure for GNU Crypto
+-          Properties p = new Properties ();
++          HashMap p = new HashMap();
+           p.put ("gnu.crypto.sasl.username", username);
+           p.put ("gnu.crypto.sasl.password", password);
+           SaslClient sasl =
+diff -uNr inetlib-1.0.orig/source/gnu/inet/smtp/SMTPConnection.java inetlib-1.0/source/gnu/inet/smtp/SMTPConnection.java
+--- inetlib-1.0.orig/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 13:18:21.533064747 +0200
++++ inetlib-1.0/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 13:21:16.996113371 +0200
+@@ -37,8 +37,8 @@
+ import java.security.GeneralSecurityException;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.HashMap;
+ import java.util.List;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -567,7 +567,7 @@
+           String[] m = new String[] { mechanism };
+           CallbackHandler ch = new SaslCallbackHandler (username, password);
+           // Avoid lengthy callback procedure for GNU Crypto
+-          Properties p = new Properties ();
++          HashMap p = new HashMap();
+           p.put ("gnu.crypto.sasl.username", username);
+           p.put ("gnu.crypto.sasl.password", password);
+           SaslClient sasl =
diff --git a/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch
new file mode 100644
index 000000000000..e717fd4e52c1
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/files/gnu-classpath-inetlib-1.1-jdk15.patch
@@ -0,0 +1,87 @@
+diff -uNr inetlib.orig/source/gnu/inet/imap/IMAPConnection.java inetlib/source/gnu/inet/imap/IMAPConnection.java
+--- inetlib.orig/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 10:25:48.402313856 +0200
++++ inetlib/source/gnu/inet/imap/IMAPConnection.java	2006-09-19 10:27:02.775026067 +0200
+@@ -46,7 +46,6 @@
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -653,7 +652,7 @@
+         String[] m = new String[] { mechanism };
+         CallbackHandler ch = new SaslCallbackHandler (username, password);
+         // Avoid lengthy callback procedure for GNU Crypto
+-        Properties p = new Properties ();
++        HashMap p = new HashMap();
+         p.put ("gnu.crypto.sasl.username", username);
+         p.put ("gnu.crypto.sasl.password", password);
+         SaslClient sasl = Sasl.createSaslClient (m, null, "smtp",
+diff -uNr inetlib.orig/source/gnu/inet/nntp/NNTPConnection.java inetlib/source/gnu/inet/nntp/NNTPConnection.java
+--- inetlib.orig/source/gnu/inet/nntp/NNTPConnection.java	2006-09-19 10:25:48.420311609 +0200
++++ inetlib/source/gnu/inet/nntp/NNTPConnection.java	2006-09-19 10:29:02.781039000 +0200
+@@ -42,7 +42,7 @@
+ import java.util.Calendar;
+ import java.util.Date;
+ import java.util.GregorianCalendar;
+-import java.util.Properties;
++import java.util.HashMap;
+ import java.util.TimeZone;
+ 
+ import javax.security.auth.callback.CallbackHandler;
+@@ -1140,7 +1140,7 @@
+     String[] m = new String[] { mechanism };
+     CallbackHandler ch = new SaslCallbackHandler (username, password);
+     // Avoid lengthy callback procedure for GNU Crypto
+-    Properties p = new Properties ();
++    HashMap p = new HashMap();
+     p.put ("gnu.crypto.sasl.username", username);
+     p.put ("gnu.crypto.sasl.password", password);
+     SaslClient sasl =
+diff -uNr inetlib.orig/source/gnu/inet/pop3/POP3Connection.java inetlib/source/gnu/inet/pop3/POP3Connection.java
+--- inetlib.orig/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 10:25:48.426310859 +0200
++++ inetlib/source/gnu/inet/pop3/POP3Connection.java	2006-09-19 10:27:59.374957608 +0200
+@@ -41,10 +41,10 @@
+ import java.security.NoSuchAlgorithmException;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.HashMap;
+ import java.util.LinkedHashMap;
+ import java.util.List;
+ import java.util.Map;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -232,7 +232,7 @@
+         String[] m = new String[] { mechanism };
+         CallbackHandler ch = new SaslCallbackHandler (username, password);
+         // Avoid lengthy callback procedure for GNU Crypto
+-        Properties p = new Properties ();
++        HashMap p = new HashMap();
+         p.put ("gnu.crypto.sasl.username", username);
+         p.put ("gnu.crypto.sasl.password", password);
+         SaslClient sasl =
+diff -uNr inetlib.orig/source/gnu/inet/smtp/SMTPConnection.java inetlib/source/gnu/inet/smtp/SMTPConnection.java
+--- inetlib.orig/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 10:25:48.428310610 +0200
++++ inetlib/source/gnu/inet/smtp/SMTPConnection.java	2006-09-19 10:26:34.107606132 +0200
+@@ -38,8 +38,8 @@
+ import java.security.GeneralSecurityException;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.HashMap;
+ import java.util.List;
+-import java.util.Properties;
+ 
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.SSLSocket;
+@@ -598,7 +598,7 @@
+         String[] m = new String[] { mechanism };
+         CallbackHandler ch = new SaslCallbackHandler (username, password);
+         // Avoid lengthy callback procedure for GNU Crypto
+-        Properties p = new Properties ();
++        HashMap p = new HashMap();
+         p.put ("gnu.crypto.sasl.username", username);
+         p.put ("gnu.crypto.sasl.password", password);
+         SaslClient sasl =
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild
new file mode 100644
index 000000000000..20dfc928d96e
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+MY_PN="inetlib"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Network extensions library for GNU classpath and classpathx"
+HOMEPAGE="http://www.gnu.org/software/classpath/"
+SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
+LICENSE="GPL-2-with-linking-exception"
+SLOT="1.0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="doc"
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/gnu-crypto-2.0.1"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+# TODO we could give configure the lib dir on the live filesystem
+# instead of populating ${S}/ext with the jars we need -nichoj
+# TODO fix jikes support. Related to bug #89711
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-jdk15.patch"
+
+	mkdir ext && cd ext
+	java-pkg_jar-from gnu-crypto javax-security.jar javax-security-auth-callback.jar
+	java-pkg_jar-from gnu-crypto javax-security.jar javax-security-sasl.jar
+	# fake jar to shut build system up, jsse is part of JDK's classpath already
+	ln -s javax-security-sasl.jar jsse.jar
+}
+
+src_compile() {
+	econf \
+		--enable-smtp \
+		--enable-imap \
+		--enable-pop3 \
+		--enable-nntp \
+		--enable-ftp \
+		--enable-gopher \
+		--with-jsse-jar="${S}"/ext \
+		--with-javax-security-auth-callback-jar="${S}"/ext \
+		--with-javax-security-sasl-jar="${S}"/ext \
+		|| die "econf failed"
+	# https://bugs.gentoo.org/show_bug.cgi?id=179897
+	emake JAVACFLAGS="${JAVACFLAGS}" -j1 || die "emake failed"
+	if use doc ; then
+		emake -j1 javadoc || die "emake javadoc failed"
+	fi
+}
+
+src_install() {
+	einstall || die
+	rm -rf "${D}"/usr/share/java
+	java-pkg_dojar ${MY_PN}.jar
+	use doc && java-pkg_dojavadoc docs
+	dodoc AUTHORS NEWS README || die
+}
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild
new file mode 100644
index 000000000000..26c4156c60e0
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="inetlib"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Network extensions library for GNU classpath and classpathx"
+HOMEPAGE="http://www.gnu.org/software/classpath/"
+SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
+LICENSE="GPL-2-with-linking-exception"
+SLOT="1.1"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="doc"
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/gnu-crypto-2.0.1"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}"
+S="${WORKDIR}/${MY_PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-jdk15.patch"
+
+	mkdir ext && cd ext
+	java-pkg_jar-from gnu-crypto
+	# fake jar to shut build system up, jsse is part of JDK's classpath already
+	ln -s javax-security.jar jsse.jar
+}
+
+src_compile() {
+	econf \
+		--enable-smtp \
+		--enable-imap \
+		--enable-pop3 \
+		--enable-nntp \
+		--enable-ftp \
+		--enable-gopher \
+		--with-jsse-jar="${S}"/ext \
+		--with-javax-security-jar="${S}"/ext \
+		|| die
+	# https://bugs.gentoo.org/show_bug.cgi?id=179897
+	emake JAVACFLAGS="${JAVACFLAGS}" -j1 || die
+	if use doc ; then
+		emake -j1 javadoc || die
+	fi
+}
+
+src_install() {
+	einstall || die
+	rm -rf "${D}"/usr/share/java
+	java-pkg_dojar inetlib.jar
+	use doc && java-pkg_dojavadoc docs
+	dodoc AUTHORS NEWS README || die
+}
diff --git a/dev-java/gnu-classpath-inetlib/metadata.xml b/dev-java/gnu-classpath-inetlib/metadata.xml
new file mode 100644
index 000000000000..50b68a318ac8
--- /dev/null
+++ b/dev-java/gnu-classpath-inetlib/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<longdescription>
+GNU Classpath inetlib is an extension library to provide extra network
+protocol support for GNU Classpath and ClasspathX project, but it can
+also used standalone to make adding http, imap, pop3 and smtp client
+support to applictions.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
new file mode 100644
index 000000000000..7a69675cd973
--- /dev/null
+++ b/dev-java/gnu-classpath/Manifest
@@ -0,0 +1 @@
+DIST classpath-0.98.tar.gz 11021342 SHA256 501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f SHA512 0d98f87cd78c166d566ecd8d0372f2d6cdf422e8c4c806ca01d3a77dafbdd80ee936de78a2c5d4226174027efdc053fe92669514bdd8acb3290a7b3ec002d31f WHIRLPOOL 1248288af3821fedae226852da41b1a176e0c03f83f95b7e7a123655e3b588f4b1716274aebd1b728b11a63e35c820994bce0293b4bed6ea8837dabb0bf90c7e
diff --git a/dev-java/gnu-classpath/files/gnu-classpath-0.98-r3-freetype-2.5.3-support.patch b/dev-java/gnu-classpath/files/gnu-classpath-0.98-r3-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-r3-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-r3.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
new file mode 100644
index 000000000000..f3d5757c64e2
--- /dev/null
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils java-pkg-2 multilib
+
+MY_P=${P/gnu-/}
+DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
+SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/classpath"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0.98"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer qt4 xml"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+		doc? ( >=dev-java/gjdoc-0.7.9-r2 )
+		dssi? ( >=media-libs/dssi-0.9 )
+		gconf? ( gnome-base/gconf )
+		gjdoc? ( >=dev-java/antlr-2.7.1:0 )
+		gmp? ( >=dev-libs/gmp-4.2.4 )
+		gstreamer? (
+			>=media-libs/gstreamer-0.10.10:0.10
+			>=media-libs/gst-plugins-base-0.10.10:0.10
+			x11-libs/gtk+:2
+		)
+		gtk? (
+				>=x11-libs/gtk+-2.8:2
+				>=dev-libs/glib-2.0
+				media-libs/freetype
+				>=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
+		)
+		qt4? ( dev-qt/qtgui:4 )
+		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+
+# java-config >2.1.11 needed for ecj version globbing
+# We should make the build not pickup the wrong antlr binary from pccts
+DEPEND="app-arch/zip
+		dev-java/eclipse-ecj
+		>=dev-java/java-config-2.1.11
+		gjdoc? ( !!dev-util/pccts )
+		gtk? (
+			x11-libs/libXrender
+			|| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )
+			x11-proto/xproto
+		)
+		>=virtual/jdk-1.5
+		${RDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PF}-freetype-2.5.3-support.patch
+}
+
+src_configure() {
+	# We require ecj anyway, so force it to avoid problems with bad versions of javac
+	export JAVAC="${EPREFIX}/usr/bin/ecj"
+	export JAVA="${EPREFIX}/usr/bin/java"
+	# build takes care of them itself, duplicate -source -target kills ecj
+	export JAVACFLAGS="-nowarn"
+	# build system is passing -J-Xmx768M which ecj however ignores
+	# this will make the ecj launcher do it (seen case where default was not enough heap)
+	export gjl_java_args="-Xmx768M"
+
+	# 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
+
+	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 gstreamer gstreamer-peer) \
+		$(use_enable qt4 qt-peer) \
+		$(use_enable xml xmlj) \
+		$(use_enable dssi ) \
+		$(use_with doc gjdoc) \
+		--enable-jni \
+		--disable-dependency-tracking \
+		--disable-plugin \
+		--host=${CHOST} \
+		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
+		--with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj-* ecj.jar) \
+		--disable-Werror \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
+	java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
+}
diff --git a/dev-java/gnu-classpath/metadata.xml b/dev-java/gnu-classpath/metadata.xml
new file mode 100644
index 000000000000..4feb4c23be56
--- /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>
+	<herd>java</herd>
+	<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="gstreamer">Build with GStreamer javax.sound.sampler provider</flag>
+		<flag name="qt4">Build with Qt4 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..3fdfb7d61ab4
--- /dev/null
+++ b/dev-java/gnu-crypto/Manifest
@@ -0,0 +1 @@
+DIST gnu-crypto-2.0.1.tar.bz2 3895714 SHA256 a7398758a5dd62f2a30bd083c3646092006d51a63b7a91ab608dc2c80d569d2c SHA512 c14aa73fb23663559195e8fc7f85a220b25078fa8ab4e7cf43b84febe96599d990ccf52fcf1f6f66f2b547d9b644bbc99b3d44dc4a777dcb72530e58c8509015 WHIRLPOOL 1ce73d64e763ef04157915938e661999bdc7861940f5d9bfbea35601b9345b05baf5ba60dbcce17d2892a1cae3d31fead53363c44306cbd4951dbce9bcefa3e2
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..bb631a1c189c
--- /dev/null
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils
+
+DESCRIPTION="GNU Crypto cryptographic primitives for Java"
+HOMEPAGE="http://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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..f06c563f37b7
--- /dev/null
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="GNU Crypto cryptographic primitives for Java"
+HOMEPAGE="http://www.gnu.org/software/gnu-crypto/"
+SRC_URI="ftp://ftp.gnupg.org/GnuPG/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..3a7ea50b6a43
--- /dev/null
+++ b/dev-java/gnu-crypto/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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..2f903d34d9af
--- /dev/null
+++ b/dev-java/gnu-hylafax/Manifest
@@ -0,0 +1 @@
+DIST gnu-hylafax-1.0.3-bin.tar.gz 1742697 SHA256 1e35853af20d74e1c3acbc460ef7fb04f76fc52be11ff0b560abe14b3c4f0a61 SHA512 7af66dac5a1b98eddc3d60aa439809f4e683a39a795ca50d0f99f92d4fb17704ab5c7528218be1f4698bca0749efd46c5ec3510e8a10a68b1b77faf1997dc4a2 WHIRLPOOL 2081d2238ca8ec5709ce7520547370b6a8431e33e33fb318612eb43cced6edfb1fc02836cca4bfc1d7c3edc24a3ea63bc53ac34cd573da436f10031c7f7b1ccf
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..04bfbb815c71
--- /dev/null
+++ b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}"
+
+# bug 546502
+PATCHES=(
+	"${FILESDIR}"/"${P}"-ClientPool.patch
+)
+
+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..00c3849387b1
--- /dev/null
+++ b/dev-java/gnu-hylafax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..96e87e436d8b
--- /dev/null
+++ b/dev-java/gnu-jaf/Manifest
@@ -0,0 +1 @@
+DIST activation-1.1.1.tar.gz 157018 SHA256 b1b5ef560d30fcb11fbf537246857d14110ce4eb2b200d4c54690472305d87b7 SHA512 d323644df13a4572bf1c10e7175c1c4cfa3078483886bba7b308989c215a23e12939b054124dbaf0437a4c5fdcb551b4e2189c09afc078218963389e4b3c3b7d WHIRLPOOL 28e6390302476710fba3fac5c2df43790b05de72dcecd3640e82829ef8139621871ea70dcced279ffb8ccd6f7a11ae5f5fe64af9c5e5bc29da603e62474790f9
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..c2256bd98acf
--- /dev/null
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="GNU implementation of the JavaBeans Activation Framework"
+HOMEPAGE="http://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 ppc 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..003d6fb8d011
--- /dev/null
+++ b/dev-java/gnu-jaf/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+
+<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-javamail/Manifest b/dev-java/gnu-javamail/Manifest
new file mode 100644
index 000000000000..03c01800bac3
--- /dev/null
+++ b/dev-java/gnu-javamail/Manifest
@@ -0,0 +1 @@
+DIST mail-1.0.tar.gz 707084 SHA256 0dcbf6b24ea1f0a47a4aff15060dda19349d8bea7025a6e7d2249969afb7099e SHA512 14513b577a312c4c3ba994db02ca561614f64d532baf07a3f58d97d8a8e129d83ed29a835b079131c1789c584b851188ae1450a531b6e5a544513c219bc37f09 WHIRLPOOL 6001858a0bb73bbb5ea855fc781ee09ed3773c7de67fc4cfed7fd6b34ea3bced42c78900de022996a2ae34651aa7884cb2e6a69d25e5fb2ade7415707a51913b
diff --git a/dev-java/gnu-javamail/gnu-javamail-1.0-r2.ebuild b/dev-java/gnu-javamail/gnu-javamail-1.0-r2.ebuild
new file mode 100644
index 000000000000..f30e319ebc81
--- /dev/null
+++ b/dev-java/gnu-javamail/gnu-javamail-1.0-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+MY_PN="mail"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="GNU implementation of the Javamail API"
+HOMEPAGE="http://www.gnu.org/software/classpathx/javamail/"
+SRC_URI="mirror://gnu/classpathx/${MY_P}.tar.gz"
+LICENSE="GPL-2-with-linking-exception"
+SLOT="1"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/gnu-jaf-1*
+	=dev-java/gnu-classpath-inetlib-1.0*
+	!<=dev-java/mx4j-3.0.1
+	!<=dev-java/mx4j-3.0.1-r2"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+# TODO: Re-enable jikes support (see bug #89711)
+
+src_compile() {
+	local activation=$(dirname $(java-pkg_getjar gnu-jaf-1 activation.jar))
+	local inetlib=$(dirname $(java-pkg_getjar gnu-classpath-inetlib-1.0 inetlib.jar))
+
+	econf \
+		--with-activation-jar=${activation} \
+		--with-inetlib-jar=${inetlib} \
+		--enable-smtp \
+		--enable-imap \
+		--enable-pop3 \
+		--enable-nntp \
+		--enable-mbox \
+		--enable-maildir \
+		|| die "failed to configure"
+
+	emake JAVACFLAGS="${JAVACFLAGS}" || die "failed to compile"
+
+	if use doc; then
+		emake javadoc || die "failed to generate javadoc"
+	fi
+}
+
+src_install() {
+	java-pkg_dojar gnumail-providers.jar
+	java-pkg_newjar gnumail.jar mail.jar
+	dodoc AUTHORS ChangeLog NEWS README README.*
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/gnu-javamail/metadata.xml b/dev-java/gnu-javamail/metadata.xml
new file mode 100644
index 000000000000..a2c2a21734d6
--- /dev/null
+++ b/dev-java/gnu-javamail/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<longdescription>
+GNU JavaMail is a free implementation of the JavaMail API specification,
+version 1.3. All the code has been written from scratch without
+reference to Sun's code, which allows GNU JavaMail to be used on a
+completely free operating system such as GNU/Linux or the Hurd. The code
+is optimized to work with free Java implementations, nothing prevents it
+from being used with any compliant JVM.
+
+GNU JavaMail provides a protocol-independent framework for building mail
+client applications in Java. The API itself provides a complete MIME
+implementation, and drivers for individual messaging protocols, known as
+providers, can be plugged into the JavaMail framework dynamically.
+Several providers, implementing Internet standard protocols, are
+included with GNU JavaMail. These include:
+
+* SMTP, IMAP, POP3
+* NNTP including posting to news servers
+* The UNIX mbox format
+* Dan Bernstein's Maildir format
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/gnu-regexp/Manifest b/dev-java/gnu-regexp/Manifest
new file mode 100644
index 000000000000..0442419f54a0
--- /dev/null
+++ b/dev-java/gnu-regexp/Manifest
@@ -0,0 +1 @@
+DIST gnu.regexp-1.1.4.tar.gz 164741 SHA256 493d9cbcb2cc08580be255f21543f3fe638a1eb93f605180583c91e1c5622080 SHA512 4397ecd2a485f67213ee74e1c942a1bfd1af5f261f964546cb3c7bc32fe88702a557d717f07d2a4d7d1db2d684ddc4191c120b35b44d1a68a126f7b81d8b0331 WHIRLPOOL 38b14b8dff8d214280f35893ad0c16ec6e8ec74e7ecd6d1d5df44bb3b88ef557589cf0d7011730bfd3fa40cb1c2861dc6655b73910aee4fc976a87da8e0e8de6
diff --git a/dev-java/gnu-regexp/files/1.1.4/Makefile.diff b/dev-java/gnu-regexp/files/1.1.4/Makefile.diff
new file mode 100644
index 000000000000..b947f9f36aad
--- /dev/null
+++ b/dev-java/gnu-regexp/files/1.1.4/Makefile.diff
@@ -0,0 +1,19 @@
+--- src/Makefile	2005-05-18 13:26:10.000000000 +0200
++++ src/Makefile.new	2005-05-18 13:26:27.000000000 +0200
+@@ -57,12 +57,12 @@
+ # Change JAVAC variable to your java compiler.
+ # Change JAVAFLAGS variable to any java flags you want to compile with.
+ 
+-JAVAC = jikes
+-JAVAFLAGS = -O
+-
+-#JAVAC = javac
++#JAVAC = jikes
+ #JAVAFLAGS = -O
+ 
++JAVAC = javac
++JAVAFLAGS = -O
++
+ JAVACOMPILE = $(JAVAC) -d "$(LIBPATH)" $(JAVAFLAGSCLASSPATH) $(JAVAFLAGS)
+ 
+ # This is the directory the gnu.regexp JAR file will be installed in when
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild
new file mode 100644
index 000000000000..1d1e775befaa
--- /dev/null
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 eutils
+
+MY_P=gnu.regexp-${PV}
+DESCRIPTION="GNU regular expression package for Java"
+HOMEPAGE="http://www.cacas.org/java/gnu/regexp/"
+SRC_URI="ftp://ftp.tralfamadore.com/pub/java/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm lib/*.jar
+	rm -rf docs/api
+}
+
+src_compile() {
+	cd "${S}/src"
+	emake -j1 JAVAC="${JAVAC}" JAVAFLAGS="${JAVACFLAGS}" || die "emake failed"
+	use doc && emake javadocs
+}
+
+src_install() {
+	java-pkg_newjar lib/gnu-regexp-${PV}.jar ${PN}.jar
+	dodoc README TODO
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/gnu
+}
diff --git a/dev-java/gnu-regexp/metadata.xml b/dev-java/gnu-regexp/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/gnu-regexp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
new file mode 100644
index 000000000000..cfd4ef898d5f
--- /dev/null
+++ b/dev-java/groovy/Manifest
@@ -0,0 +1,4 @@
+DIST groovy-src-1.6.8.zip 11998683 SHA256 caa83f91e154211b1fcf688fb16d97d63b552fbb9e2bb240ea82fb13f90b1c80 SHA512 9e914227f6e09041ccb8b918136ed2a0c264f96f1df3f033ab57cfbf3a9e6c62cfd365032040c5599d56e2f7b4c19ac9912effa3c4768c832d57ebaca6f05920 WHIRLPOOL 7cd6e33a768c833142d0387f4c47189aa7edb4f4a63dbd3b551815c7ea33174ecc428418293259902c8f8fdb55f473a05067827c7fb2e49cd3b5d6a65dc7312f
+DIST groovy-src-1.7.10.zip 12912772 SHA256 268c4504d50347e61fd83a4d04ebddbd4bf8139a4ba599de640d5537f3e4ad0c SHA512 d58cb0d135274e5e43730b517318d50d935a1b1883648318aa1c120d01181be7d3ac2796e3b68031b8d24e0fb6e9fa6fb8b1cbbfdee651a036e6000ec9be5ef1 WHIRLPOOL 992ac01f74f1fca05c4feb526d1f1a87425cd55fbc5cc39f18b999c53a54d6caf99a9353ff32dd080245ae4e7817810f9a8790a099d35566a1aa5938cfca99f3
+DIST groovy-src-1.7.5.zip 12875363 SHA256 9864b36d681ecc4e4a8f86c8b958203f8e2c01c150a3f992f5f63df552979067 SHA512 fa0f617d1894e6fd7b30216b69dc3060154a31d28a3831e7135b18377c5bc368d193d914d2b77a7daf28498562fb96c04794c874101b23dafb4421e3a1d59404 WHIRLPOOL 478346b89661f6b57cc5740df038e8bf3ced62a84a4de1dea3da94a9519cae6eba43cf583c4a81b2f459f6409a7387c2079098b12495b9f1b669260af4efaccb
+DIST groovy-src-1.8.5.zip 13131836 SHA256 82f1e45e5886278a4c86ed15dfd90a84b7e43848c72537a235835c7557e8f8cd SHA512 23cddae38b6d0b1b83dae7cf7ebc3fe68f7e8ddb33cd6fa421c0c3c76ca8bf5a8b3fe72cabe915901305f513a2b3269baf205a7a0dd6b1c6f751496d51e0557a WHIRLPOOL 9db6d1da9304e8000de9954faf91d26d76c15e628a25a09c1291afc2ca8b33bbe24d44d891599548df6931db632ae6cd801e83cb05fb6abf33f3282f463a4482
diff --git a/dev-java/groovy/files/groovy-1.8-build-pref-locking-fix.patch b/dev-java/groovy/files/groovy-1.8-build-pref-locking-fix.patch
new file mode 100644
index 000000000000..d857afffca1d
--- /dev/null
+++ b/dev-java/groovy/files/groovy-1.8-build-pref-locking-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/build.xml b/build.xml
+index ffca39c..07d93b9 100644
+--- a/build.xml
++++ b/build.xml
+@@ -830,6 +830,7 @@ $Date: 2012/01/28 09:43:04 $
+                 <path refid="toolsPath"/>

+                 <pathelement path="${mainClassesDirectory}"/>

+             </classpath>

++	    <jvmarg value="-Duser.home=${user.home}" />

+             <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/>

+             <arg value="org.codehaus.groovy.runtime.SqlGroovyMethods"/>

+             <arg value="org.codehaus.groovy.runtime.SwingGroovyMethods"/>

diff --git a/dev-java/groovy/groovy-1.6.8.ebuild b/dev-java/groovy/groovy-1.6.8.ebuild
new file mode 100644
index 000000000000..8c8445f9770b
--- /dev/null
+++ b/dev-java/groovy/groovy-1.6.8.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
+# We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
+
+# We currently do not build the embeddable jar (which is created using JarJar).
+# We could provide that via a USE flag.
+# We also don't use automatic build rewriting as there seems to be already some level of support
+# in the upstream build system
+
+# TODO: Install all 3 documentation packages. Currently only the Groovy GDK documentation is installed
+# as our java-pkg_dojavadoc function does not support multiple Javadoc installations.
+# There is also a bug (visible when loading groovyConsole for instance) where asm-1.5 is put on the cp,
+# this conflicts with the 2.2 version needed by Groovy.
+
+EAPI="2"
+WANT_ANT_TASKS="ant-antlr"
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PV=${PV/_rc/-RC-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
+HOMEPAGE="http://groovy.codehaus.org/"
+
+SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
+LICENSE="codehaus-groovy"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+RESTRICT="test"
+
+CDEPEND="
+	dev-java/asm:2.2
+	dev-java/antlr:0
+	>=dev-java/xstream-1.3
+	>=dev-java/junit-3.8.2:0
+	>=dev-java/jline-0.9.91
+	>=dev-java/ant-core-1.7.0
+	>=dev-java/commons-cli-1.2
+	dev-java/servletapi:2.4
+	>=dev-java/bsf-2.4
+	java-virtuals/jmx"
+
+RDEPEND=">=virtual/jre-1.5
+	!<dev-java/groovy-1.6.3
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-ivy:2
+	doc? (
+		dev-java/qdox
+	)
+	test? (
+		dev-java/jmock
+		dev-java/xmlunit
+		dev-db/hsqldb
+		dev-java/commons-logging
+		dev-java/ant-junit
+		dev-java/ant-trax
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_PKG_BSFIX=""
+
+src_prepare() {
+	rm -rf bootstrap
+	# security directory is needed for tests, but they currently don't pass
+	#rm -rf security
+	mkdir -p target/lib && cd target/lib
+	mkdir compile && mkdir runtime && mkdir tools
+	cd compile
+
+	java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-2.2,xstream
+	java-pkg_jar-from jline,junit,servletapi-2.4,bsf-2.3
+	java-pkg_jar-from --virtual jmx
+	java-pkg_jar-from --build-only ant-ivy:2
+	use doc && java-pkg_jar-from --build-only qdox-1.6
+}
+
+src_compile() {
+	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
+		-DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
+
+	use doc && ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars="true" -DruntimeLibDirectory="target/lib/compile" \
+	 -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
+}
+
+src_test() {
+	cd "${S}/target/lib" && mkdir test && mkdir extras && cd compile
+
+	java-pkg_jar-from --build-only ant-junit,jmock-1.0,xmlunit-1,hsqldb,commons-logging,cglib-2.1
+
+	cd "${S}"
+	ANT_TASKS="ant-junit ant-antlr ant-trax" ANT_OPTS="-Duser.home=${T}" eant \
+		-DruntimeLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" test
+}
+
+src_install() {
+	java-pkg_newjar "target/dist/${PN}.jar"
+	use doc && java-pkg_dojavadoc "target/html/groovy-jdk/"
+
+	# FIXME: install those two later
+	#
+	#use doc && java-pkg_dojavadoc "target/html/api/"
+	#use doc && java-pkg_dojavadoc "target/html/gapi/"
+
+	use source && java-pkg_dosrc "src/main/groovy" "src/main/org"
+	java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
+	java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
+	java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
+	java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
+	java-pkg_dolauncher "grape" --main org.codehaus.groovy.tools.GrapeMain
+}
diff --git a/dev-java/groovy/groovy-1.7.10.ebuild b/dev-java/groovy/groovy-1.7.10.ebuild
new file mode 100644
index 000000000000..16410f54c0e8
--- /dev/null
+++ b/dev-java/groovy/groovy-1.7.10.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
+# We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
+
+# We currently do not build the embeddable jar (which is created using JarJar).
+# We could provide that via a USE flag.
+# We also don't use automatic build rewriting as there seems to be already some level of support
+# in the upstream build system
+
+# TODO: Install all 3 documentation packages. Currently only the Groovy GDK documentation is installed
+# as our java-pkg_dojavadoc function does not support multiple Javadoc installations.
+
+EAPI="3"
+WANT_ANT_TASKS="ant-antlr"
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PV=${PV/_rc/-RC-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
+HOMEPAGE="http://groovy.codehaus.org/"
+
+SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
+LICENSE="codehaus-groovy"
+SLOT="0"
+KEYWORDS="~x86 ~x86-linux"
+IUSE="test"
+RESTRICT="test"
+
+CDEPEND=">=dev-java/asm-3.2
+	>=dev-java/ant-core-1.8.0
+	>=dev-java/junit-4.6
+	dev-java/antlr:0
+	dev-java/xstream
+	dev-java/jline
+	dev-java/commons-cli
+	dev-java/jansi
+	dev-java/servletapi:2.4
+	>=dev-java/bsf-2.4
+	java-virtuals/jmx"
+
+RDEPEND=">=virtual/jre-1.5
+	!<dev-java/groovy-1.6.3
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-ivy:2
+	doc? (
+		>=dev-java/qdox-1.12
+	)
+	test? (
+		dev-java/jmock
+		dev-java/xmlunit
+		dev-db/hsqldb
+		dev-java/commons-logging
+		dev-java/ant-junit
+		dev-java/ant-trax
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_PKG_BSFIX=""
+
+src_prepare() {
+	rm -rf bootstrap
+	# security directory is needed for tests, but they currently don't pass
+	#rm -rf security
+	mkdir -p target/lib && cd target/lib
+	mkdir compile && mkdir runtime && mkdir tools
+	cd compile
+
+	java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-3,xstream,jansi
+	java-pkg_jar-from jline,junit,servletapi-2.4,bsf-2.3
+	java-pkg_jar-from --virtual jmx
+	java-pkg_jar-from --build-only ant-ivy:2
+	use doc && java-pkg_jar-from --build-only qdox-1.12,ant-antlr
+}
+
+src_compile() {
+	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
+		-DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
+
+	use doc && ANT_TASKS="ant-antlr" ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars="true" -DruntimeLibDirectory="target/lib/compile" \
+	 -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
+}
+
+src_test() {
+	cd "${S}/target/lib" && mkdir test && mkdir extras && cd compile
+
+	java-pkg_jar-from --build-only ant-junit,jmock-1.0,xmlunit-1,hsqldb,commons-logging,cglib-2.1
+
+	cd "${S}"
+	ANT_TASKS="ant-junit ant-antlr ant-trax" ANT_OPTS="-Duser.home=${T}" eant \
+		-DruntimeLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" test
+}
+
+src_install() {
+	java-pkg_newjar "target/dist/${PN}.jar"
+	use doc && java-pkg_dojavadoc "target/html/groovy-jdk/"
+
+	# FIXME: install those two later
+	#
+	#use doc && java-pkg_dojavadoc "target/html/api/"
+	#use doc && java-pkg_dojavadoc "target/html/gapi/"
+
+	use source && java-pkg_dosrc "src/main/groovy" "src/main/org"
+	java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
+	java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
+	java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
+	java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
+	java-pkg_dolauncher "grape" --main org.codehaus.groovy.tools.GrapeMain
+}
diff --git a/dev-java/groovy/groovy-1.7.5.ebuild b/dev-java/groovy/groovy-1.7.5.ebuild
new file mode 100644
index 000000000000..4588cb70d709
--- /dev/null
+++ b/dev-java/groovy/groovy-1.7.5.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
+# We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
+
+# We currently do not build the embeddable jar (which is created using JarJar).
+# We could provide that via a USE flag.
+# We also don't use automatic build rewriting as there seems to be already some level of support
+# in the upstream build system
+
+# TODO: Install all 3 documentation packages. Currently only the Groovy GDK documentation is installed
+# as our java-pkg_dojavadoc function does not support multiple Javadoc installations.
+
+EAPI="3"
+WANT_ANT_TASKS="ant-antlr"
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PV=${PV/_rc/-RC-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
+HOMEPAGE="http://groovy.codehaus.org/"
+
+SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
+LICENSE="codehaus-groovy"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+RESTRICT="test"
+
+CDEPEND=">=dev-java/asm-3.2
+	>=dev-java/ant-core-1.8.0
+	>=dev-java/junit-4.6
+	dev-java/antlr:0
+	dev-java/xstream
+	dev-java/jline
+	dev-java/commons-cli
+	dev-java/jansi
+	dev-java/servletapi:2.4
+	>=dev-java/bsf-2.4
+	java-virtuals/jmx"
+
+RDEPEND=">=virtual/jre-1.5
+	!<dev-java/groovy-1.6.3
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-ivy:2
+	doc? (
+		dev-java/qdox
+	)
+	test? (
+		dev-java/jmock
+		dev-java/xmlunit
+		dev-db/hsqldb
+		dev-java/commons-logging
+		dev-java/ant-junit
+		dev-java/ant-trax
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_PKG_BSFIX=""
+
+src_prepare() {
+	rm -rf bootstrap
+	# security directory is needed for tests, but they currently don't pass
+	#rm -rf security
+	mkdir -p target/lib && cd target/lib
+	mkdir compile && mkdir runtime && mkdir tools
+	cd compile
+
+	java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-3,xstream,jansi
+	java-pkg_jar-from jline,junit,servletapi-2.4,bsf-2.3
+	java-pkg_jar-from --virtual jmx
+	java-pkg_jar-from --build-only ant-ivy:2
+	use doc && java-pkg_jar-from --build-only qdox-1.6,ant-antlr
+}
+
+src_compile() {
+	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
+		-DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
+
+	use doc && ANT_TASKS="ant-antlr" ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars="true" -DruntimeLibDirectory="target/lib/compile" \
+	 -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
+}
+
+src_test() {
+	cd "${S}/target/lib" && mkdir test && mkdir extras && cd compile
+
+	java-pkg_jar-from --build-only ant-junit,jmock-1.0,xmlunit-1,hsqldb,commons-logging,cglib-2.1
+
+	cd "${S}"
+	ANT_TASKS="ant-junit ant-antlr ant-trax" ANT_OPTS="-Duser.home=${T}" eant \
+		-DruntimeLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" test
+}
+
+src_install() {
+	java-pkg_newjar "target/dist/${PN}.jar"
+	use doc && java-pkg_dojavadoc "target/html/groovy-jdk/"
+
+	# FIXME: install those two later
+	#
+	#use doc && java-pkg_dojavadoc "target/html/api/"
+	#use doc && java-pkg_dojavadoc "target/html/gapi/"
+
+	use source && java-pkg_dosrc "src/main/groovy" "src/main/org"
+	java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
+	java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
+	java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
+	java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
+	java-pkg_dolauncher "grape" --main org.codehaus.groovy.tools.GrapeMain
+}
diff --git a/dev-java/groovy/groovy-1.8.5-r1.ebuild b/dev-java/groovy/groovy-1.8.5-r1.ebuild
new file mode 100644
index 000000000000..d1ea5224951e
--- /dev/null
+++ b/dev-java/groovy/groovy-1.8.5-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
+# We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
+
+# We currently do not build the embeddable jar (which is created using JarJar).
+# We could provide that via a USE flag.
+# We also don't use automatic build rewriting as there seems to be already some level of support
+# in the upstream build system
+
+# TODO: Install all 3 documentation packages. Currently only the Groovy GDK documentation is installed
+# as our java-pkg_dojavadoc function does not support multiple Javadoc installations.
+
+EAPI="3"
+WANT_ANT_TASKS="ant-antlr"
+JAVA_PKG_IUSE="doc source"
+
+inherit base versionator java-pkg-2 java-ant-2
+
+MY_PV=${PV/_rc/-RC-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
+HOMEPAGE="http://groovy.codehaus.org/"
+
+SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
+LICENSE="codehaus-groovy"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+RESTRICT="test"
+
+CDEPEND=">=dev-java/asm-3.2:3
+	>=dev-java/ant-core-1.8.0:0
+	>=dev-java/junit-4.6:4
+	dev-java/antlr:0
+	dev-java/xstream:0
+	dev-java/jline:0
+	dev-java/commons-cli:1
+	dev-java/jansi:0
+	java-virtuals/servlet-api:2.4
+	>=dev-java/bsf-2.4:2.3
+	java-virtuals/jmx:0"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-ivy:2
+	doc? (
+		dev-java/qdox:1.12
+		dev-java/commons-logging:0
+	)
+	test? (
+		dev-java/jmock:1.0
+		dev-java/xmlunit:1
+		dev-db/hsqldb:0
+		dev-java/commons-logging:0
+		dev-java/ant-junit:0
+		dev-java/ant-trax:0
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8-build-pref-locking-fix.patch" )
+
+JAVA_PKG_BSFIX=""
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e 's/fullQualifiedName/fullyQualifiedName/g' \
+		src/tools/org/codehaus/groovy/tools/DocGenerator.groovy
+
+	rm -rf bootstrap
+	# security directory is needed for tests, but they currently don't pass
+	#rm -rf security
+	mkdir -p target/lib && cd target/lib
+	mkdir compile && mkdir runtime && mkdir tools
+	cd compile
+
+	java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-3,xstream,jansi
+	java-pkg_jar-from jline,junit,servlet-api-2.4,bsf-2.3
+	java-pkg_jar-from --virtual jmx
+	java-pkg_jar-from --build-only ant-ivy:2
+	use doc && java-pkg_jar-from --build-only qdox-1.12,ant-antlr,commons-logging
+}
+
+src_compile() {
+	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
+		-DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
+
+	use doc && ANT_TASKS="ant-antlr" ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars="true" -DruntimeLibDirectory="target/lib/compile" \
+	 -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
+}
+
+src_test() {
+	cd "${S}/target/lib" && mkdir test && mkdir extras && cd compile
+
+	java-pkg_jar-from --build-only ant-junit,jmock-1.0,xmlunit-1,hsqldb,commons-logging,cglib-2.1
+
+	cd "${S}"
+	ANT_TASKS="ant-junit ant-antlr ant-trax" ANT_OPTS="-Duser.home=${T}" eant \
+		-DruntimeLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" test
+}
+
+src_install() {
+	java-pkg_newjar "target/dist/${PN}.jar"
+	use doc && java-pkg_dojavadoc "target/html/groovy-jdk/"
+
+	# FIXME: install those two later
+	#
+	#use doc && java-pkg_dojavadoc "target/html/api/"
+	#use doc && java-pkg_dojavadoc "target/html/gapi/"
+
+	use source && java-pkg_dosrc "src/main/groovy" "src/main/org"
+	java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
+	java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
+	java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
+	java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
+	java-pkg_dolauncher "grape" --main org.codehaus.groovy.tools.GrapeMain
+}
diff --git a/dev-java/groovy/groovy-1.8.5.ebuild b/dev-java/groovy/groovy-1.8.5.ebuild
new file mode 100644
index 000000000000..3695b01a3680
--- /dev/null
+++ b/dev-java/groovy/groovy-1.8.5.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
+# We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
+
+# We currently do not build the embeddable jar (which is created using JarJar).
+# We could provide that via a USE flag.
+# We also don't use automatic build rewriting as there seems to be already some level of support
+# in the upstream build system
+
+# TODO: Install all 3 documentation packages. Currently only the Groovy GDK documentation is installed
+# as our java-pkg_dojavadoc function does not support multiple Javadoc installations.
+
+EAPI="3"
+WANT_ANT_TASKS="ant-antlr"
+JAVA_PKG_IUSE="doc source"
+
+inherit base versionator java-pkg-2 java-ant-2
+
+MY_PV=${PV/_rc/-RC-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
+HOMEPAGE="http://groovy.codehaus.org/"
+
+SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
+LICENSE="codehaus-groovy"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+RESTRICT="test"
+
+CDEPEND=">=dev-java/asm-3.2
+	>=dev-java/ant-core-1.8.0
+	>=dev-java/junit-4.6
+	dev-java/antlr:0
+	dev-java/xstream
+	dev-java/jline
+	dev-java/commons-cli
+	dev-java/jansi
+	java-virtuals/servlet-api:2.4
+	>=dev-java/bsf-2.4
+	java-virtuals/jmx"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-ivy:2
+	doc? (
+		dev-java/qdox:1.12
+		dev-java/commons-logging
+	)
+	test? (
+		dev-java/jmock
+		dev-java/xmlunit
+		dev-db/hsqldb
+		dev-java/commons-logging
+		dev-java/ant-junit
+		dev-java/ant-trax
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8-build-pref-locking-fix.patch" )
+
+JAVA_PKG_BSFIX=""
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e 's/fullQualifiedName/fullyQualifiedName/g' \
+		src/tools/org/codehaus/groovy/tools/DocGenerator.groovy
+
+	rm -rf bootstrap
+	# security directory is needed for tests, but they currently don't pass
+	#rm -rf security
+	mkdir -p target/lib && cd target/lib
+	mkdir compile && mkdir runtime && mkdir tools
+	cd compile
+
+	java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-3,xstream,jansi
+	java-pkg_jar-from jline,junit,servlet-api-2.4,bsf-2.3
+	java-pkg_jar-from --virtual jmx
+	java-pkg_jar-from --build-only ant-ivy:2
+	use doc && java-pkg_jar-from --build-only qdox-1.12,ant-antlr,commons-logging
+}
+
+src_compile() {
+	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
+		-DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
+
+	use doc && ANT_TASKS="ant-antlr" ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars="true" -DruntimeLibDirectory="target/lib/compile" \
+	 -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
+}
+
+src_test() {
+	cd "${S}/target/lib" && mkdir test && mkdir extras && cd compile
+
+	java-pkg_jar-from --build-only ant-junit,jmock-1.0,xmlunit-1,hsqldb,commons-logging,cglib-2.1
+
+	cd "${S}"
+	ANT_TASKS="ant-junit ant-antlr ant-trax" ANT_OPTS="-Duser.home=${T}" eant \
+		-DruntimeLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" test
+}
+
+src_install() {
+	java-pkg_newjar "target/dist/${PN}.jar"
+	use doc && java-pkg_dojavadoc "target/html/groovy-jdk/"
+
+	# FIXME: install those two later
+	#
+	#use doc && java-pkg_dojavadoc "target/html/api/"
+	#use doc && java-pkg_dojavadoc "target/html/gapi/"
+
+	use source && java-pkg_dosrc "src/main/groovy" "src/main/org"
+	java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
+	java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
+	java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
+	java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
+	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..7b8ff2d0f24f
--- /dev/null
+++ b/dev-java/groovy/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>the.dmol@gmail.com</email>
+    <name>Ivan Baidakou</name>
+  </maintainer>
+  <longdescription>
+Groovy is a new agile dynamic language for the JVM combining lots of great
+features from languages like Python, Ruby and Smalltalk and making them
+available to the Java developers using a Java-like syntax.
+
+Groovy is designed to help you get things done on the Java platform in a
+quicker, more concise and fun way - bringing the power of Python and Ruby inside
+the Java platform.
+
+Groovy can be used as an alternative compiler to javac to generate standard Java
+bytecode to be used by any Java project or it can be used dynamically as an
+alternative language such as for scripting Java objects, templating or writing
+unit test cases.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
new file mode 100644
index 000000000000..9b20f017bdad
--- /dev/null
+++ b/dev-java/gson/Manifest
@@ -0,0 +1 @@
+DIST gson-2.3.1-sources.jar 139924 SHA256 2f2bfe44fad034b526caeb600f3cfca056a143c6c9fbd239f5cbcae4e862b8fa SHA512 a0423c03358a1d843806bc9367b1a328c147973247abfa47b956ab0409ae9542199f6402feb93155761fe538e5d0a79a095b8dad3ccd203c5be81e88713469ba WHIRLPOOL 2f5372c63c43b2ca60a329a33b456db64c4baa1a57186b0e01bcbd3454391b1d79cf26614df66eda40dbc1fa29a4da570d5b575ddab135ae17d47f5de96aa3ff
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..6f4b02f15724
--- /dev/null
+++ b/dev-java/gson/gson-2.3.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://code.google.com/p/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/metadata.xml b/dev-java/gson/metadata.xml
new file mode 100644
index 000000000000..cb549ed01713
--- /dev/null
+++ b/dev-java/gson/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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>
+</pkgmetadata>
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
new file mode 100644
index 000000000000..4e4165bea6c6
--- /dev/null
+++ b/dev-java/guava/Manifest
@@ -0,0 +1,7 @@
+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-15.0-sources.jar 1234606 SHA256 1a3f78cfd4a44f63af00afe36f2175d41ed24d25aedf3542f47664f81815a211 SHA512 fe4fcc723115fbc4f824a1358d81e98565b92b6d682b86d25b566f1e9b6c266fac42a3502e6d49d1faa87fdfbadf206043b4d8965402dd821333dda00b93819e WHIRLPOOL e9f3466073542b4d93d6f934e241e5244a5f39b0b35a83836721524bacb8e259d4f0a05cf32c53932f8decf6589e6e896873cb5bec141b0f029fd2c1f667b15a
+DIST guava-16.0.1-sources.jar 1261127 SHA256 154ce0c88dce526b822417c8402901ad0a5a299156b38c79b40cce72b72b3c2b SHA512 b6d8db3a139a2490692208cba1788db68e0c0d574f91582367d81f6d32ed7959646fc3ac14651c9de1b9b839bb4d58ec137feb928d7d183d1c2c602a4da8e88d WHIRLPOOL be647c7deef2cce8b62d4173543debd8255f6662545bc9ebd75f3b55210791dc95ff1690b6c8a983c152d1ed2f2a4f2b1f1ed3fb69b13a1d2280726a690d276b
+DIST guava-17.0-sources.jar 1272791 SHA256 df275cbcc3ab90c7fd4cc70e8b26b454c16a708b909f357f07115ca54a83f9bd SHA512 c3fa4d7c7498482939ada35737b368d6fe0b0501cc65ed686dcab24b1701a22870ed7a737eb3d107a5728823bb151842df3fe0e8d0ff20caa2e49f9224f81de5 WHIRLPOOL 7c13fc1f360e50b5c45b7c4519566077fe66507cade03660b354bc55e16dd96d9656bd83e863007a4d90953cc229df2f5319fdc488986feae4a0e9a390f29452
+DIST guava-18.0-sources.jar 1277909 SHA256 0f3381ce4caa3a01602cdf0d0f4437b9ad8f347ddabbd873ded4d498e19d9590 SHA512 bd44aa71e183d27f6f79183a2e340ed9e28f9fc750b6de5aa007b296133fb8055ea2669a7e75a31f3394cba4cfc0be1123fc8bd87d9aa8df4847f2199b14f768 WHIRLPOOL 9ae2581667b52d05bebe6d59895fdeb482ee520e4820d448d1fb867b413d9bd248d9d1329334a548d96eb91fa574f9ddf3fd11fa7800fe5ae525356d6061f757
+DIST guava-r07.zip 3044916 SHA256 3d0da5843235b26dc5d47b75df48a6f06f0cc428534580762352b3b00fa45c40 SHA512 1ea4c0b4a7747fb555150283eb851da9d96ec705f1b8e05709b533e923a2615dd82979afbf729093c493e0c11a5f7841f576a6a56a4e9fd5a7e8af224aca956f WHIRLPOOL 3718e030038eaf597b1d35e318eeb708df8d5b66a606d5ffa1fc0e7a742f22f271d6fa6d72d1ce138fcd206e32c7680c5bccf4400f3fc969f41623a7d1f88013
diff --git a/dev-java/guava/guava-07.ebuild b/dev-java/guava/guava-07.ebuild
new file mode 100644
index 000000000000..c0b3d274ef1e
--- /dev/null
+++ b/dev-java/guava/guava-07.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-r${PV}"
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="http://code.google.com/p/guava-libraries/"
+SRC_URI="http://guava-libraries.googlecode.com/files/${MY_P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jsr305:0
+	java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+JAVA_GENTOO_CLASSPATH="jsr305"
+
+java_prepare() {
+	unpack ./${PN}-src-r${PV}.zip
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README
+}
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..1ff8907ee6dd
--- /dev/null
+++ b/dev-java/guava/guava-13.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="http://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" # http://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..0dfb1adb6f4b
--- /dev/null
+++ b/dev-java/guava/guava-14.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="http://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"
+
+COMMON_DEP="
+	dev-java/javax-inject:0
+	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" # http://code.google.com/p/guava-libraries/issues/detail?id=635
+
+JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"
diff --git a/dev-java/guava/guava-15.0.ebuild b/dev-java/guava/guava-15.0.ebuild
new file mode 100644
index 000000000000..d040a260db41
--- /dev/null
+++ b/dev-java/guava/guava-15.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="http://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="15"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+COMMON_DEP="
+	dev-java/javax-inject:0
+	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" # http://code.google.com/p/guava-libraries/issues/detail?id=635
+
+JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"
diff --git a/dev-java/guava/guava-16.0.1.ebuild b/dev-java/guava/guava-16.0.1.ebuild
new file mode 100644
index 000000000000..cd03568bb422
--- /dev/null
+++ b/dev-java/guava/guava-16.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="http://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="16"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+COMMON_DEP="
+	dev-java/javax-inject:0
+	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" # http://code.google.com/p/guava-libraries/issues/detail?id=635
+
+JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"
diff --git a/dev-java/guava/guava-17.0.ebuild b/dev-java/guava/guava-17.0.ebuild
new file mode 100644
index 000000000000..b147c1a95684
--- /dev/null
+++ b/dev-java/guava/guava-17.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="http://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="17"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+COMMON_DEP="
+	dev-java/javax-inject:0
+	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" # http://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..1ea3c1a5bb63
--- /dev/null
+++ b/dev-java/guava/guava-18.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="http://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"
+
+COMMON_DEP="
+	dev-java/javax-inject:0
+	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" # http://code.google.com/p/guava-libraries/issues/detail?id=635
+
+JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"
diff --git a/dev-java/guava/metadata.xml b/dev-java/guava/metadata.xml
new file mode 100644
index 000000000000..706a5f4b27fe
--- /dev/null
+++ b/dev-java/guava/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..4599a87be264
--- /dev/null
+++ b/dev-java/guice/Manifest
@@ -0,0 +1,2 @@
+DIST guice-2.0-src.zip 17342981 SHA256 7f836156d9d6b7688d373a4c70971b8b42e3a553e26a8f98a110a868eb749394 SHA512 61e1c5b6bbd7db5017a99b2998b706071717781360ab8d622d163be2cc954d9b34ab8b68d2ab02f29bb1a8b640ac25350dca302c390855641ca3e4cc4438a1b9 WHIRLPOOL 7be8673b603ad1aa722ddb76cefaec5e1d03e9a4199d25cbb1a58a31f89c33ac1d9e0a479951b5412cc2c94504d46afd56f42a57f3d87ef3915554fbf821d506
+DIST guice-3.0-src.zip 24396399 SHA256 aaa4da9c2d588018b69a757879966da7fcaa02b4a6b208f1300a313c1a426eba SHA512 2918a2ec1c355025d789c6de4275e1b87fa0263e4529813b9758f219d9faeb08cdcba5a82962c3ec632fbdb31376c03198d12599ce6b2ae872cf8b252edd7a05 WHIRLPOOL e2b602bff8e85c6223f05bc750b912e1068f8546cc78fc31957107b6e9e8d0d23e99ea9e94b51562882ccabab14485245207f6754137d33d5e8cc6358e3e9402
diff --git a/dev-java/guice/files/2.0-build.xml.patch b/dev-java/guice/files/2.0-build.xml.patch
new file mode 100644
index 000000000000..4b0e24d3951f
--- /dev/null
+++ b/dev-java/guice/files/2.0-build.xml.patch
@@ -0,0 +1,16 @@
+--- /tmp/guice-2.0-src.orig/build.xml	2012-08-23 23:04:55.759642915 +0300
++++ build.xml	2012-08-23 23:30:05.899593954 +0300
+@@ -13,11 +13,8 @@
+   </path>
+ 
+ 
+-  <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
+-    <jar jarfile="${build.dir}/dist/guice-${version}.jar"
+-        manifest="${build.dir}/META-INF/MANIFEST.MF">
+-      <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"/>
+-    </jar>
++  <target name="jar" depends="jar.withdeps" description="Build jar.">
++	<echo>${build.dir}/${ant.project.name}</echo>
+   </target>
+ 
+   <target name="dist" depends="distjars, javadoc"
diff --git a/dev-java/guice/files/2.0-common.xml.patch b/dev-java/guice/files/2.0-common.xml.patch
new file mode 100644
index 000000000000..f410a6438c06
--- /dev/null
+++ b/dev-java/guice/files/2.0-common.xml.patch
@@ -0,0 +1,21 @@
+--- /tmp/guice-2.0-src.orig/common.xml	2012-08-23 23:28:51.056596381 +0300
++++ common.xml	2012-08-23 23:28:14.416597570 +0300
+@@ -108,17 +108,7 @@
+   <target name="jar.withdeps" depends="compile"
+       description="Build jar with dependencies embedded.">
+     <mkdir dir="${build.dir}/dist"/>
+-    <dirname property="common.basedir" file="${ant.file.common}"/>
+-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+-        classpath="${common.basedir}/lib/build/jarjar-1.0rc8.jar"/>
+-    <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
+-      <fileset dir="${build.dir}/classes"/>
+-      <zipfileset src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/>
+-      <zipfileset src="${common.basedir}/lib/build/asm-3.1.jar"/>
+-      <rule pattern="net.sf.cglib.**" result="com.google.inject.internal.cglib.@1"/>
+-      <rule pattern="org.objectweb.asm.**" result="com.google.inject.internal.asm.@1"/>
+-      <keep pattern="com.google.inject.**"/>
+-    </jarjar>
++	<jar destfile="${build.dir}/${ant.project.name}.jar"  basedir="${build.dir}/classes" />
+   </target>
+ 
+ </project>
diff --git a/dev-java/guice/files/3.0-build.xml.patch b/dev-java/guice/files/3.0-build.xml.patch
new file mode 100644
index 000000000000..cdae24107ba6
--- /dev/null
+++ b/dev-java/guice/files/3.0-build.xml.patch
@@ -0,0 +1,55 @@
+diff --git a/guice-3.0-src/build.xml b/guice-3.0-src/build.xml
+index a66a186..da1dd76 100644
+--- a/guice-3.0-src/build.xml
++++ b/guice-3.0-src/build.xml
+@@ -10,11 +10,7 @@
+   </path>
+ 
+ 
+-  <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
+-    <jar jarfile="${build.dir}/dist/guice-${version}.jar"
+-        manifest="${build.dir}/META-INF/MANIFEST.MF">
+-      <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"/>
+-    </jar>
++  <target name="jar" depends="jar.withdeps" description="Build jar.">
+   </target>
+ 
+   <target name="dist" depends="distjars, javadoc"
+@@ -166,10 +162,7 @@
+   <target name="javadoc">
+     <javadoc packagenames="com.google.*"
+              destdir="build/docs"
+-    	     docletpath="lib/build/doclava.jar"
+-             bootclasspath="${java.home}/lib/rt.jar"
+-             maxmemory="512M"
+-    	     classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar">
++             maxmemory="512M">
+       <fileset dir="${src.dir}" defaultexcludes="yes">
+         <include name="com/google/**"/>
+         <exclude name="com/google/inject/internal/**"/>
+@@ -183,25 +176,7 @@
+       <fileset dir="${multibindings.src.dir}"/>
+       <fileset dir="${persist.src.dir}"/>
+     	<fileset dir="${grapher.src.dir}"/>
+-      <!-- TODO: this breaks Doclava for some reason
+-      <fileset dir="${struts2.src.dir}"/> -->
+-
+-      <doclet name="com.google.doclava.Doclava">
+-        <param name="-hdf"/> <param name="project.name"/> <param name="Guice"/>
+-        <param name="-since"/> <param name="lib/build/guice-1.0.xml"/> <param name="Guice_1.0" />
+-        <param name="-since"/> <param name="lib/build/guice-2.0.xml"/> <param name="Guice_2.0" /> 
+-        <param name="-apiversion" value="Guice_${new.api}"/>
+-        <param name="-assetsdir" value="javadoc/assets"/>
+-      	<param name="-apixml" value="build/docs/guice-${new.api}.xml"/>
+-        <!-- TODO: fix doclava federation
+-          http://aopalliance.sourceforge.net/doc
+-          http://www.springframework.org/docs/api/
+-          <param name="-federate"/><param name="JDK"/><param name="http://download.oracle.com/javase/6/docs/api/index.html?"/>
+-          <param name="-federationxml"/><param name="JDK"/><param name="http://doclava.googlecode.com/svn/static/api/openjdk-6.xml"/>
+-        -->
+-      </doclet>
+     </javadoc>
+-    <move todir="build/docs/javadoc"><fileset dir="build/docs/reference"/></move>
+   </target>
+ 
+   <target name="no_aop"
diff --git a/dev-java/guice/files/3.0-common.xml.patch b/dev-java/guice/files/3.0-common.xml.patch
new file mode 100644
index 000000000000..01162c258a12
--- /dev/null
+++ b/dev-java/guice/files/3.0-common.xml.patch
@@ -0,0 +1,26 @@
+diff --git a/guice-3.0-src/common.xml b/guice-3.0-src/common.xml
+index a318ab3..62cadce 100644
+--- a/guice-3.0-src/common.xml
++++ b/guice-3.0-src/common.xml
+@@ -137,20 +137,6 @@
+   <target name="jar.withdeps" depends="compile"
+       description="Build jar with dependencies embedded.">
+     <mkdir dir="${build.dir}/dist"/>
+-    <dirname property="common.basedir" file="${ant.file.common}"/>
+-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+-        classpath="${common.basedir}/lib/build/jarjar-snapshot.jar"/>
+-    <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
+-      <fileset dir="${build.dir}/classes"/>
+-      <zipfileset src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/>
+-      <zipfileset src="${common.basedir}/lib/build/asm-3.1.jar"/>
+-      <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
+-      <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/>
+-      <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>
+-      <rule pattern="org.objectweb.asm.**.*" result="com.google.inject.internal.asm.@1.$@2"/>
+-      <rule pattern="com.google.inject.internal.util.*" result="com.google.inject.internal.util.$@1"/>    	
+-      <rule pattern="com.google.inject.internal.util.**.*" result="com.google.inject.internal.util.@1.$@2"/>
+-      <keep pattern="com.google.inject.**"/>
+-    </jarjar>
++    <jar destfile="${build.dir}/${ant.project.name}.jar"  basedir="${build.dir}/classes" />
+   </target>
+ </project>
diff --git a/dev-java/guice/guice-2.0-r1.ebuild b/dev-java/guice/guice-2.0-r1.ebuild
new file mode 100644
index 000000000000..33bb66f57658
--- /dev/null
+++ b/dev-java/guice/guice-2.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
+HOMEPAGE="http://code.google.com/p/google-guice/"
+SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+COMMON_DEPEND="dev-java/aopalliance:1
+	dev-java/asm:3
+	dev-java/cglib:3"
+RDEPEND="|| ( virtual/jre:1.6 virtual/jre:1.7 )
+	${COMMON_DEPEND}"
+DEPEND="|| ( virtual/jdk:1.6 virtual/jdk:1.7 )
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}-src/"
+
+RESTRICT="test"
+
+JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="aopalliance-1,asm-3,cglib-3"
+
+java_prepare() {
+	find . -name '*.jar' -delete || die
+	find . -name '*.class' -delete || die
+	epatch "${FILESDIR}"/${PV}-common.xml.patch
+	epatch "${FILESDIR}"/${PV}-build.xml.patch
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+
+	use doc && java-pkg_dojavadoc javadoc/
+	use source && java-pkg_dosrc src/com
+}
diff --git a/dev-java/guice/guice-3.0-r1.ebuild b/dev-java/guice/guice-3.0-r1.ebuild
new file mode 100644
index 000000000000..82d861cda5b1
--- /dev/null
+++ b/dev-java/guice/guice-3.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
+HOMEPAGE="http://code.google.com/p/google-guice/"
+SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+COMMON_DEPEND="dev-java/aopalliance:1
+	dev-java/javax-inject:0
+	dev-java/asm:3
+	dev-java/cglib:3"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}-src/"
+
+JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="aopalliance-1,asm-3,cglib-3,javax-inject"
+
+java_prepare() {
+	find . -name '*.jar' -exec rm -v {} + || die
+	find . -name '*.class' -exec rm -v {} + || die
+	epatch "${FILESDIR}"/${PV}-common.xml.patch
+	epatch "${FILESDIR}"/${PV}-build.xml.patch
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	use source && java-pkg_dosrc core/src/com
+}
diff --git a/dev-java/guice/metadata.xml b/dev-java/guice/metadata.xml
new file mode 100644
index 000000000000..32433bd1dedb
--- /dev/null
+++ b/dev-java/guice/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="google-code">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..780ede82b9f7
--- /dev/null
+++ b/dev-java/hamcrest-core/Manifest
@@ -0,0 +1,2 @@
+DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011
+DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
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.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1.ebuild
new file mode 100644
index 000000000000..b43883935cd3
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Library of matchers for building test expressions"
+HOMEPAGE="http://code.google.com/p/${MY_PN}/"
+SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos ~x64-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+	>=dev-java/jarjar-0.9
+	=dev-java/qdox-1.6*"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	find . -name "*.jar" -delete || die
+
+	# These jars must be symlinked as specifying them using gentoo.classpath
+	# does not work and both compilation and test fail
+	java-pkg_jar-from --into lib/generator --build-only qdox-1.6 qdox.jar qdox-1.6.1.jar
+}
+
+src_compile() {
+	ANT_TASKS="jarjar-1" eant core -Dversion=${PV}
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar
+
+	dodoc README.txt CHANGES.txt || die
+
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
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..0e2f1949947e
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://code.google.com/p/${MY_PN}/"
+SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="amd64 ppc 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..3157d41caefc
--- /dev/null
+++ b/dev-java/hamcrest-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>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="google-code">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..780ede82b9f7
--- /dev/null
+++ b/dev-java/hamcrest-generator/Manifest
@@ -0,0 +1,2 @@
+DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011
+DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
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..9736c7f9c3d7
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://code.google.com/p/${MY_PN}/"
+SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~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..d364ee23d084
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://code.google.com/p/${MY_PN}/"
+SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="amd64 ppc 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..3157d41caefc
--- /dev/null
+++ b/dev-java/hamcrest-generator/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="google-code">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..2bc825020bed
--- /dev/null
+++ b/dev-java/hamcrest-integration/Manifest
@@ -0,0 +1 @@
+DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
diff --git a/dev-java/hamcrest-integration/files/1.1-remove-targets.patch b/dev-java/hamcrest-integration/files/1.1-remove-targets.patch
new file mode 100644
index 000000000000..384709aec667
--- /dev/null
+++ b/dev-java/hamcrest-integration/files/1.1-remove-targets.patch
@@ -0,0 +1,135 @@
+diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
+index f819d3d..6d4ea63 100644
+--- a/hamcrest-1.1/build.xml
++++ b/hamcrest-1.1/build.xml
+@@ -23,87 +23,28 @@
+ 

+     <target name="generator"

+             description="Build code generator tool">

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

+-                     destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"

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

+             depends="generator"

+             description="Build core Hamcrest library">

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

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

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

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

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

+     </target>

+ 

+     <target name="library"

+             depends="core,generator"

+             description="Build library of matchers">

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

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

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

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

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

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

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

+-                     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 +62,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 +105,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 +162,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"/>

+ 			

+@@ -261,4 +202,4 @@
+         </sequential>

+     </macrodef>

+ 

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

diff --git a/dev-java/hamcrest-integration/files/1.2-remove-targets.patch b/dev-java/hamcrest-integration/files/1.2-remove-targets.patch
new file mode 100644
index 000000000000..794fe7463251
--- /dev/null
+++ b/dev-java/hamcrest-integration/files/1.2-remove-targets.patch
@@ -0,0 +1,80 @@
+diff --git a/hamcrest-1.2/build.xml b/hamcrest-1.2/build.xml
+index bf7e50c..f552ae1 100644
+--- a/hamcrest-1.2/build.xml
++++ b/hamcrest-1.2/build.xml
+@@ -23,75 +23,16 @@
+ 
+     <target name="generator"
+             description="Build code generator tool">
+-        <java-to-jar srcdir="hamcrest-generator/src/main/java"
+-                     destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
+-                     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"
+             depends="generator"
+             description="Build core Hamcrest library">
+-        <java-to-jar srcdir="hamcrest-core/src/main/java"
+-                     destjar="build/hamcrest-core-${version}.jar"/>
+-        <!-- 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"
+-                     destjar="build/hamcrest-core-${version}.jar"
+-                     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"
+-                     destjar="build/hamcrest-library-${version}.jar"
+-                     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"
+-                     destjar="build/hamcrest-library-${version}.jar"
+-                     classpath="build/hamcrest-core-${version}.jar"/>
+     </target>
+ 
+     <target name="integration"
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..f9ae6e5c589f
--- /dev/null
+++ b/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://code.google.com/p/${MY_PN}/"
+SRC_URI="http://${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..604e0a4238bb
--- /dev/null
+++ b/dev-java/hamcrest-integration/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
new file mode 100644
index 000000000000..780ede82b9f7
--- /dev/null
+++ b/dev-java/hamcrest-library/Manifest
@@ -0,0 +1,2 @@
+DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011
+DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
diff --git a/dev-java/hamcrest-library/files/1.1-remove-targets.patch b/dev-java/hamcrest-library/files/1.1-remove-targets.patch
new file mode 100644
index 000000000000..08affbce634d
--- /dev/null
+++ b/dev-java/hamcrest-library/files/1.1-remove-targets.patch
@@ -0,0 +1,113 @@
+diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
+index f819d3d..b24dea0 100644
+--- a/hamcrest-1.1/build.xml
++++ b/hamcrest-1.1/build.xml
+@@ -23,48 +23,11 @@
+ 

+     <target name="generator"

+             description="Build code generator tool">

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

+-                     destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"

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

+             depends="generator"

+             description="Build core Hamcrest library">

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

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

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

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

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

+     </target>

+ 

+     <target name="library"

+@@ -94,16 +57,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 +84,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 +127,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 +184,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"/>

+ 			

+@@ -261,4 +224,4 @@
+         </sequential>

+     </macrodef>

+ 

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

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.1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
new file mode 100644
index 000000000000..9d69e81fe71c
--- /dev/null
+++ b/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://code.google.com/p/${MY_PN}/"
+SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/hamcrest-core:${SLOT}
+	dev-java/hamcrest-generator:${SLOT}
+	dev-java/qdox:1.6
+"
+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-generator,hamcrest-core,qdox-1.6"
+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/hamcrest-library-1.3-r1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
new file mode 100644
index 000000000000..dc4eb70ce350
--- /dev/null
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://code.google.com/p/${MY_PN}/"
+SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="amd64 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..314c8dd8ca46
--- /dev/null
+++ b/dev-java/hamcrest-library/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="google-code">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..39048ac0e279
--- /dev/null
+++ b/dev-java/hawtjni-runtime/Manifest
@@ -0,0 +1 @@
+DIST hawtjni-project-1.10.tar.gz 1602839 SHA256 364c271819b7907e404dee939fc2a3f0f5ea860f2e81810d631f59467f006115 SHA512 3bd94d20bf2d8953c60753aa404077c96c93704c2bd5bebfb5fe790fc29e15d97f6172706f06cea13c4806b652405ccfef824cccf76ff018dafb7262ff845490 WHIRLPOOL 9d6a0fa421d5609d74c13ba39afc2bfd94174474557a0189a530a5c8e5bb9ab0fdf30199a2b3fd4b99c8a068a713357dc1223250182ab0b16fed61c4ee289d1e
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..8c12be844710
--- /dev/null
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..4d45ef179a0f
--- /dev/null
+++ b/dev-java/hawtjni-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>
+  <herd>java</herd>
+  <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..4f3f6e75c755
--- /dev/null
+++ b/dev-java/headius-options/Manifest
@@ -0,0 +1 @@
+DIST headius-options-1.1.tar.gz 6590 SHA256 ada43b0f2b73a83fb09f5e09c8f50590357b8e2ea39f9f1d8bc030b7353ced3d SHA512 561be8ecf02e132436a94bf60595d66839c8e86f49c6a121f8714403fea6d22369f46dbfb15b7834a8430ac6aeaddf4e6aca5b0998c51e3b7ad71c60ac6c1bf4 WHIRLPOOL e82a084850c0c9037af4344ac0477e34ae869be8924342071e2cf76aa8edce2fc3fd4960c78e572b8dbc7aefd5871d686918b81ba5672c5d2deaf79c1193f291
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..313c6526e8f8
--- /dev/null
+++ b/dev-java/headius-options/headius-options-1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8ca4e73e458b
--- /dev/null
+++ b/dev-java/headius-options/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..d9daade73405
--- /dev/null
+++ b/dev-java/helpgui/Manifest
@@ -0,0 +1 @@
+DIST helpgui-1.1-src.jar 168356 SHA256 bed678f1fcfb46cb65785a3fe6b819c312458fc6bca976142c52a0e0896a8112 SHA512 feb76605c841210cd9bfa140d22985a090e72712fad08e23963fee3f6e28cb6c198583bde8eae5999e80ed5e351ed8aa30dc5cd7318bd1817a4ba351a1c99a77 WHIRLPOOL d8d396bfc4842bb1dd5bb618b911e5f4f88f75ab1463a13da3612091bdae6e8c31ca044f11d61d32f4f8bf15db066d10394a77718d3f9ebfbebc4dc6307cab95
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..80a103009407
--- /dev/null
+++ b/dev-java/helpgui/helpgui-1.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..325982e4f9ee
--- /dev/null
+++ b/dev-java/helpgui/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..5c92f9fe7163
--- /dev/null
+++ b/dev-java/hessian/Manifest
@@ -0,0 +1 @@
+DIST hessian-4.0.3-src.jar 374965 SHA256 1084632007a583c2669e90ec5d72d7ffcb5ab0e14d4209c03adefdd144b252ed SHA512 88185b981f7ba95874899b0ccdddc9e30340e31e43e45c73722a2db8c40cb052d93a98c55aa046a0cc946c722045bfeb618390d2dde8c162916e67a22d68b0fc WHIRLPOOL df8a7aabf2010c6868e0e0a092aebfecaa42c0eec22588dd422177b1ad8524851dd7637f67b15e5b442a2e0c3762222d7ce05851edefdd39cf9885ccd2a2553b
diff --git a/dev-java/hessian/files/3.0.8-java5.patch b/dev-java/hessian/files/3.0.8-java5.patch
new file mode 100644
index 000000000000..906eb7efca18
--- /dev/null
+++ b/dev-java/hessian/files/3.0.8-java5.patch
@@ -0,0 +1,28 @@
+diff -uNr hessian-3.0.8.orig/src/com/caucho/hessian/client/HessianProxyFactory.java hessian-3.0.8/src/com/caucho/hessian/client/HessianProxyFactory.java
+--- hessian-3.0.8.orig/src/com/caucho/hessian/client/HessianProxyFactory.java	2006-08-15 10:38:05.000000000 +0200
++++ hessian-3.0.8/src/com/caucho/hessian/client/HessianProxyFactory.java	2006-08-15 10:40:24.000000000 +0200
+@@ -230,7 +230,7 @@
+   {
+     HessianProxy handler = new HessianProxy(this, new URL(url));
+ 
+-    return Proxy.newProxyInstance(api.getClassLoader(),
++    return java.lang.reflect.Proxy.newProxyInstance(api.getClassLoader(),
+ 				  new Class[] { api,
+                                                 HessianRemoteObject.class },
+                                   handler);
+diff -uNr hessian-3.0.8.orig/src/com/caucho/hessian/client/HessianProxy.java hessian-3.0.8/src/com/caucho/hessian/client/HessianProxy.java
+--- hessian-3.0.8.orig/src/com/caucho/hessian/client/HessianProxy.java	2006-08-15 10:38:05.000000000 +0200
++++ hessian-3.0.8/src/com/caucho/hessian/client/HessianProxy.java	2006-08-15 10:40:06.000000000 +0200
+@@ -94,10 +94,10 @@
+     if (methodName.equals("equals") &&
+         params.length == 1 && params[0].equals(Object.class)) {
+       Object value = args[0];
+-      if (value == null || ! Proxy.isProxyClass(value.getClass()))
++      if (value == null || ! java.lang.reflect.Proxy.isProxyClass(value.getClass()))
+         return new Boolean(false);
+ 
+-      HessianProxy handler = (HessianProxy) Proxy.getInvocationHandler(value);
++      HessianProxy handler = (HessianProxy) java.lang.reflect.Proxy.getInvocationHandler(value);
+ 
+       return new Boolean(_url.equals(handler.getURL()));
+     }
diff --git a/dev-java/hessian/files/build-3.0.8.xml b/dev-java/hessian/files/build-3.0.8.xml
new file mode 100644
index 000000000000..d3a85de83b8f
--- /dev/null
+++ b/dev-java/hessian/files/build-3.0.8.xml
@@ -0,0 +1,52 @@
+<?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="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <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}"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+         <fileset dir="${build}"/>
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+	   <javadoc destdir="${dist}/doc/api" sourcepath="${src}"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/hessian/files/build.xml-3.0.20 b/dev-java/hessian/files/build.xml-3.0.20
new file mode 100644
index 000000000000..ebef8932b346
--- /dev/null
+++ b/dev-java/hessian/files/build.xml-3.0.20
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<project name="hessian" default="all" basedir=".">
+	<target name="compile">
+		<mkdir dir="build"/>
+		<javac debug="false" srcdir="src" destdir="build">
+			<classpath>
+				<fileset dir="lib" includes="**/*.jar"/>
+			</classpath>
+		</javac>
+	</target>
+	<target name="all" depends="hessian.jar,burlap.jar,services.jar"/>
+	<target name="hessian.jar" depends="compile">
+		<jar destfile="hessian.jar">
+			<fileset dir="build" includes="**/hessian/**/*.class"/>
+		</jar>
+	</target>
+	<target name="burlap.jar" depends="compile">
+		<jar destfile="burlap.jar">
+			<fileset dir="build" includes="**/burlap/**/*.class"/>
+		</jar>
+	</target>
+	<target name="services.jar" depends="compile">
+		<jar destfile="services.jar">
+			<fileset dir="build" includes="**/services/**/*.class"/>
+		</jar>
+	</target>
+</project>
diff --git a/dev-java/hessian/files/build.xml-3.1.6 b/dev-java/hessian/files/build.xml-3.1.6
new file mode 100644
index 000000000000..ebef8932b346
--- /dev/null
+++ b/dev-java/hessian/files/build.xml-3.1.6
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<project name="hessian" default="all" basedir=".">
+	<target name="compile">
+		<mkdir dir="build"/>
+		<javac debug="false" srcdir="src" destdir="build">
+			<classpath>
+				<fileset dir="lib" includes="**/*.jar"/>
+			</classpath>
+		</javac>
+	</target>
+	<target name="all" depends="hessian.jar,burlap.jar,services.jar"/>
+	<target name="hessian.jar" depends="compile">
+		<jar destfile="hessian.jar">
+			<fileset dir="build" includes="**/hessian/**/*.class"/>
+		</jar>
+	</target>
+	<target name="burlap.jar" depends="compile">
+		<jar destfile="burlap.jar">
+			<fileset dir="build" includes="**/burlap/**/*.class"/>
+		</jar>
+	</target>
+	<target name="services.jar" depends="compile">
+		<jar destfile="services.jar">
+			<fileset dir="build" includes="**/services/**/*.class"/>
+		</jar>
+	</target>
+</project>
diff --git a/dev-java/hessian/files/build.xml-4.0.3 b/dev-java/hessian/files/build.xml-4.0.3
new file mode 100644
index 000000000000..ebef8932b346
--- /dev/null
+++ b/dev-java/hessian/files/build.xml-4.0.3
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<project name="hessian" default="all" basedir=".">
+	<target name="compile">
+		<mkdir dir="build"/>
+		<javac debug="false" srcdir="src" destdir="build">
+			<classpath>
+				<fileset dir="lib" includes="**/*.jar"/>
+			</classpath>
+		</javac>
+	</target>
+	<target name="all" depends="hessian.jar,burlap.jar,services.jar"/>
+	<target name="hessian.jar" depends="compile">
+		<jar destfile="hessian.jar">
+			<fileset dir="build" includes="**/hessian/**/*.class"/>
+		</jar>
+	</target>
+	<target name="burlap.jar" depends="compile">
+		<jar destfile="burlap.jar">
+			<fileset dir="build" includes="**/burlap/**/*.class"/>
+		</jar>
+	</target>
+	<target name="services.jar" depends="compile">
+		<jar destfile="services.jar">
+			<fileset dir="build" includes="**/services/**/*.class"/>
+		</jar>
+	</target>
+</project>
diff --git a/dev-java/hessian/hessian-4.0.3.ebuild b/dev-java/hessian/hessian-4.0.3.ebuild
new file mode 100644
index 000000000000..76fcd2a6e440
--- /dev/null
+++ b/dev-java/hessian/hessian-4.0.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc x86"
+
+IUSE=""
+
+COMMON_DEP="java-virtuals/servlet-api:2.5"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+EANT_BUILD_TARGET="all"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+
+	mkdir -p "${S}/src"
+	mkdir -p "${S}/lib"
+
+	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml"
+
+	cd "${S}/src"
+	mv ../com .
+
+	cd "${S}/lib"
+	java-pkg_jarfrom --virtual servlet-api:2.5
+}
+
+src_install() {
+	java-pkg_dojar "hessian.jar"
+	java-pkg_dojar "burlap.jar"
+	java-pkg_dojar "services.jar"
+
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/hessian/metadata.xml b/dev-java/hessian/metadata.xml
new file mode 100644
index 000000000000..656536970396
--- /dev/null
+++ b/dev-java/hessian/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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/hibernate-annotations/Manifest b/dev-java/hibernate-annotations/Manifest
new file mode 100644
index 000000000000..e97387832c46
--- /dev/null
+++ b/dev-java/hibernate-annotations/Manifest
@@ -0,0 +1,2 @@
+DIST hibernate-3.2.0.ga.tar.gz 19744419 SHA256 e242eb6b243e7b0fac132f37f4e29bf06ec87c37be5a80a0849709a6cb89b03f SHA512 2c2c8ab8c15df1a36305da1a705ea0f1ab59f306f2cd07520ed95a68bd60f0322a8813d5eed7408e89b5e79cb7eb0e6acc364f72c3a59ca05b2de0d53ffb8c3a WHIRLPOOL 05054879c82ad573d7e714150cf2a90bff4ed88cb161ec9bcc4fcd6d8068f066aed156b5d46e56df10e00f91dc96f55958b3bca0a3bc1c1a5b80cb9e94951d0c
+DIST hibernate-annotations-3.2.0.GA.tar.gz 2075220 SHA256 7ac81b03c4d4623cb7c883a3f85a47078edb261cde3fee2bfbc4fcf70a4e9bc8 SHA512 b6ee844fed4f1c2636669155051d082c167f26653b4dfb663e9fd154c6ced63034d62907ab095955cacef26ec61762ba1cdf693a08073f7c48fb530148a9d391 WHIRLPOOL 454e6f69d6558b2baf614a4b68241968198ca669f21974805b1537920b1147cbef9d473f541a8319fd5b81511912da880df891d909e144be9fc3a39771d9986e
diff --git a/dev-java/hibernate-annotations/hibernate-annotations-3.2.0.ebuild b/dev-java/hibernate-annotations/hibernate-annotations-3.2.0.ebuild
new file mode 100644
index 000000000000..c5733befdf22
--- /dev/null
+++ b/dev-java/hibernate-annotations/hibernate-annotations-3.2.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV="${PV}.GA"
+MY_P="${PN}-${MY_PV}"
+HIBERNATE_P="hibernate-3.2.0.ga"
+
+DESCRIPTION="Annotations support for Hibernate"
+HOMEPAGE="http://annotations.hibernate.org"
+SRC_URI="mirror://sourceforge/hibernate/${MY_P}.tar.gz mirror://sourceforge/hibernate/${HIBERNATE_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="3.2"
+KEYWORDS="~amd64"
+
+IUSE="doc source"
+
+COMMON_DEPS="
+	dev-java/commons-logging:0
+	dev-java/dom4j:1
+	dev-java/glassfish-persistence:0
+	dev-java/hibernate:3.1
+	dev-java/lucene:2.1"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/zip:0
+	dev-java/ant-antlr:0
+	dev-java/ant-junit:0
+	dev-java/commons-collections:0
+	${COMMON_DEPS}
+	"
+RDEPEND=">=virtual/jre-1.5
+	dev-java/lucene:1
+	${COMMON_DEPS}
+	"
+
+S="${WORKDIR}/${MY_P}"
+HIBERNATE_S="${WORKDIR}/hibernate-${SLOT}"
+
+java_prepare() {
+	cd "${HIBERNATE_S}"/lib || die
+
+	java-pkg_jar-from --build-only ant-antlr,commons-collections
+	java-pkg_jar-from --build-only ant-core ant.jar
+
+	java-pkg_jar-from commons-logging,dom4j-1,glassfish-persistence,hibernate-3.1,lucene-2.1
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/hibernate-annotations/metadata.xml b/dev-java/hibernate-annotations/metadata.xml
new file mode 100644
index 000000000000..5d17a7d4a79d
--- /dev/null
+++ b/dev-java/hibernate-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>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">hibernate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
new file mode 100644
index 000000000000..e0725a4b8069
--- /dev/null
+++ b/dev-java/hibernate/Manifest
@@ -0,0 +1 @@
+DIST hibernate-3.1.3.tar.gz 18529984 SHA256 e34feddabd7e1a432f11c670d08338720beb6c1dc5bb62952612f05260944c49 SHA512 5a5acf5abc82bbc38313148dc73cea981f69c68fb6b3023f1c6261a392853b5bd4a9852991011891e8b678ff0c35aea9554ebdd17e0da1b8fdf816ffcaca4dea WHIRLPOOL 0c2c6d5f0d5c04e9cb5e10f9eb22dbb796133791a57b8c4c18e780aa8eb637fd5fe2fa793da4885fdfe8902f7676bcce8e740219afc5176be4284bb575c99497
diff --git a/dev-java/hibernate/hibernate-3.1.3-r4.ebuild b/dev-java/hibernate/hibernate-3.1.3-r4.ebuild
new file mode 100644
index 000000000000..a1cb1e159998
--- /dev/null
+++ b/dev-java/hibernate/hibernate-3.1.3-r4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+WANT_ANT_TASKS="ant-antlr ant-swing ant-junit"
+JAVA_PKG_IUSE="doc source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV="3.1"
+DESCRIPTION="A powerful, ultra-high performance object / relational persistence and query service for Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.hibernate.org"
+LICENSE="LGPL-2"
+IUSE=""
+SLOT="3.1"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	>=dev-java/antlr-2.7.7:0[java]
+	dev-java/c3p0:0
+	dev-java/cglib:3
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0
+	dev-java/dom4j:1
+	dev-java/ehcache:0
+	dev-java/oscache:0
+	dev-java/proxool:0
+	dev-java/swarmcache:1.0
+	java-virtuals/transaction-api:0
+	dev-java/sun-jacc-api:0
+	dev-java/ant-core:0
+	dev-java/asm:2.2"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# Avoid this to happen.
+#    [javac] /var/tmp/portage/dev-java/hibernate-3.1.3-r4/work/hibernate-3.1/src/org/hibernate/dialect/MimerSQLDialect.java:13: error: unmappable character for encoding UTF8
+#    [javac]  * @author Fredrik �lund <fredrik.alund@mimer.se>
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+java_prepare() {
+	java-ant_rewrite-bootclasspath 1.5
+
+	# this depends on jboss
+	rm src/org/hibernate/cache/JndiBoundTreeCacheProvider.java \
+		src/org/hibernate/cache/TreeCache.java \
+		src/org/hibernate/cache/TreeCacheProvider.java
+
+	rm -v *.jar lib/*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+c3p0,commons-collections,commons-logging,cglib-3,transaction-api
+dom4j-1,ehcache,oscache,proxool,swarmcache-1.0
+sun-jacc-api,antlr,ant-core,asm-2.2
+"
+EANT_EXTRA_ARGS="-Dnosplash -Ddist.dir=dist"
+
+src_install() {
+	java-pkg_dojar hibernate3.jar
+	dodoc changelog.txt readme.txt
+	use doc && java-pkg_dohtml -r doc/api doc/other doc/reference
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/hibernate/metadata.xml b/dev-java/hibernate/metadata.xml
new file mode 100644
index 000000000000..5d17a7d4a79d
--- /dev/null
+++ b/dev-java/hibernate/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">hibernate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/higlayout/Manifest b/dev-java/higlayout/Manifest
new file mode 100644
index 000000000000..722ad7feaa75
--- /dev/null
+++ b/dev-java/higlayout/Manifest
@@ -0,0 +1 @@
+DIST HIGLayout1.0.zip 78855 SHA256 87464c9c889c7f5c94170ccb76ec088b1452897f670dab090ff3db06c3fed5e7 SHA512 13707cee5ba341b8f47bf97525fcecc5ad7d375f5f816f2b2ed6ed38ae398679e39dcf12e4cf135037b46ac94e7ccc17d34ad9c2671b6d4181e3e9cbc50cd58e WHIRLPOOL 52a781e6d65ea43a2b8f290c2e66be65e808442eeee50ad9c2f920737dc76ad92ca4adf64305c2b298b266f4d02d0c301e2737a20663411178f8076f7e102518
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..f870ed7646ab
--- /dev/null
+++ b/dev-java/higlayout/higlayout-1.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/metadata.xml b/dev-java/higlayout/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/higlayout/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/hoteqn/Manifest b/dev-java/hoteqn/Manifest
new file mode 100644
index 000000000000..56ec1a0bacb6
--- /dev/null
+++ b/dev-java/hoteqn/Manifest
@@ -0,0 +1 @@
+DIST hoteqn-4.0.0.tar.bz2 98714 SHA256 a38d29c2d774a8c4b508635dfef4b17f34c48ca972ef13185dd318ff7d5051d8 SHA512 a0277340bec5ca0c5535d79e091218b88eb7d3c809859fc234de59b65d3b8b6c00fac667e00f3a2f6d0b3613f8a079bdfe7ea7e40a1bf484797a09a59de0323d WHIRLPOOL 617c2e4ded198e10981fb366fca8b2b9ad97aeb1a971651f48a247db80c90190faaf9d4b55fa750525a2190891cd2fc7c1d91fae292bd11c0b3e994ff71ea01e
diff --git a/dev-java/hoteqn/hoteqn-4.0.0.ebuild b/dev-java/hoteqn/hoteqn-4.0.0.ebuild
new file mode 100644
index 000000000000..d0385f5d6eed
--- /dev/null
+++ b/dev-java/hoteqn/hoteqn-4.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+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 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4"
+
+src_unpack() {
+	unpack "${A}"
+	rm -v "${S}"/mHotEqn.java || die
+}
+
+src_compile() {
+	ejavac -nowarn -d classes $(find . -name "*.java") || die "failed to build"
+	jar cf ${PN}.jar -C classes . || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+}
+
+pkg_postinst() {
+	elog "We don't currently build the browser applet part. File a bug if you need it."
+}
diff --git a/dev-java/hoteqn/metadata.xml b/dev-java/hoteqn/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/hoteqn/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/hp-jdk-bin/Manifest b/dev-java/hp-jdk-bin/Manifest
new file mode 100644
index 000000000000..cfda34385af0
--- /dev/null
+++ b/dev-java/hp-jdk-bin/Manifest
@@ -0,0 +1,2 @@
+DIST jdk6_16005_ia.depot 138004480 SHA256 2ce897f22aa9db11ff1cdda14475f36b5b761e0c024cbbd9313e5f2da44e067f
+DIST jdk6_16005_pa.depot 99102720 SHA256 4ed271f34d28194f83ca7271d91ca1731502c93811c9fb052aa102539c3da7f5
diff --git a/dev-java/hp-jdk-bin/files/hp-jdk-bin-1.6.env b/dev-java/hp-jdk-bin/files/hp-jdk-bin-1.6.env
new file mode 100644
index 000000000000..3d5c7bfb7c01
--- /dev/null
+++ b/dev-java/hp-jdk-bin/files/hp-jdk-bin-1.6.env
@@ -0,0 +1,15 @@
+# Copyright 2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="HP JDK/JRE @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_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="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/jre/lib/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.6"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH"
diff --git a/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild b/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild
new file mode 100644
index 000000000000..9baf695820c5
--- /dev/null
+++ b/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit java-vm-2 versionator eutils
+
+DESCRIPTION="HP JDK/JRE and Plug-In"
+HOMEPAGE="http://www.hp.com/go/java"
+
+LICENSE="HP-JDKJRE6"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="-* ~hppa-hpux ~ia64-hpux" # ~hppa64-hpux ~ia64w-hpux
+
+IUSE="doc examples nsplugin"
+
+RDEPEND=""
+DEPEND=""
+
+JAVA_RELEASE=$(get_after_major_version)
+HP_RELEASE_NAME="${JAVA_RELEASE} - Oct 09"
+MY_PV=$(delete_all_version_separators ${JAVA_RELEASE})
+
+DOWNLOADPAGE="https://h20392.www2.hp.com/portal/swdepot/try.do?productNumber=JDKJRE${MY_PV}"
+
+RESTRICT="fetch"
+
+PA_JDK_DIST="jdk6_1${MY_PV}_pa.depot"
+IA_JDK_DIST="jdk6_1${MY_PV}_ia.depot"
+
+SRC_URI="
+	hppa-hpux? ( ${PA_JDK_DIST} )
+	ia64-hpux? ( ${IA_JDK_DIST} )
+"
+#	hppa64-hpux? ( ${PA_JDK_DIST} )
+#	ia64w-hpux?  ( ${IA_JDK_DIST} )
+
+S=${WORKDIR}
+
+# not for metadata use:
+use hppa-hpux   && JDK_DIST=${PA_JDK_DIST}
+use ia64-hpux   && JDK_DIST=${IA_JDK_DIST}
+#use hppa64-hpux && JDK_DIST=${PA_JDK_DIST}
+#use ia64w-hpux  && JDK_DIST=${IA_JDK_DIST}
+
+pkg_nofetch() {
+	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles."
+	einfo "Please visit"
+	einfo "    ${DOWNLOADPAGE}"
+	einfo "select 'Software specification'"
+	use hppa-hpux &&
+	einfo "    PA-RISC JDK ${HP_RELEASE_NAME}"
+	use ia64-hpux &&
+	einfo "    Itanium(R) JDK ${HP_RELEASE_NAME}"
+	einfo "follow the download instructions, and store the downloaded file as"
+	einfo "    ${DISTDIR}/${JDK_DIST}"
+	einfo "Then restart emerge: 'emerge --resume'"
+}
+
+src_unpack() {
+	local status=() diag=
+	einfo "unpacking ${A}"
+	# .depot file contains 0444 directory permissions,
+	# which disallows tar to unpack files into them,
+	# so we have to create the directory tree first.
+	tar tvf "${DISTDIR}"/${A} 2>"${T}"/tar.err |
+		awk '{ if (substr($1,1,1) == "d") { print $6 } }' |
+		xargs mkdir -p .
+	status=(${PIPESTATUS[@]})
+	[[ ${status[0]} == 0 ]] || cat "${T}"/tar.err >&2
+	[[ ${status[0]} == 0 ]] || diag="${diag}${diag:+, }tar list"
+	[[ ${status[1]} == 0 ]] || diag="${diag}${diag:+, }filter dirs"
+	[[ ${status[2]} == 0 ]] || diag="${diag}${diag:+, }create dirs"
+	[[ ${status[@]} == "0 0 0" ]] || die "unpack failed (${diag})"
+
+	# .depot file is plain tar file, but each contained file
+	# is gzip'd itself. But they do not have the .gz suffix.
+	# We do rename and gunzip in parallel for performance.
+	tar xvf "${DISTDIR}"/${A} 2>"${T}"/tar.err |
+		(
+			echo 'dollar=$$'
+			echo '.PHONY: unzip'
+			echo 'default: unzip'
+			while read f; do
+				[[ ${f} == */ ]] && continue # ignore dirs
+				[[ ${f} == J* ]] || continue # only for Jre*/ and Jdk*/
+				# there is some "opt/java6/demo/applets/Blink/Blink$1.class"
+				f=${f//\$/\$\(dollar\)}
+				echo ".PHONY: ${f}"
+				echo "unzip: ${f}"
+				echo "${f}:"
+				echo "	@mv '${f}' '${f}.gz'"
+				echo "	@gunzip '${f}.gz'"
+			done
+		) |
+		emake -f - unzip
+	status=(${PIPESTATUS[@]})
+	diag=
+	[[ ${status[0]} == 0 ]] || cat "${T}"/tar.err >&2
+	[[ ${status[0]} == 0 ]] || diag="${diag}${diag:+, }tar extract"
+	[[ ${status[1]} == 0 ]] || diag="${diag}${diag:+, }create makefile for unzip"
+	[[ ${status[2]} == 0 ]] || diag="${diag}${diag:+, }make unzip"
+	[[ ${status[@]} == "0 0 0" ]] || die "unpack failed (${diag})"
+	eend 0
+}
+
+depot-arch() {
+	use hppa-hpux   && echo PA20
+	use ia64-hpux   && echo IPF32
+#	use hppa64-hpux && echo PA20W
+#	use ia64w-hpux  && echo IPF64
+}
+
+src_install() {
+	use prefix || local EPREFIX= ED=${D}
+	dodir / || die
+	cp -pR Jre*/JRE*-{COM,$(depot-arch){,-HS}}/opt "${ED}" || die
+	cp -pR Jdk*/JDK*-{COM,$(depot-arch)}/opt       "${ED}" || die
+	! use doc      || cp -pR Jre*/JRE*-COM-DOC/opt "${ED}" || die
+	! use examples || cp -pR Jdk*/JDK*-DEMO/opt    "${ED}" || die
+
+	mv "${ED}"/opt/java$(get_version_component_range 2) "${ED}"/opt/${P} || die "rename failed"
+
+	if use nsplugin; then
+		local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/mozilla/libjavaplugin_oji$(get_libname)"
+		install_mozilla_plugin "${plugin}"
+	fi
+
+	local desktop_in="${ED}/opt/${P}/jre/plugin/desktop/sun_java.desktop"
+	if [[ -f "${desktop_in}" ]]; then
+		local desktop_out="${T}/ibm_jdk-${SLOT}.desktop"
+		# install control panel for Gnome/KDE
+		sed -e "s#\(Name=\)Java#\1Java Control Panel for HP JDK/JRE ${SLOT}#" \
+			-e "s#Exec=.*#Exec=${EPREFIX}/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=${EPREFIX}/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+			"${desktop_in}" > \
+			"${desktop_out}" || die
+
+		domenu "${desktop_out}" || die
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+}
diff --git a/dev-java/hp-jdk-bin/metadata.xml b/dev-java/hp-jdk-bin/metadata.xml
new file mode 100644
index 000000000000..53104d360b69
--- /dev/null
+++ b/dev-java/hp-jdk-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>haubi@gentoo.org</email>
+		<name>Michael Haubenwallner</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-java/htmlparser-org/Manifest b/dev-java/htmlparser-org/Manifest
new file mode 100644
index 000000000000..9532a0575a11
--- /dev/null
+++ b/dev-java/htmlparser-org/Manifest
@@ -0,0 +1 @@
+DIST htmlparser1_6_20060610.zip 4346070 SHA256 e4f1ff4be7501572fec5a17740c817b711a7dbf68f0ee97ec7f4921625981915 SHA512 f23d08d9330dc45133a227b8e1a80a515d01298027ccb0ca0863d1b4fab829f52950e3a3ccad057718fd57b05f8c0176786583af8625c70a38a940d3e878cd5f WHIRLPOOL 17376507ce22c08634455d60f3cf822e98dcd55cd8372508a78395d88ed93e64f0dad60427d9c85a2cf8cba6ed752a87f15962314e545fb46481196cb108f148
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..44766e7d5550
--- /dev/null
+++ b/dev-java/htmlparser-org/htmlparser-org-1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b4339a64621b
--- /dev/null
+++ b/dev-java/htmlparser-org/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..d8f3adb53c98
--- /dev/null
+++ b/dev-java/htmlparser/Manifest
@@ -0,0 +1 @@
+DIST htmlparser-1.4.zip 1425388 SHA256 4e696a17f25a6983c846bb72b8f4e1920659d6a1677d5620eff60417260b586c SHA512 eb0587c808b287bbb18acbba11e8efe5bd0dededd96f6bf34ef59b92144227cf8368bf76474a2c1d87a5d6b635a63057faa9d18e2a1a2d7dfeacbfaa64e57700 WHIRLPOOL ae5de0f11b294ce7c831c1e4e121e0f4d2fe354883de3f83ed33c930180bb73f4d224edfbf75754c0d560946b6cddc03d71551f7219472a71d8952a71cf7c8b9
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..b0b8767c5f36
--- /dev/null
+++ b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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=""
+
+COMMON_DEP="
+	dev-java/icu4j:52
+	dev-java/jchardet:0
+	dev-java/xom:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.jar' -delete || die
+	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 htmlparser.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..7303cef96964
--- /dev/null
+++ b/dev-java/htmlparser/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/httpcomponents-client/Manifest b/dev-java/httpcomponents-client/Manifest
new file mode 100644
index 000000000000..b56b78cd1343
--- /dev/null
+++ b/dev-java/httpcomponents-client/Manifest
@@ -0,0 +1 @@
+DIST httpcomponents-client-4.5-src.tar.gz 782815 SHA256 1af3471f99f667eb4fb5d0eae08f1dbf0b14fdfe612c1527821d3b24fa437420 SHA512 a4c3da887a2933ddec0876a3c08903153e34d3dd555dad1be8d9d48ab5dc04f56b3f22eb6f96b407d1ac85c455e33561c7e8625c0a38705bd1e810fd9b6c8517 WHIRLPOOL 774d179ab6a8dceff787223502300836df5140dda6126f021b95f4ca341dd550f72b039b67033000c14efeb680731b3a2e4b964455712a7c8a9f0a37b78af90d
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..48dc17d07cf4
--- /dev/null
+++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7303cef96964
--- /dev/null
+++ b/dev-java/httpcomponents-client/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/httpcomponents-core/Manifest b/dev-java/httpcomponents-core/Manifest
new file mode 100644
index 000000000000..452c363c3c43
--- /dev/null
+++ b/dev-java/httpcomponents-core/Manifest
@@ -0,0 +1 @@
+DIST httpcomponents-core-4.4.1-src.tar.gz 549481 SHA256 11a2b73fb412000fee89dec1301cb77277365bced7c9291a970995b5a8ab9ac4 SHA512 1ccf6233a8b254986712732418fb4e25bbdbcb99c93f55ec7955d956d33c692eff6378ed8d701542272793f05831151ee75f0102cdd3b14a6f7530fcf9639b99 WHIRLPOOL e814a6b71b85a5235567378ccad9177e75231e5e47359756c00cf0f27fc942d0d8efe1df070712c3722e4e215ef223f27fd261a28b162bad42336876dc6a1017
diff --git a/dev-java/httpcomponents-core/files/httpcomponents-core-4.2.4-build.xml b/dev-java/httpcomponents-core/files/httpcomponents-core-4.2.4-build.xml
new file mode 100644
index 000000000000..1ebbeed19ac1
--- /dev/null
+++ b/dev-java/httpcomponents-core/files/httpcomponents-core-4.2.4-build.xml
@@ -0,0 +1,74 @@
+<?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/13 8:39 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="httpcomponents-core-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <ant antfile="build.xml" dir="httpcore" target="clean"/>
+    <ant antfile="build.xml" dir="httpcore-nio" target="clean"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <ant antfile="build.xml" dir="httpcore" target="compile"/>
+    <ant antfile="build.xml" dir="httpcore-nio" target="compile"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" description="Compile the test code">
+    <ant antfile="build.xml" dir="httpcore" target="compile-tests"/>
+    <ant antfile="build.xml" dir="httpcore-nio" target="compile-tests"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" description="Run the test cases">
+    <ant antfile="build.xml" dir="httpcore" target="test"/>
+    <ant antfile="build.xml" dir="httpcore-nio" target="test"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <ant antfile="build.xml" dir="httpcore" target="javadoc"/>
+    <ant antfile="build.xml" dir="httpcore-nio" target="javadoc"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" description="Package the application">
+    <ant antfile="build.xml" dir="httpcore" target="package"/>
+    <ant antfile="build.xml" dir="httpcore-nio" target="package"/>
+  </target>
+
+</project>
diff --git a/dev-java/httpcomponents-core/files/httpcomponents-core-4.2.4-httpcore-build.xml b/dev-java/httpcomponents-core/files/httpcomponents-core-4.2.4-httpcore-build.xml
new file mode 100644
index 000000000000..7f97b4d910a5
--- /dev/null
+++ b/dev-java/httpcomponents-core/files/httpcomponents-core-4.2.4-httpcore-build.xml
@@ -0,0 +1,281 @@
+<?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/13 8:39 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.2.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.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"/>
+    <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" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="true" 
+           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}">
+        <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="true" 
+           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"/>
+  </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.9"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.9/junit-4.9.jar" 
+         dest="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.9/junit-4.9.jar" 
+         dest="${maven.repo.local}/junit/junit/4.9/junit-4.9.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"/>
+    <mkdir dir="${maven.repo.local}/org/mockito/mockito-core/1.8.5"/>
+    <get src="http://repository.apache.org/snapshots/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/objenesis/objenesis/1.0"/>
+    <get src="http://repository.apache.org/snapshots/org/objenesis/objenesis/1.0/objenesis-1.0.jar" 
+         dest="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/objenesis/objenesis/1.0/objenesis-1.0.jar" 
+         dest="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/httpcomponents-core/files/httpcomponents-core-4.2.4-httpcore-nio-build.xml b/dev-java/httpcomponents-core/files/httpcomponents-core-4.2.4-httpcore-nio-build.xml
new file mode 100644
index 000000000000..df983ac09450
--- /dev/null
+++ b/dev-java/httpcomponents-core/files/httpcomponents-core-4.2.4-httpcore-nio-build.xml
@@ -0,0 +1,307 @@
+<?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/13 8:39 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.2.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.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="${basedir}/../httpcore/target/httpcore-4.2.4.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.2.4/httpcore-4.2.4.jar"/>
+    <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"/>
+    <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.1.1/commons-logging-1.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}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="true" 
+           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}">
+        <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="true" 
+           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/"/>
+      <link href="http://hc.apache.org/httpcomponents-core-ga/httpcore/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>
+
+  <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/httpcomponents/httpcore/4.2.4"/>
+    <get src="http://repository.apache.org/snapshots/org/apache/httpcomponents/httpcore/4.2.4/httpcore-4.2.4.jar" 
+         dest="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.2.4/httpcore-4.2.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.2.4/httpcore-4.2.4.jar" 
+         dest="${maven.repo.local}/org/apache/httpcomponents/httpcore/4.2.4/httpcore-4.2.4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.9"/>
+    <get src="http://repository.apache.org/snapshots/junit/junit/4.9/junit-4.9.jar" 
+         dest="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.9/junit-4.9.jar" 
+         dest="${maven.repo.local}/junit/junit/4.9/junit-4.9.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"/>
+    <mkdir dir="${maven.repo.local}/org/mockito/mockito-core/1.8.5"/>
+    <get src="http://repository.apache.org/snapshots/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" 
+         dest="${maven.repo.local}/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/objenesis/objenesis/1.0"/>
+    <get src="http://repository.apache.org/snapshots/org/objenesis/objenesis/1.0/objenesis-1.0.jar" 
+         dest="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/objenesis/objenesis/1.0/objenesis-1.0.jar" 
+         dest="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.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"/>
+  </target>
+
+</project>
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..7cb42e64fea6
--- /dev/null
+++ b/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/commons-logging:0
+		dev-java/ant-junit:0
+		dev-java/mockito:0
+	)"
+RDEPEND=">=virtual/jre-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
+	cp "${FILESDIR}"/${P}-${HTTPNIO}-build.xml ${HTTPNIO}/build.xml
+
+	# 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..7303cef96964
--- /dev/null
+++ b/dev-java/httpcomponents-core/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/httpunit/Manifest b/dev-java/httpunit/Manifest
new file mode 100644
index 000000000000..98af4a5986de
--- /dev/null
+++ b/dev-java/httpunit/Manifest
@@ -0,0 +1 @@
+DIST httpunit-1.7.zip 4181983 SHA256 ee178a368f0db6979dfdca24c655f73726c3729fb76dafb064a8fdf8b057f625 SHA512 1d109b8ef65fb80d7904c2786db31916b2ef26c5b92730ce41b90c441d3e8d46a4a8a84a5e82237b52412c6bc29fc6eff18297d2f961616bd8429bf5d579567e WHIRLPOOL 2c397d2a9788812ee413ae682393be9103535942e695a2103ff404fe1a2ec539ed8b22201cdc2c10b011db729f821d91fe100d700b3657600c284d484070b5ce
diff --git a/dev-java/httpunit/files/rhino-fix-1.6.2.diff b/dev-java/httpunit/files/rhino-fix-1.6.2.diff
new file mode 100644
index 000000000000..c439d7183ca0
--- /dev/null
+++ b/dev-java/httpunit/files/rhino-fix-1.6.2.diff
@@ -0,0 +1,25 @@
+diff -Nur httpunit-1.6.2/src/com/meterware/httpunit/javascript/JavaScript.java httpunit-1.6.2_fixed/src/com/meterware/httpunit/javascript/JavaScript.java
+--- httpunit-1.6.2/src/com/meterware/httpunit/javascript/JavaScript.java	2006-03-26 22:16:46.000000000 +0300
++++ httpunit-1.6.2_fixed/src/com/meterware/httpunit/javascript/JavaScript.java	2007-10-14 20:34:03.000000000 +0300
+@@ -838,8 +838,6 @@
+         static ElementArray newElementArray( Scriptable parent ) {
+             try {
+                 return (ElementArray) Context.getCurrentContext().newObject( parent, "ElementArray" );
+-            } catch (PropertyException e) {
+-                throw new RhinoException( e );
+             } catch (NotAFunctionException e) {
+                 throw new RhinoException( e );
+             } catch (JavaScriptException e) {
+@@ -1144,10 +1142,10 @@
+ 
+ class RhinoException extends RuntimeException {
+ 
+-    private Exception _cause;
++    private Throwable _cause;
+ 
+ 
+-    public RhinoException( Exception cause ) {
++    public RhinoException( Throwable cause ) {
+         _cause = cause;
+     }
+ 
diff --git a/dev-java/httpunit/httpunit-1.7.ebuild b/dev-java/httpunit/httpunit-1.7.ebuild
new file mode 100644
index 000000000000..653407b99ccf
--- /dev/null
+++ b/dev-java/httpunit/httpunit-1.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="HttpUnit emulates the relevant portions of browser behavior"
+HOMEPAGE="http://httpunit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+	>=dev-java/junit-3.8:0
+	dev-java/rhino:1.6
+	dev-java/jtidy:0
+	java-virtuals/servlet-api:2.3
+	dev-java/xerces:2"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+
+java_prepare() {
+	find . -name "*.jar" | xargs rm -v
+
+	epatch "${FILESDIR}/rhino-fix-1.6.2.diff"
+
+	cd jars || die
+	java-pkg_jar-from junit,rhino-1.6,xerces-2,jtidy,servlet-api-2.3
+}
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+
+	eant clean jar $(use_doc javadocs)
+}
+
+src_install() {
+	java-pkg_dojar "lib/${PN}.jar"
+
+	dodoc doc/*.txt
+
+	if use doc; then
+		dohtml -r doc/manual doc/tutorial
+		java-pkg_dojavadoc doc/api
+	fi
+}
diff --git a/dev-java/httpunit/metadata.xml b/dev-java/httpunit/metadata.xml
new file mode 100644
index 000000000000..4c66010521dc
--- /dev/null
+++ b/dev-java/httpunit/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+		HttpUnit emulates the relevant portions of browser behavior,
+		including form submission, JavaScript, basic http authentication,
+		cookies and automatic page redirection, and allows Java test code
+		to examine returned pages either as text, an XML DOM, or containers
+		of forms, tables, and links.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">httpunit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
new file mode 100644
index 000000000000..6883c29e71ac
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -0,0 +1,12 @@
+DIST ibm-java-javacomm-6.0-9.0-linux-i386.tgz 336897 SHA256 2a04826238b0e2a24b611622191e3c3545ec6e2737fc9f240c8b53f19841d705
+DIST ibm-java-javacomm-6.0-9.0-linux-ppc.tgz 343028 SHA256 5618541e0cdb38607856eb47aa1878a3db4165c2ba0d59a87ada875c9b300da0
+DIST ibm-java-javacomm-6.0-9.0-linux-ppc64.tgz 342371 SHA256 27feede3959306f264185876440f55d5807782dc31d519600004f4868c644c4a
+DIST ibm-java-javacomm-6.0-9.0-linux-x86_64.tgz 339256 SHA256 10265a692a5056fe8d12c3d082f20ec113596e28bf98eb43d5a17a9a90176c8c
+DIST ibm-java-sdk-6.0-9.1-linux-i386.tgz 94205111 SHA256 7dc15aaa2d660ed938fc0fb71bfbe8ef25345726be90c99060cd10ed995d56bc
+DIST ibm-java-sdk-6.0-9.1-linux-ppc.tgz 96510114 SHA256 eb4c8603ecaa045a649ce3aef55e340ea984fb314a20cc692c5b244ffbf6ed9e SHA512 e24c83e79aa2100a7c0a6a5ab1c456c6b73d083254a375555880aa448da3a5023d21b13552d112a0d427eba1f2f84c3b9957794fcaf3a38d156d7c84516cc771 WHIRLPOOL 904b1ea7678dfc35c2580183b1b7a67fd6f863be5560b7b45529a757ba6b4e729f9256a0c93c0936a05c986efda2d60331f001fcb5ac27ed702a6e594afe3ec9
+DIST ibm-java-sdk-6.0-9.1-linux-ppc64.tgz 99300890 SHA256 2d9f324d934a3f7f38457d6808621510fa2c8b27c6781778d2a90476f35a00d1
+DIST ibm-java-sdk-6.0-9.1-linux-x86_64.tgz 95717823 SHA256 36df08cefcbb690d37301fb8d6d6ecd19c6a32d5b0efff13e771cb6e6f6e302d
+DIST ibm-java-sdk-6.0-9.2-linux-i386.tgz 94285404 SHA256 cc835013d9b82f4f188bc6036bb9850d7f848c513f73b321539e4eb8cc5a7e71
+DIST ibm-java-sdk-6.0-9.2-linux-ppc.tgz 96591020 SHA256 738bc53ec28ca823d01218ad5a6d665b3b2d5638225c1dc6fad5b6780b953c5b
+DIST ibm-java-sdk-6.0-9.2-linux-ppc64.tgz 99395016 SHA256 2c831e79a5e8f87e716e216edb29825c9f3e4d4e473ec6cb3b71bdf88ae8ef0d
+DIST ibm-java-sdk-6.0-9.2-linux-x86_64.tgz 95834113 SHA256 025ac23ebc96d0d88e80cef1b27fea9b2a72253e49274b1f729995d33fb4e02c
diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env
new file mode 100644
index 000000000000..8129abdff4ff
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="IBM JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_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/bin/:${JAVA_HOME}/jre/bin/classic"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.5"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/vm.jar:${JAVA_HOME}/jre/lib/core.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/graphics.jar:${JAVA_HOME}/jre/lib/security.jar:${JAVA_HOME}/jre/lib/ibmpkcs.jar:${JAVA_HOME}/jre/lib/ibmorb.jar:${JAVA_HOME}/jre/lib/ibmcfw.jar:${JAVA_HOME}/jre/lib/ibmorbapi.jar:${JAVA_HOME}/jre/lib/ibmjcefw.jar:${JAVA_HOME}/jre/lib/ibmjgssprovider.jar:${JAVA_HOME}/jre/lib/ibmjsseprovider2.jar:${JAVA_HOME}/jre/lib/ibmjaaslm.jar:${JAVA_HOME}/jre/lib/ibmcertpathprovider.jar:${JAVA_HOME}/jre/lib/server.jar:${JAVA_HOME}/jre/lib/xml.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH"
diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env
new file mode 100644
index 000000000000..1f5df15cefb2
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="IBM JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_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/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.6"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/vm.jar:${JAVA_HOME}/jre/lib/facilitators.jar:${JAVA_HOME}/jre/lib/annotation.jar:${JAVA_HOME}/jre/lib/beans.jar:${JAVA_HOME}/jre/lib/java.util.jar:${JAVA_HOME}/jre/lib/jndi.jar:${JAVA_HOME}/jre/lib/logging.jar:${JAVA_HOME}/jre/lib/security.jar:${JAVA_HOME}/jre/lib/sql.jar:${JAVA_HOME}/jre/lib/ibmorb.jar:${JAVA_HOME}/jre/lib/ibmorbapi.jar:${JAVA_HOME}/jre/lib/ibmcfw.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/ibmpkcs.jar:${JAVA_HOME}/jre/lib/ibmcertpathfw.jar:${JAVA_HOME}/jre/lib/ibmjgssfw.jar:${JAVA_HOME}/jre/lib/ibmjssefw.jar:${JAVA_HOME}/jre/lib/ibmsaslfw.jar:${JAVA_HOME}/jre/lib/ibmjcefw.jar:${JAVA_HOME}/jre/lib/ibmjgssprovider.jar:${JAVA_HOME}/jre/lib/ibmjsseprovider2.jar:${JAVA_HOME}/jre/lib/ibmcertpathprovider.jar:${JAVA_HOME}/jre/lib/ibmxmlcrypto.jar:${JAVA_HOME}/jre/lib/management-agent.jar:${JAVA_HOME}/jre/lib/xml.jar:${JAVA_HOME}/jre/lib/jlm.jar:${JAVA_HOME}/jre/lib/javascript.jar:${JAVA_HOME}/jre/lib/RACF.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH"
diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch
new file mode 100644
index 000000000000..c3fa40cfa3c7
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch
@@ -0,0 +1,12 @@
+--- include/jawt.h	2006/07/20 23:02:04	1.1
++++ include/jawt.h	2006/07/20 23:03:13
+@@ -298,7 +298,9 @@ typedef struct jawt {
+  * Get the AWT native structure.  This function returns JNI_FALSE if
+  * an error occurs.
+  */
++#ifdef _JNI_IMPORT_OR_EXPORT_
+ _JNI_IMPORT_OR_EXPORT_
++#endif
+ jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt);
+ 
+ #define JAWT_VERSION_1_3 0x00010003
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.ebuild
new file mode 100644
index 000000000000..b0dd4401edf8
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-vm-2 versionator eutils
+
+JDK_RELEASE=$(get_version_component_range 2-3)
+JAVACOMM_RELEASE=$(get_version_component_range 3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
+
+# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
+if [[ $(get_version_component_count) == 5 ]]; then
+	FP_VERSION="$(get_version_component_range 5)"
+	FP_VERSION="${FP_VERSION#p}"
+	FP_WEB="-FP${FP_VERSION}"
+	FP_LINK="fp${FP_VERSION}"
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
+else
+	FP_WEB=""
+	FP_LINK=""
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+fi
+
+#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
+# looks like they don't bump javacomm in service releases anymore
+JAVACOMM_PV_ORIG="3.${JAVACOMM_RELEASE}-0.0"
+JAVACOMM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
+JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_PV}-linux"
+JAVACOMM_DIST_PREFIX_ORIG="ibm-java-javacomm-${JAVACOMM_PV_ORIG}-linux"
+
+X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
+X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
+X86_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-i386.tgz"
+
+AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
+AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
+AMD64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-x86_64.tgz"
+
+PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
+PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
+PPC_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc.tgz"
+
+PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
+PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
+PPC64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc64.tgz"
+
+if use x86; then
+	JDK_DIST=${X86_JDK_DIST}
+	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
+	JAVACOMM_DIST_ORIG=${X86_JAVACOMM_DIST_ORIG}
+	S="${WORKDIR}/ibm-java-i386-60"
+	LINK_ARCH="intel"
+elif use amd64; then
+	JDK_DIST=${AMD64_JDK_DIST}
+	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
+	JAVACOMM_DIST_ORIG=${AMD64_JAVACOMM_DIST_ORIG}
+	S="${WORKDIR}/ibm-java-x86_64-60"
+	LINK_ARCH="amd64"
+elif use ppc; then
+	JDK_DIST=${PPC_JDK_DIST}
+	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
+	JAVACOMM_DIST_ORIG=${PPC_JAVACOMM_DIST_ORIG}
+	S="${WORKDIR}/ibm-java-ppc-60"
+	LINK_ARCH="ipseries32"
+elif use ppc64; then
+	JDK_DIST=${PPC64_JDK_DIST}
+	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
+	JAVACOMM_DIST_ORIG=${PPC64_JAVACOMM_DIST_ORIG}
+	S="${WORKDIR}/ibm-java-ppc64-60"
+	LINK_ARCH="ipseries64"
+fi
+
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
+
+SLOT="1.6"
+DESCRIPTION="IBM Java SE Development Kit"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
+# bug #125178
+ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
+
+SRC_URI="
+	x86? ( ${X86_JDK_DIST} )
+	amd64? ( ${AMD64_JDK_DIST} )
+	ppc? ( ${PPC_JDK_DIST} )
+	ppc64? ( ${PPC64_JDK_DIST} )
+	javacomm? (
+		x86? ( ${X86_JAVACOMM_DIST} )
+		amd64? ( ${AMD64_JAVACOMM_DIST} )
+		ppc? ( ${PPC_JAVACOMM_DIST} )
+		ppc64? ( ${PPC64_JAVACOMM_DIST} )
+	)"
+LICENSE="IBM-J1.6"
+KEYWORDS="-* amd64 ppc ppc64 x86"
+RESTRICT="fetch"
+IUSE="X alsa doc examples javacomm nsplugin odbc selinux"
+
+RDEPEND="
+	ppc? ( =virtual/libstdc++-3.3 )
+	ppc64? ( =virtual/libstdc++-3.3 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.6.0* )
+	odbc? ( dev-db/unixODBC )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="selinux? ( sec-policy/selinux-java )"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
+opt/${P}/jre/lib/i386/libj9vm24.so
+opt/${P}/jre/lib/i386/libjclscar_24.so
+opt/${P}/jre/lib/i386/motif21/libmawt.so
+opt/${P}/jre/lib/i386/libj9thr24.so
+opt/${P}/jre/lib/i386/libj9jit24.so
+opt/${P}/jre/lib/i386/libj9dbg24.so
+opt/${P}/jre/lib/i386/libj9gc24.so"
+
+QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so
+opt/${P}/jre/lib/i386/j9vm/libjvm.so
+opt/${P}/jre/lib/i386/libj9jvmti24.so
+opt/${P}/jre/lib/i386/libj9hookable24.so
+opt/${P}/jre/lib/i386/libj9vm24.so
+opt/${P}/jre/lib/i386/libjclscar_24.so
+opt/${P}/jre/lib/i386/libj9thr24.so
+opt/${P}/jre/lib/i386/libj9dmp24.so
+opt/${P}/jre/lib/i386/libj9prt24.so
+opt/${P}/jre/lib/i386/libj9jit24.so
+opt/${P}/jre/lib/i386/libiverel24.so
+opt/${P}/jre/lib/i386/libj9trc24.so
+opt/${P}/jre/lib/i386/libj9dbg24.so
+opt/${P}/jre/lib/i386/libj9shr24.so
+opt/${P}/jre/lib/i386/libj9gc24.so
+opt/${P}/jre/lib/i386/libj9bcv24.so
+opt/${P}/jre/lib/i386/classic/libjvm.so"
+
+QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so
+opt/${P}/jre/lib/amd64/default/libj9jvmti24.so
+opt/${P}/jre/lib/amd64/default/libj9hookable24.so
+opt/${P}/jre/lib/amd64/default/libj9vm24.so
+opt/${P}/jre/lib/amd64/default/libjclscar_24.so
+opt/${P}/jre/lib/amd64/default/libj9jpi24.so
+opt/${P}/jre/lib/amd64/default/libj9thr24.so
+opt/${P}/jre/lib/amd64/default/libj9dmp24.so
+opt/${P}/jre/lib/amd64/default/libj9prt24.so
+opt/${P}/jre/lib/amd64/default/libj9jit24.so
+opt/${P}/jre/lib/amd64/default/libiverel24.so
+opt/${P}/jre/lib/amd64/default/libj9trc24.so
+opt/${P}/jre/lib/amd64/default/libj9dbg24.so
+opt/${P}/jre/lib/amd64/default/libj9shr24.so
+opt/${P}/jre/lib/amd64/default/libj9gc24.so
+opt/${P}/jre/lib/amd64/default/libj9bcv24.so
+opt/${P}/jre/lib/amd64/default/libj9ute24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9ute24.so"
+
+pkg_nofetch() {
+	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	einfo "Please visit: ${DOWNLOADPAGE}"
+
+	einfo "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your arch:"
+	einfo "${JDK_DIST}"
+	if use javacomm ; then
+		einfo "Also download ${JAVACOMM_DIST_ORIG}"
+		ewarn "and save it as ${JAVACOMM_DIST}"
+		ewarn "Renaming is needed because javacomm changes content without changing filename."
+	fi
+
+	einfo "You can also use a direct link to your arch download page:"
+	einfo "${DIRECT_DOWNLOAD}"
+	einfo "Place the file(s) in: ${DISTDIR}"
+	einfo "Then restart emerge: 'emerge --resume'"
+
+	einfo "Note: if SR${SERVICE_RELEASE}${FP_WEB} is not available at ${DOWNLOADPAGE}"
+	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
+	einfo "isn't updated, but the files should still available through the"
+	einfo "direct link to arch download page. If it doesn't work, file a bug."
+}
+
+src_unpack() {
+	unpack ${JDK_DIST}
+	if use javacomm; then
+		mkdir "${WORKDIR}/javacomm/" || die
+		cd "${WORKDIR}/javacomm/"
+		unpack ${JAVACOMM_DIST}
+	fi
+	cd "${S}"
+
+	# bug #126105
+	epatch "${FILESDIR}/${PN}-jawt.h.patch"
+}
+
+src_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pR "${S}"/{bin,jre,lib,include,src.zip} "${D}/opt/${P}/" || die
+
+	if use examples; then
+		cp -pPR "${S}"/demo "${D}"/opt/${P}/ || die
+	fi
+	if use javacomm; then
+		chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar "${WORKDIR}"/javacomm/*/lib/*.properties || die
+		cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar "${D}"/opt/${P}/jre/lib/ext/ || die
+		cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${D}"/opt/${P}/jre/lib/ || die
+		cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${D}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
+		if use examples; then
+			cp -pPR "${WORKDIR}"/javacomm/*/examples "${D}"/opt/${P}/ || die
+		fi
+	fi
+
+	if use x86 || use ppc; then
+		if use nsplugin; then
+			local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
+			install_mozilla_plugin "${plugin}"
+		fi
+	fi
+
+	local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop"
+	if [[ -f "${desktop_in}" ]]; then
+		local desktop_out="${T}/ibm_jdk-${SLOT}.desktop"
+		# install control panel for Gnome/KDE
+		# The jre also installs these so make sure that they do not have the same
+		# Name
+		sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+			"${desktop_in}" > \
+			"${desktop_out}" || die
+
+		domenu "${desktop_out}" || die
+	fi
+
+	dohtml -a html,htm,HTML -r docs || die
+	dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
+
+	set_java_env
+
+	# a workaround to fix the BOOTCLASSPATH in our env file
+	# this is not optimal, using -Xcompressedrefs would probably make it
+	# expect the compressedrefs version...
+	if use amd64; then
+		sed -i -e "s|vm.jar|amd64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
+	fi
+	if use ppc64; then
+		sed -i -e "s|vm.jar|ppc64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
+	fi
+
+	java-vm_revdep-mask
+
+	# bug #321695
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/proc/self/coredump_filter"' > "${D}/etc/sandbox.d/20${VMHANDLE}"
+}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
new file mode 100644
index 000000000000..a6332978c653
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit java-vm-2 versionator eutils
+
+JDK_RELEASE=$(get_version_component_range 2-3)
+JAVACOMM_RELEASE=$(get_version_component_range 3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
+
+# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
+if [[ $(get_version_component_count) == 5 ]]; then
+	FP_VERSION="$(get_version_component_range 5)"
+	FP_VERSION="${FP_VERSION#p}"
+	FP_WEB="-FP${FP_VERSION}"
+	FP_LINK="fp${FP_VERSION}"
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
+else
+	FP_WEB=""
+	FP_LINK=""
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+fi
+
+#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
+# looks like they don't bump javacomm in service releases anymore
+JAVACOMM_PV_ORIG="3.${JAVACOMM_RELEASE}-0.0"
+JAVACOMM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
+JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_PV}-linux"
+JAVACOMM_DIST_PREFIX_ORIG="ibm-java-javacomm-${JAVACOMM_PV_ORIG}-linux"
+
+X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
+X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
+X86_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-i386.tgz"
+
+AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
+AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
+AMD64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-x86_64.tgz"
+
+PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
+PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
+PPC_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc.tgz"
+
+PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
+PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
+PPC64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc64.tgz"
+
+DESCRIPTION="IBM Java SE Development Kit"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+SRC_URI="
+	x86? ( ${X86_JDK_DIST} )
+	amd64? ( ${AMD64_JDK_DIST} )
+	ppc? ( ${PPC_JDK_DIST} )
+	ppc64? ( ${PPC64_JDK_DIST} )
+	javacomm? (
+		x86? ( ${X86_JAVACOMM_DIST} )
+		amd64? ( ${AMD64_JAVACOMM_DIST} )
+		ppc? ( ${PPC_JAVACOMM_DIST} )
+		ppc64? ( ${PPC64_JAVACOMM_DIST} )
+	)"
+
+LICENSE="IBM-J1.6"
+SLOT="1.6"
+KEYWORDS="-* ~amd64 ppc ~ppc64 ~x86"
+RESTRICT="fetch"
+IUSE="X alsa doc examples javacomm nsplugin odbc selinux"
+
+RDEPEND="
+	ppc? ( =virtual/libstdc++-3.3 )
+	ppc64? ( =virtual/libstdc++-3.3 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.6.0* )
+	odbc? ( dev-db/unixODBC )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND=""
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
+opt/${P}/jre/lib/i386/libj9vm24.so
+opt/${P}/jre/lib/i386/libjclscar_24.so
+opt/${P}/jre/lib/i386/motif21/libmawt.so
+opt/${P}/jre/lib/i386/libj9thr24.so
+opt/${P}/jre/lib/i386/libj9jit24.so
+opt/${P}/jre/lib/i386/libj9dbg24.so
+opt/${P}/jre/lib/i386/libj9gc24.so"
+
+QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so
+opt/${P}/jre/lib/i386/j9vm/libjvm.so
+opt/${P}/jre/lib/i386/libj9jvmti24.so
+opt/${P}/jre/lib/i386/libj9hookable24.so
+opt/${P}/jre/lib/i386/libj9vm24.so
+opt/${P}/jre/lib/i386/libjclscar_24.so
+opt/${P}/jre/lib/i386/libj9thr24.so
+opt/${P}/jre/lib/i386/libj9dmp24.so
+opt/${P}/jre/lib/i386/libj9prt24.so
+opt/${P}/jre/lib/i386/libj9jit24.so
+opt/${P}/jre/lib/i386/libiverel24.so
+opt/${P}/jre/lib/i386/libj9trc24.so
+opt/${P}/jre/lib/i386/libj9dbg24.so
+opt/${P}/jre/lib/i386/libj9shr24.so
+opt/${P}/jre/lib/i386/libj9gc24.so
+opt/${P}/jre/lib/i386/libj9bcv24.so
+opt/${P}/jre/lib/i386/classic/libjvm.so"
+
+QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so
+opt/${P}/jre/lib/amd64/default/libj9jvmti24.so
+opt/${P}/jre/lib/amd64/default/libj9hookable24.so
+opt/${P}/jre/lib/amd64/default/libj9vm24.so
+opt/${P}/jre/lib/amd64/default/libjclscar_24.so
+opt/${P}/jre/lib/amd64/default/libj9jpi24.so
+opt/${P}/jre/lib/amd64/default/libj9thr24.so
+opt/${P}/jre/lib/amd64/default/libj9dmp24.so
+opt/${P}/jre/lib/amd64/default/libj9prt24.so
+opt/${P}/jre/lib/amd64/default/libj9jit24.so
+opt/${P}/jre/lib/amd64/default/libiverel24.so
+opt/${P}/jre/lib/amd64/default/libj9trc24.so
+opt/${P}/jre/lib/amd64/default/libj9dbg24.so
+opt/${P}/jre/lib/amd64/default/libj9shr24.so
+opt/${P}/jre/lib/amd64/default/libj9gc24.so
+opt/${P}/jre/lib/amd64/default/libj9bcv24.so
+opt/${P}/jre/lib/amd64/default/libj9ute24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9ute24.so"
+
+_init_at_vars() {
+	if use x86; then
+		JDK_DIST=${X86_JDK_DIST}
+		JAVACOMM_DIST=${X86_JAVACOMM_DIST}
+		JAVACOMM_DIST_ORIG=${X86_JAVACOMM_DIST_ORIG}
+		S="${WORKDIR}/ibm-java-i386-60"
+		LINK_ARCH="intel"
+	elif use amd64; then
+		JDK_DIST=${AMD64_JDK_DIST}
+		JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
+		JAVACOMM_DIST_ORIG=${AMD64_JAVACOMM_DIST_ORIG}
+		S="${WORKDIR}/ibm-java-x86_64-60"
+		LINK_ARCH="amd64"
+	elif use ppc; then
+		JDK_DIST=${PPC_JDK_DIST}
+		JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
+		JAVACOMM_DIST_ORIG=${PPC_JAVACOMM_DIST_ORIG}
+		S="${WORKDIR}/ibm-java-ppc-60"
+		LINK_ARCH="ipseries32"
+	elif use ppc64; then
+		JDK_DIST=${PPC64_JDK_DIST}
+		JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
+		JAVACOMM_DIST_ORIG=${PPC64_JAVACOMM_DIST_ORIG}
+		S="${WORKDIR}/ibm-java-ppc64-60"
+		LINK_ARCH="ipseries64"
+	fi
+}
+
+pkg_nofetch() {
+	_init_at_vars
+
+	DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6"
+	DIRECT_DOWNLOAD+="&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
+	DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
+	# bug #125178
+	ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
+
+	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	einfo "Please visit: ${DOWNLOADPAGE}"
+
+	einfo "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your arch:"
+	einfo "${JDK_DIST}"
+	if use javacomm ; then
+		einfo "Also download ${JAVACOMM_DIST_ORIG}"
+		ewarn "and save it as ${JAVACOMM_DIST}"
+		ewarn "Renaming is needed because javacomm changes content without changing filename."
+	fi
+
+	einfo "You can also use a direct link to your arch download page:"
+	einfo "${DIRECT_DOWNLOAD}"
+	einfo "Place the file(s) in: ${DISTDIR}"
+	einfo "Then restart emerge: 'emerge --resume'"
+
+	einfo "Note: if SR${SERVICE_RELEASE}${FP_WEB} is not available at ${DOWNLOADPAGE}"
+	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
+	einfo "isn't updated, but the files should still available through the"
+	einfo "direct link to arch download page. If it doesn't work, file a bug."
+}
+
+src_unpack() {
+	_init_at_vars
+
+	unpack ${JDK_DIST}
+	if use javacomm; then
+		mkdir "${WORKDIR}/javacomm/" || die
+		cd "${WORKDIR}/javacomm/"
+		unpack ${JAVACOMM_DIST}
+	fi
+}
+
+src_prepare() {
+	# bug #126105
+	epatch "${FILESDIR}/${PN}-jawt.h.patch"
+}
+
+src_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pPR bin jre lib include src.zip "${ED}/opt/${P}" || die
+
+	if use examples; then
+		cp -pPR demo "${ED}"/opt/${P} || die
+	fi
+	if use javacomm; then
+		chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar "${WORKDIR}"/javacomm/*/lib/*.properties || die
+		cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar "${ED}"/opt/${P}/jre/lib/ext/ || die
+		cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${ED}"/opt/${P}/jre/lib/ || die
+		cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${ED}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
+		if use examples; then
+			cp -pPR "${WORKDIR}"/javacomm/*/examples "${ED}"/opt/${P}/ || die
+		fi
+	fi
+
+	if use x86 || use ppc; then
+		local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
+		if use nsplugin; then
+			install_mozilla_plugin "${plugin}"
+		else
+			rm "${ED}${plugin}" || die
+		fi
+	fi
+
+	# Install desktop file for the Java Control Panel. Using VMHANDLE as file
+	# name to prevent file collision with jre and or other slots.
+	sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \
+		-e "s#Exec=.*#Exec=${EPREFIX}/opt/${P}/jre/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=${EPREFIX}/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+		"${ED}"/opt/${P}/jre/plugin/desktop/sun_java.desktop \
+		> "${T}"/${VMHANDLE}.desktop || die
+	domenu "${T}"/${VMHANDLE}.desktop || die
+
+	dohtml -a html,htm,HTML -r docs
+	dodoc copyright notices.txt readmefirst.lnx.txt
+
+	set_java_env
+
+	# a workaround to fix the BOOTCLASSPATH in our env file
+	# this is not optimal, using -Xcompressedrefs would probably make it
+	# expect the compressedrefs version...
+	if use amd64; then
+		sed -i -e "s|vm.jar|amd64/default/jclSC160/vm.jar|g" "${ED}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
+	fi
+	if use ppc64; then
+		sed -i -e "s|vm.jar|ppc64/default/jclSC160/vm.jar|g" "${ED}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
+	fi
+
+	java-vm_set-pax-markings "${ED}"/opt/${P}
+	java-vm_revdep-mask
+	java-vm_sandbox-predict	/proc/cpuinfo /proc/self/coredump_filter /proc/self/maps
+}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.ebuild
new file mode 100644
index 000000000000..d97b3f72b9a4
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-vm-2 versionator eutils
+
+JDK_RELEASE=$(get_version_component_range 2-3)
+JAVACOMM_RELEASE=$(get_version_component_range 3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
+
+# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
+if [[ $(get_version_component_count) == 5 ]]; then
+	FP_VERSION="$(get_version_component_range 5)"
+	FP_VERSION="${FP_VERSION#p}"
+	FP_WEB="-FP${FP_VERSION}"
+	FP_LINK="fp${FP_VERSION}"
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
+else
+	FP_WEB=""
+	FP_LINK=""
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+fi
+
+#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
+# looks like they don't bump javacomm in service releases anymore
+JAVACOMM_PV_ORIG="3.${JAVACOMM_RELEASE}-0.0"
+JAVACOMM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
+JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_PV}-linux"
+JAVACOMM_DIST_PREFIX_ORIG="ibm-java-javacomm-${JAVACOMM_PV_ORIG}-linux"
+
+X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
+X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
+X86_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-i386.tgz"
+
+AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
+AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
+AMD64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-x86_64.tgz"
+
+PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
+PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
+PPC_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc.tgz"
+
+PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
+PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
+PPC64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc64.tgz"
+
+if use x86; then
+	JDK_DIST=${X86_JDK_DIST}
+	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
+	JAVACOMM_DIST_ORIG=${X86_JAVACOMM_DIST_ORIG}
+	S="${WORKDIR}/ibm-java-i386-60"
+	LINK_ARCH="intel"
+elif use amd64; then
+	JDK_DIST=${AMD64_JDK_DIST}
+	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
+	JAVACOMM_DIST_ORIG=${AMD64_JAVACOMM_DIST_ORIG}
+	S="${WORKDIR}/ibm-java-x86_64-60"
+	LINK_ARCH="amd64"
+elif use ppc; then
+	JDK_DIST=${PPC_JDK_DIST}
+	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
+	JAVACOMM_DIST_ORIG=${PPC_JAVACOMM_DIST_ORIG}
+	S="${WORKDIR}/ibm-java-ppc-60"
+	LINK_ARCH="ipseries32"
+elif use ppc64; then
+	JDK_DIST=${PPC64_JDK_DIST}
+	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
+	JAVACOMM_DIST_ORIG=${PPC64_JAVACOMM_DIST_ORIG}
+	S="${WORKDIR}/ibm-java-ppc64-60"
+	LINK_ARCH="ipseries64"
+fi
+
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
+
+SLOT="1.6"
+DESCRIPTION="IBM Java SE Development Kit"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
+# bug #125178
+ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
+
+SRC_URI="
+	x86? ( ${X86_JDK_DIST} )
+	amd64? ( ${AMD64_JDK_DIST} )
+	ppc? ( ${PPC_JDK_DIST} )
+	ppc64? ( ${PPC64_JDK_DIST} )
+	javacomm? (
+		x86? ( ${X86_JAVACOMM_DIST} )
+		amd64? ( ${AMD64_JAVACOMM_DIST} )
+		ppc? ( ${PPC_JAVACOMM_DIST} )
+		ppc64? ( ${PPC64_JAVACOMM_DIST} )
+	)"
+LICENSE="IBM-J1.6"
+KEYWORDS="-* amd64 ppc ppc64 x86"
+RESTRICT="fetch"
+IUSE="X alsa doc examples javacomm nsplugin odbc selinux"
+
+RDEPEND="
+	ppc? ( =virtual/libstdc++-3.3 )
+	ppc64? ( =virtual/libstdc++-3.3 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.6.0* )
+	odbc? ( dev-db/unixODBC )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND=""
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
+opt/${P}/jre/lib/i386/libj9vm24.so
+opt/${P}/jre/lib/i386/libjclscar_24.so
+opt/${P}/jre/lib/i386/motif21/libmawt.so
+opt/${P}/jre/lib/i386/libj9thr24.so
+opt/${P}/jre/lib/i386/libj9jit24.so
+opt/${P}/jre/lib/i386/libj9dbg24.so
+opt/${P}/jre/lib/i386/libj9gc24.so"
+
+QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so
+opt/${P}/jre/lib/i386/j9vm/libjvm.so
+opt/${P}/jre/lib/i386/libj9jvmti24.so
+opt/${P}/jre/lib/i386/libj9hookable24.so
+opt/${P}/jre/lib/i386/libj9vm24.so
+opt/${P}/jre/lib/i386/libjclscar_24.so
+opt/${P}/jre/lib/i386/libj9thr24.so
+opt/${P}/jre/lib/i386/libj9dmp24.so
+opt/${P}/jre/lib/i386/libj9prt24.so
+opt/${P}/jre/lib/i386/libj9jit24.so
+opt/${P}/jre/lib/i386/libiverel24.so
+opt/${P}/jre/lib/i386/libj9trc24.so
+opt/${P}/jre/lib/i386/libj9dbg24.so
+opt/${P}/jre/lib/i386/libj9shr24.so
+opt/${P}/jre/lib/i386/libj9gc24.so
+opt/${P}/jre/lib/i386/libj9bcv24.so
+opt/${P}/jre/lib/i386/classic/libjvm.so"
+
+QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so
+opt/${P}/jre/lib/amd64/default/libj9jvmti24.so
+opt/${P}/jre/lib/amd64/default/libj9hookable24.so
+opt/${P}/jre/lib/amd64/default/libj9vm24.so
+opt/${P}/jre/lib/amd64/default/libjclscar_24.so
+opt/${P}/jre/lib/amd64/default/libj9jpi24.so
+opt/${P}/jre/lib/amd64/default/libj9thr24.so
+opt/${P}/jre/lib/amd64/default/libj9dmp24.so
+opt/${P}/jre/lib/amd64/default/libj9prt24.so
+opt/${P}/jre/lib/amd64/default/libj9jit24.so
+opt/${P}/jre/lib/amd64/default/libiverel24.so
+opt/${P}/jre/lib/amd64/default/libj9trc24.so
+opt/${P}/jre/lib/amd64/default/libj9dbg24.so
+opt/${P}/jre/lib/amd64/default/libj9shr24.so
+opt/${P}/jre/lib/amd64/default/libj9gc24.so
+opt/${P}/jre/lib/amd64/default/libj9bcv24.so
+opt/${P}/jre/lib/amd64/default/libj9ute24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9ute24.so"
+
+pkg_nofetch() {
+	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	einfo "Please visit: ${DOWNLOADPAGE}"
+
+	einfo "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your arch:"
+	einfo "${JDK_DIST}"
+	if use javacomm ; then
+		einfo "Also download ${JAVACOMM_DIST_ORIG}"
+		ewarn "and save it as ${JAVACOMM_DIST}"
+		ewarn "Renaming is needed because javacomm changes content without changing filename."
+	fi
+
+	einfo "You can also use a direct link to your arch download page:"
+	einfo "${DIRECT_DOWNLOAD}"
+	einfo "Place the file(s) in: ${DISTDIR}"
+	einfo "Then restart emerge: 'emerge --resume'"
+
+	einfo "Note: if SR${SERVICE_RELEASE}${FP_WEB} is not available at ${DOWNLOADPAGE}"
+	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
+	einfo "isn't updated, but the files should still available through the"
+	einfo "direct link to arch download page. If it doesn't work, file a bug."
+}
+
+src_unpack() {
+	unpack ${JDK_DIST}
+	if use javacomm; then
+		mkdir "${WORKDIR}/javacomm/" || die
+		cd "${WORKDIR}/javacomm/"
+		unpack ${JAVACOMM_DIST}
+	fi
+	cd "${S}"
+
+	# bug #126105
+	epatch "${FILESDIR}/${PN}-jawt.h.patch"
+}
+
+src_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pR "${S}"/{bin,jre,lib,include,src.zip} "${D}/opt/${P}/" || die
+
+	if use examples; then
+		cp -pPR "${S}"/demo "${D}"/opt/${P}/ || die
+	fi
+	if use javacomm; then
+		chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar "${WORKDIR}"/javacomm/*/lib/*.properties || die
+		cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar "${D}"/opt/${P}/jre/lib/ext/ || die
+		cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${D}"/opt/${P}/jre/lib/ || die
+		cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${D}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
+		if use examples; then
+			cp -pPR "${WORKDIR}"/javacomm/*/examples "${D}"/opt/${P}/ || die
+		fi
+	fi
+
+	if use x86 || use ppc; then
+		if use nsplugin; then
+			local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
+			install_mozilla_plugin "${plugin}"
+		fi
+	fi
+
+	local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop"
+	if [[ -f "${desktop_in}" ]]; then
+		local desktop_out="${T}/ibm_jdk-${SLOT}.desktop"
+		# install control panel for Gnome/KDE
+		# The jre also installs these so make sure that they do not have the same
+		# Name
+		sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+			"${desktop_in}" > \
+			"${desktop_out}" || die
+
+		domenu "${desktop_out}" || die
+	fi
+
+	dohtml -a html,htm,HTML -r docs || die
+	dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
+
+	set_java_env
+
+	# a workaround to fix the BOOTCLASSPATH in our env file
+	# this is not optimal, using -Xcompressedrefs would probably make it
+	# expect the compressedrefs version...
+	if use amd64; then
+		sed -i -e "s|vm.jar|amd64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
+	fi
+	if use ppc64; then
+		sed -i -e "s|vm.jar|ppc64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
+	fi
+
+	java-vm_revdep-mask
+
+	# bug #321695
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/proc/self/coredump_filter"' > "${D}/etc/sandbox.d/20${VMHANDLE}"
+}
diff --git a/dev-java/ibm-jdk-bin/metadata.xml b/dev-java/ibm-jdk-bin/metadata.xml
new file mode 100644
index 000000000000..6844eea2bce0
--- /dev/null
+++ b/dev-java/ibm-jdk-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>
+  <herd>java</herd>
+  <longdescription>IBM SDK Development kit.</longdescription>
+  <use>
+    <flag name="javacomm">Enable Java Communications API support</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
new file mode 100644
index 000000000000..265907b39679
--- /dev/null
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -0,0 +1,8 @@
+DIST ibm-java-jre-6.0-9.1-linux-i386.tgz 64347993 SHA256 6e2db98b14b192d82ce40e0930b3369c736f843d2bcda3a6f542ef6faf4c3da3
+DIST ibm-java-jre-6.0-9.1-linux-ppc.tgz 66562449 SHA256 83b96b1689f0f473fa8aa55bcd98f44ba77470d05fcfcb81a097e74af435290d SHA512 41fc926bcc9e0bad76bd777f6bc7810261859f19d61a7d2ac0c85f841a1a36c8158ee0f3628423c1c9f5829e0998e965107cc50f5af6ea9ac7667090818a05d3 WHIRLPOOL acf0d9dc1eb71a4aca33d4d186a352e50b0909cc6330e60816ba56e116c74e8901b67f164b4dbdb9953fda4231020e22c9ce275a22a29a3851dc09df0091c0ae
+DIST ibm-java-jre-6.0-9.1-linux-ppc64.tgz 74578727 SHA256 12e46290968e595389ddaa3053e20a718674b699b796012e997c4737e484c579
+DIST ibm-java-jre-6.0-9.1-linux-x86_64.tgz 70722323 SHA256 c36e65860c1599d51d9b481b3acbf9b9c195d6ddc364480dc9877b37821641ba
+DIST ibm-java-jre-6.0-9.2-linux-i386.tgz 64421824 SHA256 87ce2252d6d88b13acb847a49d272c9798ea6267a10fbc82ea0e881c5c8e8206
+DIST ibm-java-jre-6.0-9.2-linux-ppc.tgz 66640675 SHA256 04237722187f4cd44845a0bf2764c7358f3df9a8b8468fbe629ff1f168864ceb
+DIST ibm-java-jre-6.0-9.2-linux-ppc64.tgz 74698445 SHA256 30ef8dd7ce43e328dc5252b0457f78e021faaa433f20fe350d04f9546186fbca
+DIST ibm-java-jre-6.0-9.2-linux-x86_64.tgz 70842079 SHA256 cb1f7dbfd0dacfece8deedc5dbcd2d19355ec0e4ec27612586e365c87f0eea54
diff --git a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env
new file mode 100644
index 000000000000..25398c3af6c6
--- /dev/null
+++ b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="IBM JRE @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JRE_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+PATH="${JAVA_HOME}/bin"
+ROOTPATH="${JAVA_HOME}/bin"
+LDPATH="${JAVA_HOME}/lib/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.6"
+BOOTCLASSPATH="${JAVA_HOME}/lib/vm.jar:/opt/ibm-jre-bin-1.6.0.0/lib/facilitators.jar:/opt/ibm-jre-bin-1.6.0.0/lib/annotation.jar:/opt/ibm-jre-bin-1.6.0.0/lib/beans.jar:/opt/ibm-jre-bin-1.6.0.0/lib/java.util.jar:/opt/ibm-jre-bin-1.6.0.0/lib/jndi.jar:/opt/ibm-jre-bin-1.6.0.0/lib/logging.jar:/opt/ibm-jre-bin-1.6.0.0/lib/security.jar:/opt/ibm-jre-bin-1.6.0.0/lib/sql.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmorb.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmorbapi.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmcfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/rt.jar:/opt/ibm-jre-bin-1.6.0.0/lib/charsets.jar:/opt/ibm-jre-bin-1.6.0.0/lib/resources.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmpkcs.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmcertpathfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjgssfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjssefw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmsaslfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjcefw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjgssprovider.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjsseprovider2.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmcertpathprovider.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmxmlcrypto.jar:/opt/ibm-jre-bin-1.6.0.0/lib/management-agent.jar:/opt/ibm-jre-bin-1.6.0.0/lib/xml.jar:/opt/ibm-jre-bin-1.6.0.0/lib/jlm.jar:/opt/ibm-jre-bin-1.6.0.0/lib/javascript.jar:/opt/ibm-jre-bin-1.6.0.0/lib/RACF.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH"
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.ebuild
new file mode 100644
index 000000000000..a8c295491923
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-vm-2 versionator eutils
+
+JDK_RELEASE=$(get_version_component_range 2-3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
+
+# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
+if [[ $(get_version_component_count) == 5 ]]; then
+	FP_VERSION="$(get_version_component_range 5)"
+	FP_VERSION="${FP_VERSION#p}"
+	FP_WEB="-FP${FP_VERSION}"
+	FP_LINK="fp${FP_VERSION}"
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
+else
+	FP_WEB=""
+	FP_LINK=""
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+fi
+
+JRE_DIST_PREFIX="ibm-java-jre-${TGZ_PV}-linux"
+
+X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz"
+AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz"
+PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.tgz"
+PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.tgz"
+
+if use x86; then
+	JRE_DIST=${X86_JRE_DIST}
+	S="${WORKDIR}/ibm-java-i386-60"
+	LINK_ARCH="intel"
+elif use amd64; then
+	JRE_DIST=${AMD64_JRE_DIST}
+	S="${WORKDIR}/ibm-java-x86_64-60"
+	LINK_ARCH="amd64"
+elif use ppc; then
+	JRE_DIST=${PPC_JRE_DIST}
+	S="${WORKDIR}/ibm-java-ppc-60"
+	LINK_ARCH="ipseries32"
+elif use ppc64; then
+	JRE_DIST=${PPC64_JRE_DIST}
+	S="${WORKDIR}/ibm-java-ppc64-60"
+	LINK_ARCH="ipseries64"
+fi
+
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
+
+SLOT="1.6"
+DESCRIPTION="IBM Java SE Runtime Environment"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
+# bug #125178
+ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
+
+SRC_URI="x86? ( ${X86_JRE_DIST} )
+	amd64? ( ${AMD64_JRE_DIST} )
+	ppc? ( ${PPC_JRE_DIST} )
+	ppc64? ( ${PPC64_JRE_DIST} )"
+LICENSE="IBM-J1.6"
+KEYWORDS="-* amd64 ppc ppc64 x86"
+RESTRICT="fetch"
+IUSE="X alsa nsplugin odbc selinux"
+
+RDEPEND="
+		X? (
+			x11-libs/libXext
+			x11-libs/libXft
+			x11-libs/libXi
+			x11-libs/libXp
+			x11-libs/libXtst
+			x11-libs/libX11
+			x11-libs/libXt
+		)
+		alsa? ( media-libs/alsa-lib )
+		odbc? ( dev-db/unixODBC )
+		selinux? ( sec-policy/selinux-java )"
+DEPEND="selinux? ( sec-policy/selinux-java )"
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/libj9jvmti24.so
+opt/${P}/lib/i386/libj9vm24.so
+opt/${P}/lib/i386/libjclscar_24.so
+opt/${P}/lib/i386/motif21/libmawt.so
+opt/${P}/lib/i386/libj9thr24.so
+opt/${P}/lib/i386/libj9jit24.so
+opt/${P}/lib/i386/libj9dbg24.so
+opt/${P}/lib/i386/libj9gc24.so"
+
+QA_EXECSTACK_x86="opt/${P}/bin/classic/libjvm.so
+opt/${P}/lib/i386/j9vm/libjvm.so
+opt/${P}/lib/i386/libj9jvmti24.so
+opt/${P}/lib/i386/libj9hookable24.so
+opt/${P}/lib/i386/libj9vm24.so
+opt/${P}/lib/i386/libjclscar_24.so
+opt/${P}/lib/i386/libj9thr24.so
+opt/${P}/lib/i386/libj9dmp24.so
+opt/${P}/lib/i386/libj9prt24.so
+opt/${P}/lib/i386/libj9jit24.so
+opt/${P}/lib/i386/libiverel24.so
+opt/${P}/lib/i386/libj9trc24.so
+opt/${P}/lib/i386/libj9dbg24.so
+opt/${P}/lib/i386/libj9shr24.so
+opt/${P}/lib/i386/libj9gc24.so
+opt/${P}/lib/i386/libj9bcv24.so
+opt/${P}/lib/i386/classic/libjvm.so"
+
+QA_EXECSTACK_amd64="opt/${P}/lib/amd64/default/libjvm.so
+opt/${P}/lib/amd64/default/libj9jvmti24.so
+opt/${P}/lib/amd64/default/libj9hookable24.so
+opt/${P}/lib/amd64/default/libj9vm24.so
+opt/${P}/lib/amd64/default/libjclscar_24.so
+opt/${P}/lib/amd64/default/libj9jpi24.so
+opt/${P}/lib/amd64/default/libj9thr24.so
+opt/${P}/lib/amd64/default/libj9dmp24.so
+opt/${P}/lib/amd64/default/libj9prt24.so
+opt/${P}/lib/amd64/default/libj9jit24.so
+opt/${P}/lib/amd64/default/libiverel24.so
+opt/${P}/lib/amd64/default/libj9trc24.so
+opt/${P}/lib/amd64/default/libj9dbg24.so
+opt/${P}/lib/amd64/default/libj9shr24.so
+opt/${P}/lib/amd64/default/libj9gc24.so
+opt/${P}/lib/amd64/default/libj9bcv24.so
+opt/${P}/lib/amd64/default/libj9ute24.so
+opt/${P}/lib/amd64/compressedrefs/libjvm.so
+opt/${P}/lib/amd64/compressedrefs/libj9jvmti24.so
+opt/${P}/lib/amd64/compressedrefs/libj9hookable24.so
+opt/${P}/lib/amd64/compressedrefs/libj9vm24.so
+opt/${P}/lib/amd64/compressedrefs/libjclscar_24.so
+opt/${P}/lib/amd64/compressedrefs/libj9jpi24.so
+opt/${P}/lib/amd64/compressedrefs/libj9thr24.so
+opt/${P}/lib/amd64/compressedrefs/libj9dmp24.so
+opt/${P}/lib/amd64/compressedrefs/libj9prt24.so
+opt/${P}/lib/amd64/compressedrefs/libj9jit24.so
+opt/${P}/lib/amd64/compressedrefs/libiverel24.so
+opt/${P}/lib/amd64/compressedrefs/libj9trc24.so
+opt/${P}/lib/amd64/compressedrefs/libj9dbg24.so
+opt/${P}/lib/amd64/compressedrefs/libj9shr24.so
+opt/${P}/lib/amd64/compressedrefs/libj9gc24.so
+opt/${P}/lib/amd64/compressedrefs/libj9bcv24.so
+opt/${P}/lib/amd64/compressedrefs/libj9ute24.so"
+
+pkg_nofetch() {
+	elog "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	elog "Please visit: ${DOWNLOADPAGE}"
+
+	elog "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your arch:"
+	elog "${JRE_DIST}"
+
+	elog "You can use direct link to your arch download page:"
+	elog "${DIRECT_DOWNLOAD}"
+	elog "Place the file(s) in: ${DISTDIR}"
+	elog "Then restart emerge: 'emerge --resume'"
+
+	elog "Note: if SR${SERVICE_RELEASE}${FP_WEB} is not available at ${DOWNLOADPAGE}"
+	elog "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
+	elog "isn't updated, but the files should still available through the"
+	elog "direct link to arch download page. If it doesn't work, file a bug."
+}
+
+src_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pR "${S}"/jre/* "${D}/opt/${P}/"
+
+	if use x86 || use ppc; then
+		if use nsplugin; then
+			local plugin="/opt/${P}/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
+			install_mozilla_plugin "${plugin}"
+		fi
+	fi
+
+	local desktop_in="${D}/opt/${P}/plugin/desktop/sun_java.desktop"
+	if [[ -f "${desktop_in}" ]]; then
+		local desktop_out="${T}/ibm_jre-${SLOT}.desktop"
+		# install control panel for Gnome/KDE
+		# The jdk also installs these so make sure that they do not have the same
+		# Name
+		sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JRE ${SLOT}/" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+			"${desktop_in}" > \
+			"${desktop_out}" || die
+
+		domenu "${desktop_out}" || die
+	fi
+
+	dohtml -a html,htm,HTML -r docs || die
+	dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
+
+	set_java_env
+	java-vm_revdep-mask
+}
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild
new file mode 100644
index 000000000000..d0da10048cda
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit java-vm-2 versionator eutils
+
+JDK_RELEASE=$(get_version_component_range 2-3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
+
+# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
+if [[ $(get_version_component_count) == 5 ]]; then
+	FP_VERSION="$(get_version_component_range 5)"
+	FP_VERSION="${FP_VERSION#p}"
+	FP_WEB="-FP${FP_VERSION}"
+	FP_LINK="fp${FP_VERSION}"
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
+else
+	FP_WEB=""
+	FP_LINK=""
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+fi
+
+JRE_DIST_PREFIX="ibm-java-jre-${TGZ_PV}-linux"
+
+X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz"
+AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz"
+PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.tgz"
+PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.tgz"
+
+DESCRIPTION="IBM Java SE Runtime Environment"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+SRC_URI="x86? ( ${X86_JRE_DIST} )
+	amd64? ( ${AMD64_JRE_DIST} )
+	ppc? ( ${PPC_JRE_DIST} )
+	ppc64? ( ${PPC64_JRE_DIST} )"
+
+LICENSE="IBM-J1.6"
+SLOT="1.6"
+KEYWORDS="-* ~amd64 ppc ~ppc64 ~x86"
+RESTRICT="fetch"
+IUSE="X alsa nsplugin odbc selinux"
+
+RDEPEND="
+	X? (
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	alsa? ( media-libs/alsa-lib )
+	odbc? ( dev-db/unixODBC )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND=""
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/libj9jvmti24.so
+opt/${P}/lib/i386/libj9vm24.so
+opt/${P}/lib/i386/libjclscar_24.so
+opt/${P}/lib/i386/motif21/libmawt.so
+opt/${P}/lib/i386/libj9thr24.so
+opt/${P}/lib/i386/libj9jit24.so
+opt/${P}/lib/i386/libj9dbg24.so
+opt/${P}/lib/i386/libj9gc24.so"
+
+QA_EXECSTACK_x86="opt/${P}/bin/classic/libjvm.so
+opt/${P}/lib/i386/j9vm/libjvm.so
+opt/${P}/lib/i386/libj9jvmti24.so
+opt/${P}/lib/i386/libj9hookable24.so
+opt/${P}/lib/i386/libj9vm24.so
+opt/${P}/lib/i386/libjclscar_24.so
+opt/${P}/lib/i386/libj9thr24.so
+opt/${P}/lib/i386/libj9dmp24.so
+opt/${P}/lib/i386/libj9prt24.so
+opt/${P}/lib/i386/libj9jit24.so
+opt/${P}/lib/i386/libiverel24.so
+opt/${P}/lib/i386/libj9trc24.so
+opt/${P}/lib/i386/libj9dbg24.so
+opt/${P}/lib/i386/libj9shr24.so
+opt/${P}/lib/i386/libj9gc24.so
+opt/${P}/lib/i386/libj9bcv24.so
+opt/${P}/lib/i386/classic/libjvm.so"
+
+QA_EXECSTACK_amd64="opt/${P}/lib/amd64/default/libjvm.so
+opt/${P}/lib/amd64/default/libj9jvmti24.so
+opt/${P}/lib/amd64/default/libj9hookable24.so
+opt/${P}/lib/amd64/default/libj9vm24.so
+opt/${P}/lib/amd64/default/libjclscar_24.so
+opt/${P}/lib/amd64/default/libj9jpi24.so
+opt/${P}/lib/amd64/default/libj9thr24.so
+opt/${P}/lib/amd64/default/libj9dmp24.so
+opt/${P}/lib/amd64/default/libj9prt24.so
+opt/${P}/lib/amd64/default/libj9jit24.so
+opt/${P}/lib/amd64/default/libiverel24.so
+opt/${P}/lib/amd64/default/libj9trc24.so
+opt/${P}/lib/amd64/default/libj9dbg24.so
+opt/${P}/lib/amd64/default/libj9shr24.so
+opt/${P}/lib/amd64/default/libj9gc24.so
+opt/${P}/lib/amd64/default/libj9bcv24.so
+opt/${P}/lib/amd64/default/libj9ute24.so
+opt/${P}/lib/amd64/compressedrefs/libjvm.so
+opt/${P}/lib/amd64/compressedrefs/libj9jvmti24.so
+opt/${P}/lib/amd64/compressedrefs/libj9hookable24.so
+opt/${P}/lib/amd64/compressedrefs/libj9vm24.so
+opt/${P}/lib/amd64/compressedrefs/libjclscar_24.so
+opt/${P}/lib/amd64/compressedrefs/libj9jpi24.so
+opt/${P}/lib/amd64/compressedrefs/libj9thr24.so
+opt/${P}/lib/amd64/compressedrefs/libj9dmp24.so
+opt/${P}/lib/amd64/compressedrefs/libj9prt24.so
+opt/${P}/lib/amd64/compressedrefs/libj9jit24.so
+opt/${P}/lib/amd64/compressedrefs/libiverel24.so
+opt/${P}/lib/amd64/compressedrefs/libj9trc24.so
+opt/${P}/lib/amd64/compressedrefs/libj9dbg24.so
+opt/${P}/lib/amd64/compressedrefs/libj9shr24.so
+opt/${P}/lib/amd64/compressedrefs/libj9gc24.so
+opt/${P}/lib/amd64/compressedrefs/libj9bcv24.so
+opt/${P}/lib/amd64/compressedrefs/libj9ute24.so"
+
+pkg_nofetch() {
+	if use x86; then
+		JRE_DIST=${X86_JRE_DIST}
+		LINK_ARCH="intel"
+	elif use amd64; then
+		JRE_DIST=${AMD64_JRE_DIST}
+		LINK_ARCH="amd64"
+	elif use ppc; then
+		JRE_DIST=${PPC_JRE_DIST}
+		LINK_ARCH="ipseries32"
+	elif use ppc64; then
+		JRE_DIST=${PPC64_JRE_DIST}
+		LINK_ARCH="ipseries64"
+	fi
+
+	DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6"
+	DIRECT_DOWNLOAD+="&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
+	DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
+	# bug #125178
+	ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
+
+	elog "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	elog "Please visit: ${DOWNLOADPAGE}"
+
+	elog "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your arch:"
+	elog "${JRE_DIST}"
+
+	elog "You can use direct link to your arch download page:"
+	elog "${DIRECT_DOWNLOAD}"
+	elog "Place the file(s) in: ${DISTDIR}"
+	elog "Then restart emerge: 'emerge --resume'"
+
+	elog "Note: if SR${SERVICE_RELEASE}${FP_WEB} is not available at ${DOWNLOADPAGE}"
+	elog "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
+	elog "isn't updated, but the files should still available through the"
+	elog "direct link to arch download page. If it doesn't work, file a bug."
+}
+
+src_unpack() {
+	default
+
+	local sdir=( ibm-java-* )
+	S="${WORKDIR}/${sdir[0]}"
+}
+
+src_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pR jre/* "${ED}"/opt/${P} || die
+
+	if use x86 || use ppc; then
+		local plugin="/opt/${P}/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
+		if use nsplugin; then
+			install_mozilla_plugin "${plugin}"
+		else
+			rm "${ED}"/${plugin} || die
+		fi
+	fi
+
+	# Install desktop file for the Java Control Panel. Using VMHANDLE as file
+	# name to prevent file collision with jre and or other slots.
+	sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JRE ${SLOT}/" \
+		-e "s#Exec=.*#Exec=${EPREFIX}/opt/${P}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=${EPREFIX}/opt/${P}/plugin/desktop/sun_java.png#" \
+		"${ED}"/opt/${P}/plugin/desktop/sun_java.desktop \
+		> "${T}"/${VMHANDLE}.desktop || die
+	domenu "${T}"/${VMHANDLE}.desktop || die
+
+	dohtml -a html,htm,HTML -r docs
+	dodoc copyright notices.txt readmefirst.lnx.txt
+
+	set_java_env
+	java-vm_set-pax-markings "${ED}"/opt/${P}
+	java-vm_revdep-mask
+}
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2.ebuild
new file mode 100644
index 000000000000..2edd0fbf950f
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-vm-2 versionator eutils
+
+JDK_RELEASE=$(get_version_component_range 2-3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
+
+# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
+if [[ $(get_version_component_count) == 5 ]]; then
+	FP_VERSION="$(get_version_component_range 5)"
+	FP_VERSION="${FP_VERSION#p}"
+	FP_WEB="-FP${FP_VERSION}"
+	FP_LINK="fp${FP_VERSION}"
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
+else
+	FP_WEB=""
+	FP_LINK=""
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+fi
+
+JRE_DIST_PREFIX="ibm-java-jre-${TGZ_PV}-linux"
+
+X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz"
+AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz"
+PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.tgz"
+PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.tgz"
+
+if use x86; then
+	JRE_DIST=${X86_JRE_DIST}
+	S="${WORKDIR}/ibm-java-i386-60"
+	LINK_ARCH="intel"
+elif use amd64; then
+	JRE_DIST=${AMD64_JRE_DIST}
+	S="${WORKDIR}/ibm-java-x86_64-60"
+	LINK_ARCH="amd64"
+elif use ppc; then
+	JRE_DIST=${PPC_JRE_DIST}
+	S="${WORKDIR}/ibm-java-ppc-60"
+	LINK_ARCH="ipseries32"
+elif use ppc64; then
+	JRE_DIST=${PPC64_JRE_DIST}
+	S="${WORKDIR}/ibm-java-ppc64-60"
+	LINK_ARCH="ipseries64"
+fi
+
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
+
+SLOT="1.6"
+DESCRIPTION="IBM Java SE Runtime Environment"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
+# bug #125178
+ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
+
+SRC_URI="x86? ( ${X86_JRE_DIST} )
+	amd64? ( ${AMD64_JRE_DIST} )
+	ppc? ( ${PPC_JRE_DIST} )
+	ppc64? ( ${PPC64_JRE_DIST} )"
+LICENSE="IBM-J1.6"
+KEYWORDS="-* amd64 ppc ppc64 x86"
+RESTRICT="fetch"
+IUSE="X alsa nsplugin odbc selinux"
+
+RDEPEND="
+		X? (
+			x11-libs/libXext
+			x11-libs/libXft
+			x11-libs/libXi
+			x11-libs/libXp
+			x11-libs/libXtst
+			x11-libs/libX11
+			x11-libs/libXt
+		)
+		alsa? ( media-libs/alsa-lib )
+		odbc? ( dev-db/unixODBC )
+		selinux? ( sec-policy/selinux-java )"
+DEPEND=""
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/libj9jvmti24.so
+opt/${P}/lib/i386/libj9vm24.so
+opt/${P}/lib/i386/libjclscar_24.so
+opt/${P}/lib/i386/motif21/libmawt.so
+opt/${P}/lib/i386/libj9thr24.so
+opt/${P}/lib/i386/libj9jit24.so
+opt/${P}/lib/i386/libj9dbg24.so
+opt/${P}/lib/i386/libj9gc24.so"
+
+QA_EXECSTACK_x86="opt/${P}/bin/classic/libjvm.so
+opt/${P}/lib/i386/j9vm/libjvm.so
+opt/${P}/lib/i386/libj9jvmti24.so
+opt/${P}/lib/i386/libj9hookable24.so
+opt/${P}/lib/i386/libj9vm24.so
+opt/${P}/lib/i386/libjclscar_24.so
+opt/${P}/lib/i386/libj9thr24.so
+opt/${P}/lib/i386/libj9dmp24.so
+opt/${P}/lib/i386/libj9prt24.so
+opt/${P}/lib/i386/libj9jit24.so
+opt/${P}/lib/i386/libiverel24.so
+opt/${P}/lib/i386/libj9trc24.so
+opt/${P}/lib/i386/libj9dbg24.so
+opt/${P}/lib/i386/libj9shr24.so
+opt/${P}/lib/i386/libj9gc24.so
+opt/${P}/lib/i386/libj9bcv24.so
+opt/${P}/lib/i386/classic/libjvm.so"
+
+QA_EXECSTACK_amd64="opt/${P}/lib/amd64/default/libjvm.so
+opt/${P}/lib/amd64/default/libj9jvmti24.so
+opt/${P}/lib/amd64/default/libj9hookable24.so
+opt/${P}/lib/amd64/default/libj9vm24.so
+opt/${P}/lib/amd64/default/libjclscar_24.so
+opt/${P}/lib/amd64/default/libj9jpi24.so
+opt/${P}/lib/amd64/default/libj9thr24.so
+opt/${P}/lib/amd64/default/libj9dmp24.so
+opt/${P}/lib/amd64/default/libj9prt24.so
+opt/${P}/lib/amd64/default/libj9jit24.so
+opt/${P}/lib/amd64/default/libiverel24.so
+opt/${P}/lib/amd64/default/libj9trc24.so
+opt/${P}/lib/amd64/default/libj9dbg24.so
+opt/${P}/lib/amd64/default/libj9shr24.so
+opt/${P}/lib/amd64/default/libj9gc24.so
+opt/${P}/lib/amd64/default/libj9bcv24.so
+opt/${P}/lib/amd64/default/libj9ute24.so
+opt/${P}/lib/amd64/compressedrefs/libjvm.so
+opt/${P}/lib/amd64/compressedrefs/libj9jvmti24.so
+opt/${P}/lib/amd64/compressedrefs/libj9hookable24.so
+opt/${P}/lib/amd64/compressedrefs/libj9vm24.so
+opt/${P}/lib/amd64/compressedrefs/libjclscar_24.so
+opt/${P}/lib/amd64/compressedrefs/libj9jpi24.so
+opt/${P}/lib/amd64/compressedrefs/libj9thr24.so
+opt/${P}/lib/amd64/compressedrefs/libj9dmp24.so
+opt/${P}/lib/amd64/compressedrefs/libj9prt24.so
+opt/${P}/lib/amd64/compressedrefs/libj9jit24.so
+opt/${P}/lib/amd64/compressedrefs/libiverel24.so
+opt/${P}/lib/amd64/compressedrefs/libj9trc24.so
+opt/${P}/lib/amd64/compressedrefs/libj9dbg24.so
+opt/${P}/lib/amd64/compressedrefs/libj9shr24.so
+opt/${P}/lib/amd64/compressedrefs/libj9gc24.so
+opt/${P}/lib/amd64/compressedrefs/libj9bcv24.so
+opt/${P}/lib/amd64/compressedrefs/libj9ute24.so"
+
+pkg_nofetch() {
+	elog "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	elog "Please visit: ${DOWNLOADPAGE}"
+
+	elog "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your arch:"
+	elog "${JRE_DIST}"
+
+	elog "You can use direct link to your arch download page:"
+	elog "${DIRECT_DOWNLOAD}"
+	elog "Place the file(s) in: ${DISTDIR}"
+	elog "Then restart emerge: 'emerge --resume'"
+
+	elog "Note: if SR${SERVICE_RELEASE}${FP_WEB} is not available at ${DOWNLOADPAGE}"
+	elog "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
+	elog "isn't updated, but the files should still available through the"
+	elog "direct link to arch download page. If it doesn't work, file a bug."
+}
+
+src_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pR "${S}"/jre/* "${D}/opt/${P}/"
+
+	if use x86 || use ppc; then
+		if use nsplugin; then
+			local plugin="/opt/${P}/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
+			install_mozilla_plugin "${plugin}"
+		fi
+	fi
+
+	local desktop_in="${D}/opt/${P}/plugin/desktop/sun_java.desktop"
+	if [[ -f "${desktop_in}" ]]; then
+		local desktop_out="${T}/ibm_jre-${SLOT}.desktop"
+		# install control panel for Gnome/KDE
+		# The jdk also installs these so make sure that they do not have the same
+		# Name
+		sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JRE ${SLOT}/" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+			"${desktop_in}" > \
+			"${desktop_out}" || die
+
+		domenu "${desktop_out}" || die
+	fi
+
+	dohtml -a html,htm,HTML -r docs || die
+	dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
+
+	set_java_env
+	java-vm_revdep-mask
+}
diff --git a/dev-java/ibm-jre-bin/metadata.xml b/dev-java/ibm-jre-bin/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/ibm-jre-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ical4j/Manifest b/dev-java/ical4j/Manifest
new file mode 100644
index 000000000000..e9be8f8240b9
--- /dev/null
+++ b/dev-java/ical4j/Manifest
@@ -0,0 +1 @@
+DIST ical4j-1.0.5-src.tar.bz2 9307268 SHA256 7fe8bd596489f3f015b904794fb9d9a346823e1750619ec71d6929ba870293f7 SHA512 1c2c1eb6207094fd12036d4eb93afaef820c19c7bce99611ddb9115cd62ece76972b7280364b49643147e4456ef4afca4df23ce4413e0288804183f33c2cc286 WHIRLPOOL 80b71c87bddbe5001f58203b2648a467d766f5dc8b16211d8f45f6770ec7037bab260165c1c526218bf73352884dd24be62b1d58c6d6278b06254fd651831b48
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..1ae24297ff55
--- /dev/null
+++ b/dev-java/ical4j/ical4j-1.0.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..fb19e8790932
--- /dev/null
+++ b/dev-java/ical4j/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..a269bdcc4d74
--- /dev/null
+++ b/dev-java/icedtea-bin/Manifest
@@ -0,0 +1,18 @@
+DIST icedtea-bin-core-6.1.13.7-amd64.tar.xz 49242728 SHA256 146bc914aa9d2e19d1273f2e0f71888c4ea1130eacc63bd22075f9a79e255f63 SHA512 b9e6509fe3ac033d593863af05d7853b7d4cbaf7dca041035b662dbde7866d56418fd075e4592aaf6640894bb639673a683e9c8add5aaf3c502caabae67ad2ee WHIRLPOOL 05fcd580b9d678a3717692582393d00f8e0f0de621e9edfdd1ecd76269f9d5a0ac87b14416dd49f0df0c572bf99de2436b1b4a15944f771d60c568b51c298706
+DIST icedtea-bin-core-6.1.13.7-ppc.tar.xz 39570240 SHA256 74bee77719b7285c6d91665e572cece092c1f6cee137032c50b9aec35db641d0 SHA512 e13a31f3ee4b60d603019a519047ffea8d97f3c6ff69ed7930c38e85f9051541f5dbe2c526b61175d3bcd371703168ba74949e1c7b44b4c8a790285864466e33 WHIRLPOOL 15f9b33c0edda490b48524996c2f3be263a498d97d969156e41dfbc03e7b780e568db80397a1a4716899c3fa202091bbec1c3358ddd178bdb8c010481e7604a6
+DIST icedtea-bin-core-6.1.13.7-x86.tar.xz 50373836 SHA256 3cc3e7c1fc07370bc7009d0ce7cfc2270de47165c45b8352b429aa1ccca561f2 SHA512 eb3eff46f20ffc93b7babe90aa3b9283119cf369fca503e7bdd7905455b9ac0e2eb389cc77e2e9bb02d802dc846dff75bbd218a844b80fa475e4ff04c88e9cf2 WHIRLPOOL 7593fd10d4c2e95fc02c2a7c94276632b6d99a077ec095018d5003e0c694c63f3e6eb3aa1d872f32911ad5ec2a90eae5f7a40c2784ef1b460e4a24a451369fd2
+DIST icedtea-bin-core-7.2.5.5-amd64.tar.xz 52642552 SHA256 cfa0399d93eab61004c6d3c23c7b2b46623c0fde1c8034adc09a6fdae9ba1a26 SHA512 427b134109bfd92a073f10467f030f2bccf7b3fdcc6ec66f63d0ab5a896dfb4cc4904a9b8f5b6833fe4ae73bffb54e97e75a363500ed897a153ea7a687c75e9a WHIRLPOOL 84fa1a480633d2f2459238c11fa58ba514a8eede37f54eebd19effd5e2dcf01bcf1f320c65f150018b52eea3c630c313ba85166ea9d8d44bb61b42c42738b9ad
+DIST icedtea-bin-core-7.2.5.5-arm.tar.xz 43744840 SHA256 5f508eebadbf51a01677f3dcac2678f5a09eb7e9fd8f224fd397961e56a95a73 SHA512 45524bd6e6c1f8f1ac69e2c8891c647e0dd3e4afe272561f17565f4e21b7104fdb9718f12023bfba308d311d661e00122a82c81e61a7bc6a744108495d343dc8 WHIRLPOOL 4e386a6cd5997a1d169550b3e6fcd29ccdb1bf0f7942e3c4ed02521c13afc7531de78c313ad6d50555e8781bb2566b7a10a6393db09e576bf5579ae8615fb4c4
+DIST icedtea-bin-core-7.2.5.5-ppc.tar.xz 42616472 SHA256 36cc4fd0bfef1c2ae0dcad7116dd2a3b6e7a5ff7fd25da1ae47560755415cf2f SHA512 a0f80ae0701b0f51bd165143b16aa9c9ae7314d1b1ccc5c4ef96f37012598bf1d1c7ace0742573562b642354b5f263e1dd97d026bb3d2addbe94b33c208c79b2 WHIRLPOOL 619901211cb099eb405a46bcf1bee5828c523b29ad8013fccaf77a82d3885b9517888c2461960e344aef8cb3c8b4807c909e0f693f3207c1c2dd35f74784ddac
+DIST icedtea-bin-core-7.2.5.5-x86.tar.xz 53895468 SHA256 f32ddce3e2435334aedc9bbda2319f88b4a0e92a9b7ada7afbc2724d8a1cee07 SHA512 e4e085a9e23f75e79f0172986e83bc5b03373826a11f4240c8331c0086521189a611b6a20b4f7f4c28d8e2436dcb046590a06487e14d1d79c454698ac0a5a9bc WHIRLPOOL 0785f0cac8655b6c9843b592bfe71a4c28ec4215e18d0257499ac5207458a159fb8d1c56defe6b3bedf07a0fa299531b51182f6c27abdf24bf801157b3b624a5
+DIST icedtea-bin-doc-6.1.13.7.tar.xz 9845104 SHA256 75e2d37caa2bbcca8d77f4b6b63be7337484f1a0cd35ba784f191ac433b4f8bc SHA512 0f78642a0a27cee3439aac44f2df4cb43dd167c1bdb84c337636357f63195a3dfc4d2157a2368fdc72eceaad73eea17d016ca4f39f4c09a62322abac72111999 WHIRLPOOL 66db5023cd88c241427731aa66f227cab917a389ad89140a9e9174d8da5aa9a83850edd42a9359121633305e542d74c9f9b73788c7683da733c1b407d71df8e0
+DIST icedtea-bin-doc-7.2.5.5.tar.xz 10599388 SHA256 ced6f04aeb35bdcfbeffff1f631db4ad523e16705fcce3697145cb7af111f8bb SHA512 f55dc8bb5a3c5d0b1016b03605f38f0dcb25adb1b615cd185bce771959ebe079213efb9ad25b46d2a21edf6c4338111eed2efd2e16ef6f1ca8e9458a6de22196 WHIRLPOOL 4a32c77494f7c2dbab4f682f2747f88ace7bedc43f38ffe8ffef84d0b3dfcd3269b1fff91c7e221070fc5bf2057bda1d60168d6dc428242904d2842193a0ab49
+DIST icedtea-bin-examples-6.1.13.7-amd64.tar.xz 1903880 SHA256 1bd0657d389cd046eb1d6dfab32edb66a3a18e97c8ea7d60e066cc5a48fddb3e SHA512 77892fc66c49f746d23a692bf9f6716be613111fc697cb92aef9ad12ba8cebdb32f1d434a6bcfa9237e7a382e613590dc06f8d9b6746cbf381ae8b8e9b47bda9 WHIRLPOOL 1f4d94314430ab12c0aa1cb6fd7d16ceda2a1a3e055982b590877c29d7f2c4ea94c2ebd0d8ce631b98522493a3326d68a2756a3eaa4e043c7a7e0558ae37fb15
+DIST icedtea-bin-examples-6.1.13.7-ppc.tar.xz 1889572 SHA256 c0a4d1f0cdf1bed63c62a7f261c3188bdf53dec288bb501c402325d51677297d SHA512 6c8da2362d25143cafe00c75231125a731b443bcf9325a9baf5807d56e073f551023b6b6a86bc860f615c5f28032f27dbaecf26de79d179a92dd642cc4adee3e WHIRLPOOL d87f7c9cc80481c16e68e31d13c023614b7fbc35e0b39e4adecef2e9a476253460448de935c0988ff349fda3537e900f24b6d38a4ec3805c8a331e3061b19c4f
+DIST icedtea-bin-examples-6.1.13.7-x86.tar.xz 1902248 SHA256 98efdac63222f1bffd65dc791a3bf752e10c8083d23f5d4d6a2b3c0784ba4bca SHA512 247dc6d80425af835c153bd6503e30725183a23b05f0108640040a05ca3f6d86467d174a7e92a64e4513b119040fdafc6ebcc6cffac1bc65aa778f9972f408d7 WHIRLPOOL 8eeabadbab0ad2426d6a191202991c023621f98982b87a1b62f40d2bde6282bf63d095b4c2edff27b950da846385b3cfa0917061f4ff5fab181c9b5d82d2cd0d
+DIST icedtea-bin-examples-7.2.5.5-amd64.tar.xz 1795668 SHA256 373db6d3bc88e8572a81b03e2dc5b539acb2a48347f6bdc797bf59ad7330e108 SHA512 a34b979094dd337d365d089e49aa6363f201499db2eec3d46edbec2235a55e8d0f488e1329bc699ddbc32c3d11cece95c4678ef5f49d3b4e4fd8a4481739f561 WHIRLPOOL d1112d0ddac4bb329416655e5083e762cb674a5935f655dd0d7759f4950a979b441e6bf3e1be87b596bc0cdb1c226efb96fd0b78b941f53e45c8eec66355b176
+DIST icedtea-bin-examples-7.2.5.5-arm.tar.xz 1778824 SHA256 11b02d038f5d02286200a9d1e58342aef432f0b475d3555068c6ee988407acea SHA512 5e46c15df71684124cdeb6f9ce2978bd86dd795c6c2422d4e67abcee6c230ebee3de8e235b95203fec1e06830253a86ad724d36f843fc2e385d7c3b5cb0e69fb WHIRLPOOL e8930ff6714def3c4dfdf9f1b40d5538a66897d6e9bd397f6167c264f1434889bd15c13ee965ae9db254653c084d47dd6e032c2f8228a6bb2d2c66e8d820f828
+DIST icedtea-bin-examples-7.2.5.5-ppc.tar.xz 1785508 SHA256 0b50cd010ceee2d3c0804897f9934127c4cdfc8c91729df422748ed9a7043365 SHA512 1d7e27b5391ecfa408c5d5e0c1979e732ee43fd3f295311c82d6a9a6f5014136cdbc5f449bf5343b417a66691ff8667364050072d93c2be4b3d7009d6a50980f WHIRLPOOL 42501a028a975e00ebf5449dba0fb6f67c83efa2d8c7639c23b74d96a2d06f576094089432ea28d13eb63dee7c2531fb816d39811e11381cfe33bc8c0ada2f47
+DIST icedtea-bin-examples-7.2.5.5-x86.tar.xz 1794656 SHA256 3ff68a31470260231bbf9b8a9c242705bea4303158ea5b0a739548ce2fe9702b SHA512 59819a6bdc7f74aea90f2a1c1e5714518d28fdf23b508f10fd6ad52707aea9561a4afd12997742e21583fb15008e0fb1213bc677d3930a51f9786b4a54c74f14 WHIRLPOOL dc51882d96791f4a02ee5232efe759ba2f233779765f08c275635430c60f460119e7360a4bb15f676652125c1b6257c8825b909190b51bfcc610f10401362888
+DIST icedtea-bin-src-6.1.13.7.tar.xz 39750536 SHA256 4b778433141b0231da1615266566d1881bf9f1674f5f5721f669dc130710c38d SHA512 43a7baae4874681b438e477790479dbe339a88904deec6c91acf79d09fb25d562f83070e74a8691c51a28b4ebb1f3bd7c9befa52adc4785099e08b84fa8c5eb7 WHIRLPOOL 57d14e18a8365684f5d090f86709d0d3b110ad7fb506e0bae9ff796aebf110c396fa3707bddc85af32e23b004b09d9d107e99fc392a98b5046473b39068f2876
+DIST icedtea-bin-src-7.2.5.5.tar.xz 39995356 SHA256 c4f7843ffa9a401307d60b3eae192efb2792079d5d75d5954f4e03211b52f094 SHA512 7128e4255a7587d1167f6f2b1978cc0a8f6d079b2f189e5931c424c812c6c668a0afe0390cb492592c4cbf5f9375c11ed5d9ac9870161ad710ddddb7358ba60a WHIRLPOOL 607a4160d724ba38daebda75efe80aaf2ad87f534b3a9d089a43d172b7464fadee7b5e18b03eb1b84c3ec8ec14059023b75c9f16a93907a485c3af7a2cf38b2a
diff --git a/dev-java/icedtea-bin/files/icedtea-bin-6.env b/dev-java/icedtea-bin/files/icedtea-bin-6.env
new file mode 100644
index 000000000000..8df91e5ec3d3
--- /dev/null
+++ b/dev-java/icedtea-bin/files/icedtea-bin-6.env
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="IcedTea JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
+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/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.6"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/files/icedtea-bin-7.env b/dev-java/icedtea-bin/files/icedtea-bin-7.env
new file mode 100644
index 000000000000..2db5c7b9fa61
--- /dev/null
+++ b/dev-java/icedtea-bin/files/icedtea-bin-7.env
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="IcedTea JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
+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/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.7"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.7-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.7-r1.ebuild
new file mode 100644
index 000000000000..099240139ccc
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.7-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 prefix versionator
+
+dist="http://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 ppc x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="-* ~amd64 ~ppc ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-2.0"
+X_COMMON_DEP="
+	>=media-libs/freetype-2.5:2
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/libX11-1.6
+	>=x11-libs/libXext-1.3
+	>=x11-libs/libXi-1.7
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.2"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	>=media-libs/lcms-2.6:2
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-4.8.4
+	>=sys-libs/glibc-2.20
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg:62"
+
+RDEPEND="${COMMON_DEP}
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0 )
+	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
+
+src_prepare() {
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# Reprefixify because prefix may be different.
+	sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+	eprefixify jre/lib/fontconfig.Gentoo.properties
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	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}"
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
+		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
+		elog "If you had icedtea6-bin 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
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild
new file mode 100644
index 000000000000..7ca5a1c6b843
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 prefix versionator
+
+dist="http://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 ppc x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="-* amd64 ppc x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-2.0"
+X_COMMON_DEP="
+	>=media-libs/freetype-2.5:2
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/libX11-1.6
+	>=x11-libs/libXext-1.3
+	>=x11-libs/libXi-1.7
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.2"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	>=media-libs/lcms-2.6:2
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-4.8.4
+	>=sys-libs/glibc-2.20
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg:62"
+
+RDEPEND="${COMMON_DEP}
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0 )
+	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
+
+src_prepare() {
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# Reprefixify because prefix may be different.
+	sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+	eprefixify jre/lib/fontconfig.Gentoo.properties
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	fi
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
+		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
+		elog "If you had icedtea6-bin 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
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.5.5-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.5.5-r1.ebuild
new file mode 100644
index 000000000000..28a747bdf6c6
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.5.5-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix toolchain-funcs versionator
+
+dist="http://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 arm ppc x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ~amd64 ~arm ~ppc ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin pulseaudio selinux source webstart"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-2.0"
+X_COMMON_DEP="
+		>=dev-libs/atk-2.12
+		>=dev-libs/glib-2.40:2
+		>=media-libs/fontconfig-2.11:1.0
+		>=media-libs/freetype-2.5.3:2
+		>=x11-libs/cairo-1.12
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.4
+		>=x11-libs/libXtst-1.2
+		>=x11-libs/pango-1.36"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	>=media-libs/lcms-2.6:2
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-4.8.4
+	>=sys-libs/glibc-2.20
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg:62"
+
+# cups is needed for X. #390945 #390975
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND="${COMMON_DEP}
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )
+	>=gnome-base/gsettings-desktop-schemas-3.12.2"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# Reprefixify because prefix may be different.
+	sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+	eprefixify jre/lib/fontconfig.Gentoo.properties
+
+	# 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
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	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}"
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild
new file mode 100644
index 000000000000..d9b117d55314
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix toolchain-funcs versionator
+
+dist="http://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 arm ppc x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* amd64 ~arm ppc x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin pulseaudio selinux source webstart"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-2.0"
+X_COMMON_DEP="
+		>=dev-libs/atk-2.12
+		>=dev-libs/glib-2.40:2
+		>=media-libs/fontconfig-2.11:1.0
+		>=media-libs/freetype-2.5.3:2
+		>=x11-libs/cairo-1.12
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.4
+		>=x11-libs/libXtst-1.2
+		>=x11-libs/pango-1.36"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	>=media-libs/lcms-2.6:2
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-4.8.4
+	>=sys-libs/glibc-2.20
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg:62"
+
+# cups is needed for X. #390945 #390975
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND="${COMMON_DEP}
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )
+	>=gnome-base/gsettings-desktop-schemas-3.12.2"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# Reprefixify because prefix may be different.
+	sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+	eprefixify jre/lib/fontconfig.Gentoo.properties
+
+	# 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
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	fi
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
new file mode 100644
index 000000000000..df376342a775
--- /dev/null
+++ b/dev-java/icedtea-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>
+  <herd>java</herd>
+<use>
+  <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..62a3da692e0f
--- /dev/null
+++ b/dev-java/icedtea-sound/Manifest
@@ -0,0 +1 @@
+DIST icedtea-sound-1.0.1.tar.xz 1515308 SHA256 6ff852b82ae7db7a95981271037eb3a3d52c59581e3b27a638a7c6bc8eecb4a3 SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a WHIRLPOOL aaf495c4be15ba6c656797118691128732166049a38a535804852ac5fe4c4c555017f1777a1b96cba463e8933f90a0656f1b077b88bc80291fb99007e071ad1f
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..b8f1d60fa776
--- /dev/null
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# 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 ppc 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..c254d5eecdf9
--- /dev/null
+++ b/dev-java/icedtea-sound/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <maintainer>
+    <email>gnu_andrew@member.fsf.org</email>
+    <name>Andrew John Hughes</name>
+    <description>Proxy Maintainer</description>
+  </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..6b08126660db
--- /dev/null
+++ b/dev-java/icedtea-web/Manifest
@@ -0,0 +1 @@
+DIST icedtea-web-1.5.1.tar.gz 1616344 SHA256 03f16356fa84564f1ae32286e0a090a464c87ec123b40602dcea925757900195 SHA512 ef47eecbbb52fcb44ec9585db4c4428025201b04968dfcfc26061160d80b29ee649752f21ffe891cfa5c6bf775d0bc1dbb7dbd9a79794e052bb8b865fa94d039 WHIRLPOOL 955b5cc565fa62d2f5eb85a3253751cd284a4cb926619afe60920123878281a77f348a7c26cdafea2c6d4cd760fe4d399041b665b86ff1bbaf441e25f9f18379
diff --git a/dev-java/icedtea-web/files/README.gentoo b/dev-java/icedtea-web/files/README.gentoo
new file mode 100644
index 000000000000..0b4b644d035d
--- /dev/null
+++ b/dev-java/icedtea-web/files/README.gentoo
@@ -0,0 +1,21 @@
+Manage Plugin
+-------------
+The IcedTea browser plugin (NPPlugin) can be enabled using
+eselect java-nsplugin.
+
+Select JVM
+----------
+IcedTea-Web (>=1.4) supports selecting the JVM to use for the plugin. Currently
+works for all IcedTea releases. The eselect module java-nsplugin in
+>=eselect-java-0.1.0 added support for this.
+
+Per user configuration
+----------------------
+IcedTea-Web also supports per user configuration which takes precedence over the
+global choice of JVM managed by the java-nsplugin module. If you made use of
+itweb-settings as user to set a JVM for instance and want to give control back
+to java-nsplugin to manage the JVM to use run as your user:
+'sed -i -e "/^deployment.jre.dir=/d" ~/.icedtea/deployment.properties'
+
+Per user plugin selection via eselect java-nsplugin is a longstanding feature
+request. Bug 148632
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.5-respect-ldflags.patch b/dev-java/icedtea-web/files/icedtea-web-1.5-respect-ldflags.patch
new file mode 100644
index 000000000000..72ee9ebad585
--- /dev/null
+++ b/dev-java/icedtea-web/files/icedtea-web-1.5-respect-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2014-08-14 12:15:46.000000000 +0200
++++ Makefile.am	2014-11-01 23:09:49.543555638 +0100
+@@ -322,7 +322,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/icedtea-web-1.5.1-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..dadc7bf4f2b0
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (ahughes@redhat.com)
+
+EAPI="5"
+
+inherit autotools eutils readme.gentoo java-pkg-2 java-vm-2
+
+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 ppc x86"
+
+IUSE="doc +icedtea7 javascript +nsplugin tagsoup test"
+
+COMMON_DEP="
+	icedtea7? ( || (
+		dev-java/icedtea:7 dev-java/icedtea-bin:7
+	) )
+	!icedtea7? ( || (
+		dev-java/icedtea:7 dev-java/icedtea-bin:7
+		dev-java/icedtea:6 dev-java/icedtea-bin:6
+	) )
+	app-eselect/eselect-java
+	tagsoup? ( dev-java/tagsoup )
+	nsplugin? (
+		>=dev-libs/glib-2.16
+	)"
+RDEPEND="${COMMON_DEP}"
+# Need system junit 4.8+. Bug #389795
+DEPEND="${COMMON_DEP}
+	virtual/pkgconfig
+	app-arch/zip
+	javascript? ( dev-java/rhino:1.6 )
+	nsplugin? ( net-misc/npapi-sdk )
+	test? (	>=dev-java/junit-4.8:4 )"
+
+# http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-December/011221.html
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea-bin-7"
+	if ! use icedtea7; then
+		JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-6 icedtea-bin-6"
+	fi
+	JAVA_PKG_WANT_SOURCE="1.6"
+	JAVA_PKG_WANT_TARGET="1.6"
+
+	java-pkg-2_pkg_setup
+	java-vm-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.5-respect-ldflags.patch # bug #356645
+	eautoreconf
+}
+
+src_configure() {
+	local tagsoup_jar
+	local config
+
+	# bug #527962
+	use tagsoup && tagsoup_jar="$(java-pkg_getjars tagsoup)"
+
+	config=(
+		# javaws is managed by eselect java-vm and symlinked to by icedtea so
+		# move it out of the way and symlink itweb-settings back to bin
+		--bindir="${EPREFIX}"/usr/libexec/${PN}
+		--with-jdk-home="${JAVA_HOME}"
+		$(use_enable doc docs)
+		$(use_enable nsplugin plugin)
+		$(use_with javascript rhino)
+		$(use_with tagsoup tagsoup ${tagsoup_jar})
+	)
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+	econf "${config[@]}"
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	if use nsplugin; then
+		install_mozilla_plugin "/usr/$(get_libdir)/IcedTeaPlugin.so"
+	fi
+
+	mkdir -p "${ED}"/usr/bin || die
+	dosym /usr/libexec/${PN}/itweb-settings /usr/bin/itweb-settings || die
+
+	# Should we patch system default lookup instead?
+	mkdir -p "${ED}"/etc/.java/deployment/ || die
+	echo "deployment.jre.dir=/etc/java-config-2/current-icedtea-web-vm" \
+		> "${ED}"/etc/.java/deployment/deployment.properties || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	VMHANDLE="icedtea-web@${GENTOO_VM}" java-vm_check-nsplugin
+	java_mozilla_clean_
+	readme.gentoo_print_elog
+}
+
+pkg_prerm() {
+	# override the java-vm-2 eclass check for removing a system VM, as it
+	# doesn't make sense here.
+	:;
+}
diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml
new file mode 100644
index 000000000000..a415350271b8
--- /dev/null
+++ b/dev-java/icedtea-web/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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="icedtea7">Build icedtea-7 support in addition to icedtea-6 support. Requires icedtea{-bin}-7</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..573aa64b5ad3
--- /dev/null
+++ b/dev-java/icedtea/Manifest
@@ -0,0 +1,15 @@
+DIST icedtea-2.5-aarch64-1939c010fd37.tar.bz2 8151626 SHA256 ac35bd6620553478700aaf8c825e373a7329d66473899f7184eb5a317f3db97f SHA512 b594b384bfeb18c1a1b493de7a73fef91e646769ef737009d4326922e1ba70bb0cbcd8a21b4fd352ea6155342eda7de25dddc781c3751e2a19aea07ad9dd04e0 WHIRLPOOL 853098684b5b3db7eb1a32c360c12d45c7c5e4ea877e598f466531efd1d80f90cee28cd8321fd90b044ba27e4fc142e808112bdcb603fc5d7a0c23d08be748e7
+DIST icedtea-2.5-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
+DIST icedtea-2.5-corba-52db6f325d61.tar.bz2 1069991 SHA256 f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51 SHA512 22da9802c9354a96ba1440568d698ae5fec14db89668d665e169a571d26627f7343f1a42bdbb84d4d647d4694380bb49a987ce2cf190507614b76493bc2cbd06 WHIRLPOOL 62586a018ca3856e2d1e918385d9044dfebe45fd20bb7cbd28aa5fabf2bbb7c814790911b8bac6f7459ff333fd2fa25854d538bb49b22e656ee1239839513f27
+DIST icedtea-2.5-hotspot-cac66550581b.tar.bz2 7799870 SHA256 d724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb SHA512 ba6c9cca89537837fbb201a29a634a6775bcbcc988bb145aa661183c57498db586d24046ccc27df2cb84d6971a3830942cec669a764a295696391015592d5dbd WHIRLPOOL 121630db41435d87a3bfad0ea2926b685b52321dc120c421cc08253fdce5bbbfada95b2a895b3bc48b8dcc42d45431ca2f617c75b507f548808cf5a1c9496335
+DIST icedtea-2.5-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
+DIST icedtea-2.5-jaxp-80b5a93b1406.tar.bz2 2739415 SHA256 293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256 SHA512 1f3296081493324c410ff053195f4766918cb14ab62b3630cab22b84e00200b6a69f95bbd00bd3e98c6218c0bc63e3c71fc777aef3186d696dce4be34e9023b5 WHIRLPOOL 7ed664c7265e88c8293f897516857a000ca40dbef30b3311013d7710b71287e1b1c0fa1e1408a4391c9d89722efa503d88b93d3b80c24ab912e48a757f7e43ef
+DIST icedtea-2.5-jaxws-3706d41e1476.tar.bz2 2019449 SHA256 76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be SHA512 21961675d9b7277e9b1285c4182ba9cef14dbff88fe80cffbcdfe3c0062d23b2296aa568571b68a35dbe46b6ab50a7eb63bedd4de422724239af79240ff67163 WHIRLPOOL f5258aa7de3f23690cd17db5a1a742eb8108bbcdb41f4e437bddb95472f0b48ca4a408ed4a098c996d23b22889606eeaeec13ab9c6f10c4a40800e128cc7025a
+DIST icedtea-2.5-jdk-fb9961d8dfda.tar.bz2 31868377 SHA256 c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483 SHA512 e93864204ddc263caa1e8fc366723b5e3bf774040d9af3a49ab379f3d20888f3228d1712edd07c37d7e29b2fc6961e21aff106d4a91e2646aa45f082bb93c1cc WHIRLPOOL 1c12cb46c5d896026165dab6fcaf8f29fa368176bbb12b42a1a0c338c4503b7bd9aeb761cbb7269cba8bebdc2a7c25824540e4fa1027c77a29c6621b95a51bb2
+DIST icedtea-2.5-langtools-3ffd17553e8c.tar.bz2 1701795 SHA256 71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660 SHA512 5a86c77bedd3a65d94ee7ef37eda4008bc07603b4085e63ae547b17c8c6d723441fc0919be63dd9530626ad02fb9fbdb6723cadfe0d25deb6c4044af2ba60546 WHIRLPOOL 4d9b0540c7f130450cbef855873d631b4b403bd7b6fe0ee4c2c88b5d23b8de5c2e1101adc1822ab08b13a668f7aca8d81f31d98f82497de93444e104bf4a0738
+DIST icedtea-2.5-openjdk-f8c87dd516ff.tar.bz2 127435 SHA256 5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d SHA512 7c652e8a441e7732ac62b1ffff26c9b6478232235207120c55de3fcf5246af96a7be1a3e89f8373f01ba915dd68d32f52a46dc970ec3a632966c400fc04279cf WHIRLPOOL f6d0d9228df4452a310b150fd7c866ad0a727bc5b1e61ab6340233b73af838ce8544a298bf6c3a3a683115f72c68f52740773069a7ae65af606969078df8430e
+DIST icedtea-2.5.5.tar.xz 2026212 SHA256 09e7aeb739a468dec8357f4b0757624b6c7ef38065fdf50323d369deac983dc7 SHA512 ae6a81c5bbd126ca990138c8ea15d4f0e57d4af3c633a03fcf6ce580f6b9cc1ea1948562783ddda6134aae8585ef90efca89239d1773bf16deb38c13850912b5 WHIRLPOOL 6cdd8c105cd2ff0a1dbd6a0d0283f4bd0901ed400d8e4d81503b97645af591147ec455564d8d4c9c2cf9fbcd968cb2d2e50c239782b7c8b041dbfad488661f80
+DIST icedtea-6.1.13-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
+DIST icedtea-6.1.13-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
+DIST icedtea6-1.13.7.tar.xz 4511300 SHA256 a5ca64ae94ec27d28be91f4f0624164f9b4e6e92e417e52b296556005142183b SHA512 8e701f78d31888f4e2d362fcd46ee73aae67b57e3fe0b648f12b408298391149704aefac749294a0911581e1e70f30bff57d35a748b8e3e19e57a1911aa3d241 WHIRLPOOL 5131a79b6481b500ff70a50964f0eb206565d149196c5ab350c5f06015a73cf063dceeb3946a3c3bf45eb99a0f178ab180537089c906a7816356b4e289e69002
+DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234
diff --git a/dev-java/icedtea/files/6-more-memory.patch b/dev-java/icedtea/files/6-more-memory.patch
new file mode 100644
index 000000000000..a9017fc3f030
--- /dev/null
+++ b/dev-java/icedtea/files/6-more-memory.patch
@@ -0,0 +1,20 @@
+--- patches/cacao/launcher.patch.orig	2015-04-15 01:08:25.659995834 +0100
++++ patches/cacao/launcher.patch	2015-05-18 22:12:49.492593647 +0100
+@@ -1,11 +1,14 @@
+ --- openjdk/jdk/make/docs/Makefile.orig	2010-06-21 21:15:08.000000000 +0000
+ +++ openjdk/jdk/make/docs/Makefile	2010-06-23 18:35:55.529822335 +0000
+-@@ -70,7 +70,7 @@
++@@ -68,9 +68,9 @@
++ #    NOTE: javadoc will not complete without these larger settings.
++ #    WARNING: This could cause thrashing on low memory machines.
+  ifeq ($(ARCH_DATA_MODEL),64)
+-   MAX_VM_MEMORY = 1024
++-  MAX_VM_MEMORY = 1024
+++  MAX_VM_MEMORY = 1792
+  else
+ -  MAX_VM_MEMORY = 512
+-+  MAX_VM_MEMORY = 768
+++  MAX_VM_MEMORY = 1280
+  endif
+  
+  # List of all possible directories for javadoc to look for sources
diff --git a/dev-java/icedtea/files/7-more-memory.patch b/dev-java/icedtea/files/7-more-memory.patch
new file mode 100644
index 000000000000..c68ac5333d09
--- /dev/null
+++ b/dev-java/icedtea/files/7-more-memory.patch
@@ -0,0 +1,96 @@
+--- patches/cacao/memory.patch.orig	2015-04-15 01:08:12.571871465 +0100
++++ patches/cacao/memory.patch	2015-05-18 21:23:17.604748525 +0100
+@@ -6,7 +6,7 @@
+  BOOT_SOURCE_LANGUAGE_VERSION = 6
+  BOOT_TARGET_CLASS_VERSION = 6
+ -JAVAC_FLAGS = -g -encoding ascii
+-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
+  BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+  
+  # With parallel makes, print a message at the end of compilation.
+@@ -18,7 +18,7 @@
+  BOOT_SOURCE_LANGUAGE_VERSION = 6
+  BOOT_TARGET_CLASS_VERSION = 6
+ -JAVAC_FLAGS = -g -encoding ascii
+-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
+  BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+  
+  # With parallel makes, print a message at the end of compilation.
+@@ -30,7 +30,7 @@
+  BOOT_SOURCE_LANGUAGE_VERSION=6
+  BOOT_TARGET_CLASS_VERSION=6
+ -JAVAC_FLAGS=-g -encoding ascii
+-+JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
+++JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m
+  BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+  
+  ProjectFile=jvm.vcproj
+@@ -42,14 +42,14 @@
+          echo "false"; \
+        fi)
+ -    MAX_VM_MEMORY := 512
+-+    MAX_VM_MEMORY := 1536
+++    MAX_VM_MEMORY := 1792
+      MIN_VM_MEMORY := $(MAX_VM_MEMORY)
+    else
+      MB_OF_MEMORY       := unknown
+ diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
+ --- openjdk.orig/jdk/make/docs/Makefile	2012-06-08 17:12:17.000000000 +0100
+ +++ openjdk/jdk/make/docs/Makefile	2012-06-12 11:09:31.616702981 +0100
+-@@ -69,9 +69,9 @@
++@@ -69,11 +69,11 @@
+  #    NOTE: javadoc will not complete without these larger settings.
+  #    WARNING: This could cause thrashing on low memory machines.
+  ifeq ($(ARCH_DATA_MODEL),64)
+@@ -59,8 +59,11 @@
+ -  MAX_VM_MEMORY = 1536
+ +  MAX_VM_MEMORY = 1792
+  else
+-   MAX_VM_MEMORY = 768
++-  MAX_VM_MEMORY = 768
+++  MAX_VM_MEMORY = 2048
+  endif
++ 
++ # List of all possible directories for javadoc to look for sources
+ diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
+ --- openjdk.orig/langtools/make/build.xml	2012-06-08 17:12:36.000000000 +0100
+ +++ openjdk/langtools/make/build.xml	2012-06-12 10:50:20.974290246 +0100
+@@ -80,7 +83,7 @@
+  BOOT_SOURCE_LANGUAGE_VERSION = 6
+  BOOT_TARGET_CLASS_VERSION = 6
+ -JAVAC_FLAGS = -g -encoding ascii
+-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
+  BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+  
+  # With parallel makes, print a message at the end of compilation.
+--- patches/boot/compile-for-7-cacao-mem.patch.orig	2015-04-15 01:08:12.519870970 +0100
++++ patches/boot/compile-for-7-cacao-mem.patch	2015-05-18 21:35:10.136903342 +0100
+@@ -9,7 +9,7 @@
+ -BOOT_TARGET_CLASS_VERSION = 6
+ +BOOT_SOURCE_LANGUAGE_VERSION = 7
+ +BOOT_TARGET_CLASS_VERSION = 7
+- JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++ JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
+  BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+  
+ diff -Nru openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make openjdk-boot/hotspot/make/solaris/makefiles/rules.make
+@@ -23,7 +23,7 @@
+ -BOOT_TARGET_CLASS_VERSION = 6
+ +BOOT_SOURCE_LANGUAGE_VERSION = 7
+ +BOOT_TARGET_CLASS_VERSION = 7
+- JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++ JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
+  BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+  
+ diff -Nru openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make openjdk-boot/hotspot/make/windows/makefiles/rules.make
+@@ -37,6 +37,6 @@
+ -BOOT_TARGET_CLASS_VERSION=6
+ +BOOT_SOURCE_LANGUAGE_VERSION=7
+ +BOOT_TARGET_CLASS_VERSION=7
+- JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
++ JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m
+  BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+  
diff --git a/dev-java/icedtea/files/fontconfig.Gentoo.properties.src b/dev-java/icedtea/files/fontconfig.Gentoo.properties.src
new file mode 100644
index 000000000000..519cccdad9cf
--- /dev/null
+++ b/dev-java/icedtea/files/fontconfig.Gentoo.properties.src
@@ -0,0 +1,385 @@
+#
+# 
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code 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
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Version
+
+version=1
+
+# Component Font Mappings
+
+dialog.plain.latin-1=DejaVu Sans
+dialog.plain.japanese-x0208=Sazanami Gothic
+dialog.plain.korean=Baekmuk Gulim
+dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
+dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.plain.bengali=Lohit Bengali
+dialog.plain.gujarati=Lohit Gujarati
+dialog.plain.hindi=Lohit Hindi
+dialog.plain.malayalam=Lohit Malayalam
+dialog.plain.oriya=Lohit Oriya
+dialog.plain.punjabi=Lohit Punjabi
+dialog.plain.tamil=Lohit Tamil
+dialog.plain.telugu=Lohit Telugu
+dialog.plain.sinhala=LKLUG
+
+dialog.bold.latin-1=DejaVu Sans Bold
+dialog.bold.japanese-x0208=Sazanami Gothic
+dialog.bold.korean=Baekmuk Gulim
+dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
+dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.bold.bengali=Lohit Bengali
+dialog.bold.gujarati=Lohit Gujarati
+dialog.bold.hindi=Lohit Hindi
+dialog.bold.malayalam=Lohit Malayalam
+dialog.bold.oriya=Lohit Oriya
+dialog.bold.punjabi=Lohit Punjabi
+dialog.bold.tamil=Lohit Tamil
+dialog.bold.telugu=Lohit Telugu
+dialog.bold.sinhala=LKLUG
+
+dialog.italic.latin-1=DejaVu Sans Oblique
+dialog.italic.japanese-x0208=Sazanami Gothic
+dialog.italic.korean=Baekmuk Gulim
+dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
+dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.italic.bengali=Lohit Bengali
+dialog.italic.gujarati=Lohit Gujarati
+dialog.italic.hindi=Lohit Hindi
+dialog.italic.malayalam=Lohit Malayalam
+dialog.italic.oriya=Lohit Oriya
+dialog.italic.punjabi=Lohit Punjabi
+dialog.italic.tamil=Lohit Tamil
+dialog.italic.telugu=Lohit Telugu
+dialog.italic.sinhala=LKLUG
+
+dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
+dialog.bolditalic.japanese-x0208=Sazanami Gothic
+dialog.bolditalic.korean=Baekmuk Gulim
+dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.bolditalic.bengali=Lohit Bengali
+dialog.bolditalic.gujarati=Lohit Gujarati
+dialog.bolditalic.hindi=Lohit Hindi
+dialog.bolditalic.malayalam=Lohit Malayalam
+dialog.bolditalic.oriya=Lohit Oriya
+dialog.bolditalic.punjabi=Lohit Punjabi
+dialog.bolditalic.tamil=Lohit Tamil
+dialog.bolditalic.telugu=Lohit Telugu
+dialog.bolditalic.sinhala=LKLUG
+
+sansserif.plain.latin-1=DejaVu Sans
+sansserif.plain.japanese-x0208=Sazanami Gothic
+sansserif.plain.korean=Baekmuk Gulim
+sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.plain.bengali=Lohit Bengali
+sansserif.plain.gujarati=Lohit Gujarati
+sansserif.plain.hindi=Lohit Hindi
+sansserif.plain.malayalam=Lohit Malayalam
+sansserif.plain.oriya=Lohit Oriya
+sansserif.plain.punjabi=Lohit Punjabi
+sansserif.plain.tamil=Lohit Tamil
+sansserif.plain.telugu=Lohit Telugu
+sansserif.plain.sinhala=LKLUG
+
+sansserif.bold.latin-1=DejaVu Sans Bold
+sansserif.bold.japanese-x0208=Sazanami Gothic
+sansserif.bold.korean=Baekmuk Gulim
+sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.bold.bengali=Lohit Bengali
+sansserif.bold.gujarati=Lohit Gujarati
+sansserif.bold.hindi=Lohit Hindi
+sansserif.bold.malayalam=Lohit Malayalam
+sansserif.bold.oriya=Lohit Oriya
+sansserif.bold.punjabi=Lohit Punjabi
+sansserif.bold.tamil=Lohit Tamil
+sansserif.bold.telugu=Lohit Telugu
+sansserif.bold.sinhala=LKLUG
+
+sansserif.italic.latin-1=DejaVu Sans Oblique
+sansserif.italic.japanese-x0208=Sazanami Gothic
+sansserif.italic.korean=Baekmuk Gulim
+sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.italic.bengali=Lohit Bengali
+sansserif.italic.gujarati=Lohit Gujarati
+sansserif.italic.hindi=Lohit Hindi
+sansserif.italic.malayalam=Lohit Malayalam
+sansserif.italic.oriya=Lohit Oriya
+sansserif.italic.punjabi=Lohit Punjabi
+sansserif.italic.tamil=Lohit Tamil
+sansserif.italic.telugu=Lohit Telugu
+sansserif.italic.sinhala=LKLUG
+
+sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
+sansserif.bolditalic.japanese-x0208=Sazanami Gothic
+sansserif.bolditalic.korean=Baekmuk Gulim
+sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.bolditalic.bengali=Lohit Bengali
+sansserif.bolditalic.gujarati=Lohit Gujarati
+sansserif.bolditalic.hindi=Lohit Hindi
+sansserif.bolditalic.malayalam=Lohit Malayalam
+sansserif.bolditalic.oriya=Lohit Oriya
+sansserif.bolditalic.punjabi=Lohit Punjabi
+sansserif.bolditalic.tamil=Lohit Tamil
+sansserif.bolditalic.telugu=Lohit Telugu
+sansserif.bolditalic.sinhala=LKLUG
+
+serif.plain.latin-1=DejaVu Serif
+serif.plain.japanese-x0208=Sazanami Mincho
+serif.plain.korean=Baekmuk Batang
+serif.plain.chinese-big5=AR PL ZenKai Uni
+serif.plain.chinese-gb18030=AR PL ZenKai Uni
+serif.plain.bengali=Lohit Bengali
+serif.plain.gujarati=Lohit Gujarati
+serif.plain.hindi=Lohit Hindi
+serif.plain.malayalam=Lohit Malayalam
+serif.plain.oriya=Lohit Oriya
+serif.plain.punjabi=Lohit Punjabi
+serif.plain.tamil=Lohit Tamil
+serif.plain.telugu=Lohit Telugu
+serif.plain.sinhala=LKLUG
+
+serif.bold.latin-1=DejaVu Serif Bold
+serif.bold.japanese-x0208=Sazanami Mincho
+serif.bold.korean=Baekmuk Batang
+serif.bold.chinese-big5=AR PL ZenKai Uni
+serif.bold.chinese-gb18030=AR PL ZenKai Uni
+serif.bold.bengali=Lohit Bengali
+serif.bold.gujarati=Lohit Gujarati
+serif.bold.hindi=Lohit Hindi
+serif.bold.malayalam=Lohit Malayalam
+serif.bold.oriya=Lohit Oriya
+serif.bold.punjabi=Lohit Punjabi
+serif.bold.tamil=Lohit Tamil
+serif.bold.telugu=Lohit Telugu
+serif.bold.sinhala=LKLUG
+
+serif.italic.latin-1=DejaVu Serif Oblique
+serif.italic.japanese-x0208=Sazanami Mincho
+serif.italic.korean=Baekmuk Batang
+serif.italic.chinese-big5=AR PL ZenKai Uni
+serif.italic.chinese-gb18030=AR PL ZenKai Uni
+serif.italic.bengali=Lohit Bengali
+serif.italic.gujarati=Lohit Gujarati
+serif.italic.hindi=Lohit Hindi
+serif.italic.malayalam=Lohit Malayalam
+serif.italic.oriya=Lohit Oriya
+serif.italic.punjabi=Lohit Punjabi
+serif.italic.tamil=Lohit Tamil
+serif.italic.telugu=Lohit Telugu
+serif.italic.sinhala=LKLUG
+
+serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
+serif.bolditalic.japanese-x0208=Sazanami Mincho
+serif.bolditalic.korean=Baekmuk Batang
+serif.bolditalic.chinese-big5=AR PL ZenKai Uni
+serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
+serif.bolditalic.bengali=Lohit Bengali
+serif.bolditalic.gujarati=Lohit Gujarati
+serif.bolditalic.hindi=Lohit Hindi
+serif.bolditalic.malayalam=Lohit Malayalam
+serif.bolditalic.oriya=Lohit Oriya
+serif.bolditalic.punjabi=Lohit Punjabi
+serif.bolditalic.tamil=Lohit Tamil
+serif.bolditalic.telugu=Lohit Telugu
+serif.bolditalic.sinhala=LKLUG
+
+monospaced.plain.latin-1=DejaVu Sans Mono
+monospaced.plain.japanese-x0208=Sazanami Gothic
+monospaced.plain.korean=Baekmuk Gulim
+monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.plain.bengali=Lohit Bengali
+monospaced.plain.gujarati=Lohit Gujarati
+monospaced.plain.hindi=Lohit Hindi
+monospaced.plain.malayalam=Lohit Malayalam
+monospaced.plain.oriya=Lohit Oriya
+monospaced.plain.punjabi=Lohit Punjabi
+monospaced.plain.tamil=Lohit Tamil
+monospaced.plain.telugu=Lohit Telugu
+monospaced.plain.sinhala=LKLUG
+
+monospaced.bold.latin-1=DejaVu Sans Mono Bold
+monospaced.bold.japanese-x0208=Sazanami Gothic
+monospaced.bold.korean=Baekmuk Gulim
+monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.bold.bengali=Lohit Bengali
+monospaced.bold.gujarati=Lohit Gujarati
+monospaced.bold.hindi=Lohit Hindi
+monospaced.bold.malayalam=Lohit Malayalam
+monospaced.bold.oriya=Lohit Oriya
+monospaced.bold.punjabi=Lohit Punjabi
+monospaced.bold.tamil=Lohit Tamil
+monospaced.bold.telugu=Lohit Telugu
+monospaced.bold.sinhala=LKLUG
+
+monospaced.italic.latin-1=DejaVu Sans Mono Oblique
+monospaced.italic.japanese-x0208=Sazanami Gothic
+monospaced.italic.korean=Baekmuk Gulim
+monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.italic.bengali=Lohit Bengali
+monospaced.italic.gujarati=Lohit Gujarati
+monospaced.italic.hindi=Lohit Hindi
+monospaced.italic.malayalam=Lohit Malayalam
+monospaced.italic.oriya=Lohit Oriya
+monospaced.italic.punjabi=Lohit Punjabi
+monospaced.italic.tamil=Lohit Tamil
+monospaced.italic.telugu=Lohit Telugu
+monospaced.italic.sinhala=LKLUG
+
+monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+monospaced.bolditalic.japanese-x0208=Sazanami Gothic
+monospaced.bolditalic.korean=Baekmuk Gulim
+monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.bolditalic.bengali=Lohit Bengali
+monospaced.bolditalic.gujarati=Lohit Gujarati
+monospaced.bolditalic.hindi=Lohit Hindi
+monospaced.bolditalic.malayalam=Lohit Malayalam
+monospaced.bolditalic.oriya=Lohit Oriya
+monospaced.bolditalic.punjabi=Lohit Punjabi
+monospaced.bolditalic.tamil=Lohit Tamil
+monospaced.bolditalic.telugu=Lohit Telugu
+monospaced.bolditalic.sinhala=LKLUG
+
+dialoginput.plain.latin-1=DejaVu Sans Mono
+dialoginput.plain.japanese-x0208=Sazanami Gothic
+dialoginput.plain.korean=Baekmuk Gulim
+dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+dialoginput.plain.bengali=Lohit Bengali
+dialoginput.plain.gujarati=Lohit Gujarati
+dialoginput.plain.hindi=Lohit Hindi
+dialoginput.plain.malayalam=Lohit Malayalam
+dialoginput.plain.oriya=Lohit Oriya
+dialoginput.plain.punjabi=Lohit Punjabi
+dialoginput.plain.tamil=Lohit Tamil
+dialoginput.plain.telugu=Lohit Telugu
+dialoginput.plain.sinhala=LKLUG
+
+dialoginput.bold.latin-1=DejaVu Sans Mono Bold
+dialoginput.bold.japanese-x0208=Sazanami Gothic
+dialoginput.bold.korean=Baekmuk Gulim
+dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+dialoginput.bold.bengali=Lohit Bengali
+dialoginput.bold.gujarati=Lohit Gujarati
+dialoginput.bold.hindi=Lohit Hindi
+dialoginput.bold.malayalam=Lohit Malayalam
+dialoginput.bold.oriya=Lohit Oriya
+dialoginput.bold.punjabi=Lohit Punjabi
+dialoginput.bold.tamil=Lohit Tamil
+dialoginput.bold.telugu=Lohit Telugu
+dialoginput.bold.sinhala=LKLUG
+
+dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
+dialoginput.italic.japanese-x0208=Sazanami Gothic
+dialoginput.italic.korean=Baekmuk Gulim
+dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+dialoginput.italic.bengali=Lohit Bengali
+dialoginput.italic.gujarati=Lohit Gujarati
+dialoginput.italic.hindi=Lohit Hindi
+dialoginput.italic.malayalam=Lohit Malayalam
+dialoginput.italic.oriya=Lohit Oriya
+dialoginput.italic.punjabi=Lohit Punjabi
+dialoginput.italic.tamil=Lohit Tamil
+dialoginput.italic.telugu=Lohit Telugu
+dialoginput.italic.sinhala=LKLUG
+
+dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
+dialoginput.bolditalic.korean=Baekmuk Gulim
+dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+dialoginput.bolditalic.bengali=Lohit Bengali
+dialoginput.bolditalic.gujarati=Lohit Gujarati
+dialoginput.bolditalic.hindi=Lohit Hindi
+dialoginput.bolditalic.malayalam=Lohit Malayalam
+dialoginput.bolditalic.oriya=Lohit Oriya
+dialoginput.bolditalic.punjabi=Lohit Punjabi
+dialoginput.bolditalic.tamil=Lohit Tamil
+dialoginput.bolditalic.telugu=Lohit Telugu
+dialoginput.bolditalic.sinhala=LKLUG
+
+# Search Sequences
+
+sequence.allfonts=latin-1
+sequence.allfonts.Big5=chinese-big5,latin-1
+sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1
+sequence.allfonts.EUC-KR=korean,latin-1
+sequence.allfonts.GB18030=chinese-gb18030,latin-1
+sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala
+
+# Font File Names
+
+# media-fonts/dejavu
+filename.DejaVu_Sans=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans.ttf
+filename.DejaVu_Sans_Bold=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf
+filename.DejaVu_Sans_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf
+filename.DejaVu_Sans_Bold_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf
+
+filename.DejaVu_Sans_Mono=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono.ttf
+filename.DejaVu_Sans_Mono_Bold=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf
+filename.DejaVu_Sans_Mono_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf
+filename.DejaVu_Sans_Mono_Bold_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
+
+filename.DejaVu_Serif=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif.ttf
+filename.DejaVu_Serif_Bold=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf
+filename.DejaVu_Serif_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
+filename.DejaVu_Serif_Bold_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
+
+# media-fonts/sazanami
+filename.Sazanami_Gothic=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/sazanami/sazanami-gothic.ttf
+filename.Sazanami_Mincho=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/sazanami/sazanami-mincho.ttf
+
+# media-fonts/arphicfonts
+filename.AR_PL_ShanHeiSun_Uni=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts/uming.ttc
+filename.AR_PL_ZenKai_Uni=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts/ukai.ttc
+
+# media-fonts/baekmuk-fonts
+filename.Baekmuk_Gulim=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf
+filename.Baekmuk_Batang=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf
+
+# media-fonts/lohit-fonts
+filename.Lohit_Bengali=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_bn.ttf
+filename.Lohit_Gujarati=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_gu.ttf
+filename.Lohit_Hindi=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_hi.ttf
+filename.Lohit_Kannda=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_kn.ttf
+filename.Lohit_Malayalam=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_ml.ttf
+filename.Lohit_Oriya=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_or.ttf
+filename.Lohit_Punjabi=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_pa.ttf
+filename.Lohit_Tamil=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_ta.ttf
+filename.Lohit_Telugu=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_te.ttf
+
+# media-fonts/lklug
+filename.LKLUG=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/lklug/lklug.ttf
+
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 b/dev-java/icedtea/files/icedtea.env
new file mode 100644
index 000000000000..463add6dfcf0
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea.env
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="IcedTea JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/icedtea@SLOT@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@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/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@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/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea/icedtea-6.1.13.7.ebuild b/dev-java/icedtea/icedtea-6.1.13.7.ebuild
new file mode 100644
index 000000000000..469eb9647ad9
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.13.7.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+
+inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+
+ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
+ICEDTEA_BRANCH=$(get_version_component_range 1-3)
+OPENJDK_BUILD="35"
+OPENJDK_DATE="14_apr_2015"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
+# Download cacao and jamvm regardless for use with EXTRA_ECONF
+CACAO_TARBALL="68fe50ac34ec.tar.gz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
+
+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}
+	https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/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"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+RESTRICT="test"
+
+IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +nsplugin
+	+nss pax_kernel pulseaudio selinux +source systemtap test zero +webstart"
+
+# 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/freetype-2.3.5:2=
+	>=x11-libs/gtk+-2.8:2=
+	>=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"
+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="
+	>=media-libs/giflib-4.1.6:=
+	>=media-libs/libpng-1.2:0=
+	>=sys-libs/zlib-1.2.3:=
+	virtual/jpeg:0=
+	>=media-libs/lcms-2.5
+	javascript? ( dev-java/rhino:1.6 )
+	kerberos? ( virtual/krb5 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11:= )
+	systemtap? ( >=dev-util/systemtap-1 )
+	!dev-java/icedtea-web:6"
+
+# media-fonts/lklug needs ppc ppc64 keywords
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea6
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			!ppc? ( !ppc64? ( media-fonts/lklug ) )
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_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
+# xext headers have two variants depending on version - bug #288855
+# !eclipse-ecj-3.7 - bug #392587
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:6
+		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
+	dev-libs/openssl
+	virtual/pkgconfig
+	sys-apps/lsb-release
+	${X_DEPEND}
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0 )
+	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="8500M"
+	else
+		CHECKREQS_DISK_BUILD="8000M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-6 icedtea-bin-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}
+}
+
+java_prepare() {
+	# ppc and/or CACAO demands more RAM to build.
+	epatch "${FILESDIR}/${SLOT}-more-memory.patch"
+
+	# 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"
+}
+
+src_configure() {
+	local cacao_config config hotspot_port use_cacao 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 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, sparc and x86.
+	if { use amd64 || use arm || 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 || use ppc64; }; then
+			use_cacao="yes"
+		else
+			use_zero="yes"
+		fi
+	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
+		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_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--with-pkgversion="Gentoo package ${PF}" \
+		--disable-downloading --disable-Werror \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		${zero_config} ${cacao_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() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# Don't hide classes
+	rm lib/ct.sym || die
+
+	#402507
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# doins doesn't preserve executable bits.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		docinto html
+		dodoc -r ../docs/*
+	fi
+
+	if use examples; then
+		cp -vRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# 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
+
+	# Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	if ! use X || ! use alsa || ! use cups; then
+		java-vm_revdep-mask "${dest}"
+	fi
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
+		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
+		elog "If you had icedtea6 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
+}
diff --git a/dev-java/icedtea/icedtea-7.2.5.5.ebuild b/dev-java/icedtea/icedtea-7.2.5.5.ebuild
new file mode 100644
index 000000000000..986d07483aa3
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.5.5.ebuild
@@ -0,0 +1,411 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+SLOT="7"
+
+inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+
+ICEDTEA_VER=$(get_version_component_range 2-)
+ICEDTEA_BRANCH=$(get_version_component_range 2-3)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+CORBA_TARBALL="52db6f325d61.tar.bz2"
+JAXP_TARBALL="80b5a93b1406.tar.bz2"
+JAXWS_TARBALL="3706d41e1476.tar.bz2"
+JDK_TARBALL="fb9961d8dfda.tar.bz2"
+LANGTOOLS_TARBALL="3ffd17553e8c.tar.bz2"
+OPENJDK_TARBALL="f8c87dd516ff.tar.bz2"
+HOTSPOT_TARBALL="cac66550581b.tar.bz2"
+AARCH64_TARBALL="1939c010fd37.tar.bz2"
+CACAO_TARBALL="e215e36be9fc.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}"
+AARCH64_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch64-${AARCH64_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${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}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
+	arm? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
+	arm64? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
+	!arm? ( !arm64? ( ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_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 ~ppc ~x86"
+RESTRICT="test"
+
+IUSE="+X +alsa cacao cjk +cups debug doc examples infinality jamvm javascript +jbootstrap kerberos +nsplugin
+	nss pax_kernel pulseaudio selinux smartcard +source +sunec test zero +webstart"
+
+# 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="
+	>=dev-libs/atk-1.30.0
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.5.3:2=[infinality?]
+	>=x11-libs/cairo-1.8.8:=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.8:2=
+	>=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/pango-1.24.5"
+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="
+	>=media-libs/giflib-4.1.6:=
+	>=media-libs/lcms-2.5
+	>=media-libs/libpng-1.2:0=
+	>=sys-libs/zlib-1.2.3:=
+	virtual/jpeg:0=
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	kerberos? ( virtual/krb5 )
+	>=dev-util/systemtap-1
+	smartcard? ( sys-apps/pcsc-lite )
+	sunec? ( >=dev-libs/nss-3.16.1-r1 )
+	!dev-java/icedtea-web:7"
+
+# cups is needed for X. #390945 #390975
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )
+	>=gnome-base/gsettings-desktop-schemas-3.12.2"
+
+# 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
+# xext headers have two variants depending on version - bug #288855
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:7
+		dev-java/icedtea:7
+	)
+	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
+	dev-libs/openssl
+	virtual/pkgconfig
+	sys-apps/attr
+	sys-apps/lsb-release
+	${X_DEPEND}
+	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
+		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}
+}
+
+java_prepare() {
+	# ppc and/or CACAO demands more RAM to build.
+	epatch "${FILESDIR}/${SLOT}-more-memory.patch"
+
+	# 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"
+}
+
+src_configure() {
+	local cacao_config config hotspot_port hs_tarball use_cacao 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 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 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
+		zero_config="--enable-zero"
+	fi
+
+	# Use appropriate HotSpot tarball for architecture
+	if { use arm || use arm64; }; then
+		hs_tarball="${DISTDIR}/${AARCH64_GENTOO_TARBALL}";
+	else
+		hs_tarball="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}";
+	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="${hs_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}" \
+		--with-pkgversion="Gentoo package ${PF}" \
+		--disable-downloading --disable-Werror \
+		--enable-system-lcms \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable jamvm) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable smartcard system-pcsc) \
+		$(use_enable sunec) \
+		$(use_enable infinality) \
+		${zero_config} ${cacao_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() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# Don't hide classes
+	rm lib/ct.sym || die
+
+	#402507
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# doins doesn't preserve executable bits.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		docinto html
+		dodoc -r ../docs/*
+	fi
+
+	if use examples; then
+		cp -vRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# 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
+
+	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
+	# install it anyway. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	if ! use X || ! use alsa || ! use cups; then
+		java-vm_revdep-mask "${dest}"
+	fi
+	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
+}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
new file mode 100644
index 000000000000..3f20a4b8631e
--- /dev/null
+++ b/dev-java/icedtea/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+  <email>gnu_andrew@member.fsf.org</email>
+  <name>Andrew John Hughes</name>
+  <description>Proxy Maintainer</description>
+</maintainer>
+<maintainer>
+  <email>caster@gentoo.org</email>
+  <name>Vlastimil Babka</name>
+  <description>Committer (CC me)</description>
+</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="X">Make X buildtime-only depenency.</flag>
+  <flag name="alsa">Make alsa buildtime-only dependency.</flag>
+  <flag name="cacao">Build CACAO virtual machine on platforms supporting HotSpot. (experimental)</flag>
+  <flag name="cups">Make CUPS build-only dependency.</flag>
+  <flag name="infinality">Enable better font rendering using fontconfig.</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">For building when running a PaX enabled kernel.</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="systemtap">Enable SystemTap probes in HotSpot.</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..6d8d571aef58
--- /dev/null
+++ b/dev-java/icu4j/Manifest
@@ -0,0 +1,15 @@
+DIST icu4j-3_8_1-docs.jar 1470606 SHA256 e3acbb4523ebf90288bde1ff4ebe16241ff8d5a3e53ce9e29636f569a42f0b46 SHA512 88f59573d1070f13ebce9116359603e4d0c6f0c1626ab18a2fc6a08ac5831d50341341e33576c52d97b0b763fe8a8babfd35b34d77466bef5da5ab34aec2bb6e WHIRLPOOL 750c067d4df18780612f0d77c6f48c3c16e502d15d3fdf8339a22e4235e74a192ed2ecec80f4ae00f9e4ee8dc6b949a2969c44a7d7bc93538d53b349d5df324e
+DIST icu4j-3_8_1-src.jar 13782832 SHA256 c6b42a4a9fe0d13302897ee0bf2c955b8a7a02af1ee01ad9cdb61a515638ca0f SHA512 4b652886cff0ee490db0e0c0bf9b33828b8f1026ade7a956b86c1839727be04f5bca4783c31539e8cc8e309a7e2127315f84577db0d9b425d878121867d580ee WHIRLPOOL 9936a512d2a1c259d905299e517aa64137c5ee4852a0bc646411aa85d878cdaf00001b6fcbfb459f64764463c30b224924fd711e1e15e2f544edd7505d5572ff
+DIST icu4j-49_1.tgz 18487856 SHA256 40e0c09cb8a12883bd5c06826f6651203baf214919be98f120cd89002362329a SHA512 4287439b1e8bd1ce30e1c64bd97d3f4e6ba97de7b4242ca05cf53ab83ad3a495434d77cc2816224030d4662df2cdfc3afbb4a7ed45fce2ee0c10aa0ce1ec45b2 WHIRLPOOL ef8961afff8f280db6730f0c4d64eabcc8fa8454db6d9ec7eab8d034f25646874edbc6cba5689f1993241bbfae538914ca4d4e6821eb4559e07a1a4e60b0a191
+DIST icu4j-4_0_1_1-docs.jar 1553089 SHA256 44319c329b628c5e14e74eeb285ddb876c34e3529b06c69abd9a54799490cd8e SHA512 15bf1cdb7c040403dcf0b7ebcf5355a192ce1e8841a13392badcce1d56c06a0e41bc8213f071a5530c892e2cc9e975cd9cbde6fa3f61e395cc437966e20733b8 WHIRLPOOL 0bd48dd1dc953f571da012b820b485f841ff3c5939b26e17cc92e872d94a7c122efce58cb0a6ac5479617687a8aa0f525f1650998f9e304d30274073d7c8f9fd
+DIST icu4j-4_0_1_1-src.jar 15138020 SHA256 9d5484ccb3ad6849b6d3986ee2cf146984cbbb8adb2349dc79f6a4e006bc417e SHA512 4eb02b50df0c7a008f6291c636cfc887b61ce503e0bd994d8cd5f3ec955b287e16ea640de98398414e000af8a859a4b087aa711cdaa53c8c17c7fdb760a4ca4e WHIRLPOOL 032412b7a7cb533e1f037c32cfa74db65272ca9c735d412c0f5f4abd1c41d5c4a1db26d0d8339693ff7229a052fd3cf1b8504cc250c17a3a45e7f4d58bb7f279
+DIST icu4j-4_2_1_1-docs.jar 1633918 SHA256 3749ec254d38b6ca2e13ed5cf493ac371ff3c548bf95302af41bb408e0bcbfa8 SHA512 87eeb92f168b28aa4cce3b3547311020e0b052034ef160cb5ba3b8f7fc77829b231680f061686ea87dc388f961c4d1feffcb3fc24fe5df66e51c2983c4a5be30 WHIRLPOOL 2d1a2ad3c54624721c2e7e56bef927486ca82d6f8c7e00ad6b97707ca8b6c42186b5b45babdc73961e8e6b30ed9fc29f923cf580f17bcf974593f090ac3a767b
+DIST icu4j-4_2_1_1-src.jar 16057200 SHA256 61e8d1f7879c580e7304222b80a1bf395455d50fa425a9d7e1b72164776a43fa SHA512 3d61a219a67ff5682a4c1484f7239b60982b8e6c25138ccb15a92cfae18c67592acea0200b2954f7a021b1d3765aabae98d5346f22e134af2ca18514a7925274 WHIRLPOOL cf87a51dd9f18c9f5af0549677fd971dfc9e527ee09c0e39d82fc0fa128eea6222c65d10df722b7d7f451bacaf5d80ce31122112fdcb720a2dcaaae05a61b163
+DIST icu4j-4_4_1_1-docs.jar 1783697 SHA256 2063db589ce2d7b1b3aa9f4aeff2562be2993aa5a0755b65832304a963d29491 SHA512 2b3a665c2e748445f4acd8ae25641ff28b7d26e92a9e5427ca97ef5b63e051e635380e00f1f3a099dd4faf7eac0c038ce5e8a45380337b161daf3497d16ec56a WHIRLPOOL f5c4ac56b1eab843c8223b004d91f7bcbbaadda41bd3ff3702070941486aba27183659d78195eb3298e5dd85685562ffeb644454e41c27319272fc4c64dab808
+DIST icu4j-4_4_1_1-src.jar 14821020 SHA256 a42c7db617c04f031a41bb66fa5d211f2fa2e535e2767297897e85d2ef525bff SHA512 bc02f42ea62ee1859db7be852d64c8113e8de82a21c689c2f97606fd04a773603a43ac9faee2705653bfd5c1e431a4db798751758c38dd8d0ab02142c455b243 WHIRLPOOL 2fb230aa7ff19483e177ef93f3ccfbbe7936d5cc3fbee05fac03c15e5ea7777ab2423722bebd37f428e22669b907ed3e07565b8dfc300c5b7bea01960fbd74b6
+DIST icu4j-4_4_2-docs.jar 1783887 SHA256 aa364c9e353e05e428112b05f9a9fda8e1c7d2b3404862e6df08a73f7f8b187a SHA512 212d042ca27e442525a1dcd4f69a6668535d57e49a1302b97e32bfc7ed216146eedff52633770bb01f32f560fb6d7c00774b34385a7d87cab9f0b68188a37203 WHIRLPOOL 804ac774e6e9e4b06f1d06795ea70ecb68ee23ed7689d4b603682ca1271c2d18d258faf3c23e99ff8269275774b4ba0e1b605b2b7288b51e9ae5445d25c32d7c
+DIST icu4j-4_4_2-src.jar 14844670 SHA256 c29fbf1464ad7fb88e8651953144884eea37adf36914e38a518774a99cf33b0d SHA512 90949f007e073c0e78510c66c2a1644985367921550f61976af61089ffc8a08e34a51c36c21f241f3073c7b3c5329d1ba7234043790db8dd8eef7eaf3edff79d WHIRLPOOL 82727e4e95ef662f9c6689bf5cd1d5c16f4238b682d2d88689ee561aae9c8ecc846f2bbb0adcfd125c7353b9ba160abc0c76d0d11af78047a59fd4504a39a720
+DIST icu4j-52_1.tgz 22584166 SHA256 0d720ee63ec3976a0280bc5f42ef347a5823c0debe15bd42369316433f32ae05 SHA512 4546daa126410c21ec65acc75581831c139873e2465b9fd898215cc52ebfbd6441c0a260bd449aa3d0753fe0584c02d1bd033de46904aef9e27aaa3266b78738 WHIRLPOOL 9bd5b5085289c776c221a0a85edca11185fed77874e5520627ba60b9f2772c63aa078a765ba5b228570062d063fc3077b2cbe2417d4c241b4f6940f59206bd57
+DIST icu4j-53_1.tgz 21619483 SHA256 dc1e4ab121769ced059b0b79ad1ec607ffe8e4b39950c6de83ea21656df173eb SHA512 0a5689a1f5762130f02e37fd844c9ac2f03d176fa3b49904227e6a38fdc62a6b371d3674b8f06ee2e30589f5d71578841e84d554dadc86ec7b049ff2d39e5250 WHIRLPOOL 030c7378e67017512f4762fd75b9851a62a26b4b954f10b51573ff0d029768b8fe96b159328946609c864ad273c7b7ab6bdd1d694bd4aed37af318e5ccefd558
+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
diff --git a/dev-java/icu4j/files/icu4j-3.8.1-manifest b/dev-java/icu4j/files/icu4j-3.8.1-manifest
new file mode 100644
index 000000000000..ae7ac129b5b6
--- /dev/null
+++ b/dev-java/icu4j/files/icu4j-3.8.1-manifest
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Vendor: %vendorName
+Bundle-SymbolicName: com.ibm.icu; singleton:=true
+Bundle-Version: 3.8.1.1
+Bundle-Localization: plugin
+Export-Package: com.ibm.icu.lang;version="3.8.1",
+ com.ibm.icu.math;version="3.8.1",
+ com.ibm.icu.text;version="3.8.1",
+ com.ibm.icu.util;version="3.8.1",
+ com.ibm.icu.impl;x-internal:=true,
+ com.ibm.icu.impl.data;x-internal:=true,
+ com.ibm.icu.impl.data.icudt38b;x-internal:=true,
+ com.ibm.icu.impl.data.icudt38b.brkitr;x-internal:=true,
+ com.ibm.icu.impl.data.icudt38b.coll;x-internal:=true,
+ com.ibm.icu.impl.data.icudt38b.rbnf;x-internal:=true,
+ com.ibm.icu.impl.data.icudt38b.translit;x-internal:=true
+Eclipse-LazyStart: true
+Bundle-ClassPath: .
+Eclipse-ExtensibleAPI: true
diff --git a/dev-java/icu4j/files/icu4j-4.0-manifest b/dev-java/icu4j/files/icu4j-4.0-manifest
new file mode 100644
index 000000000000..c78e8a043eb1
--- /dev/null
+++ b/dev-java/icu4j/files/icu4j-4.0-manifest
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Vendor: %vendorName
+Bundle-SymbolicName: com.ibm.icu; singleton:=true
+Bundle-Version: determinedByPortage
+Bundle-Localization: plugin
+Export-Package: com.ibm.icu.lang;version="4.0",
+ com.ibm.icu.math;version="4.0",
+ com.ibm.icu.text;version="4.0",
+ com.ibm.icu.util;version="4.0",
+ com.ibm.icu.impl;x-internal:=true,
+ com.ibm.icu.impl.data;x-internal:=true,
+ com.ibm.icu.impl.data.icudt40b;x-internal:=true,
+ com.ibm.icu.impl.data.icudt40b.brkitr;x-internal:=true,
+ com.ibm.icu.impl.data.icudt40b.coll;x-internal:=true,
+ com.ibm.icu.impl.data.icudt40b.rbnf;x-internal:=true,
+ com.ibm.icu.impl.data.icudt40b.translit;x-internal:=true
+Eclipse-LazyStart: true
+Bundle-ClassPath: .
+Eclipse-ExtensibleAPI: true
diff --git a/dev-java/icu4j/files/icu4j-4.4.2-add-jdk8-to-check.patch b/dev-java/icu4j/files/icu4j-4.4.2-add-jdk8-to-check.patch
new file mode 100644
index 000000000000..4946cf8c9840
--- /dev/null
+++ b/dev-java/icu4j/files/icu4j-4.4.2-add-jdk8-to-check.patch
@@ -0,0 +1,12 @@
+diff --git a/build.xml b/build.xml
+index 6f82ec5..9e763ae 100644
+--- a/build.xml
++++ b/build.xml
+@@ -27,6 +27,7 @@
+         <or>

+             <contains string="${java.version}" substring="1.6."/>

+             <contains string="${java.version}" substring="1.7."/>

++            <contains string="${java.version}" substring="1.8."/>

+         </or>

+     </condition>

+     <condition property="is.java5">

diff --git a/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch b/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch
new file mode 100644
index 000000000000..64151008822f
--- /dev/null
+++ b/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch
@@ -0,0 +1,18 @@
+Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java

+===================================================================

+--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java	(revision 34829)

++++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java	(revision 34830)

+@@ -1,5 +1,5 @@

+ /*

+  *******************************************************************************

+- * Copyright (C) 1996-2013, International Business Machines Corporation and    *

++ * Copyright (C) 1996-2014, International Business Machines Corporation and    *

+  * others. All Rights Reserved.                                                *

+  *******************************************************************************

+@@ -2820,5 +2820,5 @@

+                 if ( override != null && (override.compareTo("hebr") == 0 || override.indexOf("y=hebr") >= 0) && value < 1000 ) {

+                     value += HEBREW_CAL_CUR_MILLENIUM_START_YEAR;

+-                } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar

++                } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar && !cal.getType().equals("japanese")

+                     && UCharacter.isDigit(text.charAt(start))

+                     && UCharacter.isDigit(text.charAt(start+1)))

diff --git a/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch b/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
new file mode 100644
index 000000000000..dd47da77ad68
--- /dev/null
+++ b/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
@@ -0,0 +1,95 @@
+Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java

+===================================================================

+--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java	(revision 34867)

++++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java	(revision 34868)

+@@ -2820,5 +2820,5 @@

+                 if ( override != null && (override.compareTo("hebr") == 0 || override.indexOf("y=hebr") >= 0) && value < 1000 ) {

+                     value += HEBREW_CAL_CUR_MILLENIUM_START_YEAR;

+-                } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar && !cal.getType().equals("japanese")

++                } else if (count == 2 && (pos.getIndex() - start) == 2 && cal.haveDefaultCentury()

+                     && UCharacter.isDigit(text.charAt(start))

+                     && UCharacter.isDigit(text.charAt(start+1)))

+Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java

+===================================================================

+--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java	(revision 34867)

++++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java	(revision 34868)

+@@ -1,5 +1,5 @@

+ /*

+  *******************************************************************************

+- * Copyright (C) 1996-2010,2012, International Business Machines Corporation and    *

++ * Copyright (C) 1996-2014, International Business Machines Corporation and    *

+  * others. All Rights Reserved.                                                *

+  *******************************************************************************

+@@ -639,4 +639,13 @@

+     /**

+      * {@inheritDoc}

++     * @internal

++     * @deprecated This API is ICU internal only.

++     */

++    public boolean haveDefaultCentury() {

++        return false;

++    }

++

++    /**

++     * {@inheritDoc}

+      * @stable ICU 4.0

+      */

+@@ -662,3 +671,4 @@

+         return super.getActualMaximum(field);

+     }

++

+ }

+Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java

+===================================================================

+--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java	(revision 34867)

++++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java	(revision 34868)

+@@ -1,4 +1,4 @@

+ /*

+-*   Copyright (C) 1996-2013, International Business Machines

++*   Copyright (C) 1996-2014, International Business Machines

+ *   Corporation and others.  All Rights Reserved.

+ */

+@@ -6081,4 +6081,19 @@

+     }

+ 

++    /**

++     * Returns if two digit representation of year in this calendar type

++     * customarily implies a default century (i.e. 03 -> 2003).

++     * The default implementation returns <code>true</code>. A subclass may

++     * return <code>false</code> if such practice is not applicable (for example,

++     * Chinese calendar and Japanese calendar).

++     * 

++     * @return <code>true<code> if this calendar has a default century.

++     * @internal

++     * @deprecated This API is ICU internal only.

++     */

++    public boolean haveDefaultCentury() {

++        return true;

++    }

++

+     // -------- BEGIN ULocale boilerplate --------

+ 

+Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java

+===================================================================

+--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java	(revision 34867)

++++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java	(revision 34868)

+@@ -1,4 +1,4 @@

+ /*********************************************************************

+- * Copyright (C) 2000-2012, International Business Machines

++ * Copyright (C) 2000-2014, International Business Machines

+  * Corporation and others. All Rights Reserved.

+  *********************************************************************

+@@ -1019,4 +1019,13 @@

+ 

+     /**

++     * {@inheritDoc}

++     * @internal

++     * @deprecated This API is ICU internal only.

++     */

++    public boolean haveDefaultCentury() {

++        return false;

++    }

++

++    /**

+      * Override readObject.

+      */

diff --git a/dev-java/icu4j/icu4j-3.8.1-r1.ebuild b/dev-java/icu4j/icu4j-3.8.1-r1.ebuild
new file mode 100644
index 000000000000..1b88fd13de2d
--- /dev/null
+++ b/dev-java/icu4j/icu4j-3.8.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# We currently download the Javadoc documentation.
+# It could optionally be built using the Ant build file.
+# testdata.jar and icudata.jar do not contain *.class files but *.res files
+# These *.res data files are needed to built the final jar
+# They do not need to be installed however as they will already be present in icu4j.jar
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="ICU4J is a set of Java libraries providing Unicode and Globalization support"
+MY_PV=${PV//./_}
+
+SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.jar
+	doc? ( http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-docs.jar )"
+
+HOMEPAGE="http://www.icu-project.org/"
+LICENSE="icu"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND=">=virtual/jre-1.4"
+
+# build.xml does file version detection that fails for 1.7
+# http://bugs.gentoo.org/show_bug.cgi?id=213555
+DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
+	app-arch/unzip"
+
+# test curently disabled
+#DEPEND="test? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
+#	!test? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
+
+IUSE="doc test"
+
+RESTRICT="test"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	jar -xf "${DISTDIR}/${PN}-${MY_PV}-src.jar" || die "Failed to unpack"
+
+	if use doc; then
+		mkdir docs; cd docs
+		jar -xf "${DISTDIR}/${PN}-${MY_PV}-docs.jar" || die "Failed to unpack docs"
+	fi
+}
+
+src_compile() {
+	# Classes extending CharsetICU not implementing Comparable
+	# Breaks with ecj on jdk 1.5+, javac doesn't mind - Sun's hack?
+	# Restricting to javac (didn't even care to try jikes) is better
+	# than forcing 1.4
+	java-pkg_force-compiler javac
+	eant jar || die "Compile failed"
+}
+
+src_install() {
+	java-osgi_newjar-fromfile --no-auto-version "${PN}.jar" "${FILESDIR}/icu4j-${PV}-manifest" \
+		"International Components for Unicode for Java (ICU4J)"
+	java-pkg_dojar "${PN}-charsets.jar"
+
+	use doc && dohtml -r readme.html docs/*
+	use source && java-pkg_dosrc src/*
+}
+
+# Following tests will fail in Sun JDK 6 (at least):
+# toUnicode: http://bugs.icu-project.org/trac/ticket/5663
+# TimeZoneTransitionAdd: http://bugs.icu-project.org/trac/ticket/5887
+# These are bugs in the tests themselves, not in the library
+
+src_test() {
+	# Tests currently fail, disabled for now. Need to investigate (tests work in icu4j-4.0)
+	#eant check
+	einfo "Tests currently disabled."
+}
diff --git a/dev-java/icu4j/icu4j-4.0.1.1.ebuild b/dev-java/icu4j/icu4j-4.0.1.1.ebuild
new file mode 100644
index 000000000000..afed24759486
--- /dev/null
+++ b/dev-java/icu4j/icu4j-4.0.1.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+# We currently download the Javadoc documentation.
+# It could optionally be built using the Ant build file.
+# testdata.jar and icudata.jar do not contain *.class files but *.res files
+# These *.res data files are needed to built the final jar
+# They do not need to be installed however as they will already be present in icu4j.jar
+
+JAVA_PKG_IUSE="doc test source"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
+MY_PV=${PV//./_}
+
+SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.jar
+	doc? ( http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-docs.jar )"
+
+HOMEPAGE="http://www.icu-project.org/"
+LICENSE="icu"
+SLOT="4"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+
+# build.xml does file version detection that fails for 1.7
+# http://bugs.gentoo.org/show_bug.cgi?id=213555
+DEPEND="test? ( =virtual/jdk-1.6* )
+	!test? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
+	app-arch/unzip"
+
+RESTRICT="ia64? ( test )
+	x86-fbsd? ( test )"
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	jar -xf "${DISTDIR}/${PN}-${MY_PV}-src.jar" || die "Failed to unpack"
+
+	if use doc; then
+		mkdir docs; cd docs
+		jar -xf "${DISTDIR}/${PN}-${MY_PV}-docs.jar" || die "Failed to unpack docs"
+	fi
+}
+
+src_compile() {
+	# Classes extending CharsetICU not implementing Comparable
+	# Breaks with ecj on jdk 1.5+, javac doesn't mind - Sun's hack?
+	# Restricting to javac (didn't even care to try jikes) is better
+	# than forcing 1.4
+	java-pkg_force-compiler javac
+	eant jar || die "Compile failed"
+}
+
+src_install() {
+	java-osgi_newjar-fromfile "${PN}.jar" "${FILESDIR}/icu4j-4.0-manifest" \
+		"International Components for Unicode for Java (ICU4J)"
+	java-pkg_dojar "${PN}-charsets.jar"
+
+	use doc && dohtml -r readme.html docs/*
+	use source && java-pkg_dosrc src/*
+}
+
+# Tests only work with JDK-1.6, severe out of memory problems appear with 1.5
+
+src_test() {
+	# bug #299082 - these tests fail with icedtea, assume too much about double<>string conversions
+	sed -i '/DiagBigDecimal/d' src/com/ibm/icu/dev/test/TestAll.java || die
+	eant check
+}
diff --git a/dev-java/icu4j/icu4j-4.2.1.1.ebuild b/dev-java/icu4j/icu4j-4.2.1.1.ebuild
new file mode 100644
index 000000000000..e352e3d129c4
--- /dev/null
+++ b/dev-java/icu4j/icu4j-4.2.1.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+# We currently download the Javadoc documentation.
+# It could optionally be built using the Ant build file.
+# testdata.jar and icudata.jar do not contain *.class files but *.res files
+# These *.res data files are needed to built the final jar
+# They do not need to be installed however as they will already be present in icu4j.jar
+
+JAVA_PKG_IUSE="doc test source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
+MY_PV=${PV//./_}
+
+SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.jar
+	doc? ( http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-docs.jar )"
+
+HOMEPAGE="http://www.icu-project.org/"
+LICENSE="icu"
+SLOT="4.2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+
+# Tests only work with JDK-1.6, severe out of memory problems appear with 1.5
+DEPEND="test? ( =virtual/jdk-1.6* )
+	!test? ( >=virtual/jdk-1.4 )
+	app-arch/unzip"
+
+RESTRICT="ia64? ( test )
+	x86-fbsd? ( test )"
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	jar -xf "${DISTDIR}/${PN}-${MY_PV}-src.jar" || die "Failed to unpack"
+
+	if use doc; then
+		mkdir docs; cd docs
+		jar -xf "${DISTDIR}/${PN}-${MY_PV}-docs.jar" || die "Failed to unpack docs"
+	fi
+}
+
+src_compile() {
+	# Classes extending CharsetICU not implementing Comparable
+	# Breaks with ecj on jdk 1.5+, javac doesn't mind - Sun's hack?
+	# Restricting to javac (didn't even care to try jikes) is better
+	# than forcing 1.4
+	java-pkg_force-compiler javac
+	eant jar || die "Compile failed"
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+	java-pkg_dojar "${PN}-charsets.jar"
+
+	use doc && dohtml -r readme.html docs/*
+	use source && java-pkg_dosrc src/*
+}
+
+src_test() {
+	# bug #299082 - these tests fail with icedtea, assume too much about double<>string conversions
+	sed -i '/DiagBigDecimal/d' src/com/ibm/icu/dev/test/TestAll.java || die
+	eant check
+}
diff --git a/dev-java/icu4j/icu4j-4.4.1.1.ebuild b/dev-java/icu4j/icu4j-4.4.1.1.ebuild
new file mode 100644
index 000000000000..3b59302f9831
--- /dev/null
+++ b/dev-java/icu4j/icu4j-4.4.1.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+# We currently download the Javadoc documentation.
+# It could optionally be built using the Ant build file.
+# testdata.jar and icudata.jar do not contain *.class files but *.res files
+# These *.res data files are needed to built the final jar
+# They do not need to be installed however as they will already be present in icu4j.jar
+
+JAVA_PKG_IUSE="doc test source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
+MY_PV=${PV//./_}
+
+SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.jar
+	doc? ( http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-docs.jar )"
+
+HOMEPAGE="http://www.icu-project.org/"
+LICENSE="icu"
+SLOT="4.4"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+# Tests only work with JDK-1.6, severe out of memory problems appear with 1.5
+DEPEND="test? ( =virtual/jdk-1.6* )
+	!test? ( >=virtual/jdk-1.5 )"
+RDEPEND=">=virtual/jre-1.5"
+
+RESTRICT="ia64? ( test )"
+
+JAVA_PKG_WANT_SOURCE="1.5"
+JAVA_PKG_WANT_TARGET="1.5"
+JAVA_PKG_BSFIX_NAME="build.xml common-targets.xml"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	jar -xf "${DISTDIR}/${PN}-${MY_PV}-src.jar" || die "Failed to unpack"
+
+	if use doc; then
+		mkdir docs; cd docs
+		jar -xf "${DISTDIR}/${PN}-${MY_PV}-docs.jar" || die "Failed to unpack docs"
+	fi
+}
+
+src_compile() {
+	# Classes extending CharsetICU not implementing Comparable
+	# Breaks with ecj on jdk 1.5+, javac doesn't mind - Sun's hack?
+	# Restricting to javac (didn't even care to try jikes) is better
+	# than forcing 1.4
+	java-pkg_force-compiler javac
+	eant jar || die "Compile failed"
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+	java-pkg_dojar "${PN}-charsets.jar"
+	java-pkg_dojar "${PN}-localespi.jar"
+
+	dohtml readme.html || die
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc main/classes/*/src/com
+}
+
+src_test() {
+	# bug #299082 - these tests fail with icedtea, assume too much about double<>string conversions
+	sed -i '/DiagBigDecimal/d' main/tests/core/src/com/ibm/icu/dev/test/TestAllCore.java || die
+	eant check
+}
diff --git a/dev-java/icu4j/icu4j-4.4.2.ebuild b/dev-java/icu4j/icu4j-4.4.2.ebuild
new file mode 100644
index 000000000000..0b826a0a37c2
--- /dev/null
+++ b/dev-java/icu4j/icu4j-4.4.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# We currently download the Javadoc documentation.
+# It could optionally be built using the Ant build file.
+# testdata.jar and icudata.jar do not contain *.class files but *.res files
+# These *.res data files are needed to built the final jar
+# They do not need to be installed however as they will already be present in icu4j.jar
+
+JAVA_PKG_IUSE="doc test source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
+MY_PV=${PV//./_}
+
+SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-src.jar
+	doc? ( http://download.icu-project.org/files/${PN}/${PV}/${PN}-${MY_PV}-docs.jar )"
+
+HOMEPAGE="http://www.icu-project.org/"
+LICENSE="icu"
+SLOT="4.4"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+# Tests only work with JDK-1.6, severe out of memory problems appear with 1.5
+DEPEND="test? ( =virtual/jdk-1.6* )
+	!test? ( >=virtual/jdk-1.5 )"
+RDEPEND=">=virtual/jre-1.5"
+
+RESTRICT="ia64? ( test )"
+
+JAVA_PKG_WANT_SOURCE="1.5"
+JAVA_PKG_WANT_TARGET="1.5"
+JAVA_PKG_BSFIX_NAME="build.xml common-targets.xml"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	jar -xf "${DISTDIR}/${PN}-${MY_PV}-src.jar" || die "Failed to unpack"
+
+	if use doc; then
+		mkdir docs; cd docs
+		jar -xf "${DISTDIR}/${PN}-${MY_PV}-docs.jar" || die "Failed to unpack docs"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/icu4j-4.4.2-add-jdk8-to-check.patch
+}
+
+src_compile() {
+	# Classes extending CharsetICU not implementing Comparable
+	# Breaks with ecj on jdk 1.5+, javac doesn't mind - Sun's hack?
+	# Restricting to javac (didn't even care to try jikes) is better
+	# than forcing 1.4
+	java-pkg_force-compiler javac
+	eant jar || die "Compile failed"
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+	java-pkg_dojar "${PN}-charsets.jar"
+	java-pkg_dojar "${PN}-localespi.jar"
+
+	dohtml readme.html || die
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc main/classes/*/src/com
+}
+
+src_test() {
+	# bug #299082 - these tests fail with icedtea, assume too much about double<>string conversions
+	sed -i '/DiagBigDecimal/d' main/tests/core/src/com/ibm/icu/dev/test/TestAllCore.java || die
+	eant check
+}
diff --git a/dev-java/icu4j/icu4j-49.1.ebuild b/dev-java/icu4j/icu4j-49.1.ebuild
new file mode 100644
index 000000000000..016b278b5863
--- /dev/null
+++ b/dev-java/icu4j/icu4j-49.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+# 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="49"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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-52.1.ebuild b/dev-java/icu4j/icu4j-52.1.ebuild
new file mode 100644
index 000000000000..d8cc7d3a4ccf
--- /dev/null
+++ b/dev-java/icu4j/icu4j-52.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~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_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-test-DataDrivenFormat-ConsistentPivot-1.patch
+	epatch "${FILESDIR}"/${P}-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
+}
+
+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-53.1.ebuild b/dev-java/icu4j/icu4j-53.1.ebuild
new file mode 100644
index 000000000000..5e5a545b5455
--- /dev/null
+++ b/dev-java/icu4j/icu4j-53.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~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-54.1.1.ebuild b/dev-java/icu4j/icu4j-54.1.1.ebuild
new file mode 100644
index 000000000000..9def3df16b04
--- /dev/null
+++ b/dev-java/icu4j/icu4j-54.1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..c1788ad21683
--- /dev/null
+++ b/dev-java/icu4j/icu4j-55.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~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/metadata.xml b/dev-java/icu4j/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/icu4j/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/idm-console-framework/Manifest b/dev-java/idm-console-framework/Manifest
new file mode 100644
index 000000000000..2b585074ec4d
--- /dev/null
+++ b/dev-java/idm-console-framework/Manifest
@@ -0,0 +1 @@
+DIST idm-console-framework-1.1.7.tar.bz2 708770 SHA256 0d3eb64b2a7ce349add244b1544fb18a3dbf04c40b09ef91ad1ad04b44286d5c SHA512 ce4441cbc9917f6ffd0ef6ced44c7ebc542c14db60e7c6eeb844f8c68cbb15fe533916b9ea363d1e865759138d92d38365e9172206c7cd0fa385f4bf443aa739 WHIRLPOOL 1fc8f1dd66e61ed3149e0cf36a76b22794e2836cf3ac95c7172a85bc4b69476d0785f2cd2da05add7e9e3db52acef89a86273715339798f9cf71d8d9f8be558a
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..f15a695ad1e3
--- /dev/null
+++ b/dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a60d90d8a13e
--- /dev/null
+++ b/dev-java/idm-console-framework/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>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+	<longdescription>A Java Management Console framework used for remote server
+	management.</longdescription> 
+</pkgmetadata>
diff --git a/dev-java/invokebinder/Manifest b/dev-java/invokebinder/Manifest
new file mode 100644
index 000000000000..a1dfa6bc1e94
--- /dev/null
+++ b/dev-java/invokebinder/Manifest
@@ -0,0 +1 @@
+DIST invokebinder-1.2.tar.gz 28581 SHA256 378ab47e625729974b25c81a60abd425abf155a27f60c7c2728ad3a78fd9a1d4 SHA512 aaf56fa008307d56805c6de7d47285d358f4c5018f1704a8f3b44c5bda5045dc20f588e70ce6fbb3486a48f80d30a7669d568e373717401780b13dd4737a8b16 WHIRLPOOL 1c46acfcb2d6c2c53bb24e94aca5afdc578fb6a72c7b3f83e80c22e69cb98e44257c10ba92bfa86c4ec766fea6216cb0604d9be5b2bb755efcae0fa5b0bc8859
diff --git a/dev-java/invokebinder/files/invokebinder-1.2-build.xml b/dev-java/invokebinder/files/invokebinder-1.2-build.xml
new file mode 100644
index 000000000000..fdf898483bb9
--- /dev/null
+++ b/dev-java/invokebinder/files/invokebinder-1.2-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/4/13 6:11 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.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.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" 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.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"/>
+  </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.9"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.9/junit-4.9.jar" 
+         dest="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.9/junit-4.9.jar" 
+         dest="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
+    <get src="https://oss.sonatype.org/content/repositories/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/invokebinder/invokebinder-1.2.ebuild b/dev-java/invokebinder/invokebinder-1.2.ebuild
new file mode 100644
index 000000000000..54e6005669c8
--- /dev/null
+++ b/dev-java/invokebinder/invokebinder-1.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Provide a friendly DSL for binding method handles"
+SRC_URI="http://github.com/headius/invokebinder/archive/invokebinder-1.2.tar.gz"
+HOMEPAGE="https://github.com/headius/invokebinder"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+
+S="${WORKDIR}/${PN}-${P}"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+# Tests fail, three similar errors where a string is inconvertible to int.
+# Bug #472306.
+RESTRICT="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..c7bd4c31246b
--- /dev/null
+++ b/dev-java/invokebinder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..ad88be176d84
--- /dev/null
+++ b/dev-java/iso-relax/Manifest
@@ -0,0 +1 @@
+DIST iso-relax-20050331-gentoo.tar.bz2 696665 SHA256 3e3716ccc553c1a756503a56bcf92a64f6e0df3df89e6fa951a990d2c4601d70 SHA512 c327b461785ce647f9913afa6f5b77c41440e806d566884058be76e14a118d14fa305a1bc0157ee150b199b573e75af954311dc79eb8535599544f094526320a WHIRLPOOL e158e5a28d0f734b4a59923615449663b0dfc5b6b2a3ecbbff3ed37ac051fa1e6434d131195bcb6a87b5bdc36435f941bde29922be2ec92bea5c5404c8000e5e
diff --git a/dev-java/iso-relax/files/build.xml b/dev-java/iso-relax/files/build.xml
new file mode 100644
index 000000000000..841cc61688da
--- /dev/null
+++ b/dev-java/iso-relax/files/build.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<project name="ISORELAX" basedir="." default="release">
+
+	<!-- create a distribution package -->
+	<target name="release">
+		<tstamp />
+
+		<!-- compile files -->
+		<mkdir	dir="temp" />
+		<javac	srcdir="src" debug="true"
+				destdir="temp"
+				classpath="lib/verifier.jar">
+			<include name="**/*.java" />
+		</javac>
+
+		<!-- create a time stamp file -->
+		<echo file="temp/version.properties">version=${DSTAMP}</echo>
+
+		<!-- creates src zip -->
+		<delete file="src.zip"/>
+		<zip	zipfile="src.zip"
+				compress="true">
+			<fileset dir="src">
+				<patternset>
+					<exclude name="*.vjp"/>
+					<exclude name="codebase.dat"/>
+					<exclude name="*.SRG"/>
+				</patternset>
+			</fileset>
+		</zip>
+
+		<!-- creates binary jar -->
+		<delete file="isorelax.jar"/>
+		<jar	jarfile="isorelax.jar"
+				compress="true">
+			<fileset dir="temp" />
+			<fileset dir="" includes="COPYING.txt"/>
+			<!-- resource files -->
+			<fileset dir="src">
+				<patternset>
+					<include name="**/*.properties" />
+					<include name="**/*.rxm"/>
+					<include name="**/*.dtd"/>
+					<include name="**/*.rng"/>
+					<include name="**/*.mod"/>
+				</patternset>
+			</fileset>
+		</jar>
+		<delete dir="temp" />
+
+		<zip zipfile="isorelax.${DSTAMP}.zip" compress="true">
+			<fileset dir="." includes="isorelax.jar src.zip COPYING.txt"/>
+		</zip>
+	</target>
+
+
+	<!-- ant task test -->
+	<target name="ant-task-test">
+		<taskdef name="jarv" classname="org.iso_relax.ant.JARVTask">
+			<classpath path="isorelax.jar"/>
+			<classpath path="lib/verifier.jar"/>
+			<classpath path="lib/verifier.manifest.jar"/>
+		</taskdef>
+
+		<jarv
+			schemaLanguage="http://www.xml.gr.jp/xmlns/relaxCore"
+			schema="test/relax001.rlx"
+			file="test/relax001.v00.xml" />
+
+		<jarv
+			schemaLanguage="http://www.xml.gr.jp/xmlns/relaxCore"
+			schema="test/relax001.rlx">
+
+			<fileset dir="test" includes="*.xml"/>
+		</jarv>
+	</target>
+</project>
diff --git a/dev-java/iso-relax/iso-relax-20050331-r1.ebuild b/dev-java/iso-relax/iso-relax-20050331-r1.ebuild
new file mode 100644
index 000000000000..88b55165f944
--- /dev/null
+++ b/dev-java/iso-relax/iso-relax-20050331-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Interfaces useful for applications which support RELAX Core"
+HOMEPAGE="http://iso-relax.sourceforge.net"
+SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
+
+# To get the build system:
+# cvs -d:pserver:anonymous@iso-relax.cvs.sourceforge.net:/cvsroot/iso-relax login
+# mkdir iso-relax-20050331
+# cd iso-relax-20050331
+# cvs -d:pserver:anonymous@iso-relax.cvs.sourceforge.net:/cvsroot/iso-relax -frelease-20050331 co build.xml lib
+# rm -r $(find -name CVS)
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.4"
+
+EANT_BUILD_TARGET="release"
+
+src_install() {
+
+	java-pkg_dojar isorelax.jar
+	use source && java-pkg_dosrc src/*
+
+}
diff --git a/dev-java/iso-relax/iso-relax-20050331-r2.ebuild b/dev-java/iso-relax/iso-relax-20050331-r2.ebuild
new file mode 100644
index 000000000000..c5139979615e
--- /dev/null
+++ b/dev-java/iso-relax/iso-relax-20050331-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Interfaces useful for applications which support RELAX Core"
+HOMEPAGE="http://iso-relax.sourceforge.net"
+SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
+
+# To get the build system:
+# cvs -d:pserver:anonymous@iso-relax.cvs.sourceforge.net:/cvsroot/iso-relax login
+# mkdir iso-relax-20050331
+# cd iso-relax-20050331
+# cvs -d:pserver:anonymous@iso-relax.cvs.sourceforge.net:/cvsroot/iso-relax -frelease-20050331 co build.xml lib
+# rm -r $(find -name CVS)
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/ant-core:0"
+
+EANT_BUILD_TARGET="release"
+
+src_prepare() {
+	java-pkg_jarfrom --into lib ant-core ant.jar
+}
+
+src_install() {
+
+	java-pkg_dojar isorelax.jar
+	use source && java-pkg_dosrc src/*
+
+}
diff --git a/dev-java/iso-relax/metadata.xml b/dev-java/iso-relax/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/iso-relax/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/istack-commons-buildtools/Manifest b/dev-java/istack-commons-buildtools/Manifest
new file mode 100644
index 000000000000..f50011487fde
--- /dev/null
+++ b/dev-java/istack-commons-buildtools/Manifest
@@ -0,0 +1,2 @@
+DIST istack-commons-20090620-src.tar.bz2 30194 SHA256 0719fbc462f98bfb66e9606fad11845797a2ba7dd54ad780e07e16c63f3ea899 SHA512 8a037852a19dd8ecf66fd6b6ca1454503e9f3d36ee716d774a1eb70245a60cf21c7e14ae97d811953d68475c4ea9bef7b9470d0ab82363481dc0f71c2865d2d4 WHIRLPOOL 68f8427892ff95390bf418c874dccd84aefe5c04f26e40b42f1f3e6fbe85a81f695365c1ff3b34eab0a4ebf42476301434555ed43d556f39f597bcd4c6861630
+DIST istack-commons-buildtools-2.22-sources.jar 12689 SHA256 bec644682b4188813c91cc08a1b55761dfec22d6a11be531aeb9acafd896531e SHA512 6cafd354c51fe1b42bb8a6cf52ddf9f6dd97cfdd16182ed5d1a2db6440d18ab84af4d9136df09aa4703694bad546967d25e828c0e1b21fb802c66630da3f4fe4 WHIRLPOOL 6e74271502e59bf1bd64dc6b0af9ee583f79698e5b59f367f9c58af3d3e7560ab4a34b891957bc631b39fbb8d150965ff2c97697ca28b84f5399e97aec873712
diff --git a/dev-java/istack-commons-buildtools/files/istack-commons-20090620-less-maven.patch b/dev-java/istack-commons-buildtools/files/istack-commons-20090620-less-maven.patch
new file mode 100644
index 000000000000..5213c41d21c0
--- /dev/null
+++ b/dev-java/istack-commons-buildtools/files/istack-commons-20090620-less-maven.patch
@@ -0,0 +1,25 @@
+The shipped build.xml is completely bogus in trying to bring in maven.
+We just bring in ant-core, codemodel and istack-commons-runtime-1.1 ourselves,
+and it compiles perfectly.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar istack-commons-20090620.orig/buildtools/build.xml istack-commons-20090620/buildtools/build.xml
+--- istack-commons-20090620.orig/buildtools/build.xml	2009-03-30 19:28:53.000000000 -0700
++++ istack-commons-20090620/buildtools/build.xml	2009-06-20 22:15:09.194598087 -0700
+@@ -1,6 +1,8 @@
+ <?xml version="1.0"?>
+ <project name="istack-commons-buildtools" basedir="." default="dist" xmlns:artifact="urn:maven-artifact-ant">
++	<property name="name" value="istack-commons-buildtools" />
+     <import file="../build-common.xml"/>
++	<!--
+     <property name="maven.ant.file" value="maven-ant-tasks-2.0.9.jar"/>
+     <property name="src" value="src"/>
+     <property name="lib.dir" value="lib"/>
+@@ -79,5 +81,6 @@
+             <fileset dir="${src}"/>
+         </jar>
+     </target>
++	-->
+ 
+ </project>
diff --git a/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22.ebuild b/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22.ebuild
new file mode 100644
index 000000000000..755afec04df9
--- /dev/null
+++ b/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+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=""
+
+CDEPEND="dev-java/ant-core:0
+	dev-java/codemodel:2"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,codemodel-2"
diff --git a/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild b/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild
new file mode 100644
index 000000000000..fe8e61eee6a4
--- /dev/null
+++ b/dev-java/istack-commons-buildtools/istack-commons-buildtools-20090620.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="istack-commons - buildtools"
+HOMEPAGE="https://istack-commons.dev.java.net/"
+PROJ_PN="istack-commons"
+PROJ_P="${PROJ_PN}-${PV}"
+SUB_PN="buildtools"
+SRC_FILE="${PROJ_P}-src.tar.bz2"
+SRC_URI="mirror://gentoo/${SRC_FILE}"
+
+LICENSE="CDDL"
+SLOT="1.1"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${PROJ_P}"
+
+# Helper to generate the tarball :-)
+# ( PN=istack-commons-runtime ; PV=20090620 ; P="${PN}-${PV}" ; . ${P}.ebuild  ; src_tarball )
+src_tarball() {
+	CVSROOT=':pserver:guest@cvs.dev.java.net:/cvs'
+	PROJ_PN='istack-commons'
+	cvs -d "${CVSROOT}" \
+		export -D $PV -d "${PROJ_P}" \
+		"${PROJ_PN}/${PROJ_PN}" && \
+	tar cvjf "${SRC_FILE}" \
+		--exclude '*.zip' \
+		--exclude '*.jar' \
+		"${PROJ_P}" \
+		&& \
+	echo "New tarball located at ${SRC_FILE}"
+}
+
+java_prepare() {
+	epatch "${FILESDIR}/${PROJ_PN}-20090620-less-maven.patch"
+	java-ant_bsfix_one "${S}/build-common.xml"
+	libdir="${S}/${SUB_PN}/lib"
+	mkdir -p "${libdir}" || die
+	java-pkg_jar-from --into "${libdir}" ant-core
+	java-pkg_jar-from --into "${libdir}" codemodel-2
+	java-pkg_jar-from --into "${libdir}" istack-commons-runtime-1.1
+}
+
+EANT_BUILD_XML="${SUB_PN}/build.xml"
+
+src_install() {
+	java-pkg_dojar ${SUB_PN}/build/${PN}.jar
+	use source && java-pkg_dosrc ${SUB_PN}/src/*
+}
diff --git a/dev-java/istack-commons-buildtools/metadata.xml b/dev-java/istack-commons-buildtools/metadata.xml
new file mode 100644
index 000000000000..669672a6dee3
--- /dev/null
+++ b/dev-java/istack-commons-buildtools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/istack-commons-runtime/Manifest b/dev-java/istack-commons-runtime/Manifest
new file mode 100644
index 000000000000..81bcde5dc79e
--- /dev/null
+++ b/dev-java/istack-commons-runtime/Manifest
@@ -0,0 +1,3 @@
+DIST istack-commons-20070122.tar.bz2 10360 SHA256 dc8c86bb11f7ddd4c1c50ca0925d59ade16b5dc74bcd983fe95a08e104662a8e SHA512 120b9b8db52cebe507e8711dd4fcdc1a12db8d2320ff9054e1fa6688a321cbb18d25f6beb06e11a091c1cbc2870ab07e9df9681784893c5f0d6f36ae4b7e12f6 WHIRLPOOL b4d47b9d73ecd26c2effd287642521d8ecd6741c6df140bd024aa54770ddf1084d504ade53505e27dda66e3204e2625dcb63c40df1d098e4baed76f5371a55ee
+DIST istack-commons-20090620-src.tar.bz2 30194 SHA256 0719fbc462f98bfb66e9606fad11845797a2ba7dd54ad780e07e16c63f3ea899 SHA512 8a037852a19dd8ecf66fd6b6ca1454503e9f3d36ee716d774a1eb70245a60cf21c7e14ae97d811953d68475c4ea9bef7b9470d0ab82363481dc0f71c2865d2d4 WHIRLPOOL 68f8427892ff95390bf418c874dccd84aefe5c04f26e40b42f1f3e6fbe85a81f695365c1ff3b34eab0a4ebf42476301434555ed43d556f39f597bcd4c6861630
+DIST istack-commons-runtime-2.22-sources.jar 33136 SHA256 06520c4566d7ab28358ce06f03caaf7f44ebccca8b79fdb5d4ddc4df221911bb SHA512 cfabed991cadfa3562a2a281f4b3bdabadd753cd3b9ee918b3f89428e416c0d23aed928d5f61bde4f3958d12f4cb63130354cbf6bf14577ed54871a46d703bdd WHIRLPOOL d35c96f6d7658dceaa7dacf6a23f6993c7f5a0755557f24ad4f23db3a750c635dfa8769b145e100c378050136df27b46fd0ee389a458cd694cab712a019db075
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..fef9358ad89d
--- /dev/null
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-20070122-r1.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-20070122-r1.ebuild
new file mode 100644
index 000000000000..e0d761ea46d1
--- /dev/null
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-20070122-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="istack-commons"
+HOMEPAGE="https://istack-commons.dev.java.net/"
+SRC_URI="mirror://gentoo/istack-commons-${PV}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="java-virtuals/jaf"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/istack-commons-${PV}"
+
+src_unpack() {
+	unpack ${A}
+
+	java-ant_bsfix_one "${S}/build-common.xml"
+
+	java-pkg_jarfrom --into "${S}/runtime/lib" --virtual jaf
+}
+
+EANT_BUILD_XML="runtime/build.xml"
+
+src_install() {
+
+	java-pkg_dojar runtime/build/istack-commons-runtime.jar
+
+	use source && java-pkg_dosrc runtime/src/*
+}
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-20090620-r1.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-20090620-r1.ebuild
new file mode 100644
index 000000000000..46da96eee982
--- /dev/null
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-20090620-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="istack-commons"
+HOMEPAGE="https://istack-commons.dev.java.net/"
+PROJ_PN="istack-commons"
+PROJ_P="${PROJ_PN}-${PV}"
+SRC_FILE="${PROJ_P}-src.tar.bz2"
+SRC_URI="mirror://gentoo/${SRC_FILE}"
+
+LICENSE="CDDL"
+SLOT="1.1"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="
+	java-virtuals/jaf
+	java-virtuals/stax-api"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PROJ_P}"
+
+# Helper to generate the tarball :-)
+# ( PN=istack-commons-runtime ; PV=20090620 ; P="${PN}-${PV}" ; . ${P}.ebuild  ; src_tarball )
+src_tarball() {
+	CVSROOT=':pserver:guest@cvs.dev.java.net:/cvs'
+	PROJ_PN='istack-commons'
+	cvs -d "${CVSROOT}" \
+		export -D $PV -d "${PROJ_P}" \
+		"${PROJ_PN}/${PROJ_PN}" && \
+	tar cvjf "${SRC_FILE}" \
+		--exclude '*.zip' \
+		--exclude '*.jar' \
+		"${PROJ_P}" \
+		&& \
+	echo "New tarball located at ${SRC_FILE}"
+}
+
+java_prepare() {
+	java-ant_bsfix_one "${S}/build-common.xml"
+	java-pkg_jarfrom --into "${S}/runtime/lib" --virtual jaf
+	java-pkg_jarfrom --into "${S}/runtime/lib" --virtual stax-api
+}
+
+EANT_BUILD_XML="runtime/build.xml"
+
+src_install() {
+	java-pkg_dojar runtime/build/istack-commons-runtime.jar
+	use source && java-pkg_dosrc runtime/src/*
+}
diff --git a/dev-java/istack-commons-runtime/metadata.xml b/dev-java/istack-commons-runtime/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/istack-commons-runtime/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/istack-commons-soimp/Manifest b/dev-java/istack-commons-soimp/Manifest
new file mode 100644
index 000000000000..442a9dd9f2ec
--- /dev/null
+++ b/dev-java/istack-commons-soimp/Manifest
@@ -0,0 +1 @@
+DIST istack-commons-soimp-2.22-sources.jar 10208 SHA256 68a2f56b5c269be20ddc6618559fa7be2d9818f6bc7bbd3fa11eb64358509c3a SHA512 28b85550dd92b9fac106ecc2173e728adc7180350f1e47cb619e4d1d6f517cf0878cca87dc7242d80fc0dac5e3d683a2a599bbfb4aa147d33a2089e6f0b28a21 WHIRLPOOL 1abe78f63e11e89b91bc969a1684e869d137d8197e8a598ed14dc8095fef6a91fbfbefa7be572bc74ac817dfe11d11496f772da993466b5ed61c6527493c6699
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..5e2078f81cae
--- /dev/null
+++ b/dev-java/istack-commons-soimp/istack-commons-soimp-2.22.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a620379538aa
--- /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>
+	<herd>java</herd>
+<maintainer>
+	<email>monsieurp@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/istack-commons-tools/Manifest b/dev-java/istack-commons-tools/Manifest
new file mode 100644
index 000000000000..35a4f6433deb
--- /dev/null
+++ b/dev-java/istack-commons-tools/Manifest
@@ -0,0 +1,3 @@
+DIST istack-commons-20070122.tar.bz2 10360 SHA256 dc8c86bb11f7ddd4c1c50ca0925d59ade16b5dc74bcd983fe95a08e104662a8e SHA512 120b9b8db52cebe507e8711dd4fcdc1a12db8d2320ff9054e1fa6688a321cbb18d25f6beb06e11a091c1cbc2870ab07e9df9681784893c5f0d6f36ae4b7e12f6 WHIRLPOOL b4d47b9d73ecd26c2effd287642521d8ecd6741c6df140bd024aa54770ddf1084d504ade53505e27dda66e3204e2625dcb63c40df1d098e4baed76f5371a55ee
+DIST istack-commons-20090620-src.tar.bz2 30194 SHA256 0719fbc462f98bfb66e9606fad11845797a2ba7dd54ad780e07e16c63f3ea899 SHA512 8a037852a19dd8ecf66fd6b6ca1454503e9f3d36ee716d774a1eb70245a60cf21c7e14ae97d811953d68475c4ea9bef7b9470d0ab82363481dc0f71c2865d2d4 WHIRLPOOL 68f8427892ff95390bf418c874dccd84aefe5c04f26e40b42f1f3e6fbe85a81f695365c1ff3b34eab0a4ebf42476301434555ed43d556f39f597bcd4c6861630
+DIST istack-commons-tools-2.22-sources.jar 15106 SHA256 8287f624b188dd70551907728deb9fd73c9e4bf4362458e6c2e84b6ff626a1c3 SHA512 daded38bcc64a8639813e607126867a515cf26c57b709062e32dc1c507e02f1592e496d028dbb36fb40e1aa04a82fb8c1a94d66818fed6680a32790a4a9b802f WHIRLPOOL 881e528c81f636a40de81491a5b5f106af42b7b8dfb709339f23c2626e54a522c0394dc3bca7477e2e437e62592ce9f0f7c70dae1de6d8b7ebec3aa73ae17621
diff --git a/dev-java/istack-commons-tools/istack-commons-tools-2.22.ebuild b/dev-java/istack-commons-tools/istack-commons-tools-2.22.ebuild
new file mode 100644
index 000000000000..e64fb18e4b0f
--- /dev/null
+++ b/dev-java/istack-commons-tools/istack-commons-tools-2.22.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN=${PN%%-*}
+
+DESCRIPTION="IStack Commons - Tools 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 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
diff --git a/dev-java/istack-commons-tools/istack-commons-tools-20070122-r1.ebuild b/dev-java/istack-commons-tools/istack-commons-tools-20070122-r1.ebuild
new file mode 100644
index 000000000000..ed508501f40d
--- /dev/null
+++ b/dev-java/istack-commons-tools/istack-commons-tools-20070122-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="istack-commons - tools"
+HOMEPAGE="https://istack-commons.dev.java.net/"
+SRC_URI="mirror://gentoo/istack-commons-${PV}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/istack-commons-${PV}"
+
+src_unpack() {
+	unpack ${A}
+
+	java-ant_bsfix_one "${S}/build-common.xml"
+
+	cd "${S}/tools"
+	mkdir -p lib || die
+
+	ln -s $(java-config --tools) lib || die
+}
+
+EANT_BUILD_XML="tools/build.xml"
+
+src_install() {
+
+	java-pkg_dojar tools/build/istack-commons-tools.jar
+
+	use source && java-pkg_dosrc tools/src/*
+
+}
diff --git a/dev-java/istack-commons-tools/istack-commons-tools-20090620.ebuild b/dev-java/istack-commons-tools/istack-commons-tools-20090620.ebuild
new file mode 100644
index 000000000000..5c41ff09d93e
--- /dev/null
+++ b/dev-java/istack-commons-tools/istack-commons-tools-20090620.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="istack-commons - tools"
+HOMEPAGE="https://istack-commons.dev.java.net/"
+PROJ_PN="istack-commons"
+PROJ_P="${PROJ_PN}-${PV}"
+SRC_FILE="${PROJ_P}-src.tar.bz2"
+SRC_URI="mirror://gentoo/${SRC_FILE}"
+
+LICENSE="CDDL"
+SLOT="1.1"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${PROJ_P}"
+
+# Helper to generate the tarball :-)
+# ( PN=istack-commons-runtime ; PV=20090620 ; P="${PN}-${PV}" ; . ${P}.ebuild  ; src_tarball )
+src_tarball() {
+	CVSROOT=':pserver:guest@cvs.dev.java.net:/cvs'
+	PROJ_PN='istack-commons'
+	cvs -d "${CVSROOT}" \
+		export -D $PV -d "${PROJ_P}" \
+		"${PROJ_PN}/${PROJ_PN}" && \
+	tar cvjf "${SRC_FILE}" \
+		--exclude '*.zip' \
+		--exclude '*.jar' \
+		"${PROJ_P}" \
+		&& \
+	echo "New tarball located at ${SRC_FILE}"
+}
+
+java_prepare() {
+	java-ant_bsfix_one "${S}/build-common.xml"
+	cd "${S}/tools"
+	mkdir -p lib || die
+	ln -s $(java-config --tools) lib || die
+	java-pkg_jar-from --build-only --into "${S}"/tools/lib ant-core ant.jar
+}
+
+EANT_BUILD_XML="tools/build.xml"
+
+src_install() {
+
+	java-pkg_dojar tools/build/istack-commons-tools.jar
+
+	use source && java-pkg_dosrc tools/src/*
+
+}
diff --git a/dev-java/istack-commons-tools/metadata.xml b/dev-java/istack-commons-tools/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/istack-commons-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/itext/Manifest b/dev-java/itext/Manifest
new file mode 100644
index 000000000000..d745f5cc2739
--- /dev/null
+++ b/dev-java/itext/Manifest
@@ -0,0 +1,4 @@
+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
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..86bafa80f428
--- /dev/null
+++ b/dev-java/itext/itext-2.1.5-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="A Java library that 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 ppc 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.ebuild b/dev-java/itext/itext-5.5.4.ebuild
new file mode 100644
index 000000000000..0ecabcdebfbe
--- /dev/null
+++ b/dev-java/itext/itext-5.5.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library that 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"
+
+COMMON_DEP="
+	dev-java/bcmail:0
+	>=dev-java/bcprov-1.49:0
+	dev-java/bcpkix:0
+	dev-java/xml-security:0
+"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="bcmail,bcprov,bcpkix,xml-security"
+
+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
+}
diff --git a/dev-java/itext/metadata.xml b/dev-java/itext/metadata.xml
new file mode 100644
index 000000000000..73d4832148ee
--- /dev/null
+++ b/dev-java/itext/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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/j2ssh/Manifest b/dev-java/j2ssh/Manifest
new file mode 100644
index 000000000000..2ab060cd3991
--- /dev/null
+++ b/dev-java/j2ssh/Manifest
@@ -0,0 +1 @@
+DIST j2ssh-0.2.9-src.tar.gz 2182523 SHA256 9fc60e295eb7124ff2cb77a76ae6936b6583ad7dac742765cdb3f34ece70d0c9 SHA512 d7720766dcf50205089fa22d026721dc25de5def1d451fcb6680832017becc3fc8d76c2ffb5ed2e2190e08c864da24d2544515478956f78ac4d8cf4126cab6e8 WHIRLPOOL 3e039e95255f91e47c8a52ee1b4f83b8f667e1232d4649c5aeb29c9076fe92d66110bd6ec11187ed4bcf2f3987e83041d38cc1e4774bcb6b3e26adfc6feb4cec
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..ec0f1c643a47
--- /dev/null
+++ b/dev-java/j2ssh/j2ssh-0.2.9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc examples"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java implementation of the SSH protocol"
+HOMEPAGE="http://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..3917c9cd3fa5
--- /dev/null
+++ b/dev-java/j2ssh/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
new file mode 100644
index 000000000000..573baf574696
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -0,0 +1 @@
+DIST jackrabbit-2.10.1-src.zip 13437021 SHA256 e83c6046134de10724fa54a500ae4f85c1caf664d29d915688ca9f1efe21f940 SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9 WHIRLPOOL eea73d558c3e814d09f4b873c3eadad68d7265beadb52d723a248a24700f7ef2753caf0a9e0670134ee8dfba775e0faf8f6d45f21a400c0ecf0c9b9309ae0f4f
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..a511edf66938
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7303cef96964
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
new file mode 100644
index 000000000000..8ffb371d8f8b
--- /dev/null
+++ b/dev-java/jackson-annotations/Manifest
@@ -0,0 +1 @@
+DIST jackson-annotations-2.5.1.tar.gz 30360 SHA256 420d3ec38878c63d674500878539d1f32917e3aac1b9d53461020c01629d9f18 SHA512 3ff90be8927db847379371c5997a7f37bd55b368cd884b50913f454c704e10ac7819072409533cc6b8441dcb239c3694332ae8e800590d2b9c6701cccdc65364 WHIRLPOOL 04a484acf05db44e599da61388b288e5a9f9fff7289740d8620d8b4b1b6201fa4bc3722c5266904b28ab97caca84e7a4bcb67864c1b52b91ba96bc0c92ad3ef5
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.5.1.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.5.1.ebuild
new file mode 100644
index 000000000000..28f74af2d721
--- /dev/null
+++ b/dev-java/jackson-annotations/jackson-annotations-2.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High-performance JSON 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=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+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/jackson-annotations/metadata.xml b/dev-java/jackson-annotations/metadata.xml
new file mode 100644
index 000000000000..9dda24479931
--- /dev/null
+++ b/dev-java/jackson-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>
+  <herd>java</herd>
+  <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..a49e1ebc0428
--- /dev/null
+++ b/dev-java/jackson-databind/Manifest
@@ -0,0 +1 @@
+DIST jackson-databind-2.5.1.tar.gz 914121 SHA256 7673a6650d4cd353d3dadfea0afaae30e33a9416550c21772a16ecf36fca1fee SHA512 72792495612143a4601999036a40b67658df5af43c8dde1408c48d4b19581b770442f36bf448a22e19fbc31dbaec2e4cae61b5c7ee7c6c939478083ce1e24131 WHIRLPOOL 92a0fd63e1cdc03da89c024c60c1f6cd2134800d749945daecf2568f1b40db94c83641d6d6219f2d4d70425a8d07d191be39e18b07af9fe0176e1bcc595fde06
diff --git a/dev-java/jackson-databind/files/real-cglib.patch b/dev-java/jackson-databind/files/real-cglib.patch
new file mode 100644
index 000000000000..15b7a65ceff7
--- /dev/null
+++ b/dev-java/jackson-databind/files/real-cglib.patch
@@ -0,0 +1,29 @@
+From 2dbcc7408ff1104b84a982a5cde77ef11bc0dd93 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Wed, 4 Mar 2015 23:07:36 +0000
+Subject: [PATCH] Use the real cglib, not the repackaged version
+
+---
+ .../java/com/fasterxml/jackson/databind/interop/TestHibernate.java  | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java b/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
+index 48dc573..b7d89b6 100644
+--- a/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
++++ b/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
+@@ -3,9 +3,9 @@ package com.fasterxml.jackson.databind.interop;
+ import java.lang.reflect.Method;
+ import java.util.*;
+ 
+-import org.hibernate.repackage.cglib.proxy.Enhancer;
+-import org.hibernate.repackage.cglib.proxy.MethodInterceptor;
+-import org.hibernate.repackage.cglib.proxy.MethodProxy;
++import net.sf.cglib.proxy.Enhancer;
++import net.sf.cglib.proxy.MethodInterceptor;
++import net.sf.cglib.proxy.MethodProxy;
+ 
+ import com.fasterxml.jackson.databind.*;
+ 
+-- 
+2.0.4
+
diff --git a/dev-java/jackson-databind/jackson-databind-2.5.1-r1.ebuild b/dev-java/jackson-databind/jackson-databind-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..1aca01e4bdb7
--- /dev/null
+++ b/dev-java/jackson-databind/jackson-databind-2.5.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High-performance JSON 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=""
+RESTRICT="test" # 27/1306 failures :(
+
+CDEPEND="~dev-java/jackson-${PV}:${SLOT}
+	~dev-java/jackson-annotations-${PV}:${SLOT}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}
+	test? (
+		dev-java/cglib:3
+		dev-java/groovy:0
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${PN}-${P}/src"
+JAVA_SRC_DIR="main/java"
+JAVA_GENTOO_CLASSPATH="jackson-${SLOT},jackson-annotations-${SLOT}"
+
+java_prepare() {
+	epatch "${FILESDIR}/real-cglib.patch"
+
+	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' \
+		"${S}/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
+		> "${S}/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
+
+	# Requires newer JScience. Could be any class but they chose this!
+	rm "${S}/test/java/com/fasterxml/jackson/databind/deser/TestNoClassDefFoundDeserializer.java" || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ../README.md ../release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+	cd test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies cglib-2.2,groovy,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..b39646c241a9
--- /dev/null
+++ b/dev-java/jackson-databind/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..80f916758785
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -0,0 +1 @@
+DIST jackson-dataformat-xml-2.5.1.tar.gz 90436 SHA256 e5281b076d11a689c485326a30eecd422c11c36578fcb344079ffbbe09f04aff SHA512 e780f28d650b843ab80710acd20ba67d74dc4c567633eb12e0b82102880bbd0d4cd2e9a0869587bb03a1038a1380076c174e04c7fdc1d1eaa2896bf36562967a WHIRLPOOL 8581d83343b09a009b9d9b0c3bb1e5f3e40e8c57a2dfd5eba7bdbd6804c52d2d1e35183995a7a6efcb61761843943f1231e0b61ef826d8d9190b216f4ca77f1a
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.5.1.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.5.1.ebuild
new file mode 100644
index 000000000000..5dd0c12d2456
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.5.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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"
+IUSE="test"
+RESTRICT="test" # Lots of failures, new Woodstox needed?
+
+CDEPEND="~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.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${PN}-${P}/src"
+JAVA_SRC_DIR="main/java"
+JAVA_GENTOO_CLASSPATH="jackson-${SLOT},jackson-annotations-${SLOT},jackson-databind-${SLOT},jackson-module-jaxb-annotations-${SLOT},stax2-api"
+
+java_prepare() {
+	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' \
+		  "${S}/main/java/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
+		> "${S}/main/java/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ../README.md ../release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+	cd 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..bb7d6955d4c0
--- /dev/null
+++ b/dev-java/jackson-dataformat-xml/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..a9fd89ab37ae
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -0,0 +1 @@
+DIST jackson-dataformat-yaml-2.5.1.tar.gz 38346 SHA256 b0e8644b475b33c9bda87018620edf3409712d7eb1e01a6b6d342e32667b88de SHA512 b18fc58ff73f5c6a22ab1763dea7fe924848b82e1a12353b671fd28935b5e8371f15507fcf16f3a7638392d23b8ee934aab2ebf82d5c287c2658bfe77d8728a8 WHIRLPOOL c2ee03dca4beba49da15aec2f54b455906685c969ba270925d6af36952b25ca77b0f8b6dfdfca60babb1dcc4e29653f0e9409d62dcdf67d8b06e4fd4fce921bb
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.5.1.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.5.1.ebuild
new file mode 100644
index 000000000000..c48a0d680656
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.5.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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"
+IUSE="test"
+
+CDEPEND="~dev-java/jackson-${PV}:${SLOT}
+	~dev-java/jackson-databind-${PV}:${SLOT}
+	dev-java/snakeyaml:0"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}
+	test? (
+		~dev-java/jackson-annotations-${PV}:${SLOT}
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${PN}-${P}/src"
+JAVA_SRC_DIR="main/java"
+JAVA_GENTOO_CLASSPATH="jackson-${SLOT},jackson-databind-${SLOT},snakeyaml"
+
+java_prepare() {
+	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' \
+		  "${S}/main/java/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
+		> "${S}/main/java/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
+
+	# Requires OPS4J Pax Exam, which isn't packaged yet.
+	rm "${S}/test/java/com/fasterxml/jackson/dataformat/yaml/failsafe/OSGiIT.java" || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ../README.md ../release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+	cd 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..b14634f2bf70
--- /dev/null
+++ b/dev-java/jackson-dataformat-yaml/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..6db68e57fe52
--- /dev/null
+++ b/dev-java/jackson-module-jaxb-annotations/Manifest
@@ -0,0 +1 @@
+DIST jackson-module-jaxb-annotations-2.5.1.tar.gz 42922 SHA256 86e9acabc3d65cb4e28c1e4df73075648c7250405f434c09c7f75eb800a17f3a SHA512 0d877b02664ca7b1c5d6ba245b369536a5acd015382e8f46c66fc69e64b4bfb25caf6be0f6bb8bd52609e5da0b510a642ace8651853aa4b8d11681b3499abe1a WHIRLPOOL 0f00532687558e86479b739ff6f080ebf57e648fc4269128e617b128bfc37310c7329aae4a35f8149b5348d550f9481a3ae379cad3ddeac7f68ebb1578dab094
diff --git a/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.5.1.ebuild b/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.5.1.ebuild
new file mode 100644
index 000000000000..d7ef1e7b303e
--- /dev/null
+++ b/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.5.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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"
+IUSE="test"
+
+CDEPEND="~dev-java/jackson-${PV}:${SLOT}
+	~dev-java/jackson-annotations-${PV}:${SLOT}
+	~dev-java/jackson-databind-${PV}:${SLOT}
+	dev-java/stax2-api:0"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${PN}-${P}/src"
+JAVA_SRC_DIR="main/java"
+JAVA_GENTOO_CLASSPATH="jackson-${SLOT},jackson-annotations-${SLOT},jackson-databind-${SLOT}"
+
+java_prepare() {
+	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' \
+		  "${S}/main/java/com/fasterxml/jackson/module/jaxb/PackageVersion.java.in" \
+		> "${S}/main/java/com/fasterxml/jackson/module/jaxb/PackageVersion.java" || die
+
+	# Requires jax-rs, which isn't packaged yet.
+	rm "${S}/test/java/com/fasterxml/jackson/module/jaxb/introspect"/{Content,TestPropertyVisibility}.java || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ../README.md ../release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+	cd 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..47a80b4c0e9d
--- /dev/null
+++ b/dev-java/jackson-module-jaxb-annotations/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..240b0d83ee5e
--- /dev/null
+++ b/dev-java/jackson/Manifest
@@ -0,0 +1,2 @@
+DIST jackson-core-2.5.1.tar.gz 267908 SHA256 576a103f24abedba09e83cd5fa6d2a00a25deec627e29e1d8e9c38382a057f85 SHA512 bb2c3f25eb76d4acd5fed0d5d666af572f6e66b6eb0cb37b26da405d8230b92204d9b6282dda2c2c16fd3059da9aa1c0f9a4a93b3be73e99f0277befd0d6e499 WHIRLPOOL b089c0e37153ad63dcc6af705d57a2a35124b35db283761b40c0558af42b1009b58232eec99fbb1c79ea2896f21f687af226ab604d2bf4eab8d4f365563c69e7
+DIST jackson-core-lgpl-1.9.13-sources.jar 240367 SHA256 f4dad3a1b9a20fbcfd375034309e717e16740c3d770725037f165ef2cfe852bd SHA512 eae08be1f72e868a41423a67abc0af4b63365cb98bdebff4178c8b89fdfaf24324aacec1c95b1bb3d04da0b18c2fe05c87fbe6601a52c9cdbf4a8d3de3457542 WHIRLPOOL bbf02776cfef330e6283569ba0caca323846cd4562c80e6671a6e47e4afead5fc5c5e7cca95feb9d461e560285fab301f65f33cadab1ef039ece78a6fc39e8f5
diff --git a/dev-java/jackson/jackson-1.9.13.ebuild b/dev-java/jackson/jackson-1.9.13.ebuild
new file mode 100644
index 000000000000..c1400131ebf1
--- /dev/null
+++ b/dev-java/jackson/jackson-1.9.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High-performance JSON processor"
+HOMEPAGE="http://jackson.codehaus.org"
+SRC_URI="http://repo1.maven.org/maven2/org/codehaus/${PN}/${PN}-core-lgpl/${PV}/${PN}-core-lgpl-${PV}-sources.jar"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
diff --git a/dev-java/jackson/jackson-2.5.1.ebuild b/dev-java/jackson/jackson-2.5.1.ebuild
new file mode 100644
index 000000000000..183c9970f3f2
--- /dev/null
+++ b/dev-java/jackson/jackson-2.5.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+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=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${PN}-core-${PN}-core-${PV}/src"
+JAVA_SRC_DIR="main/java"
+
+java_prepare() {
+	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' \
+		"${S}/main/java/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
+		> "${S}/main/java/com/fasterxml/jackson/core/json/PackageVersion.java" || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc ../README.md ../release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+	cd 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..32cb17ad1925
--- /dev/null
+++ b/dev-java/jackson/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..299e6721ca74
--- /dev/null
+++ b/dev-java/jacl/Manifest
@@ -0,0 +1 @@
+DIST jacl1.4.1.tar.gz 1921630 SHA256 0edac0a7d2253c29c44ccc92427fa9ad4ee81b6c82142e417f72399a8584b749 SHA512 e4b906efbd3ef4ab9338e8bf2f50c3b820e25b9fbe61f194e90cc0fa128f68d64eb459f7b05171d4b86b4c9635ef483906a02952bdedcee89ccb92256b789247 WHIRLPOOL d40416577c88403a34b3f4c2c7ba45365330690832d4f7c4013a4c17b3ae2e589e99a9d7c8a93d18b4690fdefad1e3298dd28b3b89a467b8dcf2138e3e3b58cf
diff --git a/dev-java/jacl/files/1.3.3-javacflags.patch b/dev-java/jacl/files/1.3.3-javacflags.patch
new file mode 100644
index 000000000000..600cabc2b7e8
--- /dev/null
+++ b/dev-java/jacl/files/1.3.3-javacflags.patch
@@ -0,0 +1,36 @@
+Index: Makefile.in
+===================================================================
+RCS file: /cvsroot/tcljava/tcljava/Makefile.in,v
+retrieving revision 1.60
+diff -u -r1.60 Makefile.in
+--- Makefile.in	5 Aug 2006 01:50:11 -0000	1.60
++++ Makefile.in	3 Apr 2007 08:51:22 -0000
+@@ -54,7 +54,7 @@
+ XTERM			= xterm
+ JAVA_FLAGS		= @JAVA_FLAGS@
+ JAVA_G_FLAGS		= @JAVA_G_FLAGS@
+-JAVAC_FLAGS		= @JAVAC_FLAGS@
++JAVAC_FLAGS		?= @JAVAC_FLAGS@
+ JAVAC_D_FLAG		= @JAVAC_D_FLAG@
+ JAR_EXTRACT_FLAGS	= @JAR_EXTRACT_FLAGS@
+ JAR_COMPRESS_FLAGS	= @JAR_COMPRESS_FLAGS@
+Index: tcljava.m4
+===================================================================
+RCS file: /cvsroot/tcljava/tcljava/tcljava.m4,v
+retrieving revision 1.35
+diff -u -r1.35 tcljava.m4
+--- tcljava.m4	21 Aug 2006 22:26:37 -0000	1.35
++++ tcljava.m4	3 Apr 2007 08:51:28 -0000
+@@ -226,9 +226,9 @@
+     # Look for a setting for the CLASSPATH, we might need one to run JAVAC
+     AC_JAVA_CLASSPATH
+ 
+-    # FIXME : add detection of command line arguments for JAVAC
+-
+-    JAVAC_FLAGS=-g
++    if test "x${JAVAC_FLAGS}" = "x"; then
++        JAVAC_FLAGS=-g
++    fi
+     JAVAC_D_FLAG=-d
+ 
+     dnl Test out the Java compiler with an empty class
diff --git a/dev-java/jacl/files/jacl-1.4.1-build.patch b/dev-java/jacl/files/jacl-1.4.1-build.patch
new file mode 100644
index 000000000000..5f2ccf946492
--- /dev/null
+++ b/dev-java/jacl/files/jacl-1.4.1-build.patch
@@ -0,0 +1,39 @@
+diff -Naur jacl1.4.1.bak/Makefile.in jacl1.4.1/Makefile.in
+--- jacl1.4.1.bak/Makefile.in	2008-09-14 14:44:18.000000000 +1200
++++ jacl1.4.1/Makefile.in	2008-09-14 14:46:31.000000000 +1200
+@@ -54,7 +54,7 @@
+ XTERM			= xterm
+ JAVA_FLAGS		= @JAVA_FLAGS@
+ JAVA_G_FLAGS		= @JAVA_G_FLAGS@
+-JAVAC_FLAGS		= @JAVAC_FLAGS@
++JAVAC_FLAGS		?= @JAVAC_FLAGS@
+ JAVAC_D_FLAG		= @JAVAC_D_FLAG@
+ JAR_EXTRACT_FLAGS	= @JAR_EXTRACT_FLAGS@
+ JAR_COMPRESS_FLAGS	= @JAR_COMPRESS_FLAGS@
+@@ -983,8 +983,8 @@
+ 	$(JAVAC) $(JAVAC_FLAGS) \
+ 	$(JAVAC_D_FLAG) $(TCLJAVA_BUILD_DIR) \
+ 		tcl/lang/*.java
+-	mkdir $(TCLJAVA_BUILD_DIR)/tcl/lang/library
+-	mkdir $(TCLJAVA_BUILD_DIR)/tcl/lang/library/java
++	mkdir -p $(TCLJAVA_BUILD_DIR)/tcl/lang/library
++	mkdir -p $(TCLJAVA_BUILD_DIR)/tcl/lang/library/java
+ 	cp -fr $(TCLJAVA_SRC_DIR)/tcl/lang/library/java/*.tcl \
+ 		$(TCLJAVA_BUILD_DIR)/tcl/lang/library/java
+ 
+diff -Naur jacl1.4.1.bak/tcljava.m4 jacl1.4.1/tcljava.m4
+--- jacl1.4.1.bak/tcljava.m4	2008-09-14 14:44:18.000000000 +1200
++++ jacl1.4.1/tcljava.m4	2008-09-14 14:44:30.000000000 +1200
+@@ -226,9 +226,9 @@
+     # Look for a setting for the CLASSPATH, we might need one to run JAVAC
+     AC_JAVA_CLASSPATH
+ 
+-    # FIXME : add detection of command line arguments for JAVAC
+-
+-    JAVAC_FLAGS=-g
++    if test "x${JAVAC_FLAGS}" = "x"; then
++        JAVAC_FLAGS=-g
++    fi
+     JAVAC_D_FLAG=-d
+ 
+     dnl Test out the Java compiler with an empty class
diff --git a/dev-java/jacl/jacl-1.4.1.ebuild b/dev-java/jacl/jacl-1.4.1.ebuild
new file mode 100644
index 000000000000..983cee4b4928
--- /dev/null
+++ b/dev-java/jacl/jacl-1.4.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit base java-pkg-2
+
+DESCRIPTION="Jacl is an implementation of Tcl written in Java"
+HOMEPAGE="http://tcljava.sourceforge.net"
+MY_P="${P//-}"
+SRC_URI="mirror://sourceforge/tcljava/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/tcl-8.4.5
+	>=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
+# jikes support disabled for now.
+# refer to bug #100020 and bug #89711
+
+src_compile() {
+	local jflags="$(java-pkg_javac-args)"
+	JAVAC_FLAGS="${jflags}" \
+		econf --enable-jacl --without-jikes || die
+	#ali_bush: Fails intermitently with MAKEOPTS="-j3"
+	JAVAC_FLAGS="${jflags}" \
+		emake -j1 DESTDIR="/usr/share/${PN}" || die "emake failed"
+}
+
+RESTRICT="test"
+# Dies with anything else besides 1.4 so more trouble than benefit
+src_test() {
+	emake check || die "Tests failed"
+	einfo "Some tests are known to fail. We didn't restrict them"
+	einfo "because the ebuild doesn't die."
+}
+
+src_install() {
+	#emake DESTDIR="${D}" install || die "emake install failed"
+	java-pkg_dojar *.jar
+	java-pkg_dolauncher jaclsh --main tcl.lang.Shell
+	dodoc README ChangeLog known_issues.txt || die
+	use doc && java-pkg_dohtml -r docs/*
+}
diff --git a/dev-java/jacl/metadata.xml b/dev-java/jacl/metadata.xml
new file mode 100644
index 000000000000..6b283ec84313
--- /dev/null
+++ b/dev-java/jacl/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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/jad-bin/Manifest b/dev-java/jad-bin/Manifest
new file mode 100644
index 000000000000..2d21fb77d324
--- /dev/null
+++ b/dev-java/jad-bin/Manifest
@@ -0,0 +1 @@
+DIST jadls158.zip 389972 SHA256 2878e19fc1fdd725b516f538a57b02aaec1b2d1e4b106d550230381ffa9c0c81 SHA512 5f16c51f676990ea6cf76cbee4c9fbf93273fb6a4474a136c032457fcb29c9507508b543d3f65a212cd4e21d14671f0b4368ce5a42dc7c542e75883a911a5ebf WHIRLPOOL 672e03204c9ab461d355cc1719aad22612f3b6fa921fdb4cfa0e2fe4577a000610adf9248ca859f00ffd13ed03a780b2bd8916f52151d31da0a7210bacd5787a
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..e86053895f1c
--- /dev/null
+++ b/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 -ppc 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/jad-bin-1.5.8e.ebuild b/dev-java/jad-bin/jad-bin-1.5.8e.ebuild
new file mode 100644
index 000000000000..c436ac75eefb
--- /dev/null
+++ b/dev-java/jad-bin/jad-bin-1.5.8e.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Jad - The fast JAva Decompiler"
+HOMEPAGE="http://www.kpdus.com/jad.html"
+SRC_URI="http://www.kpdus.com/jad/linux/jadls158.zip"
+DEPEND="app-arch/unzip"
+RDEPEND=""
+KEYWORDS="x86 amd64 -ppc"
+SLOT="0"
+LICENSE="freedist"
+IUSE=""
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/jad-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jade/Manifest b/dev-java/jade/Manifest
new file mode 100644
index 000000000000..f2ce758493c7
--- /dev/null
+++ b/dev-java/jade/Manifest
@@ -0,0 +1 @@
+DIST JADE-src-3.3.zip 1677444 SHA256 f16314c6b514bb4318668990788116c8c90005fb5393f7d7b3785c0b66020606 SHA512 b191de5d5406276cc5ad382f4b0627f2f2b9eef3aba46d8c23e3bb4f6489808450755e6f360a2d39a1eed88c22cd4dd2d35ab140e55ffe8f021e89709a094562 WHIRLPOOL bbbcd9c5a4f4d0f75282c22f4d88ae091c735cd58dda7bc08e017579c8da6fb1fa6204980067f311c5e3545cfacb5feac00bb887161d9db818116cf42748a9f7
diff --git a/dev-java/jade/jade-3.3-r1.ebuild b/dev-java/jade/jade-3.3-r1.ebuild
new file mode 100644
index 000000000000..e0fbca06f15f
--- /dev/null
+++ b/dev-java/jade/jade-3.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JADE is FIPA-compliant Java Agent Development Environment"
+SRC_URI="mirror://gentoo/JADE-src-${PV}.zip"
+HOMEPAGE="http://jade.cselt.it/"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+S="${WORKDIR}/${PN}"
+
+EANT_BUILD_TARGET="clean lib"
+EANT_DOC_TARGET="doc"
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+	dodoc README ChangeLog
+	use doc && java-pkg_dojavadoc doc/
+	use source && java-pkg_dosrc src/FIPA src/jade src/starlight
+}
diff --git a/dev-java/jade/jade-3.3-r2.ebuild b/dev-java/jade/jade-3.3-r2.ebuild
new file mode 100644
index 000000000000..d084610e8849
--- /dev/null
+++ b/dev-java/jade/jade-3.3-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JADE is FIPA-compliant Java Agent Development Environment"
+SRC_URI="mirror://gentoo/JADE-src-${PV}.zip"
+HOMEPAGE="http://jade.cselt.it/"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+S="${WORKDIR}/${PN}"
+
+EANT_BUILD_TARGET="clean lib"
+EANT_DOC_TARGET="doc"
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+	dodoc README ChangeLog
+	use doc && java-pkg_dojavadoc doc/api/
+	use source && java-pkg_dosrc src/FIPA src/jade src/starlight
+}
diff --git a/dev-java/jade/metadata.xml b/dev-java/jade/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/jade/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jaffl/Manifest b/dev-java/jaffl/Manifest
new file mode 100644
index 000000000000..fe59561e4016
--- /dev/null
+++ b/dev-java/jaffl/Manifest
@@ -0,0 +1 @@
+DIST jaffl-0.5.11.tar.gz 559465 SHA256 77a7e7bf0b98521ed749238fec8eb184426b074010874a9ee9f076e27b74ac6a SHA512 efa5479901ac6d21310af7d482298281189b7d91b806a273cf99faacb4ee0ec6862427077e2553153c3741a640371199cf78750cd4de9f9fdd92e3f1962d7728 WHIRLPOOL 6970de5819e6335c454584a5071290ed10ace121197a5f4396063dbc9eae388bffa573ab921c6896c018f4f3c1441a0dda54952de8a7527cb5aebefe0a7127f3
diff --git a/dev-java/jaffl/files/jaffl-0.5.11-GNUmakefile.patch b/dev-java/jaffl/files/jaffl-0.5.11-GNUmakefile.patch
new file mode 100644
index 000000000000..89e6dda90cc6
--- /dev/null
+++ b/dev-java/jaffl/files/jaffl-0.5.11-GNUmakefile.patch
@@ -0,0 +1,11 @@
+--- libtest/GNUmakefile.orig	2015-06-08 12:11:24.235000000 +0000
++++ libtest/GNUmakefile	2015-06-08 11:47:52.963000000 +0000
+@@ -38,7 +38,7 @@
+ #   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-parentheses
++WFLAGS = -W -Wall -Wno-unused -Wno-parentheses
+ PICFLAGS = -fPIC
+ SOFLAGS = -shared -Wl,-O1
+ LDFLAGS += $(SOFLAGS)
diff --git a/dev-java/jaffl/files/jaffl-0.5.11-library-path.patch b/dev-java/jaffl/files/jaffl-0.5.11-library-path.patch
new file mode 100644
index 000000000000..4782f17111fd
--- /dev/null
+++ b/dev-java/jaffl/files/jaffl-0.5.11-library-path.patch
@@ -0,0 +1,10 @@
+--- src/com/kenai/jaffl/provider/Library.java.orig	2011-09-07 12:13:06.942731817 +0200
++++ src/com/kenai/jaffl/provider/Library.java	2011-09-07 12:13:08.983731771 +0200
+@@ -23,6 +23,7 @@
+             userLibraryPath.addAll(getPropertyPaths("jaffl.library.path"));
+             // Add JNA paths for compatibility
+             userLibraryPath.addAll(getPropertyPaths("jna.library.path"));
++            userLibraryPath.addAll(getPropertyPaths("java.library.path"));
+         }
+     };
+     
diff --git a/dev-java/jaffl/files/library-path-0.5.1.patch b/dev-java/jaffl/files/library-path-0.5.1.patch
new file mode 100644
index 000000000000..2a0335ed65fe
--- /dev/null
+++ b/dev-java/jaffl/files/library-path-0.5.1.patch
@@ -0,0 +1,9 @@
+--- src/com/kenai/jaffl/provider/Library.java	2010-06-04 10:55:00.000000000 +1200
++++ src/com/kenai/jaffl/provider/Library.java	2010-06-04 10:55:49.000000000 +1200
+@@ -53,5 +53,6 @@
+         userLibraryPath.addAll(getPropertyPaths("jaffl.library.path"));
+         // Add JNA paths for compatibility
+         userLibraryPath.addAll(getPropertyPaths("jna.library.path"));
++	userLibraryPath.addAll(getPropertyPaths("java.library.path"));
+     }
+ }
diff --git a/dev-java/jaffl/jaffl-0.5.11.ebuild b/dev-java/jaffl/jaffl-0.5.11.ebuild
new file mode 100644
index 000000000000..742f5ee7b732
--- /dev/null
+++ b/dev-java/jaffl/jaffl-0.5.11.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="http://kenai.com/projects/jaffl"
+SRC_URI="http://github.com/jnr/jnr-ffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+CDEPEND="dev-java/jffi:1.2
+	dev-java/jnr-x86asm:0
+	dev-java/asm:3"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+		dev-java/hamcrest-core:0
+	)"
+
+JAR_VERSION=$(get_version_component_range 1-2)
+
+src_unpack() {
+	default
+
+	mv * "${P}" || die
+}
+
+java_prepare() {
+	rm -vf lib/{.,junit*}/*.jar
+
+	epatch "${FILESDIR}"/${P}-library-path.patch
+	epatch "${FILESDIR}"/${P}-GNUmakefile.patch
+
+	# Don't choke on errors from generating the Javadoc
+	cd "${S}" || die
+	java-ant_xml-rewrite -f ./nbproject/build-impl.xml \
+						 -c -e javadoc \
+						 -a failonerror \
+						 -v no
+
+	java-pkg_jar-from --into lib jffi-1.2
+	java-pkg_jar-from --into lib jnr-x86asm
+	java-pkg_jar-from --into lib asm-3 asm.jar asm-3.2.jar
+	java-pkg_jar-from --into lib asm-3 asm-analysis.jar asm-analysis-3.2.jar
+	java-pkg_jar-from --into lib asm-3 asm-commons.jar asm-commons-3.2.jar
+	java-pkg_jar-from --into lib asm-3 asm-tree.jar asm-tree-3.2.jar
+	java-pkg_jar-from --into lib asm-3 asm-util.jar asm-utils-3.2.jar
+	java-pkg_jar-from --into lib asm-3 asm-xml.jar asm-xml-3.2.jar
+}
+
+EANT_EXTRA_ARGS="-Dreference.jffi.jar=lib/jffi.jar \
+	-Dreference.jnr-x86asm.jar=lib/jnr-x86asm.jar \
+	-Dproject.jffi=\"${S}\" \
+	-Dproject.jnr-x86asm=\"${S}\"
+	-D\"already.built.${S}\"=true"
+
+src_test() {
+	local paths="$(java-config -di jnr-x86asm,jffi-1.2):${S}/build"
+
+	ANT_TASKS="ant-junit ant-nodeps" eant test \
+		-Drun.jvmargs="-Djava.library.path=${paths}" \
+		-Dlibs.junit_4.classpath="$(java-pkg_getjars junit-4,hamcrest-core)" ${EANT_EXTRA_ARGS}
+}
+
+src_install() {
+	java-pkg_newjar dist/${PN}-${JAR_VERSION}.jar
+
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jaffl/metadata.xml b/dev-java/jaffl/metadata.xml
new file mode 100644
index 000000000000..e5bc2e7bb499
--- /dev/null
+++ b/dev-java/jaffl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+		A native function invocation interface that can have multiple different
+		low level implementations (e.g. JNA, JFFI or Maxine)
+	</longdescription>
+	<upstream>
+		<remote-id type="github">wmeissner/jaffl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jakarta-jstl/Manifest b/dev-java/jakarta-jstl/Manifest
new file mode 100644
index 000000000000..ee50f00bde71
--- /dev/null
+++ b/dev-java/jakarta-jstl/Manifest
@@ -0,0 +1 @@
+DIST jakarta-taglibs-standard-1.1.2-src.tar.gz 287031 SHA256 47a0222c426d93dcc9d7493520d52dba85ba256385d351cdc957cf4b6b30fe23 SHA512 86189831d7836bfb32915be54518f8a8746000f7184d92a7e1b2f0da8d1ba4ab98861022e6be24074fe3bd487d6d413d72b3e2c8990b1f63a680b481b746d1c6 WHIRLPOOL df56675c21be28aee7ab825c77f07b2c767da6559354522aee1eb748590e06a5a3e6961a52c881b38c1eba77a8ecd85c9c8b69ae672e6f43f7077fe7fb345d3b
diff --git a/dev-java/jakarta-jstl/files/build-xml.patch b/dev-java/jakarta-jstl/files/build-xml.patch
new file mode 100644
index 000000000000..85e5e1041582
--- /dev/null
+++ b/dev-java/jakarta-jstl/files/build-xml.patch
@@ -0,0 +1,12 @@
+--- jakarta-taglibs-standard-1.1.2-src/standard/build.xml	2004-10-25 16:26:23.000000000 -0400
++++ build.xml	2006-10-10 16:33:05.000000000 -0400
+@@ -170,8 +170,7 @@
+     <javac 
+       srcdir="${library.src}" 
+       destdir="${build.library}/classes"
+-      bootclasspath="${xalan.jar}:${java.home}/lib/rt.jar"
+-      classpath="${servlet24.jar}:${jsp20.jar}:${jdbc2_0-stdext.jar}:${jaxp-api.jar}:${dom.jar}:${sax.jar}"
++      classpath="${servlet24.jar}:${jsp20.jar}:${jdbc2_0-stdext.jar}:${jaxp-api.jar}:${dom.jar}:${sax.jar}:${xalan.jar}"
+       excludes="org/apache/taglibs/standard/lang/jstl/parser/jsp20/* org/apache/taglibs/standard/lang/jpath/** org/apache/taglibs/standard/lang/spel/**"
+       debug="${compile.debug}"
+       deprecation="${compile.deprecation}"
diff --git a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..a1e04fff9165
--- /dev/null
+++ b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="jakarta-taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="An implementation of the JSP Standard Tag Library (JSTL)"
+HOMEPAGE="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html"
+SRC_URI="mirror://apache/jakarta/taglibs/standard/source/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="dev-java/servletapi:2.4
+	dev-java/xalan"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+#	test? ( dev-java/ant-junit )
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}-src/standard"
+
+# Needs cactus packaged
+# http://bugs.gentoo.org/show_bug.cgi?id=212890
+RESTRICT="test"
+
+java_prepare() {
+	# put xalan from bootclasspath to classpath
+	epatch "${FILESDIR}/build-xml.patch"
+	# due to JDBC API changes
+	java-ant_rewrite-bootclasspath 1.5
+
+	echo -e "base.dir=..\n" \
+		"build.dir = \${base.dir}/build\n" \
+		"build.classes=\${build.dir}/standard/standard/classes\n" \
+		"dist.dir = \${base.dir}/dist\n" \
+		"servlet24.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)\n" \
+		"jsp20.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)\n" \
+		"xalan.jar=$(java-pkg_getjar xalan xalan.jar)" \
+		> build.properties
+	#use test && echo "junit.jar=$(java-pkg_getjars --build-only junit)" >> build.properties
+	java-pkg_filter-compiler jikes
+}
+
+EANT_BUILD_TARGET="build"
+EANT_DOC_TARGET="javadoc-dist"
+EANT_TEST_TARGET="run.junit"
+
+src_install() {
+	java-pkg_dojar "${S}"/../build/standard/standard/lib/*.jar
+
+	use doc && java-pkg_dohtml -r "${S}"/doc/web/* "${S}"/../dist/standard/javadoc/
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc "${S}"/src/*
+}
diff --git a/dev-java/jakarta-jstl/metadata.xml b/dev-java/jakarta-jstl/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/jakarta-jstl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jakarta-oro/Manifest b/dev-java/jakarta-oro/Manifest
new file mode 100644
index 000000000000..9a873d6fea13
--- /dev/null
+++ b/dev-java/jakarta-oro/Manifest
@@ -0,0 +1 @@
+DIST jakarta-oro-2.0.8.tar.gz 345304 SHA256 4c4f3c7c479994c3ce09f542d4fbdc03eed58a2d7f320d32f2baf238b5b6f566 SHA512 a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920 WHIRLPOOL 4392b2084036f0079a81a38550b919bc10c763cadf684e68d12e9c6dc8c43a2a03f66baba8cc96e7b4dd8f2ddca8ed550bc7ec1e570b692ae27df1a16fefd2a1
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..af8dbd1c0f57
--- /dev/null
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/metadata.xml b/dev-java/jakarta-oro/metadata.xml
new file mode 100644
index 000000000000..3423fc466439
--- /dev/null
+++ b/dev-java/jakarta-oro/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+	<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..d8e6017c14a7
--- /dev/null
+++ b/dev-java/jakarta-regexp/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r4.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r4.ebuild
new file mode 100644
index 000000000000..49894e4193fa
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/"
+SLOT="1.3"
+IUSE="doc source"
+LICENSE="Apache-1.1"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm *.jar
+	mkdir lib
+	sed -i 's:./jakarta-site2::' build.xml || die "sed failed"
+}
+
+src_compile() {
+	eant $(use_doc javadocs) jar
+}
+
+src_install() {
+	cd "${S}/build"
+	java-pkg_newjar ${P}.jar ${PN}.jar
+	cd "${S}"
+
+	if use doc; then
+		java-pkg_dojavadoc docs/api
+		java-pkg_dohtml docs/*.html
+		dodoc docs/*.txt
+	fi
+
+	use source && java-pkg_dosrc "${S}"/src/java/*
+}
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..4069a12ee4e5
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="1.3"
+IUSE=""
+LICENSE="Apache-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/java"
+
+java_prepare() {
+	rm build.xml || die
+	find -name "*.jar" -delete || die
+}
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild
new file mode 100644
index 000000000000..b14ab153e2a3
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/"
+SLOT="1.4"
+IUSE="doc source"
+LICENSE="Apache-1.1"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm *.jar
+	mkdir lib
+}
+
+src_compile() {
+	eant $(use_doc javadocs) jar
+}
+
+src_install() {
+	cd "${S}/build"
+	java-pkg_newjar ${P}.jar ${PN}.jar
+	cd "${S}"
+
+	if use doc; then
+		java-pkg_dojavadoc docs/api
+		java-pkg_dohtml docs/*.html
+		dodoc docs/*.txt
+	fi
+
+	use source && java-pkg_dosrc "${S}"/src/java/*
+}
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..c550446bad34
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="1.4"
+IUSE=""
+LICENSE="Apache-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/java"
+
+java_prepare() {
+	rm build.xml || die
+	find -name "*.jar" -delete || 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..bcad094d1ee2
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="http://archive.apache.org/dist/${PN/-//}/${P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/"
+
+SLOT="${PV}"
+IUSE=""
+LICENSE="Apache-1.1"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/java"
+
+java_prepare() {
+	rm build.xml || die
+	find -name "*.jar" -delete || die
+}
diff --git a/dev-java/jakarta-regexp/metadata.xml b/dev-java/jakarta-regexp/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/jakarta-regexp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jakarta-slide-webdavclient/Manifest b/dev-java/jakarta-slide-webdavclient/Manifest
new file mode 100644
index 000000000000..ace9948aa2e4
--- /dev/null
+++ b/dev-java/jakarta-slide-webdavclient/Manifest
@@ -0,0 +1 @@
+DIST jakarta-slide-webdavclient-src-2.1.tar.gz 2123807 SHA256 ab21b3c25534259993ae4e671bde0ffc8bd6bedae6ee888876cbab98f5e1d4a8 SHA512 a3bf236332e39abba2934eaf8e5e12bf463a97ff8a38bb433d58b59889d68583c240a62b4a47a923ab3ccddca57a41c7a7e4a682a89757f4266d698ae338e682 WHIRLPOOL 6e23782621372bcd25b5b8b56d1c1081e1d9050f69235403aa90ce1317161b5bf27ab1d9ec200cd743077d70fe31e48c3db59b8e421f6eac4395382d671d5f9b
diff --git a/dev-java/jakarta-slide-webdavclient/files/jakarta-slide-webdavclient-2.1-gentoo.patch b/dev-java/jakarta-slide-webdavclient/files/jakarta-slide-webdavclient-2.1-gentoo.patch
new file mode 100644
index 000000000000..29b11b74c3ca
--- /dev/null
+++ b/dev-java/jakarta-slide-webdavclient/files/jakarta-slide-webdavclient-2.1-gentoo.patch
@@ -0,0 +1,75 @@
+--- build.xml.orig	2005-05-22 17:13:28.000000000 +0200
++++ build.xml	2005-05-22 17:20:32.000000000 +0200
+@@ -83,6 +83,12 @@
+         <pathelement location="${commons-transaction.jar}"/>
+         <pathelement location="${j2ee-spec.jar}"/>
+     </path>
++    
++    <path id="mycp">
++	    <fileset dir="lib">
++		    <include name="**/*.jar" />
++	    </fileset>
++    </path>
+     <!-- =================================================================== -->
+     <!-- Prepare build                                                       -->
+     <!-- =================================================================== -->
+@@ -160,7 +166,7 @@
+         <javac srcdir="clientlib/src/java" destdir="${clientlib.build}/classes" 
+          debug="${compile.debug}" deprecation="${compile.deprecation}" 
+          optimize="${compile.optimize}" excludes="**/CVS/**">
+-            <classpath refid="clientlib.classpath"/>
++            <classpath refid="mycp"/>
+         </javac>
+     </target>
+     <!-- =================================================================== -->
+@@ -188,12 +194,12 @@
+         <javac srcdir="commandline/src/java" destdir="${cmd.build}/classes" 
+ 	       debug="${compile.debug}" deprecation="${compile.deprecation}" 
+ 	       optimize="${compile.optimize}" excludes="**/Slide.java">
+-            <classpath refid="cmd.classpath"/>
++            <classpath refid="mycp"/>
+         </javac>
+         <javac srcdir="${cmd.build}/src" destdir="${cmd.build}/classes" 
+ 	       debug="${compile.debug}" deprecation="${compile.deprecation}" 
+ 	       optimize="${compile.optimize}" includes="**/Slide.java">
+-            <classpath refid="cmd.classpath"/>
++            <classpath refid="mycp"/>
+         </javac>
+     </target>
+     <!-- =================================================================== -->
+@@ -205,7 +211,7 @@
+         <javac srcdir="ant/src/java" destdir="${ant.build}/classes" 
+ 	       debug="${compile.debug}" deprecation="${compile.deprecation}" 
+ 	       optimize="${compile.optimize}" excludes="**/*Test.java">
+-            <classpath refid="ant.classpath"/>
++            <classpath refid="mycp"/>
+         </javac>
+         <copy todir="${ant.build}/classes">
+           <fileset dir="ant/src/java">
+@@ -223,7 +229,7 @@
+         <javac srcdir="connector/src/java" destdir="${jca.build}/classes" 
+ 	       debug="${compile.debug}" deprecation="${compile.deprecation}" 
+ 	       optimize="${compile.optimize}" excludes="**/*Test.java">
+-            <classpath refid="jca.classpath"/>
++            <classpath refid="mycp"/>
+         </javac>
+         <copy todir="${jca.build}/classes">
+           <fileset dir="connector/src/java"/>
+@@ -265,7 +271,7 @@
+     <!-- =================================================================== -->
+     <!-- Build a WebDAV client distribution                                     -->
+     <!-- =================================================================== -->
+-    <target name="dist-clientlib" depends="build-clientlib,prepare-dist,javadoc-clientlib"
++    <target name="dist-clientlib" depends="build-clientlib,prepare-dist"
+ 	    description="Jar WebDAV client lib and copy required jar libs">
+         <copy todir="${clientlib.dist}/lib">
+             <fileset dir="lib">
+@@ -398,7 +404,7 @@
+           deprecation="${compile.deprecation}"
+           optimize="${compile.optimize}" >
+           <src path="${basedir}/connector/example/src/java"/>
+-          <classpath refid="jca.classpath" />
++          <classpath refid="mycp" />
+         </javac>
+         <zip zipfile="${jca.dist}/connector-example.war">
+             <zipfileset dir="${jca.build}/classes/connector" prefix="WEB-INF/classes/connector" includes="TestServlet.class"/>
diff --git a/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r3.ebuild b/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r3.ebuild
new file mode 100644
index 000000000000..7d44a9bf64c1
--- /dev/null
+++ b/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${PN}-src-${PV}"
+DESCRIPTION="A content repository"
+HOMEPAGE="http://jakarta.apache.org/slide/index.html"
+SRC_URI="http://archive.apache.org/dist/jakarta/slide/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/commons-httpclient:3
+	dev-java/jdom:1.0
+	dev-java/xml-im-exporter:0"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	rm -v lib/*.jar || die
+	java-pkg-2_src_prepare
+}
+
+EANT_GENTOO_CLASSPATH="jdom-1.0,commons-httpclient-3,xml-im-exporter"
+EANT_BUILD_TARGET="dist-clientlib"
+EANT_DOC_TARGET="javadoc-clientlib"
+
+src_install() {
+	java-pkg_newjar dist/lib/${P/client/lib}.jar ${PN/client/lib}.jar
+
+	dodoc README || die
+	use doc && java-pkg_dojavadoc build/clientlib/doc/clientjavadoc
+	use source && java-pkg_dosrc \
+		clientlib/src/java/* \
+		ant/src/java/* \
+		commandline/src/java/* \
+		connector/src/java/*
+}
diff --git a/dev-java/jakarta-slide-webdavclient/metadata.xml b/dev-java/jakarta-slide-webdavclient/metadata.xml
new file mode 100644
index 000000000000..04727dbb34c2
--- /dev/null
+++ b/dev-java/jakarta-slide-webdavclient/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+		Slide is a content repository which can serve as a basis for a
+		content management system / framework and other purposes"
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jal/Manifest b/dev-java/jal/Manifest
new file mode 100644
index 000000000000..0ddf241455f2
--- /dev/null
+++ b/dev-java/jal/Manifest
@@ -0,0 +1 @@
+DIST jal-20031117-src.tar.gz 48793 SHA256 2f1bfd0c9b56a362da8fa5b61af3fd0722bb80e5b89fb12291b5a40e9f21db75 SHA512 0cb6cbd5e80d38dfbf57417b756dbc3bdddb2a28c4cbec292799ee71ac86cff3121f1e09e86f976f6562dafac54835bdd58780e4f1ffe733897b6d6ef053f95e WHIRLPOOL 54e9b1a005e2b10f62bcfd43bf1cf512fc0d0479ad113cfc57e3188f90b23184e1d6340ca56736faf7f309fc88196498652d459c75cbca7e2f76889ed3ac1568
diff --git a/dev-java/jal/files/buildxml.patch b/dev-java/jal/files/buildxml.patch
new file mode 100644
index 000000000000..16e39c93e222
--- /dev/null
+++ b/dev-java/jal/files/buildxml.patch
@@ -0,0 +1,18 @@
+diff -uprN jal-20031117.orig/build.xml jal-20031117/build.xml
+--- jal-20031117.orig/build.xml	2004-11-22 17:00:41.200663880 +0100
++++ jal-20031117/build.xml	2004-11-22 20:00:39.322099904 +0100
+@@ -16,11 +16,13 @@
+ 	debug="on"
+ 	optimize="on"
+         destdir="${build}"
++	source="1.4"
++	target="1.4"
+     />
+   </target>
+ 
+   <target name="jar" depends="compile">
+-    <jar jarfile="jal-${version}.jar" 
++    <jar jarfile="jal.jar" 
+          basedir="${build}"
+ 		 />
+   </target>
diff --git a/dev-java/jal/jal-20031117-r3.ebuild b/dev-java/jal/jal-20031117-r3.ebuild
new file mode 100644
index 000000000000..29882c675739
--- /dev/null
+++ b/dev-java/jal/jal-20031117-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Partial port of the C++ Standard Template Library"
+SRC_URI="http://vigna.dsi.unimi.it/jal/${P}-src.tar.gz"
+HOMEPAGE="http://vigna.dsi.unimi.it/jal/"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.4"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/buildxml.patch
+
+	# we have to generate the sources first
+	./instantiate -n byte bytes
+	./instantiate -n short shorts
+	./instantiate -n char chars
+	./instantiate -n int ints
+	./instantiate -n long longs
+	./instantiate -n float floats
+	./instantiate -n double doubles
+	./instantiate Object objects
+	./instantiate String strings
+	mkdir -p src/jal
+	mv bytes shorts chars ints longs floats doubles objects strings src/jal
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc "${S}"/src/jal
+}
diff --git a/dev-java/jal/metadata.xml b/dev-java/jal/metadata.xml
new file mode 100644
index 000000000000..182e3b1ada5b
--- /dev/null
+++ b/dev-java/jal/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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..6c62bcb5d5b8
--- /dev/null
+++ b/dev-java/jama/Manifest
@@ -0,0 +1 @@
+DIST Jama-1.0.3.tar.gz 82188 SHA256 a8f4c8f3a4a5d5f8908304638d03aa181b7c71debb2e3c08bb9dc14fcc350a75 SHA512 9bedf8f35ea1d400194b5a3b49914ebd04b5a31247959886f1967d062ceffae30993d34cd2f15d3942285a45c6930e2d4518f4ed0cc013ce853cc26aca021b0d WHIRLPOOL aa9f303b906bead6f4620d1d307a372ccbc305bd0947948b3b26b160b4f5b6ab67901289d9525ff2705e8d9ab21d3a6c30f3715c9ae57394a373e1bbdfd9c436
diff --git a/dev-java/jama/jama-1.0.3.ebuild b/dev-java/jama/jama-1.0.3.ebuild
new file mode 100644
index 000000000000..c043f057cd02
--- /dev/null
+++ b/dev-java/jama/jama-1.0.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit base java-pkg-2
+
+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"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}"
+
+src_compile() {
+	mkdir -p build || die
+
+	ejavac -d build $(find Jama -name '*.java')
+
+	$(java-config -j) cf ${MY_PN}.jar -C build ${MY_PN} || die
+}
+
+src_install() {
+	java-pkg_dojar ${MY_PN}.jar
+
+	dodoc Jama/ChangeLog
+
+	use doc && java-pkg_dojavadoc Jama/doc
+	use source && java-pkg_dosrc Jama
+}
diff --git a/dev-java/jama/metadata.xml b/dev-java/jama/metadata.xml
new file mode 100644
index 000000000000..3926a381f532
--- /dev/null
+++ b/dev-java/jama/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/jamon/Manifest b/dev-java/jamon/Manifest
new file mode 100644
index 000000000000..c443308a737c
--- /dev/null
+++ b/dev-java/jamon/Manifest
@@ -0,0 +1 @@
+DIST JAMonAll_103005.zip 143825 SHA256 23eceb23264c4643846372c6454f9406d2435aeaf840a183033d9fa50176c9ab SHA512 bb4b7fbd108a0612ceb59486c985f32ffa4c9dd158fe6d6c307357d3ab76c53dfa87ed691295a9de9172744e46c6a01c2ed976d3959834e1665fbbc36dcafb97 WHIRLPOOL 53aa936d313f32e052609173dd94de9bc8b659babcca8af71f4729e646989fb44d25a49f442db792dcb1bde762c40f3b46db69d9c075f659125d233dfdf1e015
diff --git a/dev-java/jamon/files/build-1.0.xml b/dev-java/jamon/files/build-1.0.xml
new file mode 100644
index 000000000000..4153ebfa4868
--- /dev/null
+++ b/dev-java/jamon/files/build-1.0.xml
@@ -0,0 +1,54 @@
+<?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="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <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}"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+         <fileset dir="${build}"/>
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+      <javadoc destdir="${dist}/doc/api">
+      	<fileset dir="${src}"/>
+      </javadoc>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/jamon/files/jamon-1.01-java1.5.patch b/dev-java/jamon/files/jamon-1.01-java1.5.patch
new file mode 100644
index 000000000000..e7ad896f1a11
--- /dev/null
+++ b/dev-java/jamon/files/jamon-1.01-java1.5.patch
@@ -0,0 +1,41 @@
+diff -ru Code/com/jamonapi/utils/CommandIterator.java Code-patched/com/jamonapi/utils/CommandIterator.java
+--- Code/com/jamonapi/utils/CommandIterator.java	2004-01-29 22:42:34.000000000 -0500
++++ Code-patched/com/jamonapi/utils/CommandIterator.java	2005-11-04 08:52:30.000000000 -0500
+@@ -38,8 +38,8 @@
+     

+     

+     /** Iterate through an Enumeration passing the Command object each element in the Collection **/

+-    public static void iterate(Enumeration enum, Command command)throws Exception     {

+-        iterate(new EnumIterator(enum) , command);

++    public static void iterate(Enumeration my_enum, Command command)throws Exception     {

++        iterate(new EnumIterator(my_enum) , command);

+     }

+ 

+     /** Iterate passing each Command each Object that is being iterated **/

+diff -ru Code/com/jamonapi/utils/EnumIterator.java Code-patched/com/jamonapi/utils/EnumIterator.java
+--- Code/com/jamonapi/utils/EnumIterator.java	2004-01-29 22:42:34.000000000 -0500
++++ Code-patched/com/jamonapi/utils/EnumIterator.java	2005-11-04 08:52:10.000000000 -0500
+@@ -6,18 +6,18 @@
+ 

+ 

+ public class EnumIterator extends java.lang.Object implements java.util.Iterator {

+-    Enumeration enum;

++    Enumeration my_enum;

+ 

+-    public EnumIterator(Enumeration enum) {

+-        this.enum=enum;

++    public EnumIterator(Enumeration my_enum) {

++        this.my_enum=my_enum;

+     }

+     

+     public boolean hasNext() {

+-        return enum.hasMoreElements();

++        return my_enum.hasMoreElements();

+     }

+     

+     public Object next() {

+-        return enum.nextElement();

++        return my_enum.nextElement();

+     }

+     

+     public void remove() {

diff --git a/dev-java/jamon/jamon-1.01-r3.ebuild b/dev-java/jamon/jamon-1.01-r3.ebuild
new file mode 100644
index 000000000000..7af9c03b4c44
--- /dev/null
+++ b/dev-java/jamon/jamon-1.01-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="JAMon"
+MY_PV="103005"
+
+DESCRIPTION="Java API to monitor production applications"
+HOMEPAGE="http://www.javaperformancetuning.com/tools/jamon/index.shtml"
+SRC_URI="mirror://sourceforge/jamonapi/${MY_PN}All_${MY_PV}.zip"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.4
+	java-virtuals/servlet-api:2.3"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${RDEPEND}"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	rm ${MY_PN}.{j,w}ar || die
+
+	epatch "${FILESDIR}"/${P}-java1.5.patch
+
+	mv Code src || die
+
+	# No provided ant script! Bad upstream, bad!
+	cp "${FILESDIR}"/build-1.0.xml build.xml || die
+}
+
+src_compile() {
+	eant jar $(use_doc) \
+		-Dproject.name=${PN} \
+		-Dclasspath=$(java-pkg_getjars servlet-api-2.3)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	use doc && java-pkg_dojavadoc dist/doc/api
+}
diff --git a/dev-java/jamon/metadata.xml b/dev-java/jamon/metadata.xml
new file mode 100644
index 000000000000..7ab7fd707165
--- /dev/null
+++ b/dev-java/jamon/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+	A free, simple, high performance, thread safe, Java API that allows
+	developers to easily monitor production applications
+	</longdescription>
+	<upstream>
+		<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..99424ee2ad28
--- /dev/null
+++ b/dev-java/jamvm/Manifest
@@ -0,0 +1 @@
+DIST jamvm-1.5.4.tar.gz 656283 SHA256 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124 SHA512 a4a7a2917881262fee19b6aedd9dc50a78463c5e4b02bda4b8184aef49797e3476f8ec8671047a01ba246af7d84cbe58f57ee84bb198817738c79d9f62c1ddbc WHIRLPOOL 615d94ab3a8359c8d6d0a2347d836c0a6adceaeda03a72d105b094f4ffb3161a5f3abbd4c12aa75703823da203d1cee91591e829a796813f82fcfbf2703068f2
diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/classes-location.patch
new file mode 100644
index 000000000000..57d046a81882
--- /dev/null
+++ b/dev-java/jamvm/files/classes-location.patch
@@ -0,0 +1,27 @@
+diff -ur jamvm-1.5.0.old/configure.ac jamvm-1.5.0/configure.ac
+--- jamvm-1.5.0.old/configure.ac	2008-03-03 17:31:46.000000000 +0200
++++ jamvm-1.5.0/configure.ac	2008-03-03 17:36:14.000000000 +0200
+@@ -208,6 +208,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 -ur jamvm-1.5.0.old/src/class.h jamvm-1.5.0/src/class.h
+--- jamvm-1.5.0.old/src/class.h	2008-03-03 17:31:46.000000000 +0200
++++ jamvm-1.5.0/src/class.h	2008-03-03 17:36:51.000000000 +0200
+@@ -39,10 +39,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-1.5.4-r2.env b/dev-java/jamvm/files/jamvm-1.5.4-r2.env
new file mode 100644
index 000000000000..85c551eb63d3
--- /dev/null
+++ b/dev-java/jamvm/files/jamvm-1.5.4-r2.env
@@ -0,0 +1,11 @@
+VERSION="JamVM JRE @PV@"
+JAVA_HOME="/usr/@LIBDIR@/@PN@"
+BOOTCLASSPATH="${JAVA_HOME}/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/jamvm-1.5.4-r2.ebuild b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..d7c2807c7624
--- /dev/null
+++ b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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 ppc x86"
+IUSE="debug libffi"
+
+CLASSPATH_SLOT=0.98
+DEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT}
+	libffi? ( virtual/libffi )
+	amd64? ( virtual/libffi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# without this patch, classes.zip is not found at runtime
+	epatch "${FILESDIR}/classes-location.patch"
+	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
+}
+
+CLASSPATH_DIR="/usr/gnu-classpath-${CLASSPATH_SLOT}"
+
+src_configure() {
+	# Keep libjvm.so out of /usr
+	# http://bugs.gentoo.org/show_bug.cgi?id=181896
+	INSTALL_DIR="/usr/$(get_libdir)/${PN}"
+
+	filter-flags "-fomit-frame-pointer"
+
+	if use amd64 || use libffi; then
+		append-cflags "$(pkg-config --cflags-only-I libffi)"
+	fi
+
+	local fficonf="--enable-ffi"
+	use !amd64 && fficonf="$(use_enable libffi ffi)"
+
+	econf ${fficonf} \
+		--disable-dependency-tracking \
+		$(use_enable debug trace) \
+		--prefix=${INSTALL_DIR} \
+		--datadir=/usr/$(get_libdir) \
+		--bindir=/usr/bin \
+		--libdir=${INSTALL_DIR}/lib \
+		--with-classpath-install-dir=${CLASSPATH_DIR}
+}
+
+create_launcher() {
+	local script="${D}/${INSTALL_DIR}/bin/${1}"
+	cat > "${script}" <<-EOF
+		#!/bin/sh
+		exec /usr/bin/jamvm \
+			-Xbootclasspath/p:"${CLASSPATH_DIR}/share/classpath/tools.zip" \
+			gnu.classpath.tools.${1}.Main "\$@"
+	EOF
+	chmod +x "${script}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
+
+	set_java_env "${FILESDIR}/${PN}-1.5.4-r2.env"
+
+	dosym /usr/bin/jamvm ${INSTALL_DIR}/bin/java
+	dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip ${INSTALL_DIR}/jre/lib/rt.jar
+	dosym ${CLASSPATH_DIR}/share/classpath/tools.zip ${INSTALL_DIR}/lib/tools.jar
+	for file in ${CLASSPATH_DIR}/bin/*; do
+		base=$(basename ${file})
+		create_launcher ${base#g}
+	done
+}
diff --git a/dev-java/jamvm/metadata.xml b/dev-java/jamvm/metadata.xml
new file mode 100644
index 000000000000..a98889672a9e
--- /dev/null
+++ b/dev-java/jamvm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..7d2780843e90
--- /dev/null
+++ b/dev-java/janino/Manifest
@@ -0,0 +1 @@
+DIST janino-2.7.0.zip 992669 SHA256 9b0c089ab2659605aa2aea00431a683f9a29b56f01a31fec2db6ab60cc33f783 SHA512 0fe0faf16c9d7c63ed14b156bbf75b1ce6deebda24fc0eb0176e96693de9877187694dfb39e748523329430332a36017b2d7d04b2b26ef0847fde7396106185f WHIRLPOOL 503efab6a1b68e9bcbdfde49af81e2f29064054d551af06faf2125d33f131c9a44881057a8a3fa48f8061479bba21baf0c4f9d005a8360d432483ad201b8c5a0
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..0942a3bb502e
--- /dev/null
+++ b/dev-java/janino/janino-2.7.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..604e0a4238bb
--- /dev/null
+++ b/dev-java/janino/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/jansi-native/Manifest b/dev-java/jansi-native/Manifest
new file mode 100644
index 000000000000..67b1e78d5635
--- /dev/null
+++ b/dev-java/jansi-native/Manifest
@@ -0,0 +1 @@
+DIST jansi-native-1.5.tar.gz 205008 SHA256 2416e325a0092eb878f235d3771f23aedbdff2c6b85feb49a068ebfc3661b2f5 SHA512 29d178f013701b7e7844f899530f51486037e3a1403018ba4a41475ceb8d58afec768d177f64cbedd41adfb681ba08e578c2e18d956770bc039dfece8602a212 WHIRLPOOL b25c9a218b6a754bb2820722753f2adc0b67b8e04c041e5c4a6ba3e73fe9adaa21b70cf0d8bc7d2a952ceca9e0b8a407b7db1f725888e9b0d86bb11d4051336c
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..680d5edf6bbc
--- /dev/null
+++ b/dev-java/jansi-native/jansi-native-1.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..5321c600db61
--- /dev/null
+++ b/dev-java/jansi-native/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..be073ec56bce
--- /dev/null
+++ b/dev-java/jansi/Manifest
@@ -0,0 +1,2 @@
+DIST jansi-1.1-sources.jar 18401 SHA256 c347970cb7e74832ddc7a37966ec9e1697965200eaaadcf4f1f3f407ad965ce4 SHA512 6f731c3e87b3662ce03a951bea837aa02822cb21ad477e458f8a6ce11b6943fba88d5b6c3786bf47fb9e48d4d30debb4527812fa6c58fe973244ace459b6031d WHIRLPOOL 532adaac74483967079676569c446cfe903a7b22dabffddd4be69dac0c7c4c45ea9bad21fcd5658f5768be68650fe971773a549bcbb6973768a0cd912ba00329
+DIST jansi-1.11.tar.gz 252095 SHA256 e5c7bd4d9ccba7a2f191380111960c7bd699a7ffee370891b2ef7f905047cccf SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1 WHIRLPOOL 30bc2f3bcf1f74ed5b939e9cfb2c16e54f41e679a97c9983643207b264ddd8fdaf9a898c188f12ea2e84742c45942946f59dda97de1b76f39da050329ef91c24
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.1.ebuild b/dev-java/jansi/jansi-1.1.ebuild
new file mode 100644
index 000000000000..52ddcb5e8ee8
--- /dev/null
+++ b/dev-java/jansi/jansi-1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2
+
+DESCRIPTION="Jansi is a small java library that allows you to use ANSI escape sequences in your console output"
+HOMEPAGE="http://jansi.fusesource.org/"
+
+SRC_URI="http://jansi.fusesource.org/repo/release/org/fusesource/jansi/jansi/${PV}/${P}-sources.jar"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5
+	dev-java/jna"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/jna"
+
+src_compile() {
+	mkdir target
+	ejavac -classpath "$(java-pkg_getjars jna)" org/fusesource/jansi/*.java org/fusesource/jansi/internal/*.java -d target
+	jar -cf jansi.jar -C target .
+
+	use doc && mkdir target/html && javadoc org/fusesource/jansi/*.java org/fusesource/jansi/internal/*.java -d target/html
+}
+
+src_install() {
+	java-pkg_newjar "${PN}.jar"
+	use doc && java-pkg_dojavadoc "target/html/"
+	use source && java-pkg_dosrc "org"
+}
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..b40130b52e1f
--- /dev/null
+++ b/dev-java/jansi/jansi-1.11-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# TODO: Get doc (missing classpath entries) working.
+JAVA_PKG_IUSE="source test"
+
+inherit vcs-snapshot java-pkg-2 java-ant-2
+
+DESCRIPTION="Jansi is a small java 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/metadata.xml b/dev-java/jansi/metadata.xml
new file mode 100644
index 000000000000..95667b00a6b6
--- /dev/null
+++ b/dev-java/jansi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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>
+</pkgmetadata>
diff --git a/dev-java/japitools/Manifest b/dev-java/japitools/Manifest
new file mode 100644
index 000000000000..6802615e3949
--- /dev/null
+++ b/dev-java/japitools/Manifest
@@ -0,0 +1 @@
+DIST japitools-0.9.7.tar.gz 92537 SHA256 2201fe0252713938e70bdf0fc118c640477d8b9fc0ad2967734f4b8ee1630b80 SHA512 28e2ecb76d8b180134904ec7aef5b15c60b02be32ef2519886eb38bb468f80ab59abb7ce27752ddbd380a3ef580e8435a983cc17797f3147933894786fd8e52d WHIRLPOOL f59aa416e5f53364d949a3549cb8a93723ff869becb95a44eaedbe47ffed94b6c1d4310f4efe91e0108a5bb40baca674d537ab3c8552d96e036cfb770897fc2d
diff --git a/dev-java/japitools/files/japitools-0.9.7-classpath.patch b/dev-java/japitools/files/japitools-0.9.7-classpath.patch
new file mode 100644
index 000000000000..caf3f1a7f296
--- /dev/null
+++ b/dev-java/japitools/files/japitools-0.9.7-classpath.patch
@@ -0,0 +1,20 @@
+diff -Nur japitools-0.9.7/src/net/wuffies/japi/JapiantTask.java japitools-0.9.7_patched/src/net/wuffies/japi/JapiantTask.java
+--- japitools-0.9.7/src/net/wuffies/japi/JapiantTask.java	2006-10-23 02:42:44.000000000 +0300
++++ japitools-0.9.7_patched/src/net/wuffies/japi/JapiantTask.java	2008-07-03 20:46:59.000000000 +0300
+@@ -130,7 +130,15 @@
+         }
+ 
+         {
+-            args.add(System.getProperty("java.home") + File.separator + "lib" + File.separator + "rt.jar");
++            File rtJar=new File(System.getProperty("java.home") + File.separator + "lib" + File.separator + "rt.jar");
++            if(rtJar.exists())
++            	args.add(System.getProperty("java.home") + File.separator + "lib" + File.separator + "rt.jar");
++            File vmJar=new File(System.getProperty("java.home") + File.separator + "lib" + File.separator + "vm.jar");
++            if(vmJar.exists())
++            	args.add(System.getProperty("java.home") + File.separator + "lib" + File.separator + "vm.jar");
++            File coreJar=new File(System.getProperty("java.home") + File.separator + "lib" + File.separator + "core.jar");
++            if(coreJar.exists())
++            	args.add(System.getProperty("java.home") + File.separator + "lib" + File.separator + "core.jar");
+         }
+ 
+         {
diff --git a/dev-java/japitools/japitools-0.9.7-r1.ebuild b/dev-java/japitools/japitools-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..96ddbfd5c3b5
--- /dev/null
+++ b/dev-java/japitools/japitools-0.9.7-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source test"
+inherit eutils java-pkg-2 java-ant-2
+
+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"
+IUSE=""
+
+DEPEND="dev-java/ant-core
+	>=virtual/jdk-1.4
+	test? (
+		=dev-java/junit-3*
+		dev-java/ant-junit
+	)"
+
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-classpath.patch
+
+	cd "${S}"/bin || die
+	rm japize.bat || die
+	sed -e "s:../share/java:../share/${PN}/lib:" -i * \
+		|| die "Failed to correct the location of the jar file in perl scripts."
+}
+
+src_compile() {
+	eant jar
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
+}
+src_install() {
+	java-pkg_dojar share/java/*.jar
+	dobin bin/*
+
+	if use doc; then
+		cp -r design "${T}"
+		dohtml "${T}"/design/{*.css,*.html}
+		rm "${T}"/design/{*.css,*.html}
+		dodoc "${T}"/design/*
+	fi
+
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/japitools/metadata.xml b/dev-java/japitools/metadata.xml
new file mode 100644
index 000000000000..8759b6fb051b
--- /dev/null
+++ b/dev-java/japitools/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+
+<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..f155f3a3a9c5
--- /dev/null
+++ b/dev-java/jarbundler/Manifest
@@ -0,0 +1,3 @@
+DIST jarbundler-1.7.tar.gz 109484 SHA256 e727488efa0a990beca9343ad8050875ea459ea913aa7d54eeffc54c4a590ad2 SHA512 f3572fcf857c87fb6ff2c396f5da7502164a13e54a8adba1f9e6eece85c1a59509a3215443ca7d692992eac435bf4e962cc17f5ef64be0d0f676db563ade942a WHIRLPOOL 0a2f450980a6ccf954d75fd19b9e285054d0feb17d7913646e4875bd1273a5ed52236e3c34cab352e9168e71c7d339c6922ba73c66c2f8ecddaac3a53d6a4209
+DIST jarbundler-1.8.1.tar.gz 132101 SHA256 19f670035bfe13409dd562753b32144f4597fb56782a7baf604ec034a5f4f6a2 SHA512 f18657aaaae749846544fc35b65fe5e548a0471d85bf4e1d671bf1c7309f2392487069e880ce5f9c1a0e076637dddd9274d536969a9df5401331835f881553b4 WHIRLPOOL fb80abf779f7ebadcb331ffc785a6ae99063955b5fafbaaca1edc1fd6ee4a1730ef3ce20c312c3d6eca7827ee47d9e62dbe3a78268e11890742c2f2d165468bf
+DIST jarbundler.zip 159874 SHA256 6fb64f13d466804fa0ca0767708a0cc9cf1db1ed7904dc92afca188608ab9a6e SHA512 8b8b45533c601d10b6f986b913b824bb05617ac0901f178ee3fcfbdffa41ca060325228f71e62c4dfade778d50dd2040504eabf49311d386d75b82f77a535280 WHIRLPOOL 3676b6fabacc4054575cb5e5cf509a848d20222b28de1dad2ae0859f3b82ca070f294bb227849a3bb9a6a7662af45442a2fcb1502450a2cc7fe36c0e8be20245
diff --git a/dev-java/jarbundler/jarbundler-1.7.ebuild b/dev-java/jarbundler/jarbundler-1.7.ebuild
new file mode 100644
index 000000000000..a8c33283497c
--- /dev/null
+++ b/dev-java/jarbundler/jarbundler-1.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4
+		 dev-java/ant-core"
+
+src_compile() {
+	eant jar -Dant.jar="$(java-pkg_getjar ant-core ant.jar)" $(use_doc javadocs)
+}
+
+src_install() {
+	java-pkg_newjar "build/${P}.jar"
+	use doc && java-pkg_dojavadoc javadoc/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jarbundler/jarbundler-1.8.1-r1.ebuild b/dev-java/jarbundler/jarbundler-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..ced2b9fcfdcf
--- /dev/null
+++ b/dev-java/jarbundler/jarbundler-1.8.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON_DEP}"
+RDEPEND="
+	>=virtual/jre-1.4
+	>=dev-java/ant-core-1.7
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v *.jar || die
+	java-ant_rewrite-classpath
+}
+
+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-1.8.1-r2.ebuild b/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
new file mode 100644
index 000000000000..b1341521b3ae
--- /dev/null
+++ b/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..eb1f71af1ec3
--- /dev/null
+++ b/dev-java/jarbundler/jarbundler-2.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..604e0a4238bb
--- /dev/null
+++ b/dev-java/jarbundler/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest
new file mode 100644
index 000000000000..cfb68dc02b47
--- /dev/null
+++ b/dev-java/jarjar/Manifest
@@ -0,0 +1,2 @@
+DIST jarjar-src-0.9.zip 188269 SHA256 da90f1cb07dbd07b8141a4541acc701a0d33abb2808fe2410dd6782c98cb9b2a SHA512 ddfdad65785c9ecd98021cd1eb6226bce182e77421be2608a9e1776164e0e84ec957a453cb54e19fc0cc9cd2fcacb3867f399e1b40bd9696607885f00ab3c917 WHIRLPOOL 1e526ffc0dd4bf3e20e4751d171598028e78c6087bb6a02f070771a855495cbc8b54669c6802a2acb6115204e45e6cf7df1183bc259d978d67f71949c2d96c59
+DIST jarjar-src-1.4.zip 339014 SHA256 54368bb0ec484429243dc5620ce49d428f007c7eb8f3400367cdb2142dcc11ed SHA512 62af4f07c3fe2b887da959b8251a94fbd1c142e56b3332ad81865eef9ba32ded47883fc37d943c0081a4496ab71ef044022d13f21ccdb8db690638c26fc52c31 WHIRLPOOL c5fb411211f303976d3c10c6d3063b50defb7c5e8368d9f4f5faeef17eced530e59fa7d67153d04a9be98f60a28f276800f9e672a044415d69a2e4905222e03f
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-0.9.ebuild b/dev-java/jarjar/jarjar-0.9.ebuild
new file mode 100644
index 000000000000..99deccfca80b
--- /dev/null
+++ b/dev-java/jarjar/jarjar-0.9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Tool for repackaging third-party jars"
+SRC_URI="mirror://sourceforge/jarjar/${PN}-src-${PV}.zip"
+HOMEPAGE="http://jarjar.sourceforge.net"
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+COMMON_DEP="
+	=dev-java/asm-2.0*
+	=dev-java/gnu-regexp-1*
+	>=dev-java/ant-core-1.7.0
+	dev-java/java-getopt"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )
+	app-arch/unzip
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v src/main/com/tonicsystems/jarjar/JarJarMojo.java || die
+	rm -vr src/main/gnu || die
+
+	epatch "${FILESDIR}/0.9-system-jars.patch"
+	# bug #191378
+	epatch "${FILESDIR}/0.9-bootclasspath.patch"
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+	java-pkg_jar-from asm-2
+	java-pkg_jar-from gnu-regexp-1
+	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from java-getopt-1
+}
+
+ANT_TASKS="none"
+EANT_BUILD_TARGET="jar-nojarjar"
+
+src_test() {
+	# regenerates this
+	cp -i dist/${P}.jar "${T}" || die
+	cd lib || die
+	java-pkg_jar-from junit
+	cd ..
+	ANT_TASKS="ant-junit" eant test
+	cp "${T}/${P}.jar" dist || die
+}
+
+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/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
new file mode 100644
index 000000000000..859e8e70f8fb
--- /dev/null
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Tool for repackaging third-party jars"
+#SRC_URI="mirror://sourceforge/jarjar/${PN}-src-${PV}.zip"
+SRC_URI="http://jarjar.googlecode.com/files/${PN}-src-${PV}.zip"
+HOMEPAGE="http://jarjar.sourceforge.net"
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+CDEPEND="
+	dev-java/asm:4
+	dev-java/gnu-regexp:1
+	dev-java/java-getopt:1
+	dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+RESTRICT='test'
+
+# FIXME: tests fail to pass.
+#src_test() {
+#	# regenerates this
+#	cp -i dist/${P}.jar "${T}" || die
+#	cd lib || die
+#	java-pkg_jar-from junit
+#	cd ..
+#	ANT_TASKS="ant-junit" eant test
+#	cp "${T}/${P}.jar" dist || die
+#}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}" || die
+	rm -v src/main/com/tonicsystems/jarjar/JarJarMojo.java || die
+
+	cd "${S}/lib" || die
+	rm -v *.jar || die
+
+	java-pkg_jar-from asm-4
+	java-pkg_jar-from gnu-regexp-1
+	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from java-getopt-1
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/0.9-system-jars.patch"
+
+	# bug #191378
+	epatch "${FILESDIR}/0.9-bootclasspath.patch"
+}
+
+ANT_TASKS="none"
+EANT_BUILD_TARGET="jar-nojarjar"
+
+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..7303cef96964
--- /dev/null
+++ b/dev-java/jarjar/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/java-config-wrapper/Manifest b/dev-java/java-config-wrapper/Manifest
new file mode 100644
index 000000000000..822f3c0cceb0
--- /dev/null
+++ b/dev-java/java-config-wrapper/Manifest
@@ -0,0 +1 @@
+DIST java-config-wrapper-0.16.tar.bz2 7421 SHA256 26a9bddd2c4123bbe32cb52a248cfc8657ab9d414d4c330a10ec2bee3c3aa300 SHA512 24dc96d18b71e59129f0e5a376b7ca412941ec7337d7f3cbd67f40c211318955234b480031047fc367875cfaf8613a0f4aca67d479d424de9b48592d5dcb3fbf WHIRLPOOL f7e2e4fdedf7c51529a90d69e6ed34a15b98c062005476e01d2e5aaeea2d113c40e3d879fdc0a825512460545333bd55caf3f6779421fd101a09d70f3edd9d06
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild
new file mode 100644
index 000000000000..8f1ac10614dd
--- /dev/null
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Wrapper for java-config"
+HOMEPAGE="http://www.gentoo.org/proj/en/java"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="!<dev-java/java-config-1.3"
+RDEPEND="app-portage/portage-utils"
+
+src_install() {
+	dobin src/shell/* || die
+	dodoc AUTHORS || die
+}
diff --git a/dev-java/java-config-wrapper/metadata.xml b/dev-java/java-config-wrapper/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/java-config-wrapper/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
new file mode 100644
index 000000000000..9db5c14267e4
--- /dev/null
+++ b/dev-java/java-config/Manifest
@@ -0,0 +1 @@
+DIST java-config-2.2.0.tar.bz2 51851 SHA256 2cc47541714975099886156838f1f2c584b65e0cbc75ba2348cb18d9dec85fb7 SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a WHIRLPOOL 1ded227dcdd7f248f9a8335b07bf006ebfefc8368dd400558d3ed7ca14e22da83ee052fc33d65bb784c61d573fa7fae6295be4d023ad7652ed4704997260316e
diff --git a/dev-java/java-config/java-config-2.2.0.ebuild b/dev-java/java-config/java-config-2.2.0.ebuild
new file mode 100644
index 000000000000..be468bf47252
--- /dev/null
+++ b/dev-java/java-config/java-config-2.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="http://www.gentoo.org/proj/en/java/"
+SRC_URI="http://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+	>=dev-java/java-config-wrapper-0.15
+	sys-apps/baselayout-java
+	sys-apps/portage"
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-java/java-config/metadata.xml b/dev-java/java-config/metadata.xml
new file mode 100644
index 000000000000..7e8e0030c863
--- /dev/null
+++ b/dev-java/java-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>
+	<herd>java</herd>
+	<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/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/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..97523c04b6af
--- /dev/null
+++ b/dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.3.ebuild b/dev-java/java-dep-check/java-dep-check-0.3.ebuild
new file mode 100644
index 000000000000..3d60f1c85e0d
--- /dev/null
+++ b/dev-java/java-dep-check/java-dep-check-0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+
+inherit java-pkg-2
+
+DESCRIPTION="Java Dependency checker"
+HOMEPAGE="http://www.gentoo.org/proj/en/java"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+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}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${FILESDIR}/Main-${PV}.java" Main.java || die
+}
+src_compile() {
+	ejavac -cp $(java-pkg_getjars asm-3,commons-cli-1) -encoding UTF-8 -d . Main.java
+	jar cf ${PN}.jar javadepchecker/*.class || die "jar failed"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	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..7303cef96964
--- /dev/null
+++ b/dev-java/java-dep-check/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/java-getopt/Manifest b/dev-java/java-getopt/Manifest
new file mode 100644
index 000000000000..66b153e6f9ce
--- /dev/null
+++ b/dev-java/java-getopt/Manifest
@@ -0,0 +1 @@
+DIST java-getopt-1.0.14.tar.gz 45561 SHA256 ad0d5cd146d676a3ac0ef4bf6a292eb7f79d32d0cb4f202fa7e3d43dcb52d98e SHA512 611a08b60ed787eaa1bf6bf6ce45075ed2bd75d7eead941879e019ef12cb4fcd7a196d0e64e9a75adaf35240c872f14590d7afa4e2dda03016fa970bd2e2dc25 WHIRLPOOL 294783537a7dc35478a2ba6d3951ee5351435676b0bd9bf9c3315a697aeb32e55cb5e8b42b249f04f2a0c3c4a8052ef381c11dc16e0bfd5eafe41393f7ead11e
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..87628b3b638c
--- /dev/null
+++ b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..838c00a4a448
--- /dev/null
+++ b/dev-java/java-getopt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/java-gnome/Manifest b/dev-java/java-gnome/Manifest
new file mode 100644
index 000000000000..864cf3eed949
--- /dev/null
+++ b/dev-java/java-gnome/Manifest
@@ -0,0 +1,3 @@
+DIST java-gnome-4.0.19.tar.bz2 1048049 SHA256 3954ee78277918a32aa80b35cfc1892f3b21af4a6956d9e53e1f0e980512bd9b SHA512 da59fb69e0ab0547f9cb0979c16a16514ee512ed0a44a52689727d5d2ed1744a69650b8a9f3e9d5f3abdeec158a5f6b6af0326a394c7a4c96bad91c6f90903f1 WHIRLPOOL a4201f55950655d8d4ea5f5908c331bad140f7dcd9a710684d372a370800f88716d2066d06d15bb9d996e04948b4d32e477efba51cbec79dfc763d2f7755850d
+DIST java-gnome-4.0.20.tar.bz2 1053511 SHA256 2f2e1e97076507026e8bfca45183d30667fcd064177c4914d1b071923227c813 SHA512 8769d48b7dcb76487951b99df05dc04487098ccafb144779e53da2e5e934edbb18964053505750056f78b7117d2ab54538ab493c1a38bf82d9530fdcdfc52a85 WHIRLPOOL 0c20628780e16e64eb3d7728b3f10716144a1268b9ebd612bede3c1eef89f28d4f9b11c5c5d68ac68cb8cfa01e83f2bdc55b1b7bc05ce76e6c7085c453b89a1b
+DIST java-gnome-4.1.3.tar.xz 989568 SHA256 060b2b249bad918b91a55a82b8a2ed085bec5734defaf31e6c8c5ad006532373 SHA512 06f9468f59b5d7ac09fd9542b808c8bf7af5099df925b00f2b27d1dc515f1c15ea93b1fd8166bfa46eed143f6759fec360a8c3be3a5edb08d28901687493bd0a WHIRLPOOL aed0b93d138fd70ec6b0b62875346353ca11394f62ecfdd7b1a795010431fc7f84df58c1c66edb824be5c340e406b4882ffe5201f64a3c2ef80fb6d4d1ae689f
diff --git a/dev-java/java-gnome/files/java-gnome-4.0.18-libnotify-0.7.patch b/dev-java/java-gnome/files/java-gnome-4.0.18-libnotify-0.7.patch
new file mode 100644
index 000000000000..adfe937338f5
--- /dev/null
+++ b/dev-java/java-gnome/files/java-gnome-4.0.18-libnotify-0.7.patch
@@ -0,0 +1,231 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: serkan@gentoo.org-20110131175810-2wn3gvabeesq0b3x
+# target_branch: ../mainline
+# testament_sha1: dd22e2db4f450dde1d4a5128da7833d50c34ab69
+# timestamp: 2011-01-31 20:04:36 +0200
+# base_revision_id: andrew@operationaldynamics.com-20101224023849-\
+#   u859g3kgg2y9ybx4
+# 
+# Begin patch
+=== modified file 'configure'
+--- configure	2010-12-22 11:23:13 +0000
++++ configure	2011-01-31 17:58:10 +0000
+@@ -787,7 +787,7 @@
+ 			"gtkspell");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify");
+ 
+@@ -835,7 +835,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -897,7 +897,7 @@
+ 			"libgtksourceview2.0-dev");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify-dev");
+ 
+@@ -943,7 +943,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -989,7 +989,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -1050,7 +1050,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+
+=== modified file 'src/bindings/org/gnome/notify/Notification.java'
+--- src/bindings/org/gnome/notify/Notification.java	2010-01-06 06:28:28 +0000
++++ src/bindings/org/gnome/notify/Notification.java	2011-01-31 17:58:10 +0000
+@@ -71,8 +71,7 @@
+      * <p>
+      * The summary appears on the titlebar of notification and body appears as
+      * its text. Icon may be a string defining a theme icon or the filename
+-     * identifying the icon that appears next to text. Attach identifies the
+-     * widget that the notification relates to.
++     * identifying the icon that appears next to text.
+      * 
+      * <p>
+      * Note that all but summary can be <code>null</code>.
+@@ -80,19 +79,8 @@
+      * @since 4.0.12
+      */
+ 
+-    public Notification(String summary, String body, String icon, Widget attach) {
+-        super(NotifyNotification.createNotification(summary, body, icon, attach));
+-    }
+-
+-    /**
+-     * Create a new notification attached to a {@link StatusIcon}. See
+-     * {@link #Notification(String,String,String,Widget) Notification()} for
+-     * other parameters.
+-     * 
+-     * @since 4.0.12
+-     */
+-    public Notification(String summary, String body, String icon, StatusIcon statusIcon) {
+-        super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon));
++    public Notification(String summary, String body, String icon) {
++        super(NotifyNotification.createNotification(summary, body, icon));
+     }
+ 
+     /**
+@@ -109,34 +97,6 @@
+     }
+ 
+     /**
+-     * Attaches Notification to a Widget setting hints to its location.
+-     * 
+-     * @since 4.0.12
+-     */
+-    public void attach(Widget attach) {
+-        NotifyNotification.attachToWidget(this, attach);
+-    }
+-
+-    /**
+-     * Attaches Notification to a {@link StatusIcon} setting hints to its
+-     * location.
+-     * 
+-     * @since 4.0.12
+-     */
+-    public void attach(StatusIcon statusIcon) {
+-        NotifyNotification.attachToStatusIcon(this, statusIcon);
+-    }
+-
+-    /**
+-     * Sets the position of the notification to display on screen.
+-     * 
+-     * @since 4.0.12
+-     */
+-    public void setGeometryHints(Screen screen, int x, int y) {
+-        NotifyNotification.setGeometryHints(this, screen, x, y);
+-    }
+-
+-    /**
+      * Display the notification on screen.
+      * 
+      * @since 4.0.12
+
+=== modified file 'src/defs/NotifyNotification.defs'
+--- src/defs/NotifyNotification.defs	2009-05-16 05:46:28 +0000
++++ src/defs/NotifyNotification.defs	2011-01-31 17:58:10 +0000
+@@ -15,19 +15,6 @@
+     '("const-gchar*" "summary")
+     '("const-gchar*" "body" (null-ok))
+     '("const-gchar*" "icon" (null-ok))
+-    '("GtkWidget*" "attach" (null-ok))
+-  )
+-)
+-
+-(define-function notify_notification_new_with_status_icon
+-  (is-constructor-of "NotifyNotification")
+-  (c-name "notify_notification_new_with_status_icon")
+-  (return-type "NotifyNotification*")
+-  (parameters
+-    '("const-gchar*" "summary")
+-    '("const-gchar*" "body" (null-ok))
+-    '("const-gchar*" "icon" (null-ok))
+-    '("GtkStatusIcon*" "status_icon")
+   )
+ )
+ 
+@@ -42,35 +29,6 @@
+   )
+ )
+ 
+-(define-method attach_to_widget
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_widget")
+-  (return-type "none")
+-  (parameters
+-    '("GtkWidget*" "attach")
+-  )
+-)
+-
+-(define-method attach_to_status_icon
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_status_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GtkStatusIcon*" "status_icon")
+-  )
+-)
+-
+-(define-method set_geometry_hints
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_set_geometry_hints")
+-  (return-type "none")
+-  (parameters
+-    '("GdkScreen*" "screen")
+-    '("gint" "x")
+-    '("gint" "y")
+-  )
+-)
+-
+ (define-method show
+   (of-object "NotifyNotification")
+   (c-name "notify_notification_show")
+
+# Begin bundle
+IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQgyxQcAA4nfgGQwUH///3//
+/3C////4YAbX3jt9D0BVPeHnM9ju2qPbPDJQ9Sm1PQnlT2KejJpqaj/VTeJNE09Rsnqj1NDT0PSQ
+00waKYTJM0ZJk00mhoAAAGgAGgAaHDTTBDIaaZGTCAaaAMJo0yYAEDQYkI1JtGpiAxMmgBpo0AaN
+AGmmgaAIpRomSbRNqmPVNH6mKPUZGTIaZD1MQNAAyGEkQQEwjQJiBNpGmQjymT1A00DQGQaUhcxG
+ZHGCjAJ4K8Z2XsMDKmIDAeRljvwm1XFLy9VGBIe6dXM9es72qSm02uYSqri2Z4c5z2sUSaql6JYN
+sQHmSFk9xiUAkUgkDk2QcRIyfUkVMp2ad7nCV1R1VQlamrTlBOZCsgE5jBCWRvL9B3anDWWAP6jc
+GdjZ9vTQh7TY3xjefYhQOXKxZATTZg23g1XPwbWlZ1aLW7E767+2nKw771bgLAVQnnBQAVY5GkVj
+Qirkxg0gdAIFp7VAxPhwHNvSS5Dm6RMC1gqO0Y3PoLII59n9a83SE2Cke9iUy2wGJdIt79dxtoxz
+PNLtcUVKbEFlsyQw7Bx8BMCZ48HEzkc4BPkcFTFIPKGkcyYpFvGcuuMfVHMpWTRlLrJivHLkRVB/
+YK8nMaifJq12nxw1ClqdF+LrBonk4Arhdt4KNJ7Skmcxt8IIW+iyvMChRTQiWcrWaPdr0VsWVTBX
+zKjWiEoH9zJDCCs51pCCRCQAt9UenE9Vkk8UqQgm4xWEC82a/O9mDnQS/1kGDCCU6HuQ7a2GE5AH
+MsYbLc1I03qa9zKSIpfJETAzlEMcAV/YGcugah4StijQ+u8hAFoqRjovMBsxRRwYyib7IhGZIbeX
+yHPIC0BnPMdCOqYLYSrqNZBwgloadzGBxqDInq3mRLcZQcpNIUG3nssLwsZiFpWbOnyhXhSaaMSF
+peMhjIwzMVoweswKzD3yJAtF1loZGEKKN48wwvbEseTsp0ZYUSxRnL/jYjXC2GRbdEzmFmSO3I0E
+iuhOVFToUuQjERJCw0gpWlG8xSaQoAkumWv1MKC4QCsxjvLKzHGfyRc982ZqqDEFVdIio35xiokD
+GklArZKanh8zTFuF+jcWGCFSZ/RTZyYKxdz6A+VMEMY6oLzVqLEaWpJkSBEeNcqZVFJvoJUpolOa
+objYTtKM5XUXF4dwauWumi61RIIauBZYNO0cIuJsaGlEgESYuXNxgVfAG/sCikhOkGRqFOltYjQB
+uygmVhGyq67f5W/PV+RssyRRoERCETaHh/eDQ29v8vunm+0qaQ//tfDE935+JQp/inNTzZIbsDZx
+CWB29q1sdcvaIBwiFAs/xFUSbZt942vHQzcJ/D0a+vLG8A5iVsQ4YXRKy+Jtj7tnnI5qyIiJIhPh
+9HAex426xtDpAzhjcA6bG8GkX231fHA2Oz0v947dcHL9/ga+x0r+IuTjhqhI31ZbqZN3uFgmLWOe
+L4njaQwpZ0p9mvm3N6NBBmIzFRebYOTQfMnNRVs4N6gMIgvY3fn5QOQ3+sKxBGnixaOffp3TQT3Z
+t0b294rnXq+powRoRtUCgx44hI4FPDluRSLEc8XJgZgMwlPFCsGgTgPkXKh3EcqH32Txbg0EKKfZ
+QuMZ6GYaVy4uQ6TWcKjMeYIjZfJojxxcl0smWPDDS9VGk1YBWYZzpJzhkiHBNfMBtYIrpIBVJtvu
+SQ1cZgiyo28Uk4BOkYgCr6WigyRL0nR2HHqY0cnB7H5r6g34oU1/y7lnUGXS2JUQKBKSMkLeGcH7
+O47QPkJeAfO9eLLaC8/V0OyDlMWfSCc0PZh3INiB9Ota0es9qUH89uYIVMeFuhCcwXLksdPRqz7N
+NZiIWBhN9a7eJTHR0kajgkImFtjMBJpAnJrq9ucCEmFoQIKAVBpZd4uTmjLdSWHusMPMln3EFUFt
+2ZtBFE7SrAjSHPTPQrtegG2cJC3TDY1JkorWEoq28Hik0hKIqPp12gM7fbbgkilhanDr8lolsPZt
+zGh+YCoYYEckzWLLhSM866RbA1uOTj6HhIIUgg0GhIv52TCtIBVKkT54T+FAKrTTvPR1dk7NzMp0
+JPyMjPcGyrPUIwOsgHpRYJV9li8YJKIQ2y1WT6pFEG/JpDHCyUzBGFuyWJxWPEHUPVc6wbLQqX8i
+xYIrMLFqUESYkxv/zoCYKxdvBm4IOLgbOeGD6UwAuBCm+vNAJhgsJC0yFwrDbqZqoHxy8NV6dsKc
+92WlKOUzHsQx3KddeHf6L7VSCyKFpS8WRuQ3EFRBBuZdPWE4VI2/fERpFA1szpyxDniHW/nmhzYe
+FSKBdAits/xdyRThQkAgyxQc
diff --git a/dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch b/dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch
new file mode 100644
index 000000000000..d71be1bf995a
--- /dev/null
+++ b/dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch
@@ -0,0 +1,291 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: serkan@gentoo.org-20110328160500-s98m2vzg7wh44xsx
+# target_branch: ../mainline
+# testament_sha1: 3cf7a2a7e1af3fab89b8ead7f906642d84977eb2
+# timestamp: 2011-03-28 19:11:05 +0300
+# source_branch: /usr/portage/dev-java/java-gnome/files/java-gnome-\
+#   4.0.19-libnotify-0.7.patch
+# base_revision_id: andrew@operationaldynamics.com-20110214064042-\
+#   fv6tgq41rru7wjng
+# 
+# Begin patch
+=== modified file 'configure'
+--- configure	2011-02-14 06:40:42 +0000
++++ configure	2011-02-14 22:27:29 +0000
+@@ -805,7 +805,7 @@
+ 			"gtkspell");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify");
+ 
+@@ -853,7 +853,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -917,7 +917,7 @@
+ 			"libgtksourceview2.0-dev");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify-dev");
+ 
+@@ -968,7 +968,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -1020,7 +1020,7 @@
+ 			"lib${cpu_arch}gtksourceview-2.0-devel");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"lib${cpu_arch}notify-devel");
+ 
+@@ -1083,7 +1083,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+
+=== modified file 'doc/examples/notify/ExampleLowBattery.java'
+--- doc/examples/notify/ExampleLowBattery.java	2010-01-06 06:54:34 +0000
++++ doc/examples/notify/ExampleLowBattery.java	2011-03-28 16:05:00 +0000
+@@ -61,7 +61,7 @@
+          */
+ 
+         notification = new Notification("Low Battery Example", "Your battery is low!",
+-                "messagebox_warning", icon);
++                "messagebox_warning");
+ 
+         /*
+          * Quit the application after notification disappears.
+
+=== modified file 'src/bindings/org/gnome/notify/Notification.java'
+--- src/bindings/org/gnome/notify/Notification.java	2011-02-14 03:34:07 +0000
++++ src/bindings/org/gnome/notify/Notification.java	2011-03-13 22:23:48 +0000
+@@ -80,41 +80,7 @@
+      */
+ 
+     public Notification(String summary, String body, String icon) {
+-        super(NotifyNotification.createNotification(summary, body, icon, null));
+-    }
+-
+-    /**
+-     * Create a new notification.
+-     * 
+-     * <p>
+-     * The summary appears on the titlebar of notification and body appears as
+-     * its text. Icon may be a string defining a theme icon or the filename
+-     * identifying the icon that appears next to text. Attach identifies the
+-     * widget that the notification relates to.
+-     * 
+-     * <p>
+-     * Note that all but summary can be <code>null</code>.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
+-     * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
+-     */
+-
+-    public Notification(String summary, String body, String icon, Widget attach) {
+-        super(NotifyNotification.createNotification(summary, body, icon, attach));
+-    }
+-
+-    /**
+-     * Create a new notification attached to a {@link StatusIcon}. See
+-     * {@link #Notification(String,String,String,Widget) Notification()} for
+-     * other parameters.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
+-     * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
+-     */
+-    public Notification(String summary, String body, String icon, StatusIcon statusIcon) {
+-        super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon));
++        super(NotifyNotification.createNotification(summary, body, icon));
+     }
+ 
+     /**
+@@ -131,39 +97,6 @@
+     }
+ 
+     /**
+-     * Attaches Notification to a Widget setting hints to its location.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
+-     * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
+-     */
+-    public void attach(Widget attach) {
+-        NotifyNotification.attachToWidget(this, attach);
+-    }
+-
+-    /**
+-     * Attaches Notification to a {@link StatusIcon} setting hints to its
+-     * location.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
+-     * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
+-     */
+-    public void attach(StatusIcon statusIcon) {
+-        NotifyNotification.attachToStatusIcon(this, statusIcon);
+-    }
+-
+-    /**
+-     * Sets the position of the notification to display on screen.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3
+-     */
+-    public void setGeometryHints(Screen screen, int x, int y) {
+-        NotifyNotification.setGeometryHints(this, screen, x, y);
+-    }
+-
+-    /**
+      * Display the notification on screen.
+      * 
+      * @since 4.0.12
+
+=== modified file 'src/defs/NotifyNotification.defs'
+--- src/defs/NotifyNotification.defs	2009-05-16 05:46:28 +0000
++++ src/defs/NotifyNotification.defs	2011-01-31 17:58:10 +0000
+@@ -15,19 +15,6 @@
+     '("const-gchar*" "summary")
+     '("const-gchar*" "body" (null-ok))
+     '("const-gchar*" "icon" (null-ok))
+-    '("GtkWidget*" "attach" (null-ok))
+-  )
+-)
+-
+-(define-function notify_notification_new_with_status_icon
+-  (is-constructor-of "NotifyNotification")
+-  (c-name "notify_notification_new_with_status_icon")
+-  (return-type "NotifyNotification*")
+-  (parameters
+-    '("const-gchar*" "summary")
+-    '("const-gchar*" "body" (null-ok))
+-    '("const-gchar*" "icon" (null-ok))
+-    '("GtkStatusIcon*" "status_icon")
+   )
+ )
+ 
+@@ -42,35 +29,6 @@
+   )
+ )
+ 
+-(define-method attach_to_widget
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_widget")
+-  (return-type "none")
+-  (parameters
+-    '("GtkWidget*" "attach")
+-  )
+-)
+-
+-(define-method attach_to_status_icon
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_status_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GtkStatusIcon*" "status_icon")
+-  )
+-)
+-
+-(define-method set_geometry_hints
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_set_geometry_hints")
+-  (return-type "none")
+-  (parameters
+-    '("GdkScreen*" "screen")
+-    '("gint" "x")
+-    '("gint" "y")
+-  )
+-)
+-
+ (define-method show
+   (of-object "NotifyNotification")
+   (c-name "notify_notification_show")
+
+# Begin bundle
+IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYC7DCIACghfgGQ0UH///3//
+//C////4YA8dZ9xu46SdZbWaakqAoAZ9be83nuFDIehp7YKESiQZSepimaU9ED1D1Hih6TJtIAaA
+0AANAeUCUQCYBNQRKf6o0hpk9T0npAYg2oAaaeoGgOMjTJiaDJkwmmQMhoDQGmTQwAmgMJESZECN
+MTTKeqYw1TaTGp6mmTaTQNMj0mmmg0BJVE2jQjNCYmmENNP1Q09E2kejUwR6hoeoGEAkkEAEyA0N
+BBkiehqZPIaamJPU9R6nqDQbU0lswJsE7CsC4hcgMGbOQ7q0NbmapCXrHz6wR2GWwpYUeWhigoZK
+BRcS0pX8rt1mLkAhhrkgJHjh/X9W+eJa4a/04wbaiV+js0OQSE2bW61UKvY1WrBaqWUG320Xgm0E
+JunEVhJjuCJAawksggoNlJAgD5AkleVaNLRjE3IUwT0jUdKX1RKD2ZyCGNg2mxttNo+PjFm96QfE
+PlVWvZCgbGhwzVBw6Io4mdNM08TuKGO1C1CLykWutV30pWd19s76tZjvrM3Y3Rsmg5ImFjaKYoxs
+vutN1YwawlEe6akoq98H8LJ39Q0J9yYdA8Byoe0BwfsBLwzpMiY52uaNQKItAfNsDI+53C/eoZCT
+XHWhKKJFsCwKkZ4CWR5D5A/zY9GzoboKx0E3AuIbgh9uAzO4hn7Bja37+nJyreaJxdiSmJ6HgHsF
+7XIR2huwc0wVuNuv0frjtiK0PABB8wXcCejRtG/5hvOgIBw5l6vE2bvnSYgYmkB8wgsusGLfzzkR
+yAVhBIsSUgbQ7A2UgWg4FIDcoTzCpCEEoyOQrzKwisLaRyZhcxCVO9L2B+/q/9z6j7upeVVTAREK
+IgiI58mzxW26qHO+TWGgSK4Qa6QkNihpYg9QmIJAtIUmLucKJODADAvLXo5WIKoOSgcXJCUkAE0c
+QUFBJEGxCwcu1gp7Tc8pYFYkMBNRfqaKghu+4gA+VOuqHDE+m3iJFCM0FqYGmV5FZVEPO0xVnyKi
+JCY5xnhET0E3GUo2iBshaqaRoUQuI1hUDpM84LXfJskD/JSWK/aK8NpdKFmzckQSC10iGaGs9IVG
+EVvDh6QqILFmjrxiCWhDuY8Ye0oCKKp2Q6TkBsiGbckrZQSWNVlV4g1wpCoJwnRLSFiJk7P9HoUb
+a3bHv5gArDViVbq2wgOQRYdQ5uZbxC4EldJjdACPkGgNeksqmVIgwMOUegDhwTRDjexSMhZ0ngQM
+/MFOvFfU10bQ7N540/kHXCQB6UnW1vyIaR42p5dibchLIC4WIkK8mnJGYc+YpGki9jNBpyJMj+A8
+dEQQyYQBgra7tlmmxCM6y2zZy61bgVUlIKQy57USV9prQFfteooEJRGYiDnObCeFMIvDYXWeiush
+NoJ6GSU6py1WFIDD3UPVxPS5JP3tmiYvnBMCNvTn4pEppJL8hlIjh7SsHRU5HY+Tx7AO/gQL+YS4
+rPajYGBjsPczp1ZIkatM0A10dVJJEQY1wkSRXgGubTOhWbZgGv03PlAZsuCcTJudx1yU2XhUzKYO
+54GCZhc8UKPgHDwUeLYzL15zmZfV3c0HVd+AQPIPIPi9gdKR56BBbUSpzqdGRbGZjUSrRGASSIZE
+DUzklqkdJEoT1fWhz0VuSUWZxmM+rRcUsOLZ5o0WkvrAdg+0jr1NOGPYPhIEuTbjgIOL69SJpUFU
+GNZeBBIwhM9iunKRhBS2kNvXTWYrAbRLliGgt++AH2YxR5dnWsHOHgtGp1AcwiKiEWbowJoVIy5o
+xo42acNRCHeJ2d3IbMmQbRTJc5aYMcbcNclZiBgdLg0C+65c3NX7sLXVBpu0JxbpeDv3hG2SCmGa
+u9xYu38kKQBJjy6vRqF8R6mVyy0ewnkJNMFGD0KZ7H2BsvLlEJal082UObtucRaXH87ncpxGxxar
+RowSxa3IdAT7PO3gPQYKnQUuLouKXG3UiT1LiECf/ofGhG8e9HNPR0YOS9YMczkkRjKQpPQC1SQS
+Gmpirnj0l0V4DGaS19kw7K4KCB04Xr6SH7aT3xNq0Gf5q0cMB4eA8IgdHdsmnkclsyIyOhgXvw2j
+6sz/BEPhAVCrg1bG91HqiqPtjQIpC+GI0YIGotAXnsUIvVX4ZU4HtoMMFsTC7jjsGg1RysjDIpJN
+OBT4Pg1gcc69VbC7sSbzYwBvyC0On+P9U6miaCbk5L9zeDJrkwj/HcsYKgdgTpOelgQ6sGXb19cE
+RLoekOhPoZESSsorGtapskaGlWPEiRLtgTJ1IzoRkQBm+Sg0tNvTQ6QkLDc8GBvzgQsqqFHcFZY6
+AoIKH4Yci3JbJ3oTN/JhhPtuzzjLw+cIp4D4wZgL3CiBmjoIKCOGArQVHBUBYBoBiIUCEgYZrBFg
+RVIvBF8gw+89SRxh2i84dxGMYxo4CCCFDQZ02NtuSwcy+CGyWLmCUISsOgqPhh1hrC7FTfyxbQck
+BIf0AQhhDDvz+H87e40NpjTEuxwxjXy7QNnB5WHg9veuyo+n1+yQdAd7/p5/4H1AoV8v+h1cEwU5
+A2H6g93kGTvpNVrtucEE51vOY/OIHrQOAboLaDQKhW6Qg6grkVNborAM4Au9FS5sM+DGIo3rgCvT
+EqV3GA6nbxb8UQFUnHx3AV4AbwYMjBPZ+p5lxbL1e70FXeajnWCyeAWguzthmnxs1hn8vaBQHUfg
+ds4BiGQAhiEQebNGQtUrBLAmuGPAENyiA5U5QeY8DQbwXMmANLMrGzOeIbBg+gGCPX66CXu9gZAq
+MXnPP2bjjGW240l+Q0ifIZ9lvfi2mHXJXqtF0UedzgR6MlSeGOEsaqsV5M/lCfuCWqfe0coa/oHc
+QPM9nxfoO++/3ch+cEF+V3AF7WSqBgTBxDwEkoh7AXHC7FF4kvK+w+oNMwPYOPiySqBdB/K8NiRz
+EVwiEd7jnwBxyLMYwOslk34n1hadZEQU8jCQrG6CqqWZWkn7BbA576gphZQYncGSKZtViznfVfWI
+JYuPy18gXQWzh7QkCYERCG257EsjrwGj/J5qvWJ1PbSSdzzFqesiQ0yOON4Bbq4uwcClxOAS65nB
+r+yFoCMFpPyGLOUsQW9Iyg8wqG3dIZLjbrHLfQXybtpaHw28LdpLZXrBXJBUSJ4HhQC3E6iViRv+
+E4ZMo1nQZgTF1xq21YRXSkcc4L+8gMvMC7exwHHumNfmHA0FYqmxtvZrOi62iPL0tzO3lOg2HTvy
+lsl26+i46ZMtPDm4aYbXzmUe7vlCxpk0mnEl5EuMvXQj6gbbTThvzhBkrwRkK8eO20oyE2nMxWbt
+nRi4FZe7Aw1UUdN24McmuiAcA2iB1VWBnPb1BRVaXhhfmqgFcIVfYIgYnuz8AZIu0CEtgJ6QboX8
+AzQBfT00HzBwhLxCIYzLA5hXeIKERBkPSAqDs9fU4ewkiYkNA2prockzz9+++KcxF0IglwMh16Vv
+AGkNEDPLLhTN6msqdSU0QKud6uvSGjsSFaL+EvWlrSeyDtBsAoHgfBEyESCN4kLx7ArDx7AIh3ev
+2d4QoxYZMMhDfgQlUG4HWBo5IjXAWwQZo9Yef2AdwegIMITRzNh1RHsGIIoejsBOWWAZe2e69flQ
+uYAiQ5VcC5QPaIJgOjMG9IaEGQKBc9/c9CIgT7gRfavPTk/n4B5w1hMFIZAGQmSBgVB3pI3u0B3A
+9Je8lSw7OHvBcveCoWUiYiMkm7eh9JMRCEG5x9gUxJKo6E1gI7WP6fEAbEkWCANbA6fxrALggS+g
+iEmeH0i6AdGSfzdYOAsCo+VgGcO8SygW8pzng8lQWJHMvDLmDMwYBslBTh96zIGUiFKQ9wfpp+XG
+uISABxOsQbXpEBCVVrwC5KkFnDjKFIIYFIFHWE3hAUgQBlJ80WdrRDXPWclrV4Jgc3ldqEhFjJBx
+BwB7N5eIS6A9FtZmdrEE7MmMELcECwEJU9IJh0yCKdQhLKhYw3xBWev6JhgYSGGOs7ry/pSNaSiF
+HP648wZJkgykiRJNYAPzMFcc2qWcO3/XpqEGXcjpz+r436A93599F3UwMKT4/WcEQxBgW/9AUNIj
+VVjUJLBGAD0jxBTCEqTwqTjOwklBCnh1SYhs9yJJg6rBgEg+ZEeyQqMJTCmWSpxAuLADN+vgzI8Z
+gGo61q6whSk1MqCRNTJEoamSJ9QcQRkaTYx8ga0t/NiCgZAWoGkVSzi1MG02EzWxYQbmQqQRP5fh
++73gTB77xwdYQ9QOB2YF05/TMEiUglQawHAQvSyJB5wPcjS8zSBzZwYgMjNAFEJeixcISyghgsP0
+UYNIPCATK5gf1JEiM4dkwPdtyzJGEu3kB6/dcW/skONoqQ8ri4M4fGpHwn0BeIpEGsnBbEkX6vjf
+OktAku4D6zAqH7ebzrSIhqAz/FJORMIL5NCabyjIY94RDPH8PMEiy5dTO8z8MK1SOxJb+77mBeAs
+a0PvJVCB725QQlLDSiTtD7bkeY+8bbKATzikrg+lnnyoG4pK9IhtRENqTDRAuhIGNFlSSoSW7/4u
+5IpwoSEBdhhE
diff --git a/dev-java/java-gnome/files/java-gnome-4.0.20-extendsboxed.patch b/dev-java/java-gnome/files/java-gnome-4.0.20-extendsboxed.patch
new file mode 100644
index 000000000000..2cb31856717e
--- /dev/null
+++ b/dev-java/java-gnome/files/java-gnome-4.0.20-extendsboxed.patch
@@ -0,0 +1,61 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: abo-DBsUyxBEGcoyHQ1ptcDwU6trohdlbqPIoKRdnAj6d+WDsCgFy4VtynJYGxeQrm1n@public.gmane.org
+# target_branch: bzr://research.operationaldynamics.com/bzr/java-\
+#   gnome/mainline/
+# testament_sha1: d216bed6ef1b2623531fd1fe8d974e6e80f801f4
+# timestamp: 2011-12-15 22:15:31 +0100
+# base_revision_id: andrew-2KHxOkysSnqmy7d5DmSz6aFmO0nFMD88kjLrS2kiXIfrYvW/6KLgWA@public.gmane.org\
+#   dhkqq211ktceucsl
+# 
+# Begin patch
+=== modified file 'src/bindings/org/gnome/glib/Plumbing.java'
+--- src/bindings/org/gnome/glib/Plumbing.java	2011-06-19 04:33:24 +0000
++++ src/bindings/org/gnome/glib/Plumbing.java	2011-12-15 21:09:40 +0000
+@@ -153,7 +153,7 @@
+      * Retrieve an array of appropriate Java Boxeds for the given array of
+      * pointers.
+      */
+-    protected static Boxed[] boxedArrayFor(final Class<?> type, final long[] pointers, Boxed[] boxeds) {
++    protected static Boxed[] boxedArrayFor(final Class<? extends Boxed> type, final long[] pointers, Boxed[] boxeds) {
+         if (pointers == null) {
+             return null;
+         }
+@@ -170,7 +170,7 @@
+      * @throw ClassCastException if the GType pointed by given pointer is not
+      *        a GBoxed.
+      */
+-    protected static Boxed boxedFor(Class<?> type, final long pointer) {
++    protected static Boxed boxedFor(Class<? extends Boxed> type, final long pointer) {
+         Boxed proxy;
+ 
+         if (pointer == 0L) {
+@@ -202,7 +202,7 @@
+      * 
+      * @see #boxedFor(Class, long)
+      */
+-    protected static void fillBoxedArray(Class<?> type, Boxed[] boxeds, long[] pointers) {
++    protected static void fillBoxedArray(Class<? extends Boxed> type, Boxed[] boxeds, long[] pointers) {
+         if (pointers == null) {
+             return;
+         }
+
+# Begin bundle
+IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaBByfIAAa/fjEAQUGf/9/sA
+UAq////4AQAIAFAEGSaqmPQLWu4EkUJqn5MSeKe1GieQUbJiaI000DT1ASUk8JqHlNoKDEAANADQ
+NAEkQEaEaapmk0eoeTSA0aaaPU0GgOYBMAJgABMAATAAEkqej0JNR6j1DEaaB6h6mgMgA0yHWW3+
+Ju/ZoNpsRz1ywEaVrSsoyeGCB1LL2zZmDv7UeEZ2csNaA7xhD6/e+/wT7Tl2fNjiu6Ejl4wjdWbd
+Mub2pqi9qhzImIR0YKvUu2714RaW5DsKHYY5M8TFKaY+2oIxcVt3LRdrWmwV9blGOYKS9DJTpW0T
+R3QJAHy5Zijz+9TYRObAaUiRzUol0zhEWhJOozeqWpYIqyZbvhqyVV2tcLgZdcViIYXRGU1EWamP
+fTK5S0q+z3lYTFEWq5cF5tuYW2k7WvMGDlqQqx/yLnF+VNBiFDBOMqdO1Zar8QvCNzzpC7eSyknC
+VZnG4qPUcRRtV8C8NzGZlHI5goVGVbsKUpN5XIqNh132rlrcaFCrpxPrT6DHMK/xUi8wtxK7JEE+
+LghEkZweOJ2UkPaseTKLkUzA0XRipOKNF+aIy2J01IY42ndTy4Fwr3ip3jVzgoEgIEOAryVNTToR
+IIs9o+SLTo5F002iUCdG4rd8Tq2mWvBjh3Opei6h5JbZDLkZk33pFBl6jSZOWupp41zP2iy2ZHb0
+iOqcIZ9O687Bs1+PSrDHGvmFqXjrTouj5VB40o1rimaVSh1THOg52eFfn4rlQjMlvK2G4ioWMkp8
+DzsCErteFWAHTbgMwt0r4eWNZeNK7aUk1NCqQeJvxHzV65eiwOMqWyQofWjJwZdotRKlJM2WnhFu
+itOE08953PNQFU8iywcHQtyUJflM0d3TfT8Ww9HJaUxyTKETQe8IOPq0H8aCmAtlW9ScDbTB1gYx
+xaTEzHL40HkxhM53kRYMjw3IfhErFBXhCbKnpQx3UaCJPRoB+/f1TZJyAOWp19ApvRMoZ65LAnCz
+YFcdsFxFCzYnuDivTFYKoKAofaJk/unkDYZBm9+ZHdJ0xUaq1lo2zMF4riTTRQTzYXaAZablBybq
+kQyYI/YJxBkaKUGYGGrmaJSIpkzJlx9XUlkvNnv5lyB1DVHoJhd3EpAawbYbYWYxlX0UL2xpSTWJ
+QFaMmVs+pmTmkJUaF7dJVVjN/V2LAWevoEeGvMODBbgBzgSom6MN1hnByeecE2VKFodt5FRRGSJj
+OIOVNY/sSzFGSwBkFGKglaolFEKpVNfvtS3qMORqDoUYTT0UFPFixc1qVZZ4DhLAKrkk7tN1nIMB
+a7Lhii6yuUgqwb8kuxQxgJOLkKFWGwDMN0NZSy/1f+LuSKcKEhQIOT5A
diff --git a/dev-java/java-gnome/files/java-gnome-4.0.20-libnotify-0.7.patch b/dev-java/java-gnome/files/java-gnome-4.0.20-libnotify-0.7.patch
new file mode 100644
index 000000000000..076d467b2ab8
--- /dev/null
+++ b/dev-java/java-gnome/files/java-gnome-4.0.20-libnotify-0.7.patch
@@ -0,0 +1,300 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: serkan@gentoo.org-20110328160500-s98m2vzg7wh44xsx
+# target_branch: ../mainline
+# testament_sha1: 3cf7a2a7e1af3fab89b8ead7f906642d84977eb2
+# timestamp: 2011-03-28 19:11:05 +0300
+# source_branch: /usr/portage/dev-java/java-gnome/files/java-gnome-\
+#   4.0.19-libnotify-0.7.patch
+# base_revision_id: andrew@operationaldynamics.com-20110214064042-\
+#   fv6tgq41rru7wjng
+# 
+# Begin patch
+=== modified file 'configure'
+--- configure	2011-02-14 06:40:42 +0000
++++ configure	2011-02-14 22:27:29 +0000
+@@ -805,7 +805,7 @@
+ 			"gtkspell");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify");
+ 
+@@ -853,7 +853,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -917,7 +917,7 @@
+ 			"libgtksourceview2.0-dev");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"libnotify-dev");
+ 
+@@ -968,7 +968,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+@@ -1020,7 +1020,7 @@
+ 			"lib${cpu_arch}gtksourceview-2.0-devel");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"lib${cpu_arch}notify-devel");
+ 
+@@ -1083,7 +1083,7 @@
+ 			"FIXME");
+ 
+ 	check_system_library(@gnomedev_libs,
+-			"libnotify >= 0.4.5 libnotify < 0.7.0",
++			"libnotify >= 0.7.0",
+ 			"LibNotify",
+ 			"FIXME");
+ 
+
+=== modified file 'doc/examples/notify/ExampleLowBattery.java'
+--- doc/examples/notify/ExampleLowBattery.java	2010-01-06 06:54:34 +0000
++++ doc/examples/notify/ExampleLowBattery.java	2011-03-28 16:05:00 +0000
+@@ -61,7 +61,7 @@
+          */
+ 
+         notification = new Notification("Low Battery Example", "Your battery is low!",
+-                "messagebox_warning", icon);
++                "messagebox_warning");
+ 
+         /*
+          * Quit the application after notification disappears.
+
+=== modified file 'src/bindings/org/gnome/notify/Notification.java'
+--- src/bindings/org/gnome/notify/Notification.java	2011-02-14 03:34:07 +0000
++++ src/bindings/org/gnome/notify/Notification.java	2011-03-13 22:23:48 +0000
+@@ -80,46 +80,9 @@
+      */
+ 
+     public Notification(String summary, String body, String icon) {
+-        super(NotifyNotification.createNotification(summary, body, icon, null));
++        super(NotifyNotification.createNotification(summary, body, icon));
+     }
+ 
+-    /**
+-     * Create a new notification.
+-     * 
+-     * <p>
+-     * The summary appears on the titlebar of notification and body appears as
+-     * its text. Icon may be a string defining a theme icon or the filename
+-     * identifying the icon that appears next to text. Attach identifies the
+-     * widget that the notification relates to.
+-     * 
+-     * <p>
+-     * Note that all but summary can be <code>null</code>.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets
+-     *             and status icons. See
+-     *             http://live.gnome.org/GnomeShell/Design
+-     *             /Guidelines/MessageTray/Compatibility
+-     */
+-
+-    public Notification(String summary, String body, String icon, Widget attach) {
+-        super(NotifyNotification.createNotification(summary, body, icon, attach));
+-    }
+-
+-    /**
+-     * Create a new notification attached to a {@link StatusIcon}. See
+-     * {@link #Notification(String,String,String,Widget) Notification()} for
+-     * other parameters.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets
+-     *             and status icons. See
+-     *             http://live.gnome.org/GnomeShell/Design
+-     *             /Guidelines/MessageTray/Compatibility
+-     */
+-    public Notification(String summary, String body, String icon, StatusIcon statusIcon) {
+-        super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon));
+-    }
+ 
+     /**
+      * Updates the notification with given parameters see
+@@ -135,43 +98,6 @@
+     }
+ 
+     /**
+-     * Attaches Notification to a Widget setting hints to its location.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets
+-     *             and status icons. See
+-     *             http://live.gnome.org/GnomeShell/Design
+-     *             /Guidelines/MessageTray/Compatibility
+-     */
+-    public void attach(Widget attach) {
+-        NotifyNotification.attachToWidget(this, attach);
+-    }
+-
+-    /**
+-     * Attaches Notification to a {@link StatusIcon} setting hints to its
+-     * location.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3, notifications will be independent of widgets
+-     *             and status icons. See
+-     *             http://live.gnome.org/GnomeShell/Design
+-     *             /Guidelines/MessageTray/Compatibility
+-     */
+-    public void attach(StatusIcon statusIcon) {
+-        NotifyNotification.attachToStatusIcon(this, statusIcon);
+-    }
+-
+-    /**
+-     * Sets the position of the notification to display on screen.
+-     * 
+-     * @since 4.0.12
+-     * @deprecated In GNOME 3
+-     */
+-    public void setGeometryHints(Screen screen, int x, int y) {
+-        NotifyNotification.setGeometryHints(this, screen, x, y);
+-    }
+-
+-    /**
+      * Display the notification on screen.
+      * 
+      * @since 4.0.12
+
+=== modified file 'src/defs/NotifyNotification.defs'
+--- src/defs/NotifyNotification.defs	2009-05-16 05:46:28 +0000
++++ src/defs/NotifyNotification.defs	2011-01-31 17:58:10 +0000
+@@ -15,19 +15,6 @@
+     '("const-gchar*" "summary")
+     '("const-gchar*" "body" (null-ok))
+     '("const-gchar*" "icon" (null-ok))
+-    '("GtkWidget*" "attach" (null-ok))
+-  )
+-)
+-
+-(define-function notify_notification_new_with_status_icon
+-  (is-constructor-of "NotifyNotification")
+-  (c-name "notify_notification_new_with_status_icon")
+-  (return-type "NotifyNotification*")
+-  (parameters
+-    '("const-gchar*" "summary")
+-    '("const-gchar*" "body" (null-ok))
+-    '("const-gchar*" "icon" (null-ok))
+-    '("GtkStatusIcon*" "status_icon")
+   )
+ )
+ 
+@@ -42,35 +29,6 @@
+   )
+ )
+ 
+-(define-method attach_to_widget
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_widget")
+-  (return-type "none")
+-  (parameters
+-    '("GtkWidget*" "attach")
+-  )
+-)
+-
+-(define-method attach_to_status_icon
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_status_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GtkStatusIcon*" "status_icon")
+-  )
+-)
+-
+-(define-method set_geometry_hints
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_set_geometry_hints")
+-  (return-type "none")
+-  (parameters
+-    '("GdkScreen*" "screen")
+-    '("gint" "x")
+-    '("gint" "y")
+-  )
+-)
+-
+ (define-method show
+   (of-object "NotifyNotification")
+   (c-name "notify_notification_show")
+
+# Begin bundle
+IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYC7DCIACghfgGQ0UH///3//
+//C////4YA8dZ9xu46SdZbWaakqAoAZ9be83nuFDIehp7YKESiQZSepimaU9ED1D1Hih6TJtIAaA
+0AANAeUCUQCYBNQRKf6o0hpk9T0npAYg2oAaaeoGgOMjTJiaDJkwmmQMhoDQGmTQwAmgMJESZECN
+MTTKeqYw1TaTGp6mmTaTQNMj0mmmg0BJVE2jQjNCYmmENNP1Q09E2kejUwR6hoeoGEAkkEAEyA0N
+BBkiehqZPIaamJPU9R6nqDQbU0lswJsE7CsC4hcgMGbOQ7q0NbmapCXrHz6wR2GWwpYUeWhigoZK
+BRcS0pX8rt1mLkAhhrkgJHjh/X9W+eJa4a/04wbaiV+js0OQSE2bW61UKvY1WrBaqWUG320Xgm0E
+JunEVhJjuCJAawksggoNlJAgD5AkleVaNLRjE3IUwT0jUdKX1RKD2ZyCGNg2mxttNo+PjFm96QfE
+PlVWvZCgbGhwzVBw6Io4mdNM08TuKGO1C1CLykWutV30pWd19s76tZjvrM3Y3Rsmg5ImFjaKYoxs
+vutN1YwawlEe6akoq98H8LJ39Q0J9yYdA8Byoe0BwfsBLwzpMiY52uaNQKItAfNsDI+53C/eoZCT
+XHWhKKJFsCwKkZ4CWR5D5A/zY9GzoboKx0E3AuIbgh9uAzO4hn7Bja37+nJyreaJxdiSmJ6HgHsF
+7XIR2huwc0wVuNuv0frjtiK0PABB8wXcCejRtG/5hvOgIBw5l6vE2bvnSYgYmkB8wgsusGLfzzkR
+yAVhBIsSUgbQ7A2UgWg4FIDcoTzCpCEEoyOQrzKwisLaRyZhcxCVO9L2B+/q/9z6j7upeVVTAREK
+IgiI58mzxW26qHO+TWGgSK4Qa6QkNihpYg9QmIJAtIUmLucKJODADAvLXo5WIKoOSgcXJCUkAE0c
+QUFBJEGxCwcu1gp7Tc8pYFYkMBNRfqaKghu+4gA+VOuqHDE+m3iJFCM0FqYGmV5FZVEPO0xVnyKi
+JCY5xnhET0E3GUo2iBshaqaRoUQuI1hUDpM84LXfJskD/JSWK/aK8NpdKFmzckQSC10iGaGs9IVG
+EVvDh6QqILFmjrxiCWhDuY8Ye0oCKKp2Q6TkBsiGbckrZQSWNVlV4g1wpCoJwnRLSFiJk7P9HoUb
+a3bHv5gArDViVbq2wgOQRYdQ5uZbxC4EldJjdACPkGgNeksqmVIgwMOUegDhwTRDjexSMhZ0ngQM
+/MFOvFfU10bQ7N540/kHXCQB6UnW1vyIaR42p5dibchLIC4WIkK8mnJGYc+YpGki9jNBpyJMj+A8
+dEQQyYQBgra7tlmmxCM6y2zZy61bgVUlIKQy57USV9prQFfteooEJRGYiDnObCeFMIvDYXWeiush
+NoJ6GSU6py1WFIDD3UPVxPS5JP3tmiYvnBMCNvTn4pEppJL8hlIjh7SsHRU5HY+Tx7AO/gQL+YS4
+rPajYGBjsPczp1ZIkatM0A10dVJJEQY1wkSRXgGubTOhWbZgGv03PlAZsuCcTJudx1yU2XhUzKYO
+54GCZhc8UKPgHDwUeLYzL15zmZfV3c0HVd+AQPIPIPi9gdKR56BBbUSpzqdGRbGZjUSrRGASSIZE
+DUzklqkdJEoT1fWhz0VuSUWZxmM+rRcUsOLZ5o0WkvrAdg+0jr1NOGPYPhIEuTbjgIOL69SJpUFU
+GNZeBBIwhM9iunKRhBS2kNvXTWYrAbRLliGgt++AH2YxR5dnWsHOHgtGp1AcwiKiEWbowJoVIy5o
+xo42acNRCHeJ2d3IbMmQbRTJc5aYMcbcNclZiBgdLg0C+65c3NX7sLXVBpu0JxbpeDv3hG2SCmGa
+u9xYu38kKQBJjy6vRqF8R6mVyy0ewnkJNMFGD0KZ7H2BsvLlEJal082UObtucRaXH87ncpxGxxar
+RowSxa3IdAT7PO3gPQYKnQUuLouKXG3UiT1LiECf/ofGhG8e9HNPR0YOS9YMczkkRjKQpPQC1SQS
+Gmpirnj0l0V4DGaS19kw7K4KCB04Xr6SH7aT3xNq0Gf5q0cMB4eA8IgdHdsmnkclsyIyOhgXvw2j
+6sz/BEPhAVCrg1bG91HqiqPtjQIpC+GI0YIGotAXnsUIvVX4ZU4HtoMMFsTC7jjsGg1RysjDIpJN
+OBT4Pg1gcc69VbC7sSbzYwBvyC0On+P9U6miaCbk5L9zeDJrkwj/HcsYKgdgTpOelgQ6sGXb19cE
+RLoekOhPoZESSsorGtapskaGlWPEiRLtgTJ1IzoRkQBm+Sg0tNvTQ6QkLDc8GBvzgQsqqFHcFZY6
+AoIKH4Yci3JbJ3oTN/JhhPtuzzjLw+cIp4D4wZgL3CiBmjoIKCOGArQVHBUBYBoBiIUCEgYZrBFg
+RVIvBF8gw+89SRxh2i84dxGMYxo4CCCFDQZ02NtuSwcy+CGyWLmCUISsOgqPhh1hrC7FTfyxbQck
+BIf0AQhhDDvz+H87e40NpjTEuxwxjXy7QNnB5WHg9veuyo+n1+yQdAd7/p5/4H1AoV8v+h1cEwU5
+A2H6g93kGTvpNVrtucEE51vOY/OIHrQOAboLaDQKhW6Qg6grkVNborAM4Au9FS5sM+DGIo3rgCvT
+EqV3GA6nbxb8UQFUnHx3AV4AbwYMjBPZ+p5lxbL1e70FXeajnWCyeAWguzthmnxs1hn8vaBQHUfg
+ds4BiGQAhiEQebNGQtUrBLAmuGPAENyiA5U5QeY8DQbwXMmANLMrGzOeIbBg+gGCPX66CXu9gZAq
+MXnPP2bjjGW240l+Q0ifIZ9lvfi2mHXJXqtF0UedzgR6MlSeGOEsaqsV5M/lCfuCWqfe0coa/oHc
+QPM9nxfoO++/3ch+cEF+V3AF7WSqBgTBxDwEkoh7AXHC7FF4kvK+w+oNMwPYOPiySqBdB/K8NiRz
+EVwiEd7jnwBxyLMYwOslk34n1hadZEQU8jCQrG6CqqWZWkn7BbA576gphZQYncGSKZtViznfVfWI
+JYuPy18gXQWzh7QkCYERCG257EsjrwGj/J5qvWJ1PbSSdzzFqesiQ0yOON4Bbq4uwcClxOAS65nB
+r+yFoCMFpPyGLOUsQW9Iyg8wqG3dIZLjbrHLfQXybtpaHw28LdpLZXrBXJBUSJ4HhQC3E6iViRv+
+E4ZMo1nQZgTF1xq21YRXSkcc4L+8gMvMC7exwHHumNfmHA0FYqmxtvZrOi62iPL0tzO3lOg2HTvy
+lsl26+i46ZMtPDm4aYbXzmUe7vlCxpk0mnEl5EuMvXQj6gbbTThvzhBkrwRkK8eO20oyE2nMxWbt
+nRi4FZe7Aw1UUdN24McmuiAcA2iB1VWBnPb1BRVaXhhfmqgFcIVfYIgYnuz8AZIu0CEtgJ6QboX8
+AzQBfT00HzBwhLxCIYzLA5hXeIKERBkPSAqDs9fU4ewkiYkNA2prockzz9+++KcxF0IglwMh16Vv
+AGkNEDPLLhTN6msqdSU0QKud6uvSGjsSFaL+EvWlrSeyDtBsAoHgfBEyESCN4kLx7ArDx7AIh3ev
+2d4QoxYZMMhDfgQlUG4HWBo5IjXAWwQZo9Yef2AdwegIMITRzNh1RHsGIIoejsBOWWAZe2e69flQ
+uYAiQ5VcC5QPaIJgOjMG9IaEGQKBc9/c9CIgT7gRfavPTk/n4B5w1hMFIZAGQmSBgVB3pI3u0B3A
+9Je8lSw7OHvBcveCoWUiYiMkm7eh9JMRCEG5x9gUxJKo6E1gI7WP6fEAbEkWCANbA6fxrALggS+g
+iEmeH0i6AdGSfzdYOAsCo+VgGcO8SygW8pzng8lQWJHMvDLmDMwYBslBTh96zIGUiFKQ9wfpp+XG
+uISABxOsQbXpEBCVVrwC5KkFnDjKFIIYFIFHWE3hAUgQBlJ80WdrRDXPWclrV4Jgc3ldqEhFjJBx
+BwB7N5eIS6A9FtZmdrEE7MmMELcECwEJU9IJh0yCKdQhLKhYw3xBWev6JhgYSGGOs7ry/pSNaSiF
+HP648wZJkgykiRJNYAPzMFcc2qWcO3/XpqEGXcjpz+r436A93599F3UwMKT4/WcEQxBgW/9AUNIj
+VVjUJLBGAD0jxBTCEqTwqTjOwklBCnh1SYhs9yJJg6rBgEg+ZEeyQqMJTCmWSpxAuLADN+vgzI8Z
+gGo61q6whSk1MqCRNTJEoamSJ9QcQRkaTYx8ga0t/NiCgZAWoGkVSzi1MG02EzWxYQbmQqQRP5fh
++73gTB77xwdYQ9QOB2YF05/TMEiUglQawHAQvSyJB5wPcjS8zSBzZwYgMjNAFEJeixcISyghgsP0
+UYNIPCATK5gf1JEiM4dkwPdtyzJGEu3kB6/dcW/skONoqQ8ri4M4fGpHwn0BeIpEGsnBbEkX6vjf
+OktAku4D6zAqH7ebzrSIhqAz/FJORMIL5NCabyjIY94RDPH8PMEiy5dTO8z8MK1SOxJb+77mBeAs
+a0PvJVCB725QQlLDSiTtD7bkeY+8bbKATzikrg+lnnyoG4pK9IhtRENqTDRAuhIGNFlSSoSW7/4u
+5IpwoSEBdhhE
diff --git a/dev-java/java-gnome/java-gnome-4.0.19.ebuild b/dev-java/java-gnome/java-gnome-4.0.19.ebuild
new file mode 100644
index 000000000000..0f4e14d4219b
--- /dev/null
+++ b/dev-java/java-gnome/java-gnome-4.0.19.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils versionator java-pkg-2 multilib
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Java bindings for GTK and GNOME"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="4.0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.22
+	>=x11-libs/gtk+-2.22.0:2
+	>=gnome-base/libglade-2.6.4
+	>=gnome-base/libgnome-2.22.0
+	>=gnome-base/gnome-desktop-2.22.0:2
+	>=x11-libs/cairo-1.10.0[svg]
+	>=x11-libs/gtksourceview-2.6.2:2.0
+	>=app-text/gtkspell-2.0.15-r1:2
+	>=x11-libs/libnotify-0.4.5
+	>=dev-libs/libunique-1.0.8:1
+	>=gnome-base/librsvg-2.32.1
+	dev-libs/atk
+	>=virtual/jre-1.5"
+DEPEND="${RDEPEND}
+	dev-java/junit:0
+	dev-lang/perl
+	virtual/pkgconfig
+	>=virtual/jdk-1.5"
+
+# Needs X11
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	if has_version ">=x11-libs/libnotify-0.7"; then
+		epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	fi
+}
+
+src_configure() {
+	# Handwritten in perl so not using econf
+	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die
+}
+
+src_compile() {
+	# Fails parallel build in case GCJ is detected
+	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
+	emake -j1 || die "Compilation of java-gnome failed"
+
+	if use doc; then
+		DISPLAY= emake -j1 doc || die "Making documentation failed"
+	fi
+}
+
+src_install(){
+	emake -j1 DESTDIR="${D}" install || die
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk-${SLOT}.jar
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk.jar
+
+	dodoc AUTHORS HACKING NEWS README || die
+	use doc && java-pkg_dojavadoc doc/api
+	use examples && java-pkg_doexamples doc/examples
+	use source && java-pkg_dosrc src/bindings/org
+}
diff --git a/dev-java/java-gnome/java-gnome-4.0.20.ebuild b/dev-java/java-gnome/java-gnome-4.0.20.ebuild
new file mode 100644
index 000000000000..c6bc58fd6af3
--- /dev/null
+++ b/dev-java/java-gnome/java-gnome-4.0.20.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils versionator java-pkg-2 multilib python-r1
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Java bindings for GTK and GNOME"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-libs/glib-2.22
+	>=x11-libs/gtk+-2.22.0:2
+	>=gnome-base/libglade-2.6.4
+	>=gnome-base/libgnome-2.22.0
+	>=gnome-base/gnome-desktop-2.22.0:2
+	>=x11-libs/cairo-1.10.0[svg]
+	>=x11-libs/gtksourceview-2.6.2:2.0
+	>=app-text/gtkspell-2.0.15-r1:2
+	>=x11-libs/libnotify-0.4.5
+	>=dev-libs/libunique-1.0.8:1
+	>=gnome-base/librsvg-2.32.1
+	dev-libs/atk
+	>=virtual/jre-1.5
+	${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}
+	dev-java/junit:0
+	dev-lang/perl
+	virtual/pkgconfig
+	>=virtual/jdk-1.5"
+
+# Needs X11
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+}
+
+java_prepare() {
+	if has_version ">=x11-libs/libnotify-0.7"; then
+		epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	fi
+
+	# From http://permalink.gmane.org/gmane.comp.gnome.bindings.java.devel/1668
+	# which has been applied upstream in versions >=4.1.2.
+	epatch "${FILESDIR}"/${P}-extendsboxed.patch
+}
+
+src_configure() {
+	# Handwritten in perl so not using econf
+	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die
+}
+
+src_compile() {
+	# Fails parallel build in case GCJ is detected
+	# See https://bugs.gentoo.org/show_bug.cgi?id=200550
+	emake -j1
+
+	if use doc ; then
+		DISPLAY= emake -j1 doc
+	fi
+}
+
+src_install(){
+	emake -j1 DESTDIR="${D}" install
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk-${SLOT}.jar
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk.jar
+
+	dodoc AUTHORS HACKING NEWS README
+	use doc && java-pkg_dojavadoc doc/api
+	use examples && java-pkg_doexamples doc/examples
+	use source && java-pkg_dosrc src/bindings/org
+}
diff --git a/dev-java/java-gnome/java-gnome-4.1.3.ebuild b/dev-java/java-gnome/java-gnome-4.1.3.ebuild
new file mode 100644
index 000000000000..d947dce0101f
--- /dev/null
+++ b/dev-java/java-gnome/java-gnome-4.1.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils versionator java-pkg-2 multilib python-r1 virtualx
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Java bindings for GTK and GNOME"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}.tar.xz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="4.1"
+KEYWORDS="amd64 ~ppc x86"
+
+COMMON_DEP="
+	app-text/enchant:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.28:2
+	dev-libs/libunique:3
+	gnome-base/librsvg:2
+	>=x11-libs/cairo-1.10.0[svg]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0
+	>=x11-libs/libnotify-0.7.0
+	x11-libs/pango:0
+	${PYTHON_DEPS}"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+
+DEPEND="${COMMON_DEP}
+	dev-java/junit:0
+	dev-lang/perl
+	>=virtual/jdk-1.6
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+}
+
+src_configure() {
+	# Handwritten in perl so not using econf
+	./configure prefix=/usr libdir=/usr/$(get_libdir)/${PN}-${SLOT} jardir=/usr/share/${PN}-${SLOT}/lib || die
+}
+
+src_compile() {
+	emake
+	use doc && DISPLAY= emake doc
+}
+
+# Needs X11, fails even then
+RESTRICT="test"
+src_test() {
+	Xemake test
+}
+
+src_install(){
+	emake -j1 DESTDIR="${D}" install
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk-${SLOT}.jar
+	java-pkg_regjar /usr/share/${PN}-${SLOT}/lib/gtk.jar
+
+	use doc && java-pkg_dojavadoc doc/api
+	use examples && java-pkg_doexamples doc/examples
+	use source && java-pkg_dosrc src/bindings/org
+}
diff --git a/dev-java/java-gnome/metadata.xml b/dev-java/java-gnome/metadata.xml
new file mode 100644
index 000000000000..f1b3f175c0be
--- /dev/null
+++ b/dev-java/java-gnome/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+		An elegant set of language bindings to allow you to write
+		native GNOME/GTK applications in Java. Works with both
+		traditional Java VMs and also with GCJ, allowing the creation
+		of native Linux executable binaries.
+
+		These libraries all come from the java-gnome project, which in
+		turn is part of the official suite of GNOME language bindings.
+
+		As of java-gnome 2.8, the previously monolithic package was
+		split into numerous individual libraries to allow more
+		modular use. Those libraries are libgtk-java, libgnome-java,
+		libgconf-java, libglade-java, etc.
+
+		This ebuild is a meta package which simply depends on the
+		various libraries which make up the complete java-gnome suite.
+
+		In all likelihood (especially if you're developing apps) this
+		is what you want to emerge.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
new file mode 100644
index 000000000000..82724982be41
--- /dev/null
+++ b/dev-java/java-sdk-docs/Manifest
@@ -0,0 +1,3 @@
+DIST jdk-6u30-apidocs.zip 59086542 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab SHA512 5139b1a65765f258f21c629a0cfbf07aed0c12b3eb08d4615b049e825abd90c5b3385af99dba3a4ac6e0a94a5ffaa32ee648fb3e7ac1815ec6b74fe0d8e9f0ee WHIRLPOOL 941236c68b189f9cd23f0e904cc01da9f87cc39967c84cddf4c20a04fa2872eb99af147a21bb770320cad28b2cd86205402a141f7217d5301fa9a6ea41c3a136
+DIST jdk-7u80-docs-all.zip 61168809 SHA256 0494bd49bc9cb3cbe3203120ae8b2c8e0aeb1579cb15c0fbd3cd780d19aa200a SHA512 c673c00e55c9a19938c42512cb9c6ae65de9803a1307d11a2043903d87cc36d9ed1f5a1e287040d8570e430cfe55f496354c1242fe6e242f1245f8271394ea1a WHIRLPOOL ad18886c401ec42735665081a0dd5ba3dc7678de0171f3aa8151c2e4ce3392e467be65c602f393da38373e589fa9800ed1afd3601d2cef4e48b06e57f491698e
+DIST jdk-8u51-docs-all.zip 92230995 SHA256 fa36f0611df525b39e27353daa42b089dc76f86f7dc09b0dc98d72c10ba76284 SHA512 bb1e65820902153d2fbebc170b18bce0c630dc8b5ce70fde53f6b55f9203267411846b9c81a77fb0c45f30df30f4d327120499c3ad11dc8e50c078d096e1943f WHIRLPOOL dd0e6b2dfbd8ce9960359013ace595c50c7281e8bed3e7cbc2a93f6a776eb4d60ecbc7d2a16796eefca02d38af3fcee9b4633215288ce464fed852e147599a50
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.30.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.30.ebuild
new file mode 100644
index 000000000000..9b0ee7a4f926
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.6.0.30.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit versionator
+
+UPDATE_VER="$(get_version_component_range 4)"
+
+SRC_URI="jdk-6u${UPDATE_VER}-apidocs.zip"
+DESCRIPTION="Sun's documentation bundle (including API) for Java SE"
+HOMEPAGE="http://download.oracle.com/javase/6/docs/index.html"
+LICENSE="oracle-java-documentation"
+SLOT="1.6.0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND=""
+RESTRICT="fetch"
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u25-doc-download-355137.html"
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${SRC_URI} from "
+	einfo "${DOWNLOAD_URL}"
+	einfo "(yes, the download page URL refers to an older version for some reason)"
+	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 "http://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.7.0.80.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild
new file mode 100644
index 000000000000..52215cf52664
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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 "http://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.51.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.51.ebuild
new file mode 100644
index 000000000000..f97746c7d467
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.51.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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 ~ppc ~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 "http://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/metadata.xml b/dev-java/java-sdk-docs/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/java-sdk-docs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
new file mode 100644
index 000000000000..4280cd6174e8
--- /dev/null
+++ b/dev-java/java-service-wrapper/Manifest
@@ -0,0 +1,5 @@
+DIST wrapper_3.2.3_src.tar.gz 3409483 SHA256 7e57b0103959fe3566def64b1dd3fef6537032a7e4b2a7811594f1db7d9f5859 SHA512 5ff696069402496e7b871b60a00a5a87a6bcaf1c30ad5c69530725cf7c45d55d98e2500761b36ecd1ac97f67331d43b43775cff89d526fecbc67056a8899519a WHIRLPOOL 4bf2376166b8d0d3164f31f2d5ec0f60d1e53f31afea72f7ca0d113ec331205d4bb539254295b03c0d9320c4c65e92378a95eca8a45b87728ea6003d619b09ae
+DIST wrapper_3.3.1_src.zip 381967 SHA256 5d3090c235e93bf5f502edd191b5aeb5d611743e8a4d1908fe308917ef601594 SHA512 cd15097b04de7f95e3ab751643292b2e01465cf52ac4c510d9a94ee955f81a623aba9bad592f09cbfa09a12b5fce27ce1526a3e785e4705f575ec9ab481b8438 WHIRLPOOL 08b5830726faf46164e0a79c6b690f9664b2799cedeb344e07cb842b97f0f599576c2cb37ded71d3eb43c6bf5e31bc13b04405d1eef3692c8d3a355193d8b311
+DIST wrapper_3.3.3_src.tar.gz 300817 SHA256 63a39aa218c1a8146f75b98cf232396ed89c2ea09a395a5b83bc6ce306ce64fc SHA512 0deff9374c009c24f8092195d0c3029581a61d02159bd10a8e100dfa0908a7ddfaf3fa7896df820df3fb695c047a378b6e02d7722b766dd7771d1313ca6f7cde WHIRLPOOL 5d8f470ee0b899a7d68384186c2c585f1e89c53d16499be4394078bcc7ee96de766f59481d81d7dfaeb12b5ecd1602c9dba298a0681d2f583718deb865498bfa
+DIST wrapper_3.5.14_src.tar.gz 499693 SHA256 dac159a3e68a54926deaa545b92d1ed54671ccc44a375b38d0fb514e1a846481 SHA512 7787d3edd46f61cbf1d1a175b8994c074b5471a35c0ccb9e5b860e709e5e7d3cbd40282c2ee222e7e8e076f84e3ad5af1019fae069809333ef1ab04f6eea2b26 WHIRLPOOL 30715d5ec3e8fdb15c489bf17112437b151a1bd1cfd2f02c1369c47002aa6aff689ef1c7996170283e5671beeaf8ed36076fac9f752a7956226f85f7e10663c2
+DIST wrapper_3.5.25_src.tar.gz 556678 SHA256 3cbecb7f2101eda82125e3649e3245fc1e7b4b4d6501b479990ea8b18ac6450b SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4 WHIRLPOOL d6bcf8aa40525e80e7bfeb927b690cd818c69da276a0d6cfd2b6a37afb88cb0b826485fc25cb76fa89d7c6227e49735f31361641f966944caba5ee2cec44bec0
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch
new file mode 100644
index 000000000000..80d24f7469ce
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch
@@ -0,0 +1,53 @@
+--- build.xml	2008-02-24 20:10:00.000000000 +1300
++++ build.xml	2008-02-24 20:17:10.000000000 +1300
+@@ -397,16 +397,6 @@
+             <classpath refid="project.class.path"/>
+         </javac>
+ 
+-        <!-- compile everything under src/test -->
+-        <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
+-               deprecation="on"
+-               debug="on"
+-               optimize="on"
+-               source="${javac.target.version}"
+-               target="${javac.target.version}">
+-            <classpath refid="test.class.path"/>
+-        </javac>
+-
+         <!-- copy resource files to build directory -->
+         <copy todir="${build.classes}" > 
+             <fileset dir="${src.dir}/java" > 
+@@ -430,6 +420,24 @@
+             <class name="org.tanukisoftware.wrapper.WrapperManager"/>
+         </javah>
+     </target>
++
++    <target name="compile-test" depends="compile-java-warn">
++        <!-- compile everything under src/test -->
++        <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
++                deprecation="on"
++                debug="on"
++                optimize="on"
++                source="${javac.target.version}"
++                target="${javac.target.version}">
++	        <classpath refid="test.class.path"/>
++	        <classpath>
++                <fileset dir="lib">
++		            <include name="**/*.jar"/>
++			    </fileset>
++            </classpath>
++        </javac>
++    </target>
++
+     <target name="msvc-missing" depends="init:msg" if="msvc.missing">
+         <condition property="msvc.home.v8_c" value="${msvc.home.v8_64_c}">
+             <equals arg1="${bits}" arg2="64"/>
+@@ -636,7 +644,7 @@
+     <!-- =================================================================== -->
+     <!-- Test Task                                                           -->
+     <!-- =================================================================== -->
+-    <target name="test" depends="jar" description="Runs unit tests">
++    <target name="test" depends="compile-test,jar" description="Runs unit tests">
+         <mkdir dir="${build.tests}"/>
+         
+         <junit fork="true"
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch
new file mode 100644
index 000000000000..c61679a602c1
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch
@@ -0,0 +1,62 @@
+diff -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make
+--- wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make	2008-08-17 10:40:04.000000000 +0300
++++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make	2008-11-16 17:31:47.000000000 +0200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
+ 
+-COMPILE = gcc -O3 -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
++COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+@@ -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) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -lm -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
+ 
+ %.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 -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make
+--- wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make	2008-08-17 10:40:04.000000000 +0300
++++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make	2008-11-16 17:31:54.000000000 +0200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
+ 
+-COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
++COMPILE = $(CC) -fPIC -DLINUX -D_FILE_OFFSET_BITS=64
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+@@ -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) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
+ 
+ %.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.14-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
new file mode 100644
index 000000000000..ce5fd4aed26b
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
@@ -0,0 +1,62 @@
+diff -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make
+--- wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make	2012-02-08 21:14:51.000000000 +1300
++++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make	2012-04-18 23:47:55.000000000 +1200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+ 
+-COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE 
++COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE 
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+@@ -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) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
+ 
+ %.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 -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make
+--- wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make	2012-02-08 21:14:51.000000000 +1300
++++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make	2012-04-18 23:50:06.000000000 +1200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+ 
+-COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
++COMPILE = $(CC) -fPIC -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+@@ -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) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so  $(libwrapper_so_OBJECTS) -lm
+ 
+ %.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.14-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch
new file mode 100644
index 000000000000..b69927384dd2
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch
@@ -0,0 +1,22 @@
+Author: Ralph Sennhauser <sera@gentoo.org>
+
+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.
+
+--- a/src/c/wrapper.c
++++ b/src/c/wrapper.c
+@@ -4664,7 +4664,7 @@ void checkIfRegularExe(TCHAR** para) {
+     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, TRUE);
++        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE, TRUE);
+         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-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.2.3.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild
new file mode 100644
index 000000000000..723ce123c62c
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc source test"
+inherit base java-pkg-2 java-ant-2 eutils
+
+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="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+
+# TODO test with 1.3
+DEPEND=">=virtual/jdk-1.4
+		test? (
+			dev-java/ant-junit
+			=dev-java/junit-3*
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	BITS="32"
+	use amd64 && BITS="64"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# TODO file upstream
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	use x86 && sed -i -e 's|gcc -O3 -Wall --pedantic|$(CC) $(CFLAGS) -fPIC -lm|g' \
+		"src/c/Makefile-linux-x86-${BITS}"
+	use amd64 && sed -i -e 's|gcc -O3 -fPIC -Wall --pedantic|$(CC) $(CFLAGS) -fPIC|g' \
+		"src/c/Makefile-linux-x86-${BITS}"
+	# remove to avoid usage of stuff here"
+	rm -R tools
+
+	if use test; then
+		mkdir lib
+		cd lib
+		java-pkg_jar-from --build-only junit
+	fi
+}
+
+src_compile() {
+	tc-getCC
+	eant -Dbits=${BITS} jar compile-c $(use_doc -Djdoc.dir=api jdoc)
+}
+
+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 doc/{AUTHORS,readme.txt,revisions.txt}
+
+	use doc && dohtml -r doc/english/
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild
new file mode 100644
index 000000000000..9274a7694c0b
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc source test"
+inherit base java-pkg-2 java-ant-2 eutils
+
+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}.zip"
+
+LICENSE="tanuki-community"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+
+# TODO test with 1.3
+DEPEND=">=virtual/jdk-1.4
+		test? (
+			dev-java/ant-junit
+			=dev-java/junit-3*
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	BITS="32"
+	use amd64 && BITS="64"
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
+}
+
+src_compile() {
+	tc-export CC
+	eant -Dbits=${BITS} jar compile-c $(use_doc -Djdoc.dir=api)
+}
+
+src_test() {
+	mkdir -p lib
+	java-pkg_jar-from --build-only --into lib junit
+
+	local gentoocp="gentoo.classpath=$(java-pkg_getjars --build-only junit)"
+
+	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" "${gentoocp}" test
+}
+
+src_install() {
+	java-pkg_dojar lib/wrapper.jar
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc doc/{readme.txt,revisions.txt}
+
+	use doc && dohtml -r doc/english/
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.3.3.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.3.3.ebuild
new file mode 100644
index 000000000000..709341372c56
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.3.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc source test"
+
+inherit base java-pkg-2 java-ant-2 eutils
+
+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"
+
+# TODO test with 1.3
+DEPEND=">=virtual/jdk-1.4
+		test? (
+			dev-java/ant-junit
+			=dev-java/junit-3*
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.3.1-as-needed.patch"
+	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	tc-export CC
+	BITS="32"
+	use amd64 && BITS="64"
+	eant -Dbits=${BITS} jar compile-c
+	if use doc; then
+		javadoc -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 doc/{readme.txt,revisions.txt} || die
+
+	use doc && dohtml -r doc/english/
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild
new file mode 100644
index 000000000000..6ffb9ff60f44
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+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"
+
+java_prepare() {
+	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	epatch "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch #414027
+}
+
+src_compile() {
+	tc-export CC
+	BITS="32"
+	use amd64 && BITS="64"
+	eant -Dbits=${BITS} jar compile-c
+	if use doc; then
+		javadoc -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/java-service-wrapper-3.5.14.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14.ebuild
new file mode 100644
index 000000000000..e1b68ca92b82
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc source test"
+
+inherit base java-pkg-2 java-ant-2 eutils
+
+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"
+
+# TODO test with 1.3
+DEPEND=">=virtual/jdk-1.4
+		test? (
+			dev-java/ant-junit
+			=dev-java/junit-3*
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.5.14-as-needed.patch"
+	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	tc-export CC
+	BITS="32"
+	use amd64 && BITS="64"
+	eant -Dbits=${BITS} jar compile-c
+	if use doc; then
+		javadoc -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 && dohtml -r doc/english/
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild
new file mode 100644
index 000000000000..c0e1cae08abd
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+java_prepare() {
+	#Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch #414027
+	epatch "${FILESDIR}"/${P}-testsuite.patch
+
+	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
+		javadoc -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..1f05146b8ffe
--- /dev/null
+++ b/dev-java/java-service-wrapper/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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/java-xmlbuilder/Manifest b/dev-java/java-xmlbuilder/Manifest
new file mode 100644
index 000000000000..73b6871d335a
--- /dev/null
+++ b/dev-java/java-xmlbuilder/Manifest
@@ -0,0 +1 @@
+DIST java-xmlbuilder-0.6.tar.bz2 14612 SHA256 938ed969c80399a2c75e81a0283b9fc9d752d983362a265d389e1b46cb972633 SHA512 b73e0a326563af2aaa6f9cc0600d64b9ba6969430e27ad0dfff1b20b253e46d2888e5654c301c0b3b5b70c5766a2fbd94776df1ccb37d9d1e90bc76f190c5a92 WHIRLPOOL bb24b128bacd34113b6129ccb23e51bae757b6fee2070638ea3d889cfdfe3404340dd5b4f6f430afdbd7d3a832cfdbbf7a661c729177f9504556cd2b21069be9
diff --git a/dev-java/java-xmlbuilder/java-xmlbuilder-0.6-r1.ebuild b/dev-java/java-xmlbuilder/java-xmlbuilder-0.6-r1.ebuild
new file mode 100644
index 000000000000..72863d4a1c5d
--- /dev/null
+++ b/dev-java/java-xmlbuilder/java-xmlbuilder-0.6-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A utility that allows simple XML documents to be constructed using Java"
+HOMEPAGE="https://code.google.com/p/java-xmlbuilder/"
+SRC_URI="http://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/base64:0"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}
+	test? ( dev-java/junit:0 )
+"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="base64"
+
+src_test() {
+	mkdir target/tests || die
+	testcp="$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH},junit):target/tests:${S}/${PN}.jar"
+	ejavac -cp "${testcp}" -d target/tests src/test/java/com/jamesmurty/utils/TestXmlBuilder.java
+	ejunit4 -cp "${testcp}" com.jamesmurty.utils.TestXmlBuilder
+}
diff --git a/dev-java/java-xmlbuilder/metadata.xml b/dev-java/java-xmlbuilder/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/java-xmlbuilder/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
new file mode 100644
index 000000000000..2b000818d10d
--- /dev/null
+++ b/dev-java/javacc/Manifest
@@ -0,0 +1,3 @@
+DIST javacc-4.0src.tar.gz 765150 SHA256 062a35b89cf1bb4260627c32f480d26e17bf4595024e4b4e472a46fe1b24655f SHA512 1c4363ed318d1c29d44243847b54af97e477095c9070ea434349c79ed0e20c1ff90bd5e8bdc07e6d95237412d0c6fcaa8674ee1309f0926a4e165d4c52370ac0 WHIRLPOOL 1bd3e2c6b3d5e7467d9f2288d9a45436bf848c0e5cbce426ec96ceadf70680f20a6b2e44fa2eabbbe0362cd58d5ef52e025c2ffbcaa88002c2c3a5f3208f1512
+DIST javacc-4.2src.tar.gz 843455 SHA256 504d452ea1904e5b3a2728cbcacf0b9916630bd2ba746112104f741cec230139 SHA512 5dae37425b3aaf64390261ef4c452ef9a0a9b9cdc386c6d818cbea577b1c7b539b2012ef3a4044723ddf07cabb602cd46c26bfcb731610d6876750ffe85472b1 WHIRLPOOL 6a33d6a93c10c208b45887728fb834e6e5180bd045b9cb15aebc8c4042ea8c7d44e78b1bf5586ab3b7db06e08502411f0c30e777e49a395c4e19c1cd3794a484
+DIST javacc-5.0src.tar.gz 810123 SHA256 766cae9d3710054f452a7f0779db885eacfdae363152cb2e7fe025aa7ea17370 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6 WHIRLPOOL 11b299f2e2c0f0d699b0eb5f150e2200b60c0b385a0f3c8e4ca2be38971b71b52c7d351c7219af636d4fbab451fe9e471b9f2f676bc79cc2e76740e702159825
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-4.0-r4.ebuild b/dev-java/javacc/javacc-4.0-r4.ebuild
new file mode 100644
index 000000000000..1edfc1a5d3e8
--- /dev/null
+++ b/dev-java/javacc/javacc-4.0-r4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.dev.java.net/"
+SRC_URI="https://${PN}.dev.java.net/files/documents/17/26783/${P}src.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+DEPEND=">=virtual/jdk-1.4
+	=dev-java/junit-3.8*
+	test? ( dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/junit-3.8*"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-javadoc.patch
+	rm -v lib/junit*/*.jar || die
+}
+
+_eant() {
+	# Most likely not needed at runtime but better safe than sorry
+	eant -Djunit.jar="$(java-pkg_getjar junit junit.jar)" "${@}"
+}
+
+src_compile() {
+	_eant jar $(use_doc)
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" _eant test
+}
+
+src_install() {
+	java-pkg_dojar bin/lib/${PN}.jar
+
+	dodoc README || die
+
+	if use doc; then
+		java-pkg_dohtml -r www/*
+		java-pkg_dojavadoc doc/api
+	fi
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -R examples/* "${D}"/usr/share/doc/${PF}/examples
+	fi
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=/usr/share/javacc/" > "${T}"/22javacc
+	doenvd "${T}"/22javacc
+
+	echo "export VERSION=4.0" > "${T}"/pre
+
+	local launcher
+	for launcher in javacc jjdoc jjtree
+	do
+		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
+	done
+}
diff --git a/dev-java/javacc/javacc-4.2.ebuild b/dev-java/javacc/javacc-4.2.ebuild
new file mode 100644
index 000000000000..7b0cecd3b720
--- /dev/null
+++ b/dev-java/javacc/javacc-4.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.dev.java.net/"
+SRC_URI="https://${PN}.dev.java.net/files/documents/17/117795/${P}src.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+DEPEND=">=virtual/jdk-1.5
+	dev-java/junit:0
+	test? (
+		>=virtual/jdk-1.5
+		dev-java/ant-junit
+	)
+	!test? ( >=virtual/jdk-1.4 )"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/junit:0"
+
+# We don't want 1.5 bytecode just because of the testcase
+JAVA_PKG_WANT_TARGET="1.4"
+JAVA_PKG_WANT_SOURCE="1.4"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.0-javadoc.patch
+	rm -v lib/junit*/*.jar || die
+}
+
+_eant() {
+	eant -Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" "${@}"
+}
+
+src_compile() {
+	_eant jar $(use_doc)
+}
+
+src_test() {
+	# this testcase wants 1.5 and this seems the easiest way to do it
+	JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" java-ant_bsfix_one examples/JavaGrammars/1.5/build.xml
+	ANT_TASKS="ant-junit" _eant test
+}
+
+src_install() {
+	java-pkg_dojar bin/lib/${PN}.jar
+
+	dodoc README || die
+
+	if use doc; then
+		java-pkg_dohtml -r www/*
+		java-pkg_dojavadoc doc/api
+	fi
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -R examples/* "${D}"/usr/share/doc/${PF}/examples
+	fi
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=/usr/share/javacc/" > "${T}"/22javacc
+	doenvd "${T}"/22javacc
+
+	echo "export VERSION=${PV}" > "${T}"/pre
+
+	local launcher
+	for launcher in javacc jjdoc jjtree
+	do
+		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
+	done
+}
diff --git a/dev-java/javacc/javacc-5.0-r1.ebuild b/dev-java/javacc/javacc-5.0-r1.ebuild
new file mode 100644
index 000000000000..eb779d02bd6f
--- /dev/null
+++ b/dev-java/javacc/javacc-5.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils 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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+COMMON_DEP="
+	dev-java/junit:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (	dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.0-javadoc.patch
+	rm -v lib/junit*/*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="junit"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar bin/lib/${PN}.jar
+
+	dodoc README
+
+	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
+	doenvd "${T}"/22javacc
+
+	echo "export VERSION=${PV}" > "${T}"/pre
+
+	local launcher
+	for launcher in javacc jjdoc jjtree
+	do
+		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
+	done
+}
diff --git a/dev-java/javacc/javacc-5.0.ebuild b/dev-java/javacc/javacc-5.0.ebuild
new file mode 100644
index 000000000000..a0064854a661
--- /dev/null
+++ b/dev-java/javacc/javacc-5.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.dev.java.net/"
+SRC_URI="https://${PN}.dev.java.net/files/documents/17/142527/${P}src.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+DEPEND=">=virtual/jdk-1.5
+	dev-java/junit:0
+	test? (	dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.5
+	dev-java/junit:0"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.0-javadoc.patch
+	rm -v lib/junit*/*.jar || die
+}
+
+_eant() {
+	eant -Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" "${@}"
+}
+
+src_compile() {
+	# this testcase wants 1.5 and this seems the easiest way to do it
+	JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" java-ant_bsfix_one examples/JavaGrammars/1.5/build.xml
+	_eant jar $(use_doc)
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" _eant test
+}
+
+src_install() {
+	java-pkg_dojar bin/lib/${PN}.jar
+
+	dodoc README || die
+
+	if use doc; then
+		java-pkg_dohtml -r www/*
+		java-pkg_dojavadoc doc/api
+	fi
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -R examples/* "${D}"/usr/share/doc/${PF}/examples
+	fi
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=/usr/share/javacc/" > "${T}"/22javacc
+	doenvd "${T}"/22javacc
+
+	echo "export VERSION=${PV}" > "${T}"/pre
+
+	local launcher
+	for launcher in javacc jjdoc jjtree
+	do
+		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
+	done
+}
diff --git a/dev-java/javacc/metadata.xml b/dev-java/javacc/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/javacc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
new file mode 100644
index 000000000000..5d18634502db
--- /dev/null
+++ b/dev-java/javacup/Manifest
@@ -0,0 +1,2 @@
+DIST java-cup-src-11b-20150326.tar.gz 376913 SHA256 3df107f48b9726d1bf6c4061f6a1304b125aa766da211cd17ff85a2d56339825 SHA512 020beda9f019e03b1d35a20b7c10f4d43d5d39e46f3beb0a993fe6471f4c1369440d76b4f88a6161f8169406760720c7811c07396ca0ad7eab5ee9e4b091b733 WHIRLPOOL 54e2b7d53918c0e053c690c0db14e5ab2ddc2454c64f7a531690b9e4fe37e76aee1e9bb3711cc515423cf2d288ca7054a903d331619b1dd0a28f62121555e004
+DIST javacup-0.11a_beta20060608.tar.bz2 285727 SHA256 cb3ad4951d734bd1e5a6ff835018dea26a47564f820ae0a925f9c30f2fb7e1ff SHA512 383172f7d9cb127ad5d1d6de561eaf53b057bf7511f6f8c353fc03860daabb023e11330e0518b9c390e255a643c9c1e609b5fbdfd3c2e92dd68dc2d2354a931f WHIRLPOOL 6480219de3a997eb9a942ce816f9868dc13d06b8c0553521e9cf37fe568265cf752efcd36d9b64ea424d225d4823fce0652c9b0d7e1c853e38cd9f00fb12ce30
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/files/javacup-0.11b_beta20150326-build-xml.patch b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch
new file mode 100644
index 000000000000..5aa346303dc0
--- /dev/null
+++ b/dev-java/javacup/files/javacup-0.11b_beta20150326-build-xml.patch
@@ -0,0 +1,26 @@
+From 1488926a5731b17a577a1fd161eb95b88458a09b Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 7 Aug 2015 21:42:29 +0200
+Subject: [PATCH] Bundled JFlex.jar also contains java_cup/runtime/Scanner, our
+ replacement does not
+
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index 33f0c60..89c9793 100644
+--- a/build.xml
++++ b/build.xml
+@@ -53,7 +53,7 @@
+   </target>
+ 
+   <taskdef name="cup" classname="java_cup.anttask.CUPTask" classpath="${bin}/java-cup-11.jar" />
+-  <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar" />
++  <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar:${bin}/java-cup-11.jar" />
+ 
+   <target name="cup" depends="init">
+     <cup srcfile="${cup}/parser.cup" interface="on" destdir="${java}" parser="parser" symbols="sym" quiet="false" nonterms="true"/>
+-- 
+2.5.0
+
diff --git a/dev-java/javacup/javacup-0.11a_beta20060608.ebuild b/dev-java/javacup/javacup-0.11a_beta20060608.ebuild
new file mode 100644
index 000000000000..0c8a13fa7066
--- /dev/null
+++ b/dev-java/javacup/javacup-0.11a_beta20060608.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="CUP Parser Generator for Java"
+
+HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
+
+# We cannot put the actual SRC_URI because it causes conflicts with Gentoo mirroring system
+# No better URI is available, waiting until it hits actual Gentoo mirrors
+
+#SRC_URI="https://www2.in.tum.de/WebSVN/dl.php?repname=CUP&path=/develop/&rev=0&isdir=1"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="userland_BSD"
+
+# find for bug #214664
+DEPEND=">=virtual/jdk-1.4
+	!userland_BSD? ( >=sys-apps/findutils-4.4 )"
+RDEPEND=">=virtual/jre-1.4
+		>=dev-java/ant-core-1.7.0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	find . -name "*.class" -delete || die
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)"
+	rm bin/java-cup-11.jar
+	cp dist/java-cup-11a.jar bin/java-cup-11.jar
+	eant clean
+	einfo "Recompiling with newly generated javacup"
+	eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)"
+	use doc && javadoc -sourcepath src/ java_cup -d javadoc
+}
+
+src_install() {
+	java-pkg_newjar dist/java-cup-11a.jar
+	java-pkg_newjar dist/java-cup-11a-runtime.jar ${PN}-runtime.jar
+	java-pkg_register-ant-task
+
+	dodoc changelog.txt || die
+	dohtml manual.html || die
+	use source && java-pkg_dosrc java/*
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/javacup/javacup-0.11b_beta20150326.ebuild b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
new file mode 100644
index 000000000000..46cd7d62372e
--- /dev/null
+++ b/dev-java/javacup/javacup-0.11b_beta20150326.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="CUP Parser Generator for Java"
+
+HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
+
+# We cannot put the actual SRC_URI because it causes conflicts with Gentoo mirroring system
+# No better URI is available, waiting until it hits actual Gentoo mirrors
+
+MY_PV=${PV/_beta/-}
+MY_PV=${MY_PV##0.}
+SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="userland_BSD system-jflex"
+
+# find for bug #214664
+DEPEND=">=virtual/jdk-1.5
+	system-jflex? ( dev-java/jflex:0 )
+	!userland_BSD? ( >=sys-apps/findutils-4.4 )
+	>=dev-java/ant-core-1.7.0:0"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build-xml.patch
+	epatch "${FILESDIR}"/${P}-build-xml-svn.patch
+
+	find . -name '*.class' -delete || die
+
+	if use system-jflex; then  # break the circular dependency
+		rm bin/JFlex.jar || die
+		java-pkg_jar-from --build-only jflex JFlex.jar bin/JFlex.jar
+	fi
+
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	local classpath="$(java-pkg_getjars --build-only ant-core)"
+
+	eant -Dgentoo.classpath="${classpath}"
+	rm bin/java-cup-11.jar || die
+	cp dist/java-cup-11b.jar bin/java-cup-11.jar || die
+	eant clean
+
+	einfo "Recompiling with newly generated javacup"
+	eant -Dgentoo.classpath="${classpath}"
+	use doc && javadoc -sourcepath src/ java_cup -d javadoc
+}
+
+src_install() {
+	java-pkg_newjar dist/java-cup-11b.jar
+	java-pkg_newjar dist/java-cup-11b-runtime.jar ${PN}-runtime.jar
+	java-pkg_register-ant-task
+
+	dodoc changelog.txt || die
+	dohtml manual.html || die
+	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..3364029ae5a8
--- /dev/null
+++ b/dev-java/javacup/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<use>
+		<flag name="system-jflex">
+			Build against system <pkg>dev-java/jflex</pkg> rather than the bundled one.
+			Disabling this flag allows breaking the circular dependency when necessary.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
new file mode 100644
index 000000000000..7dc239585356
--- /dev/null
+++ b/dev-java/javahelp/Manifest
@@ -0,0 +1 @@
+DIST javahelp2-src-2.0.05_svn63.zip 3747088 SHA256 a864ac71701ed8d12ba192460cd7b4d51e78813f39a140ede5d9b04afd9eae92 SHA512 ed795dad98f8d80f4cd4cda40b6aea0978cda621b131b1563016c1ddc02afeb37f3626a28003dac26d7fe996274fb9a97e741a500b15d06b1e5a93342020abc3 WHIRLPOOL 111398f9e6731749af6a0f36b59cd5a609c8fd203b03fc219bac02a456e2ae92718acac2f75debe768c978a14fb000ad7ea9b7eb0b94f6b6f4d8c1f95a0bafc6
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..4bf1748c0ed4
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86 ~x86-fbsd ~x86-freebsd ~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..fc5ba13dc08f
--- /dev/null
+++ b/dev-java/javahelp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..f6fece011456
--- /dev/null
+++ b/dev-java/javassist/Manifest
@@ -0,0 +1,5 @@
+DIST javassist-2.6.zip 1143271 SHA256 c77a56714df64996c704c76718d07ea97f582c6eba20711bfd9ecbd468bd02e8 SHA512 8a6da5e2a44cc3bc5b87538a4eda56808d13998d8c9932153f9bb42a1c7844d1a1c7311eb22b0b4ad04649bb7c22156acf851bee638cffbd3328bcef1d2a9f37 WHIRLPOOL e08b458d1fd3e1a89b81b19077c9e7c22fe8fd33d64542d9a7d3ea63ad0aef5df8bd229c6144e85e612eae288dbe6b0ca16210790bba866925148f2d90cd71ad
+DIST javassist-3.14.0-GA.zip 2258443 SHA256 8a6070659f3409cd23392bcdf29b86232666043dad06ba25c4de221c8c8affc5 SHA512 e8e1aac22a147ee13d73c8e8c43835e28e63b1f7cb0d9ccd91e2d0ee23507f7af0eb0c22c779ec0bf6e9ab0a522c6719edb2bdd4e2d38a715c1397b6fd76a562 WHIRLPOOL e4167a5a81e80729f3cf47dea4ee968cb6b94681d448e67150c08bc283b8d0e6b3c81e92e5539b612a3adbfb359dc3c93d74a5bbd6aac3532c83ba387126450c
+DIST javassist-3.18.2.tar.gz 1179428 SHA256 7ace5b44ffdd96b64a3268a3f014d0ad9c44d9f4d8cd3a20e92877dbbac5a6fc SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca WHIRLPOOL c2fc97f00435420fb147743f4f5d0c8d7235abdf3b3fbd4fadb33dbeb42a7f3fce6d6d401c27ab84d05b93088ff3e4e9f8468e859aa1ef039522e0bb8ee52e20
+DIST javassist-3.4.zip 1714086 SHA256 0f7dc85472d72acf4c74a47ce0d62462218709c6a2f272dc9785e17a524ccaff SHA512 601616cdde208cef536af8ebf20a9ee43178871e8b1ebf892dae63ebb0d9e11e742091ac781a46018d968674ce918864ebc5de5951d05a345d0ea60c9dfa7c04 WHIRLPOOL 09deaef9c992a379d16a86937456bd45bc982d5ab4f95bd7ae4095cf378200918701ce1fa50a1ba1b00186aef5386986bd81de83c19baa4f56388e1d444f1eea
+DIST javassist-3.7.GA.zip 1918656 SHA256 239cea00bbc674b1430ae371003f76173d531412ca1d5fff7fc223b671a03524 SHA512 3ef38287488c54886937b2aef9fd9667e5f109816913419152ab709517de63625b7b9d0af3cc5aedc66fb2ad880db10a975475b22bfaa72464fee11fcf1f6060 WHIRLPOOL 3193bc2d0c64a073d168216137b53879df098db60e6f22ecae4cffef2229f4346c1480774ba44e7f0055183e63b0fea26b0d5e0aabce908de321b87d7c35b31f
diff --git a/dev-java/javassist/javassist-2.6-r1.ebuild b/dev-java/javassist/javassist-2.6-r1.ebuild
new file mode 100644
index 000000000000..b9d3a78ea787
--- /dev/null
+++ b/dev-java/javassist/javassist-2.6-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	>=dev-java/ant-core-1.5
+	source? ( app-arch/zip )"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	rm -rf work
+}
+
+src_compile() {
+	eant jar $(use_doc 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
+}
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..396b4083dc51
--- /dev/null
+++ b/dev-java/javassist/javassist-2.6-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	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.14.0-r1.ebuild b/dev-java/javassist/javassist-3.14.0-r1.ebuild
new file mode 100644
index 000000000000..d37945ae0311
--- /dev/null
+++ b/dev-java/javassist/javassist-3.14.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+# TODO add notes about where the distfile comes from
+DESCRIPTION="Javassist makes Java bytecode manipulation simple"
+SRC_URI="mirror://sourceforge/project/jboss/Javassist/${PV}.GA/javassist-${PV}-GA.zip"
+HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
+
+LICENSE="MPL-1.1"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+S="${WORKDIR}/${P}-GA"
+
+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/javassist-3.14.0.ebuild b/dev-java/javassist/javassist-3.14.0.ebuild
new file mode 100644
index 000000000000..76c01df9b543
--- /dev/null
+++ b/dev-java/javassist/javassist-3.14.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+# TODO add notes about where the distfile comes from
+DESCRIPTION="Javassist makes Java bytecode manipulation simple"
+SRC_URI="mirror://sourceforge/project/jboss/Javassist/${PV}.GA/javassist-${PV}-GA.zip"
+HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
+
+LICENSE="MPL-1.1"
+SLOT="3"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+S="${WORKDIR}/${P}-GA"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_DOC_TARGET="javadocs"
+
+src_compile() {
+	java-pkg-2_src_compile -Dgentoo.classpath=$(java-config --tools)
+}
+
+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
+}
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..30d45db35039
--- /dev/null
+++ b/dev-java/javassist/javassist-3.18.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	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/javassist-3.4-r1.ebuild b/dev-java/javassist/javassist-3.4-r1.ebuild
new file mode 100644
index 000000000000..eeec5fa29bdb
--- /dev/null
+++ b/dev-java/javassist/javassist-3.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+# TODO add notes about where the distfile comes from
+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="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+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/javassist-3.4.ebuild b/dev-java/javassist/javassist-3.4.ebuild
new file mode 100644
index 000000000000..705187288acd
--- /dev/null
+++ b/dev-java/javassist/javassist-3.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+# TODO add notes about where the distfile comes from
+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="3"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v *.jar || die
+	java-ant_rewrite-classpath build.xml
+}
+
+src_compile() {
+	eant clean jar $(use_doc javadocs) -Dgentoo.classpath=$(java-config --tools)
+}
+
+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
+}
diff --git a/dev-java/javassist/javassist-3.7-r1.ebuild b/dev-java/javassist/javassist-3.7-r1.ebuild
new file mode 100644
index 000000000000..b31ddad7b414
--- /dev/null
+++ b/dev-java/javassist/javassist-3.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+# TODO add notes about where the distfile comes from
+DESCRIPTION="Javassist makes Java bytecode manipulation simple"
+SRC_URI="mirror://sourceforge/jboss/${P}.GA.zip"
+HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
+
+LICENSE="MPL-1.1"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+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/javassist-3.7.ebuild b/dev-java/javassist/javassist-3.7.ebuild
new file mode 100644
index 000000000000..a969bbe3cf26
--- /dev/null
+++ b/dev-java/javassist/javassist-3.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+# TODO add notes about where the distfile comes from
+DESCRIPTION="Javassist makes Java bytecode manipulation simple"
+SRC_URI="mirror://sourceforge/jboss/${P}.GA.zip"
+HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
+
+LICENSE="MPL-1.1"
+SLOT="3"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v *.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_DOC_TARGET="javadocs"
+
+src_compile() {
+	java-pkg-2_src_compile -Dgentoo.classpath=$(java-config --tools)
+}
+
+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
+}
diff --git a/dev-java/javassist/metadata.xml b/dev-java/javassist/metadata.xml
new file mode 100644
index 000000000000..b684b894016c
--- /dev/null
+++ b/dev-java/javassist/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jboss</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
new file mode 100644
index 000000000000..071901b215e3
--- /dev/null
+++ b/dev-java/javatoolkit/Manifest
@@ -0,0 +1 @@
+DIST javatoolkit-0.3.0.tar.bz2 16823 SHA256 47bf8aad2ec58b2d850e8cbe57fe2707859d800b215b24387c7652a50353677c SHA512 e7bbe04e39ab277d0aab89f0eea963c4b0341a336660dab08bfad0510ad1b2b49ce7410a2363bcf9ebad5f8757ee254ddc27af642b4bfb374db52d82cf02c3b1 WHIRLPOOL a9b1034939a0e22c49620bb29d3652e8f5e6a8e71645556fe00463aabc0c1ff2ac2b666f59fd0ceea8ea5dc18579d90cc11a07ba341028831e3b8dd1e8a0e9ce
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..a2ea2c9276a8
--- /dev/null
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Collection of Gentoo-specific tools for Java"
+HOMEPAGE="http://www.gentoo.org/proj/en/java/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-python2.6.patch"
+		"${FILESDIR}/${P}-no-pyxml.patch"
+	)
+
+	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..e80ed52a09bd
--- /dev/null
+++ b/dev-java/javatoolkit/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/javax-inject/Manifest b/dev-java/javax-inject/Manifest
new file mode 100644
index 000000000000..d24bcf5991d3
--- /dev/null
+++ b/dev-java/javax-inject/Manifest
@@ -0,0 +1 @@
+DIST javax.inject-1-bundle.jar 43323 SHA256 efe257736656de99747098ceafd64dae7b5722a585176eb79ee9dbf7cd995ee5 SHA512 397db77e3426a4539b895535557cbe9e1795c186a9bc397efa716b42d02b03c4403f20c4c13fb2b99b25e5a14abd3407e9d0d843cd4c3442a1386a2b30ba50e3 WHIRLPOOL 466ae846ad0c8abcc1279e314f79121bd17c627d3729e7dd1c144b5d67f161e0f5fdee278b51c689cdcdcc01ac5fe5f2c8b8b103d94e18413f2b37cfb1b4b7f7
diff --git a/dev-java/javax-inject/files/javax-inject-1-build.xml b/dev-java/javax-inject/files/javax-inject-1-build.xml
new file mode 100644
index 000000000000..2b7e7cdd3051
--- /dev/null
+++ b/dev-java/javax-inject/files/javax-inject-1-build.xml
@@ -0,0 +1,154 @@
+<?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:21 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="javax.inject-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="javax.inject-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}"/>
+  </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"/>
+
+  <!-- ====================================================================== -->
+  <!-- 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/javax-inject/javax-inject-1-r1.ebuild b/dev-java/javax-inject/javax-inject-1-r1.ebuild
new file mode 100644
index 000000000000..22efd9c7ecf3
--- /dev/null
+++ b/dev-java/javax-inject/javax-inject-1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P=${PN/-/.}-${PV}
+
+DESCRIPTION="Dependency injection for Java (JSR-330)"
+HOMEPAGE="http://code.google.com/p/atinject/"
+SRC_URI="http://atinject.googlecode.com/files/${MY_P}-bundle.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	unzip -q ${MY_P}-sources.jar || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	sed -i 's/\(<mkdir dir="${maven.build.outputDir}"\/>\)/\1<javac srcdir="." destdir="${maven.build.outputDir}" \/>/g' build.xml || die
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	if use doc ; then
+		javadoc -d javadoc $(find javax -name "*.java") || die "Javadoc failed"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar target/javax.inject-${PV}.jar
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc javax
+}
diff --git a/dev-java/javax-inject/metadata.xml b/dev-java/javax-inject/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/javax-inject/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/javolution/Manifest b/dev-java/javolution/Manifest
new file mode 100644
index 000000000000..494417be587f
--- /dev/null
+++ b/dev-java/javolution/Manifest
@@ -0,0 +1,4 @@
+DIST javolution-2.2.4-src.zip 391698 SHA256 72f117ec3e7d8772c67bb5114596e75edcb0ffb00a3824ed7a2b9516e11e3078 SHA512 9cdc9a97667fa3b112b01b6d8275ae09b4e6d7fbcc7587d4c347072883ba3cc7a4c7e308778a6e4a1bdcaf4d093b081b35f0776d4a9d589d15677bbe02516912 WHIRLPOOL ede988cb048156d65804f78ba65e6152a86dbd2d58e165fdbdc907fa4c2fb30c2c306c1d216760444ca6d23fb7d666492d64ca8c2c5f01feede7497a3386e890
+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
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-2.2.4-r1.ebuild b/dev-java/javolution/javolution-2.2.4-r1.ebuild
new file mode 100644
index 000000000000..183df0c3a6f1
--- /dev/null
+++ b/dev-java/javolution/javolution-2.2.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+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="LGPL-2.1"
+SLOT="2.2.4"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/javolution-${PV%.*}"
+
+EANT_BUILD_TARGET="init_1.4 compile jar"
+EANT_DOC_TARGET="doc"
+
+src_unpack() {
+	unpack ${A}
+	java-pkg_filter-compiler jikes
+}
+
+src_install() {
+
+	java-pkg_dojar javolution.jar
+
+	dodoc doc/coding_standard.txt
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc "${S}/src/javolution"
+
+}
diff --git a/dev-java/javolution/javolution-2.2.4-r2.ebuild b/dev-java/javolution/javolution-2.2.4-r2.ebuild
new file mode 100644
index 000000000000..c31d5de6ae18
--- /dev/null
+++ b/dev-java/javolution/javolution-2.2.4-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+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="LGPL-2.1"
+SLOT="2.2.4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/javolution-${PV%.*}"
+
+EANT_BUILD_TARGET="init_1.4 compile jar"
+EANT_DOC_TARGET="doc"
+EANT_FILTER_COMPILER="jikes"
+
+src_install() {
+	java-pkg_dojar javolution.jar
+
+	dodoc doc/coding_standard.txt
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc "${S}/src/javolution"
+}
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..c8f6382d8308
--- /dev/null
+++ b/dev-java/javolution/javolution-4.0.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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-4.0.2.ebuild b/dev-java/javolution/javolution-4.0.2.ebuild
new file mode 100644
index 000000000000..564076264916
--- /dev/null
+++ b/dev-java/javolution/javolution-4.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+inherit 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 ppc 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"
+
+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..e2e2c908b2a0
--- /dev/null
+++ b/dev-java/javolution/javolution-6.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz
+	http://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..7303cef96964
--- /dev/null
+++ b/dev-java/javolution/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jax-rpc/Manifest b/dev-java/jax-rpc/Manifest
new file mode 100644
index 000000000000..e91430bba90e
--- /dev/null
+++ b/dev-java/jax-rpc/Manifest
@@ -0,0 +1 @@
+DIST jax-rpc-1.1.3.01.tar.bz2 763737 SHA256 54d29016732aefb35892b98a7393a8d47061e37933e8387292fd103d2488542e SHA512 a08e5389a93ddbe72c0598bb96698f2b1b87030aa9cc5ac33460eaeeb639970ee1662aeef9c0e703dac202bf27f9996b2f5e5bf48821786a32e3c67e9f1bc45d WHIRLPOOL 4309eedb2aa5a673e9a4d4314ef4eb1ebdb653f9941172a4a372f4723186eda63025dc2e2e59bb7a073459329f4d32a3d30b7126b4b305f75b970015734a9ebe
diff --git a/dev-java/jax-rpc/files/jax-rpc-1.1.3.01-length.patch b/dev-java/jax-rpc/files/jax-rpc-1.1.3.01-length.patch
new file mode 100644
index 000000000000..990b17457476
--- /dev/null
+++ b/dev-java/jax-rpc/files/jax-rpc-1.1.3.01-length.patch
@@ -0,0 +1,11 @@
+--- src/com/sun/xml/rpc/streaming/FastInfosetReader.java.vanilla	2007-03-18 16:27:14.000000000 +0100
++++ src/com/sun/xml/rpc/streaming/FastInfosetReader.java	2007-03-18 16:26:23.000000000 +0100
+@@ -296,7 +296,7 @@
+     
+     private boolean isWhiteSpaceCharacters() {
+         int i = _charactersOffset;
+-        final int end = i + _charactersLength;
++        final int end = i + _characters.length;
+         while (i < end) {
+             if (_characters[i++] > '\u0020') {
+                 return false;
diff --git a/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild b/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild
new file mode 100644
index 000000000000..4175ef0b59c9
--- /dev/null
+++ b/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Reference Implementation of JAX-RPC, the Java APIs for XML based RPC"
+HOMEPAGE="http://jax-rpc.dev.java.net/"
+# CVS: cvs -d :pserver:guest@cvs.dev.java.net:/cvs checkout -r JAXRPC_1_1_3_01_PKG_081806 jax-rpc/jaxrpc-ri
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+COMMON_DEP="=dev-java/servletapi-2.4*
+	dev-java/fastinfoset
+	dev-java/jaxp
+	dev-java/jsr67
+	dev-java/jsr101
+	dev-java/jsr173
+	dev-java/relaxng-datatype
+	dev-java/saaj
+	dev-java/sax
+	dev-java/sun-jaf
+	java-virtuals/javamail
+	dev-java/xsdlib
+	>=dev-java/xerces-2.8"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+EANT_BUILD_TARGET="image"
+EANT_DOC_TARGET="javadocs"
+EANT_EXTRA_ARGS="-Djava.mail=lib/mail.jar"
+
+S="${WORKDIR}/jaxrpc-ri"
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-length.patch"
+
+	cd "${S}/lib"
+
+	java-pkg_jar-from --build-only ant-core
+	java-pkg_jar-from fastinfoset fastinfoset.jar FastInfoset.jar
+	java-pkg_jar-from jaxp
+	java-pkg_jar-from jsr67 jsr67.jar saaj-api.jar
+	java-pkg_jar-from jsr101
+	java-pkg_jar-from jsr173 jsr173.jar jsr173_api.jar
+	java-pkg_jar-from relaxng-datatype
+	java-pkg_jar-from saaj saaj.jar saaj-impl.jar
+	java-pkg_jar-from sax
+	java-pkg_jar-from servletapi-2.4 servlet-api.jar servlet.jar
+	java-pkg_jar-from sun-jaf
+	java-pkg_jar-from --virtual javamail
+	java-pkg_jar-from xsdlib
+	java-pkg_jar-from xerces-2
+
+	cd "${S}/src"
+	find . -name '*.java' -exec sed -i \
+		-e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \
+		{} \;
+
+}
+
+src_install() {
+
+	java-pkg_dojar "build/lib/jaxrpc-spi.jar"
+	java-pkg_dojar "build/lib/jaxrpc-impl.jar"
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use source && java-pkg_dosrc src
+
+}
diff --git a/dev-java/jax-rpc/jax-rpc-1.1.3.01.ebuild b/dev-java/jax-rpc/jax-rpc-1.1.3.01.ebuild
new file mode 100644
index 000000000000..d32b93a6406b
--- /dev/null
+++ b/dev-java/jax-rpc/jax-rpc-1.1.3.01.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Reference Implementation of JAX-RPC, the Java APIs for XML based RPC"
+HOMEPAGE="http://jax-rpc.dev.java.net/"
+# CVS: cvs -d :pserver:guest@cvs.dev.java.net:/cvs checkout -r JAXRPC_1_1_3_01_PKG_081806 jax-rpc/jaxrpc-ri
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP="=dev-java/servletapi-2.4*
+	dev-java/fastinfoset
+	dev-java/jaxp
+	dev-java/jsr67
+	dev-java/jsr101
+	dev-java/jsr173
+	dev-java/relaxng-datatype
+	dev-java/saaj
+	dev-java/sax
+	dev-java/sun-jaf
+	dev-java/sun-javamail
+	dev-java/xsdlib
+	>=dev-java/xerces-2.8"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+EANT_BUILD_TARGET="image"
+EANT_DOC_TARGET="javadocs"
+EANT_EXTRA_ARGS="-Djava.mail=lib/mail.jar"
+
+S="${WORKDIR}/jaxrpc-ri"
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-length.patch"
+
+	cd "${S}/lib"
+
+	java-pkg_jar-from --build-only ant-core
+	java-pkg_jar-from fastinfoset fastinfoset.jar FastInfoset.jar
+	java-pkg_jar-from jaxp
+	java-pkg_jar-from jsr67 jsr67.jar saaj-api.jar
+	java-pkg_jar-from jsr101
+	java-pkg_jar-from jsr173 jsr173.jar jsr173_api.jar
+	java-pkg_jar-from relaxng-datatype
+	java-pkg_jar-from saaj saaj.jar saaj-impl.jar
+	java-pkg_jar-from sax
+	java-pkg_jar-from servletapi-2.4 servlet-api.jar servlet.jar
+	java-pkg_jar-from sun-jaf
+	java-pkg_jar-from sun-javamail
+	java-pkg_jar-from xsdlib
+	java-pkg_jar-from xerces-2
+
+	cd "${S}/src"
+	find . -name '*.java' -exec sed -i \
+		-e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \
+		{} \;
+
+}
+
+src_install() {
+
+	java-pkg_dojar "build/lib/jaxrpc-spi.jar"
+	java-pkg_dojar "build/lib/jaxrpc-impl.jar"
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use source && java-pkg_dosrc src
+
+}
diff --git a/dev-java/jax-rpc/metadata.xml b/dev-java/jax-rpc/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jax-rpc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jax-ws-api/Manifest b/dev-java/jax-ws-api/Manifest
new file mode 100644
index 000000000000..6abc9a8d49c5
--- /dev/null
+++ b/dev-java/jax-ws-api/Manifest
@@ -0,0 +1 @@
+DIST jaxws-api-fcs-src.zip 56065 SHA256 e8101f74494f479ce35a7a9d3619c6bdda561c9ea4137543b66cd73c1a1d0bf8 SHA512 d1a2dcfc6b410f0632e3d2106d1edcaabf20280d28a882d28f71a9ccea4f7375821a2f9aebc6a5115dd4f2171f7950ec7dcbb864a96656424ee7d97c852b7b70 WHIRLPOOL dfe6426a1e2ac5c29cfe6d0f5b2aeb25fcb7e83354999d3babfce8b777b679b4f8b33d9aece9e3dc68b62a68bcfc97101d987df037679331aac8beb0d0bdecf5
diff --git a/dev-java/jax-ws-api/files/build.xml-2.0 b/dev-java/jax-ws-api/files/build.xml-2.0
new file mode 100644
index 000000000000..288b58b2bb4e
--- /dev/null
+++ b/dev-java/jax-ws-api/files/build.xml-2.0
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<project name="jax-ws-api" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac debug="false" srcdir="." destdir="build" encoding="UTF-8">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="jax-ws-api.jar">
+      <fileset dir="build" includes="**/*.class"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/jax-ws-api/jax-ws-api-2.0.ebuild b/dev-java/jax-ws-api/jax-ws-api-2.0.ebuild
new file mode 100644
index 000000000000..e362028283a2
--- /dev/null
+++ b/dev-java/jax-ws-api/jax-ws-api-2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JAXWS 2.0 API Final Release"
+HOMEPAGE="https://jax-ws.dev.java.net/"
+SRC_URI="https://jax-ws.dev.java.net/files/documents/4202/34734/jaxws-api-fcs-src.zip"
+
+LICENSE="CDDL"
+SLOT="2"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP="dev-java/jsr67
+	=dev-java/jaxb-2*"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	mkdir lib
+	cd lib
+	java-pkg_jar-from jsr67
+	java-pkg_jar-from jaxb-2
+
+	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die
+
+}
+
+src_install() {
+
+	java-pkg_dojar "${PN}.jar"
+
+	use source && java-pkg_dosrc .
+
+}
diff --git a/dev-java/jax-ws-api/metadata.xml b/dev-java/jax-ws-api/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jax-ws-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jax-ws-tools/Manifest b/dev-java/jax-ws-tools/Manifest
new file mode 100644
index 000000000000..7359ea9daf0f
--- /dev/null
+++ b/dev-java/jax-ws-tools/Manifest
@@ -0,0 +1 @@
+DIST JAXWS2.0.1m1_source_20060817.jar 8993405 SHA256 9725cfb91cecff833055d7af45c3413ca9d1a818a4cfdb86211ed82f383f3865 SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314 WHIRLPOOL fe0727935c592b538b7042808fffa987ea5ae47554367ea0cfc91f65d765bd234713aaa142b2297988d74eec01fce9cd4bedceb0fb7b0068eb38084a1d5f5ba7
diff --git a/dev-java/jax-ws-tools/files/jax-ws-tools-2.0.1-gentoo.patch b/dev-java/jax-ws-tools/files/jax-ws-tools-2.0.1-gentoo.patch
new file mode 100644
index 000000000000..723b5485e94c
--- /dev/null
+++ b/dev-java/jax-ws-tools/files/jax-ws-tools-2.0.1-gentoo.patch
@@ -0,0 +1,30 @@
+diff -Nru jaxws-si.vanilla/build.xml jaxws-si/build.xml
+--- jaxws-si.vanilla/build.xml	2007-04-16 20:09:54.000000000 +0200
++++ jaxws-si/build.xml	2007-04-16 20:27:39.000000000 +0200
+@@ -69,16 +69,6 @@
+     <mkdir dir="rt_build"/>

+     <mkdir dir="tools_build"/>

+ 

+-    <copy todir="rt_build">

+-      <fileset dir="src/rt/src">

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

+-      </fileset>

+-    </copy>

+-    <versionProp file="rt_build/com/sun/xml/ws/version.properties" />

+-    <javac srcdir="src/rt/src" destdir="rt_build" debug="true">

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

+-    </javac>

+-

+     <copy todir="tools_build">

+       <fileset dir="src/tools/wscompile/src">

+         <include name="**/*.properties" />

+@@ -88,6 +78,9 @@
+     <javac srcdir="src/tools/wscompile/src" destdir="tools_build" debug="true">

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

+     </javac>

++    <jar destfile="jax-ws-tools.jar">

++      <fileset dir="tools_build" includes="**/*.*"/>

++    </jar>

+   </target>

+ 

+ </project>

diff --git a/dev-java/jax-ws-tools/files/jax-ws-tools-2.0.1-remove-unused-saaj-import.patch b/dev-java/jax-ws-tools/files/jax-ws-tools-2.0.1-remove-unused-saaj-import.patch
new file mode 100644
index 000000000000..ee4ff8f324be
--- /dev/null
+++ b/dev-java/jax-ws-tools/files/jax-ws-tools-2.0.1-remove-unused-saaj-import.patch
@@ -0,0 +1,11 @@
+diff -ur jaxws-si.old/src/tools/wscompile/src/com/sun/tools/ws/util/xml/XmlUtil.java jaxws-si/src/tools/wscompile/src/com/sun/tools/ws/util/xml/XmlUtil.java
+--- jaxws-si.old/src/tools/wscompile/src/com/sun/tools/ws/util/xml/XmlUtil.java	2008-10-05 12:32:27.000000000 +0300
++++ jaxws-si/src/tools/wscompile/src/com/sun/tools/ws/util/xml/XmlUtil.java	2008-10-05 12:32:42.000000000 +0300
+@@ -44,7 +44,6 @@
+ import org.w3c.dom.NodeList;

+ import org.w3c.dom.Text;

+ 

+-import com.sun.xml.messaging.saaj.util.ByteInputStream;

+ import com.sun.tools.ws.util.WSDLParseException;

+ import com.sun.xml.ws.util.xml.NamedNodeMapIterator;

+ import com.sun.xml.ws.util.xml.NodeListIterator;

diff --git a/dev-java/jax-ws-tools/jax-ws-tools-2.0.1-r1.ebuild b/dev-java/jax-ws-tools/jax-ws-tools-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..a27705d56b7b
--- /dev/null
+++ b/dev-java/jax-ws-tools/jax-ws-tools-2.0.1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Reference implementation of the Java API for XML Web Services"
+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 ppc x86"
+IUSE=""
+
+COMMON_DEP="dev-java/istack-commons-runtime:0
+	dev-java/istack-commons-tools:0
+	dev-java/jaxb:2
+	dev-java/jaxb-tools:2
+	dev-java/txw2-runtime:0
+	dev-java/jsr173:0
+	>=dev-java/jsr181-1.0:0
+	dev-java/jax-ws-api:2
+	dev-java/jax-ws:2
+	dev-java/codemodel:2
+	dev-java/apt-mirror:0"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/jaxws-si"
+
+src_unpack() {
+	echo "A" | java -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+
+	unpack ./jaxws-src.zip || die "unzip failed"
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jarfrom istack-commons-runtime
+	java-pkg_jarfrom istack-commons-tools
+	java-pkg_jarfrom jaxb-2
+	java-pkg_jarfrom jaxb-tools-2
+	java-pkg_jarfrom txw2-runtime
+	java-pkg_jarfrom jsr173
+	java-pkg_jarfrom jsr181
+	java-pkg_jarfrom jax-ws-api-2
+	java-pkg_jarfrom jax-ws-2
+	java-pkg_jarfrom codemodel-2
+	java-pkg_jarfrom apt-mirror
+	java-pkg_jarfrom --build-only ant-core
+	ln -s $(java-config --tools) || die
+
+	cp \
+		"${S}"/src/tools/wscompile/build/gen-src/com/sun/tools/ws/resources/*.java \
+		"${S}"/src/tools/wscompile/src/com/sun/tools/ws/resources/ || die "cp failed"
+
+	find "${S}/src/" -name '*.java' -exec \
+		sed -i -e \
+			's,com.sun.org.apache.xml.internal.resolver,org.apache.xml.resolver,g' \
+			{} \;
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-remove-unused-saaj-import.patch"
+
+}
+
+EANT_BUILD_TARGET="build"
+
+src_install() {
+
+	java-pkg_dojar jax-ws-tools.jar
+
+	use source && java-pkg_dosrc src/tools/wscompile/src/*
+
+}
diff --git a/dev-java/jax-ws-tools/metadata.xml b/dev-java/jax-ws-tools/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jax-ws-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jax-ws/Manifest b/dev-java/jax-ws/Manifest
new file mode 100644
index 000000000000..7359ea9daf0f
--- /dev/null
+++ b/dev-java/jax-ws/Manifest
@@ -0,0 +1 @@
+DIST JAXWS2.0.1m1_source_20060817.jar 8993405 SHA256 9725cfb91cecff833055d7af45c3413ca9d1a818a4cfdb86211ed82f383f3865 SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314 WHIRLPOOL fe0727935c592b538b7042808fffa987ea5ae47554367ea0cfc91f65d765bd234713aaa142b2297988d74eec01fce9cd4bedceb0fb7b0068eb38084a1d5f5ba7
diff --git a/dev-java/jax-ws/files/jax-ws-2.0.1-gentoo.patch b/dev-java/jax-ws/files/jax-ws-2.0.1-gentoo.patch
new file mode 100644
index 000000000000..ac544927199d
--- /dev/null
+++ b/dev-java/jax-ws/files/jax-ws-2.0.1-gentoo.patch
@@ -0,0 +1,53 @@
+Files jaxws-si.vanilla/.build.xml.swp and jaxws-si/.build.xml.swp differ
+diff -Nru jaxws-si.vanilla/build.xml jaxws-si/build.xml
+--- jaxws-si.vanilla/build.xml	2007-04-16 20:09:54.000000000 +0200
++++ jaxws-si/build.xml	2007-04-16 20:18:16.000000000 +0200
+@@ -78,16 +78,10 @@
+     <javac srcdir="src/rt/src" destdir="rt_build" debug="true">

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

+     </javac>

++    <jar destfile="jax-ws.jar">

++      <fileset dir="rt_build" includes="**/*.*"/>

++    </jar>

+ 

+-    <copy todir="tools_build">

+-      <fileset dir="src/tools/wscompile/src">

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

+-      </fileset>

+-    </copy>

+-    <versionProp file="tools_build/com/sun/tools/ws/version.properties" />

+-    <javac srcdir="src/tools/wscompile/src" destdir="tools_build" debug="true">

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

+-    </javac>

+   </target>

+ 

+ </project>

+Files jaxws-si.vanilla/src/rt/src/com/sun/xml/ws/message/stream/.StreamMessage.java.swp and jaxws-si/src/rt/src/com/sun/xml/ws/message/stream/.StreamMessage.java.swp differ
+diff -Nru jaxws-si.vanilla/src/rt/src/com/sun/xml/ws/message/stream/StreamHeader.java jaxws-si/src/rt/src/com/sun/xml/ws/message/stream/StreamHeader.java
+--- jaxws-si.vanilla/src/rt/src/com/sun/xml/ws/message/stream/StreamHeader.java	2007-04-16 20:09:54.000000000 +0200
++++ jaxws-si/src/rt/src/com/sun/xml/ws/message/stream/StreamHeader.java	2007-04-16 20:12:34.000000000 +0200
+@@ -214,12 +214,8 @@
+     }

+ 

+     public void writeTo(XMLStreamWriter w) throws XMLStreamException {

+-        try {

+             // TODO what about in-scope namespaces

+             _mark.writeToXMLStreamWriter(w);

+-        } catch (XMLStreamBufferException e) {

+-            throw new XMLStreamException2(e);

+-        }

+     }

+ 

+     public void writeTo(SOAPMessage saaj) throws SOAPException {

+diff -Nru jaxws-si.vanilla/src/rt/src/com/sun/xml/ws/message/stream/StreamMessage.java jaxws-si/src/rt/src/com/sun/xml/ws/message/stream/StreamMessage.java
+--- jaxws-si.vanilla/src/rt/src/com/sun/xml/ws/message/stream/StreamMessage.java	2007-04-16 20:09:54.000000000 +0200
++++ jaxws-si/src/rt/src/com/sun/xml/ws/message/stream/StreamMessage.java	2007-04-16 20:13:34.000000000 +0200
+@@ -287,8 +287,6 @@
+             return new StreamMessage(envelopeTag, headerTag, attachmentSet, HeaderList.copy(headers), bodyTag, clone, soapVersion);

+         } catch (XMLStreamException e) {

+             throw new WebServiceException("Failed to copy a message",e);

+-        } catch (XMLStreamBufferException e) {

+-            throw new WebServiceException("Failed to copy a message",e);

+         }

+     }

+ 

diff --git a/dev-java/jax-ws/jax-ws-2.0.1-r1.ebuild b/dev-java/jax-ws/jax-ws-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..9a1bdd1df9f9
--- /dev/null
+++ b/dev-java/jax-ws/jax-ws-2.0.1-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Reference implementation of the Java API for XML Web Services"
+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 ppc x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="dev-java/istack-commons-runtime:0
+	dev-java/jax-ws-api:2
+	dev-java/jaxb:2
+	dev-java/jsr173:0
+	>=dev-java/jsr181-1.0
+	dev-java/jsr250:0
+	dev-java/sun-httpserver-bin:2
+	dev-java/jsr67:0
+	dev-java/saaj:0
+	dev-java/sjsxp:0
+	dev-java/stax-ex:0
+	dev-java/sun-jaf:0
+	dev-java/txw2-runtime:0
+	dev-java/xmlstreambuffer:0
+	dev-java/xml-commons-resolver:0"
+
+# abstract interface problems with 1.5
+# https://bugs.gentoo.org/show_bug.cgi?id=207633
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/jaxws-si"
+
+src_unpack() {
+	echo "A" | java -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+
+	unpack ./jaxws-src.zip || die "unzip failed"
+}
+
+java_prepare() {
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jarfrom istack-commons-runtime
+	java-pkg_jarfrom jax-ws-api-2
+	java-pkg_jarfrom jaxb-2
+	java-pkg_jarfrom jsr173
+	java-pkg_jarfrom jsr181
+	java-pkg_jarfrom jsr250
+	java-pkg_jarfrom jsr67
+	java-pkg_jarfrom saaj
+	java-pkg_jarfrom sjsxp
+	java-pkg_jarfrom sun-httpserver-bin-2
+	java-pkg_jarfrom stax-ex
+	java-pkg_jarfrom sun-jaf
+	java-pkg_jarfrom txw2-runtime
+	java-pkg_jarfrom xml-commons-resolver
+	java-pkg_jarfrom xmlstreambuffer
+
+	cp \
+		"${S}"/src/rt/build/gen-src/com/sun/xml/ws/resources/*.java \
+		"${S}"/src/rt/src/com/sun/xml/ws/resources/ || die "cp failed"
+
+	find "${S}/src/" -name '*.java' -exec \
+		sed -i -e \
+			's,com.sun.org.apache.xml.internal.resolver,org.apache.xml.resolver,g' \
+			{} \;
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	java-ant_rewrite-bootclasspath auto build.xml "$(java-pkg_getjars jax-ws-api-2)"
+}
+
+EANT_BUILD_TARGET="build"
+
+src_install() {
+	java-pkg_dojar jax-ws.jar
+
+	use source && java-pkg_dosrc src/rt/src/*
+}
diff --git a/dev-java/jax-ws/metadata.xml b/dev-java/jax-ws/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jax-ws/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jaxb-tools/Manifest b/dev-java/jaxb-tools/Manifest
new file mode 100644
index 000000000000..472c8dfabc59
--- /dev/null
+++ b/dev-java/jaxb-tools/Manifest
@@ -0,0 +1 @@
+DIST JAXB2_src_20070125.jar 3089194 SHA256 26bec14fa220b111b7153f9889926b86a9cdc8a73aa2541149dadd7d7151afa1 SHA512 5d6c3dec6d7d9010ec6eed1785211338ce781eb13e492fcc7417d9acab6a0259abc7d23e22dc749d201793f632cfabff3f065e422b99f0af9395d881afea81bf WHIRLPOOL 4a7bcfd66383081a831ac4c1dd5fbff3e46dd1247dc59c6840e7bd029d9780b94d0d3f35f836b5d5b596b808970a41d48fbfc49770db9924a797a5766b540123
diff --git a/dev-java/jaxb-tools/files/build.xml-2.1.2 b/dev-java/jaxb-tools/files/build.xml-2.1.2
new file mode 100644
index 000000000000..bcda10608511
--- /dev/null
+++ b/dev-java/jaxb-tools/files/build.xml-2.1.2
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<project name="jaxb" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac debug="false" srcdir="src" destdir="build">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+    <copy todir="build">
+      <fileset dir="src" includes="**/*.properties"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="jaxb-tools.jar">
+      <fileset dir="build" includes="**/*.class"/>
+      <fileset dir="build" includes="**/*.properties"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild b/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild
new file mode 100644
index 000000000000..3f7b1388614b
--- /dev/null
+++ b/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="1"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Reference implementation of the JAXB specification"
+HOMEPAGE="http://jaxb.dev.java.net/"
+SRC_URI="https://jaxb.dev.java.net/${PV}/JAXB2_src_20070125.jar"
+
+LICENSE="CDDL"
+SLOT="2"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="dev-java/codemodel:2
+	dev-java/iso-relax:0
+	dev-java/istack-commons-runtime:0
+	dev-java/istack-commons-tools:0
+	dev-java/jaxb:2
+	dev-java/jsr173:0
+	dev-java/msv:0
+	dev-java/relaxng-datatype:0
+	dev-java/rngom:0
+	dev-java/sun-dtdparser:0
+	dev-java/sun-jaf:0
+	dev-java/txw2-runtime:0
+	dev-java/xml-commons-resolver:0
+	dev-java/xsdlib:0
+	dev-java/xsom:0"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/jaxb-ri-20070125"
+
+src_unpack() {
+
+	cd "${WORKDIR}"
+	echo "A" | java -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jarfrom --build-only ant-core
+	java-pkg_jarfrom codemodel-2
+	java-pkg_jarfrom iso-relax
+	java-pkg_jarfrom istack-commons-runtime
+	java-pkg_jarfrom istack-commons-tools
+	java-pkg_jarfrom jaxb-2
+	java-pkg_jarfrom jsr173
+	java-pkg_jarfrom msv
+	java-pkg_jarfrom relaxng-datatype
+	java-pkg_jarfrom rngom
+	java-pkg_jarfrom sun-dtdparser
+	java-pkg_jarfrom sun-jaf
+	java-pkg_jarfrom txw2-runtime
+	java-pkg_jarfrom xml-commons-resolver
+	java-pkg_jarfrom xsdlib
+	java-pkg_jarfrom xsom
+	ln -s $(java-config --tools) || die
+
+	cd "${S}/src/com/sun/"
+	rm -rf codemodel # in dev-java/codemodel
+	rm -rf xml # in dev-java/jaxb
+
+	cd "${S}"
+	# Their build.xml does not do everything we want
+	cp -v "${FILESDIR}/build.xml-${PV}" build.xml || die "cp failed"
+
+	find src -name '*.java' -exec \
+		sed -i \
+			-e 's,com.sun.org.apache.xml.internal.resolver,org.apache.xml.resolver,g' \
+			{} \;
+
+}
+
+src_install() {
+	java-pkg_dojar jaxb-tools.jar
+	java-pkg_dolauncher "xjc-${SLOT}" \
+		--main com.sun.tools.xjc.Driver
+
+	use source && java-pkg_dosrc src/*
+
+}
diff --git a/dev-java/jaxb-tools/metadata.xml b/dev-java/jaxb-tools/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jaxb-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jaxb/Manifest b/dev-java/jaxb/Manifest
new file mode 100644
index 000000000000..472c8dfabc59
--- /dev/null
+++ b/dev-java/jaxb/Manifest
@@ -0,0 +1 @@
+DIST JAXB2_src_20070125.jar 3089194 SHA256 26bec14fa220b111b7153f9889926b86a9cdc8a73aa2541149dadd7d7151afa1 SHA512 5d6c3dec6d7d9010ec6eed1785211338ce781eb13e492fcc7417d9acab6a0259abc7d23e22dc749d201793f632cfabff3f065e422b99f0af9395d881afea81bf WHIRLPOOL 4a7bcfd66383081a831ac4c1dd5fbff3e46dd1247dc59c6840e7bd029d9780b94d0d3f35f836b5d5b596b808970a41d48fbfc49770db9924a797a5766b540123
diff --git a/dev-java/jaxb/files/build.xml-2.1.2 b/dev-java/jaxb/files/build.xml-2.1.2
new file mode 100644
index 000000000000..8a31e3516e5d
--- /dev/null
+++ b/dev-java/jaxb/files/build.xml-2.1.2
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<project name="jaxb" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac debug="false" srcdir="src" destdir="build">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+    <copy todir="build">
+      <fileset dir="src" includes="**/*.properties"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="jaxb-api.jar">
+      <fileset dir="build" includes="javax/**/*.class"/>
+      <fileset dir="build" includes="javax/**/*.properties"/>
+    </jar>
+    <jar destfile="jaxb-impl.jar">
+      <fileset dir="build" includes="com/**/*.class"/>
+      <fileset dir="build" includes="com/**/*.properties"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/jaxb/jaxb-2.1.2-r1.ebuild b/dev-java/jaxb/jaxb-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..6320cadaa8c6
--- /dev/null
+++ b/dev-java/jaxb/jaxb-2.1.2-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="1"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Reference implementation of the JAXB specification"
+HOMEPAGE="http://jaxb.dev.java.net/"
+DATE="20070125"
+MY_P="JAXB2_src_${DATE}"
+SRC_URI="https://jaxb.dev.java.net/${PV}/${MY_P}.jar"
+
+LICENSE="CDDL"
+SLOT="2"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/istack-commons-runtime:0
+	dev-java/jsr173:0
+	java-virtuals/jaf
+	dev-java/txw2-runtime:0"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/jaxb-ri-${DATE}"
+
+src_unpack() {
+	echo "A" | java -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+
+	# Source is missing Messages.properties, copy it from binary version:
+	cd "${T}"
+	unzip -qq "${S}/lib/jaxb-api.jar"
+	for mp in $(find javax -name '*.properties'); do
+		mv "${mp}" "${S}/src/${mp}" || die
+	done
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+	java-pkg_jarfrom --build-only ant-core
+	java-pkg_jarfrom istack-commons-runtime
+	java-pkg_jarfrom jsr173
+	java-pkg_jarfrom jaf
+	java-pkg_jarfrom txw2-runtime
+	ln -s $(java-config --tools) || die
+
+	cd "${S}/src/com/sun/"
+	rm -rf codemodel # in dev-java/codemodel
+	rm -rf tools # in dev-java/jaxb-tools
+
+	cp -v "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die "cp failed"
+
+}
+
+src_install() {
+	java-pkg_dojar jaxb-api.jar
+	java-pkg_dojar jaxb-impl.jar
+
+	use source && java-pkg_dosrc src/*
+
+}
diff --git a/dev-java/jaxb/metadata.xml b/dev-java/jaxb/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jaxb/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
new file mode 100644
index 000000000000..44cfdde4d18e
--- /dev/null
+++ b/dev-java/jaxen/Manifest
@@ -0,0 +1,2 @@
+DIST jaxen-1.1.1-src.tar.gz 271343 SHA256 f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca SHA512 095523a1600324a2d2f748717c6af0ffe216120b834c1157912b57ea076c639aa3e47fe87da0316cae491ba838765e5e06bc304cdb610789101a54192d976940 WHIRLPOOL 2fec877f4b3e565304a7cd8bc7b5b391eaa74068c6bf241d8b2ef0fe5973273164247ec1166fedfbf92f082aa1120a4a3f0ce47e0e13a15add75ac00c128810a
+DIST jaxen-1.1.4-src.tar.gz 268493 SHA256 97d039a029ccaddf5ef301cafd1da8549b8360fe3ca0c15d65fc57162cd4433e SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031 WHIRLPOOL 44e3449ec8c0c15496c9528c668593d3dde67da67108e5927aee630df6ee3803999f812ab7597f37a68829e95a435fe6699bc9681583f6a500cd55cc51fbd6dc
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.1.ebuild b/dev-java/jaxen/jaxen-1.1.1.ebuild
new file mode 100644
index 000000000000..8b3a95acabd6
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 eutils java-ant-2
+
+MY_P=${P/_beta/-beta-}
+DESCRIPTION="A Java XPath Engine"
+HOMEPAGE="http://jaxen.org/"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz"
+
+LICENSE="JDOM"
+SLOT="1.1"
+KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc source test"
+
+COMMON_DEP="~dev-java/jdom-1.0
+	=dev-java/dom4j-1*
+	dev-java/xom"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit =dev-java/junit-3* )
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	java-ant_ignore-system-classes
+
+	mkdir -p "${S}/target/lib"
+	cd "${S}/target/lib"
+	java-pkg_jar-from dom4j-1
+	java-pkg_jar-from jdom-1.0
+	java-pkg_jar-from xom
+}
+
+src_install() {
+	java-pkg_newjar target/${MY_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/*
+}
+
+src_test() {
+	java-pkg_jar-from --into target/lib junit
+	ANT_TASKS="ant-junit" eant test -DJunit.present=true
+}
diff --git a/dev-java/jaxen/jaxen-1.1.4.ebuild b/dev-java/jaxen/jaxen-1.1.4.ebuild
new file mode 100644
index 000000000000..2503e98ce30d
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java XPath Engine"
+HOMEPAGE="http://jaxen.codehaus.org/"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
+
+LICENSE="JDOM"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/dom4j:1
+	dev-java/jdom:1.0
+	dev-java/xom:0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit:0 )
+	${COMMON_DEP}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="dom4j-1,jdom-1.0,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/metadata.xml b/dev-java/jaxen/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/jaxen/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
new file mode 100644
index 000000000000..bdd66d7d548a
--- /dev/null
+++ b/dev-java/jaxme/Manifest
@@ -0,0 +1 @@
+DIST ws-jaxme-0.5.2-src.tar.gz 5478402 SHA256 0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc SHA512 f41e0e66f8c017efb55a3d4e002caaf8e4978ca52fa2c66ed25daf8c22a0643d1865a8a7313b72326926cc08ae79d08136d662ae83a6e1cdc6eb4d9bc7fbacdc WHIRLPOOL b7815c1e7dbace025a8980a6e4571abfa6976f50fff988d7686f6c0e7c2316aeef47b5e788323298861d3218852b8c57f56ad4ec610b2ef4905471f644f11b22
diff --git a/dev-java/jaxme/files/jaxme-0.3.1-base64.diff b/dev-java/jaxme/files/jaxme-0.3.1-base64.diff
new file mode 100644
index 000000000000..b0475f9cb900
--- /dev/null
+++ b/dev-java/jaxme/files/jaxme-0.3.1-base64.diff
@@ -0,0 +1,36 @@
+--- ws-jaxme-0.3.1/buildjm.xml.orig	2006-07-30 18:46:21.000000000 +0200
++++ ws-jaxme-0.3.1/buildjm.xml	2006-07-30 19:04:24.000000000 +0200
+@@ -54,6 +54,7 @@
+       <pathelement location="${preqs}/ant.jar"/>
+       <pathelement location="${preqs}/xml-apis.jar"/>
+       <pathelement location="${preqs}/xercesImpl.jar"/>
++      <pathelement location="${preqs}/gnu-crypto.jar"/>
+     </path>
+ 
+     <path id="jaxme.runtime.path">
+--- ws-jaxme-0.3.1/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java.orig	2006-07-30 18:49:11.000000000 +0200
++++ ws-jaxme-0.3.1/src/jaxme/org/apache/ws/jaxme/util/Base64Binary.java	2006-07-30 19:02:54.000000000 +0200
+@@ -18,8 +18,7 @@
+ 
+ import java.io.IOException;
+ 
+-import sun.misc.BASE64Decoder;
+-import sun.misc.BASE64Encoder;
++import gnu.crypto.util.Base64;
+ 
+ 
+ /**
+@@ -33,11 +32,11 @@
+   }
+ 
+   public static byte[] decode(String pValue) throws IOException {
+-    return (new BASE64Decoder()).decodeBuffer(pValue);
++    return Base64.decode(pValue);
+   }
+ 
+   public static String encode(byte[] pValue) {
+-    return (new BASE64Encoder()).encode(pValue);
++    return Base64.encode(pValue);
+   }
+ 
+   public static void main(String[] args) throws Exception {
diff --git a/dev-java/jaxme/files/jaxme-0.3.1-gentoo.patch b/dev-java/jaxme/files/jaxme-0.3.1-gentoo.patch
new file mode 100644
index 000000000000..c51a33c713c7
--- /dev/null
+++ b/dev-java/jaxme/files/jaxme-0.3.1-gentoo.patch
@@ -0,0 +1,41 @@
+diff -ru ws-jaxme-0.3.1/build.xml ws-jaxme-0.3.1-patched/build.xml
+--- ws-jaxme-0.3.1/build.xml	2004-09-02 18:41:58.000000000 -0400
++++ ws-jaxme-0.3.1-patched/build.xml	2005-06-26 22:59:39.000000000 -0400
+@@ -157,9 +157,8 @@
+   <target name="doc" depends="javadoc,docbook.html,forrest,replace"
+       description="Generates the documentation"/>
+ 
+-  <target name="javadoc" depends="init,all"
++  <target name="javadoc" depends="init"
+       description="Generates the API documentation">
+-    <delete dir="${build.apidocs}"/>
+     <mkdir dir="${build.apidocs}"/>
+     <javadoc
+                      access="protected"
+@@ -189,8 +188,8 @@
+         <pathelement location="${src.js}"/>
+         <pathelement location="${src.jm}"/>
+         <pathelement location="${src.pm}"/>
+-        <pathelement location="${build.js.src}"/>
+-        <pathelement location="${build.jm.src}"/>
++        <!--pathelement location="${build.js.src}"/>
++        <pathelement location="${build.jm.src}"/-->
+       </sourcepath>
+     </javadoc>
+   </target>
+@@ -245,6 +244,15 @@
+     <delete dir="${dist}"/>
+   </target>
+ 
++  <target name="jar">
++
++    <ant antfile="buildapi.xml" target="jar" inheritall="false" inheritrefs="false"/>
++    <ant antfile="buildxs.xml" target="jar" inheritall="false" inheritrefs="false"/>
++    <ant antfile="buildjs.xml" target="jar" inheritall="false" inheritrefs="false"/>
++    <ant antfile="buildjm.xml" target="compile" inheritall="false" inheritrefs="false"/>
++    <ant antfile="buildpm.xml" target="compile" inheritall="false" inheritrefs="false"/>
++  </target>
++
+   <target name="all">
+     <ant antfile="buildapi.xml" target="all" inheritall="false" inheritrefs="false"/>
+     <ant antfile="buildxs.xml" target="all" inheritall="false" inheritrefs="false"/>
diff --git a/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch b/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch
new file mode 100644
index 000000000000..210a1783c783
--- /dev/null
+++ b/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch
@@ -0,0 +1,24 @@
+diff -ur ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
+--- ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java	2005-03-10 12:14:08.000000000 +0200
++++ ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java	2009-04-05 00:43:39.498597962 +0300
+@@ -45,7 +45,7 @@
+  * @author <a href="mailto:joe@ispsoft.de">Jochen Wiedmann</a>
+  * @version $Id$
+  */
+-public class JMMarshallerImpl extends JMControllerImpl implements JMMarshaller {
++public abstract class JMMarshallerImpl extends JMControllerImpl implements JMMarshaller {
+   /** Default value for {@link Marshaller#JAXB_ENCODING}.
+    * (UTF-8 encoding)
+    */
+diff -ur ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java
+--- ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java	2005-03-04 12:41:53.000000000 +0200
++++ ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMUnmarshallerImpl.java	2009-04-05 00:43:53.635210800 +0300
+@@ -44,7 +44,7 @@
+ 
+ /** JaxMe's {@link javax.xml.bind.Unmarshaller} implementation.
+  */
+-public class JMUnmarshallerImpl extends JMControllerImpl implements JMUnmarshaller {
++public abstract class JMUnmarshallerImpl extends JMControllerImpl implements JMUnmarshaller {
+     private static final SAXParserFactory spf;
+     static {
+         spf = SAXParserFactory.newInstance();
diff --git a/dev-java/jaxme/jaxme-0.5.2-r1.ebuild b/dev-java/jaxme/jaxme-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..eb1e5ecbe992
--- /dev/null
+++ b/dev-java/jaxme/jaxme-0.5.2-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN=ws-${PN}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="JaxMe 2 is an open source implementation of JAXB, the specification for Java/XML binding"
+HOMEPAGE="http://ws.apache.org/jaxme/index.html"
+SRC_URI="mirror://apache/ws/${PN}/source/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="dev-java/antlr:0[java]
+	>=dev-java/xerces-2.7
+	=dev-java/junit-3.8*
+	>=dev-java/log4j-1.2.8:0
+	dev-java/xmldb:0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	dev-db/hsqldb:0
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+# We do it later
+JAVA_PKG_BSFIX="off"
+
+java_prepare() {
+	cd "${S}/prerequisites"
+	rm *.jar
+	java-pkg_jarfrom antlr
+	java-pkg_jarfrom junit
+	java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar
+	java-pkg_jarfrom xerces-2
+	java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar
+	java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
+	java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar
+	java-pkg_jarfrom --build-only ant-core ant.jar ant.jar
+	# no linking to it, should be used for tests only but used to generate stuff during build anyway
+	java-pkg_jarfrom --build-only hsqldb hsqldb.jar hsqldb-1.7.1.jar
+
+	# Special case: jaxme uses ant/*.xml files, so rewriting them by hand
+	# is better:
+	cd "${S}"
+	for i in build.xml ant/*.xml src/webapp/build.xml src/test/jaxb/build.xml; do
+		java-ant_bsfix_one "${i}"
+	done
+
+	# Patch marshal classes to be abstract for build to succeed
+	epatch "${FILESDIR}/${P}-fix_marshallers.patch"
+}
+
+EANT_TEST_ANT_TASKS="hsqldb"
+
+src_compile() {
+	local ant_target="all"
+	local ant_args=""
+	if use doc; then
+		ant_args="-Dbuild.apidocs=dist/doc/api"
+		# The javadoc target depends on all so it is enough. Passing both results in two builds,
+		# where the second pass fails due to hsqldb lock - bug #310311.
+		ant_target="javadoc"
+	fi
+
+	eant ${ant_args} ${ant_target}
+}
+
+src_install() {
+	pushd dist > /dev/null
+	for jar in *.jar; do
+		java-pkg_newjar ${jar} ${jar/-${PV}/}
+	done
+	popd > /dev/null
+
+	dodoc NOTICE || die
+
+	if use doc; then
+		java-pkg_dojavadoc dist/doc/api
+		dohtml -r src/documentation/manual
+	fi
+	use source && java-pkg_dosrc src/{pm,jaxme,js,api,webapp,xs}/*
+}
diff --git a/dev-java/jaxme/jaxme-0.5.2.ebuild b/dev-java/jaxme/jaxme-0.5.2.ebuild
new file mode 100644
index 000000000000..c6f0acc53b2c
--- /dev/null
+++ b/dev-java/jaxme/jaxme-0.5.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN=ws-${PN}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="JaxMe 2 is an open source implementation of JAXB, the specification for Java/XML binding"
+HOMEPAGE="http://ws.apache.org/jaxme/index.html"
+SRC_URI="mirror://apache/ws/${PN}/source/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="dev-java/antlr:0[java]
+	>=dev-java/xerces-2.7
+	=dev-java/junit-3.8*
+	>=dev-java/log4j-1.2.8
+	dev-java/xmldb:0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	dev-db/hsqldb:0
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+# We do it later
+JAVA_PKG_BSFIX="off"
+
+java_prepare() {
+	cd "${S}/prerequisites"
+	rm *.jar
+	java-pkg_jarfrom antlr
+	java-pkg_jarfrom junit
+	java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar
+	java-pkg_jarfrom xerces-2
+	java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar
+	java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
+	java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar
+	java-pkg_jarfrom --build-only ant-core ant.jar ant.jar
+	# no linking to it, should be used for tests only but used to generate stuff during build anyway
+	java-pkg_jarfrom --build-only hsqldb hsqldb.jar hsqldb-1.7.1.jar
+
+	# Special case: jaxme uses ant/*.xml files, so rewriting them by hand
+	# is better:
+	cd "${S}"
+	for i in build.xml ant/*.xml src/webapp/build.xml src/test/jaxb/build.xml; do
+		java-ant_bsfix_one "${i}"
+	done
+
+	# Patch marshal classes to be abstract for build to succeed
+	epatch "${FILESDIR}/${P}-fix_marshallers.patch"
+}
+
+EANT_TEST_ANT_TASKS="hsqldb"
+
+src_compile() {
+	local ant_target="all"
+	local ant_args=""
+	if use doc; then
+		ant_args="-Dbuild.apidocs=dist/doc/api"
+		# The javadoc target depends on all so it is enough. Passing both results in two builds,
+		# where the second pass fails due to hsqldb lock - bug #310311.
+		ant_target="javadoc"
+	fi
+
+	eant ${ant_args} ${ant_target}
+}
+
+src_install() {
+	pushd dist > /dev/null
+	for jar in *.jar; do
+		java-pkg_newjar ${jar} ${jar/-${PV}/}
+	done
+	popd > /dev/null
+
+	dodoc NOTICE || die
+
+	if use doc; then
+		java-pkg_dojavadoc dist/doc/api
+		dohtml -r src/documentation/manual
+	fi
+	use source && java-pkg_dosrc src/{pm,jaxme,js,api,webapp,xs}/*
+}
diff --git a/dev-java/jaxme/metadata.xml b/dev-java/jaxme/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/jaxme/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jaxp/Manifest b/dev-java/jaxp/Manifest
new file mode 100644
index 000000000000..40d270ab3ad7
--- /dev/null
+++ b/dev-java/jaxp/Manifest
@@ -0,0 +1 @@
+DIST jaxp-1.4.tar.bz2 644928 SHA256 bc516f8d0673014ed9532eeda67d876996440f7a578f0e4fb464d9aa7d1bb3fe SHA512 d9a0a61a46ec3661eec63fc5a3ff32bde1bba8bc17653c8e05a54f4e36063e9a8b06cf9ce47686f76f08c3858ce4951ff2a85e2fb997cd82088338e2ee519e73 WHIRLPOOL 1afe192d4deed29b5fbc93f5f11f71097c9b9319c68c213988499a525d0e89c6bdd97e8643e1afc560cafd06028179ff23aac317244cadae5aa06a794c8da375
diff --git a/dev-java/jaxp/files/build.xml-1.4 b/dev-java/jaxp/files/build.xml-1.4
new file mode 100644
index 000000000000..9068b31f7b9f
--- /dev/null
+++ b/dev-java/jaxp/files/build.xml-1.4
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<project name="jaxp" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac debug="false" srcdir="jaxp-1_4-api/src" destdir="build">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="jaxp-ri.jar">
+      <fileset dir="build" includes="**/*.class"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/jaxp/jaxp-1.4-r1.ebuild b/dev-java/jaxp/jaxp-1.4-r1.ebuild
new file mode 100644
index 000000000000..15eff2c9d19b
--- /dev/null
+++ b/dev-java/jaxp/jaxp-1.4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The Java API for XML Processing (JAXP)"
+HOMEPAGE="https://jaxp.dev.java.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+src_prepare() {
+	cp -i "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die "cp failed"
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar jaxp-ri.jar
+
+	use source && java-pkg_dosrc jaxp-1_4-api/src/{javax,org}
+	dohtml \
+		docs/JAXP-Compatibility.html \
+		docs/ReleaseNotes.html
+	use doc && java-pkg_dojavadoc docs/api
+
+	cd "${ED}/usr/share/${PN}/lib/"
+	ln -s jaxp-ri.jar jaxp.jar || die
+	java-pkg_regjar /usr/share/${PN}/lib/jaxp.jar
+}
diff --git a/dev-java/jaxp/metadata.xml b/dev-java/jaxp/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jaxp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jaxr/Manifest b/dev-java/jaxr/Manifest
new file mode 100644
index 000000000000..05f5a43bf9e7
--- /dev/null
+++ b/dev-java/jaxr/Manifest
@@ -0,0 +1 @@
+DIST jaxr-1.0.6.tar.bz2 562108 SHA256 8937ad4f264da6bc4e8e284e89f10199265b658f7559b0c87e6cf6659c46ef98 SHA512 823853352943a8e6ad7ff4b9cb0739f129bdbecaf66e9da150791710a3ec532b9f41d55697610b6af7702c40098d6f9a0639321c969fc5ea8b119c44e3c49abb WHIRLPOOL d568ffce984da5ed9dbce59a348b0cb09101de1dd4ef03407da034e23c7089d43d1a656453f82442d2b4063d88dd03118a645b3af7b3582e945f003cf07bd56e
diff --git a/dev-java/jaxr/files/jaxr-1.0.6-javadoc.patch b/dev-java/jaxr/files/jaxr-1.0.6-javadoc.patch
new file mode 100644
index 000000000000..9d06f6f63d4c
--- /dev/null
+++ b/dev-java/jaxr/files/jaxr-1.0.6-javadoc.patch
@@ -0,0 +1,13 @@
+--- build.xml.vanilla	2007-03-18 21:59:10.000000000 +0100
++++ build.xml	2007-03-18 22:00:54.000000000 +0100
+@@ -206,7 +206,9 @@
+            <sourcepath>
+                <pathelement location="${src.dir}"/>
+            </sourcepath>
+-           <fileset dir="${src.dir}"/>
++           <fileset dir="${src.dir}">
++               <include name="**/*.java"/>
++           </fileset>
+        </javadoc>
+    </target>
+    <target name="javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,javadoc-build">
diff --git a/dev-java/jaxr/jaxr-1.0.6-r1.ebuild b/dev-java/jaxr/jaxr-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..90a19b0bfbe7
--- /dev/null
+++ b/dev-java/jaxr/jaxr-1.0.6-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java API for XML Registries"
+HOMEPAGE="https://glassfish.dev.java.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+CDEPEND="dev-java/jaxb:2
+	dev-java/jsr173:0
+	dev-java/jsr67:0
+	dev-java/jsr93:0
+	dev-java/sun-jaf:0"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}-ri"
+
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="javadoc-build"
+
+EANT_GENTOO_CLASSPATH="
+	jaxb-2
+	jsr67
+	jsr173
+	jsr93
+	sun-jaf
+"
+
+java_prepare() {
+	mkdir "${S}"/lib || die
+
+	java-pkg_jar-from --into lib jaxb-2
+	java-pkg_jar-from --into lib jsr67 jsr67.jar saaj-api.jar
+	java-pkg_jar-from --into lib jsr173 jsr173.jar jsr173_1.0_api.jar
+	java-pkg_jar-from --into lib jsr93 jsr93-api.jar jaxr-api.jar
+	java-pkg_jar-from --into lib sun-jaf
+
+	epatch "${FILESDIR}/${P}-javadoc.patch"
+
+	if use doc; then
+		java-ant_xml-rewrite \
+			-f "${S}"/build.xml \
+			-c -e javadoc \
+			-a failonerror \
+			-v "false"
+	fi
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}-impl.jar
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/java/*
+
+}
diff --git a/dev-java/jaxr/metadata.xml b/dev-java/jaxr/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jaxr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jazzy/Manifest b/dev-java/jazzy/Manifest
new file mode 100644
index 000000000000..6c412eb5c1fc
--- /dev/null
+++ b/dev-java/jazzy/Manifest
@@ -0,0 +1 @@
+DIST jazzy-0.5.2.src.zip 235936 SHA256 df6925f924094a9ebab51f30c0e90299e93be7258c194b6f0ea06a1df04fe43d SHA512 6d20f9bc133c03049c4c2a5c8612a52ef9fa09bc7510fb762c1ba9de479b1ce9319633ae2e78d3a1dd63900198d4e2468887113d034d95ba3e05bc631cc2de5e WHIRLPOOL de286057fd174df70ce571699c2c38c4cee67f3c0d821be254e126e29e70802fcee420706a2814dab8fa45b6a929e1c78c535702e0e0dcb0e752619f5be3fb03
diff --git a/dev-java/jazzy/jazzy-0.5.2.ebuild b/dev-java/jazzy/jazzy-0.5.2.ebuild
new file mode 100644
index 000000000000..358f6f2a7738
--- /dev/null
+++ b/dev-java/jazzy/jazzy-0.5.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Spell Check API"
+HOMEPAGE="http://sourceforge.net/projects/jazzy"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	mkdir dict
+	rm -v www/*.jar || die
+}
+
+EANT_BUILD_TARGET="library-all"
+
+src_install() {
+	java-pkg_dojar dist/lib/*.jar
+	dodoc README.txt || die
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/com
+	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..51b51082a589
--- /dev/null
+++ b/dev-java/jazzy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..9c845fccd636
--- /dev/null
+++ b/dev-java/jbitcollider-core/Manifest
@@ -0,0 +1 @@
+DIST jBitcollider-0.8.zip 1192489 SHA256 b36482ee9e919c669bb1797ff7e50f57edf505af67664e280fe1dff361861044 SHA512 272e9e0e6e66d3ac9d17e17d8fcbed82b508e512c5cdada7f18c2920597f31ae5968509c9814c5530ee7c5bea9f3d1b049b922d55056637642bcb515b890a9f7 WHIRLPOOL 6f095ae92410596b9b2bf51f7c1b365a1f8ae2f495299716912ab87dbfd351992fb6657846a104b73b334f883d9e762c0668cceb2c4709c45114b9f213263b3e
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..7b2d0929168c
--- /dev/null
+++ b/dev-java/jbitcollider-core/jbitcollider-core-0.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..af796c11fbdf
--- /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>
+		<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..b81da140abe8
--- /dev/null
+++ b/dev-java/jboss-logging/Manifest
@@ -0,0 +1 @@
+DIST jboss-logging-3.1.4.tar.gz 25018 SHA256 805053336b77c4c62e89a920ef9b80cfc6577964fcdcadb7c3ab43b017e1c734 SHA512 633b18b079089444a5f7406a6a2b29100abd2c752306ada4fda0c15f07a60a363d67616e2521ec079f1df37ecdadcbb46e26819a9f5647e3d1a18219c494b73a WHIRLPOOL b60657d39425309c7917a9019b957d83898462c142bdfd95fe5ba1d8c91cb6b0d119515810747f68db15623d389f955c8a1adaafbebb58860570ad9994bffb14
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.3-r1-build.xml b/dev-java/jboss-logging/files/jboss-logging-3.1.3-r1-build.xml
new file mode 100644
index 000000000000..f024bcc74854
--- /dev/null
+++ b/dev-java/jboss-logging/files/jboss-logging-3.1.3-r1-build.xml
@@ -0,0 +1,224 @@
+<?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.3.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" depends="get-deps" 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.3.GA]]&gt;</doctitle>
+      <header>&lt;![CDATA[JBoss Logging 3.1.3.GA]]&gt;</header>
+      <footer>&lt;![CDATA[JBoss Logging 3.1.3.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>
+
+  <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/jboss/logmanager/jboss-logmanager/1.2.0.GA"/>
+    <get src="http://repo.maven.apache.org/maven2/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar" 
+         dest="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.16"/>
+    <get src="http://repo.maven.apache.org/maven2/log4j/log4j/1.2.16/log4j-1.2.16.jar" 
+         dest="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1"/>
+    <get src="http://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" 
+         dest="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
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..d4c3725843e7
--- /dev/null
+++ b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..34e7aafc4655
--- /dev/null
+++ b/dev-java/jboss-logging/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..b97240484d1d
--- /dev/null
+++ b/dev-java/jboss-logmanager/Manifest
@@ -0,0 +1 @@
+DIST jboss-logmanager-1.5.1.tar.gz 132910 SHA256 3999086ba0c01b249daac8a41b49706a5f595db3b2f24a3e788827baccda95ac SHA512 a586f3619c90390d38c0355024f1d711b11e06efa35b3da9f12f7d98e04debad5250ef30ec9b869d27ffc60d9e5d5c8e690cc4a2b0a71553a2a994cfdef89768 WHIRLPOOL c69a6918308c378d03df37396a0c8e3f83073372bf98236f05015661cb5b3b5190bb7fc68ac7f303c65fb464a6798feb4219313dfd781026bc76e6d6f0444d98
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..e136b8a6002b
--- /dev/null
+++ b/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..323b20f370d0
--- /dev/null
+++ b/dev-java/jboss-logmanager/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="github">jboss-logging/jboss-logmanager</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-java/jboss-marshalling/Manifest b/dev-java/jboss-marshalling/Manifest
new file mode 100644
index 000000000000..0b97104c37d1
--- /dev/null
+++ b/dev-java/jboss-marshalling/Manifest
@@ -0,0 +1 @@
+DIST jboss-marshalling-1.3.0.CR9-sources.jar 174155 SHA256 8c98a596199f029b870df34dac547833c2e2c5a25c47ece6f03cd5f38c169008 SHA512 d7a1ae24ec50acf20f8150cf6e741a846e9a5837f9d8e4c06d8429793f69b95a7c03449ba5a6debb00bd22b596b6f801e25e0f38ccce7ac25cafd601e2ef7058 WHIRLPOOL 80b8c9cd440fc8c32dc55a7d18412c84c9765eec8a5b2c99b3035464d24f61398574734b1152683afd26d2dac62751951813ac691184c278df821fc61846a576
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..c3043eb5852b
--- /dev/null
+++ b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="Alternative compatible serialization API that fixes many JDK serialization API problems"
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/jboss-marshalling/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jboss-modules/Manifest b/dev-java/jboss-modules/Manifest
new file mode 100644
index 000000000000..9f917de4330f
--- /dev/null
+++ b/dev-java/jboss-modules/Manifest
@@ -0,0 +1,2 @@
+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
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..4e601b3375dc
--- /dev/null
+++ b/dev-java/jboss-modules/jboss-modules-1.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b655dfc7ae6a
--- /dev/null
+++ b/dev-java/jboss-modules/jboss-modules-1.3.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..6a960ae0c94e
--- /dev/null
+++ b/dev-java/jboss-modules/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..3e24b3469260
--- /dev/null
+++ b/dev-java/jcalendar/Manifest
@@ -0,0 +1,2 @@
+DIST jcalendar-1.3.3.zip 669499 SHA256 1dbbf9037026b32adfd123d3946c3ca272075f8b4ddf205436cddeffae320ac9 SHA512 966cb1f063b15bb941e9e263bd0dcf8a6121a6fa37ed2def69be6031856a1459a198f1b10202d697aafff8c71ad6f4e191449014bb692385c066f2c93b9c73fd WHIRLPOOL 39ef9f370b9ddc7c04717c45b34614919e65e54d52b6c2c0b0898b38d917d470e2442bfde08f2b94d567c8806749651aa00362363d38b4a13ba6fae3171a1b58
+DIST jcalendar-1.4.zip 982517 SHA256 21fb9332aad57d9542e9833376686a4bc7612e979c638e97334421bd15447c4f SHA512 aeab6f98451f4fa8718e127de6c0af345410bebbd1de4fa1ca4b9e7f5a22908f9e455ba96da34ef9e8691b4d462e8a01dbd7881b6565a0f3a65d18fe58b68d9c WHIRLPOOL 8c25a8918ef7d83cce59c347701a7af8e3a1bd307398f80d9e2d9d076afae05daaa56e1430eba167139aaae6193ed84a6c860d68ecd286992be71bec9e0dd388
diff --git a/dev-java/jcalendar/jcalendar-1.3.3.ebuild b/dev-java/jcalendar/jcalendar-1.3.3.ebuild
new file mode 100644
index 000000000000..04f87060681c
--- /dev/null
+++ b/dev-java/jcalendar/jcalendar-1.3.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java date chooser bean for graphically picking a date"
+SRC_URI="http://www.toedter.com/download/${P}.zip"
+HOMEPAGE="http://www.toedter.com/en/jcalendar/"
+
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+COMMON_DEPEND="dev-java/jgoodies-looks:2.0"
+
+RDEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	>=app-arch/unzip-5.50-r1
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}"
+
+# NOTE: build.xml contains no tests
+
+java_prepare() {
+	cd lib || die
+	rm -v *.jar || die
+
+	java-pkg_jar-from jgoodies-looks-2.0
+}
+
+EANT_BUILD_XML="src/build.xml"
+EANT_DOC_TARGET="dist"
+
+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/jcalendar-1.4.ebuild b/dev-java/jcalendar/jcalendar-1.4.ebuild
new file mode 100644
index 000000000000..fa558a8ee1a5
--- /dev/null
+++ b/dev-java/jcalendar/jcalendar-1.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java date chooser bean for graphically picking a date"
+SRC_URI="http://www.toedter.com/download/${P}.zip"
+HOMEPAGE="http://www.toedter.com/en/jcalendar/"
+
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="dev-java/jgoodies-looks:2.6"
+
+RDEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	>=app-arch/unzip-5.50-r1
+	${COMMON_DEPEND}"
+
+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() {
+	rm lib/*.jar || die
+}
+
+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..3754862a002f
--- /dev/null
+++ b/dev-java/jcalendar/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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..89868b0ca8b8
--- /dev/null
+++ b/dev-java/jchardet/Manifest
@@ -0,0 +1 @@
+DIST jchardet-1.1.zip 82782 SHA256 2d83cd7a24a5a5c1cbf02f649008b0d792f5e4bc11e18a7df8ce4f885bc8650a SHA512 3a6141b1783286adfc072075f46da8f6e719361425cb2cbcd1c4c4dd82a6ef834a9f6f1aad8126d663dcfa12ad20cc362566dc2095ea95e01bd95adfae20bc28 WHIRLPOOL 4dbc0af21024b9da7d332cd2cb6c9103300a2618b189e4cbe97ad574b328db4727db60ec008f0c09b316d1d27c68371a33645d6a4dd1703f6cd906af3376dff4
diff --git a/dev-java/jchardet/files/build.xml b/dev-java/jchardet/files/build.xml
new file mode 100644
index 000000000000..ad0d4b0c1d09
--- /dev/null
+++ b/dev-java/jchardet/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/jchardet/jchardet-1.1.ebuild b/dev-java/jchardet/jchardet-1.1.ebuild
new file mode 100644
index 000000000000..779b386613f3
--- /dev/null
+++ b/dev-java/jchardet/jchardet-1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+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.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+EANT_BUILD_TARGET="dist"
+
+src_prepare() {
+	rm -f dist/lib/chardet.jar
+
+	mkdir -p src/org/mozilla/intl/chardet/ || die
+	mv src/*.java src/org/mozilla/intl/chardet || die
+}
+
+src_install() {
+	java-pkg_dojar dist/lib/chardet.jar
+
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jchardet/metadata.xml b/dev-java/jchardet/metadata.xml
new file mode 100644
index 000000000000..636867dbfc6b
--- /dev/null
+++ b/dev-java/jchardet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jchardet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jcharts/Manifest b/dev-java/jcharts/Manifest
new file mode 100644
index 000000000000..6723743c29ef
--- /dev/null
+++ b/dev-java/jcharts/Manifest
@@ -0,0 +1 @@
+DIST jCharts-0.7.5.zip 2499046 SHA256 add40a61a022f353421bfc578537871b7d716750896d689ada8ac294334956d6 SHA512 6b3da4f24cf6481d978a2ddda6db723b93c4fa966b536604ed2e9a6f238925c510eae59bb2cf1c11ea66cebf38292c880655aab4e09f6c8af3fcb4fbbbad92c1 WHIRLPOOL 26d00c4852ae00f4e605061b4c50f911a81856a198ab50af4547af12b73972ba8e23424d252fbcb65343f40e42b4c8b26cfec863442c66c372d21fb3a7db0bc4
diff --git a/dev-java/jcharts/jcharts-0.7.5-r3.ebuild b/dev-java/jcharts/jcharts-0.7.5-r3.ebuild
new file mode 100644
index 000000000000..b80a346f054c
--- /dev/null
+++ b/dev-java/jcharts/jcharts-0.7.5-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="jCharts-${PV}"
+DESCRIPTION="jCharts is a 100% Java based charting utility that outputs a variety of charts"
+HOMEPAGE="http://jcharts.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# tests need X11
+RESTRICT=test
+
+CDEPEND="dev-java/batik:1.8
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND="${CDEPEND}
+	|| ( virtual/jre:1.6 virtual/jre:1.5 )"
+
+DEPEND="${CDEPEND}
+	|| ( virtual/jdk:1.6 virtual/jdk:1.5 virtual/jdk:1.4 )"
+
+#RDEPEND="${CDEPEND}
+#	>=virtual/jre-1.4"
+#DEPEND="${CDEPEND}
+#	>=virtual/jdk-1.4
+#	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	rm -v *.{jar,war} lib/*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_BUILD_XML="build/build.xml"
+EANT_DOC_TARGET="javadocs"
+EANT_GENTOO_CLASSPATH="
+	batik-1.8
+	servlet-api-3.0
+"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/*.jar
+	dohtml docs/*.html
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use source && java-pkg_dosrc src/org
+	use examples && java-pkg_doexamples demo
+}
diff --git a/dev-java/jcharts/metadata.xml b/dev-java/jcharts/metadata.xml
new file mode 100644
index 000000000000..808861f03622
--- /dev/null
+++ b/dev-java/jcharts/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+		jCharts is a 100% Java based charting utility that outputs a
+		variety of charts. This package has been designed from the
+		ground up by volunteers for displaying charts via Servlets,
+		JSP's, and Swing apps. First release was in December 2000.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jcharts</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jcifs/Manifest b/dev-java/jcifs/Manifest
new file mode 100644
index 000000000000..b9c081bde3d5
--- /dev/null
+++ b/dev-java/jcifs/Manifest
@@ -0,0 +1 @@
+DIST jcifs-1.3.17.tgz 862091 SHA256 b6c5d82ed0bc015986206101a908eacd96bca8915187a092e34ebb373eeb545d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc WHIRLPOOL eff4a90de687ac21525b9502a85e1b75a29856b46586020f929d46e2a8157c6f6c602fa3d848456ff864b22c2c2c603e34c193afea2cd03433dae74d5a4b1fea
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..cc018a8e0707
--- /dev/null
+++ b/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/metadata.xml b/dev-java/jcifs/metadata.xml
new file mode 100644
index 000000000000..40818e0723b0
--- /dev/null
+++ b/dev-java/jcifs/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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..17443011dfc9
--- /dev/null
+++ b/dev-java/jcip-annotations/Manifest
@@ -0,0 +1 @@
+DIST jcip-annotations-1.0-1.tar.gz 7524 SHA256 57d47e633507ce6e039dd52752720fdc96262093d58e1f43a117a995e312cf09 SHA512 22eb285a445b25a718846dad45581dbe7a324a2d670bd05f4b2aa5e850ae34af6bcedbf143e17a7cd6cf7e510e0dd447992ba1d5316432e8a8db5584a1e1973e WHIRLPOOL 1f840e4ff7ac1a84c92aef73f9f86e3f0f3ec1849975f50b4603953e409ee61207181c432cc794cc4c36b0dbff107d55f45b2f33822a92bdecd18757b69eedd5
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..c16c3964a786
--- /dev/null
+++ b/dev-java/jcip-annotations/jcip-annotations-1.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f71022b22834
--- /dev/null
+++ b/dev-java/jcip-annotations/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..f39d35a0dd2e
--- /dev/null
+++ b/dev-java/jclasslib/Manifest
@@ -0,0 +1 @@
+DIST jclasslib_unix_3_0.tar.gz 1774938 SHA256 eec6d971b913802904e1f76758ff9b739680489bdaced18543a359308390405c SHA512 0bd46f5a1c837f888d9b570f49085bb04d71e401d89b74880bd4af765cf27493b56e17ff065b155672bf6de6edb14006c619b3afe8bc6c488dc16e2fc97131ab WHIRLPOOL c15bf9a2457b72c517c83109b8cf1c88a4d0343d3f7a82de40e20f63d518ece9f53255181e9e5cf04cae640a663bb10e7c33049bfbbd8c05a792407ae1a2db9b
diff --git a/dev-java/jclasslib/files/3.0-browser.patch b/dev-java/jclasslib/files/3.0-browser.patch
new file mode 100644
index 000000000000..33635d693e74
--- /dev/null
+++ b/dev-java/jclasslib/files/3.0-browser.patch
@@ -0,0 +1,12 @@
+diff -ur jclasslib.old/src/org/gjt/jclasslib/browser/BrowserMDIFrame.java jclasslib/src/org/gjt/jclasslib/browser/BrowserMDIFrame.java
+--- jclasslib.old/src/org/gjt/jclasslib/browser/BrowserMDIFrame.java	2007-02-27 22:37:56.000000000 +0200
++++ jclasslib/src/org/gjt/jclasslib/browser/BrowserMDIFrame.java	2007-02-27 22:47:48.000000000 +0200
+@@ -633,7 +633,7 @@
+         if (System.getProperty("os.name").startsWith("Windows")) {
+             commandLine = "rundll32.exe url.dll,FileProtocolHandler " + urlSpec;
+         } else {
+-            commandLine = "netscape " + urlSpec;
++            commandLine = System.getProperty("gentoo.browser", "firefox") + " " + urlSpec;
+         }
+         try {
+             Runtime.getRuntime().exec(commandLine);
diff --git a/dev-java/jclasslib/files/3.0-pre b/dev-java/jclasslib/files/3.0-pre
new file mode 100644
index 000000000000..b84f5b9d705a
--- /dev/null
+++ b/dev-java/jclasslib/files/3.0-pre
@@ -0,0 +1 @@
+[[ ${BROWSER} ]] && gjl_java_args="${gjl_java_args} -Dgentoo.browser=${BROWSER}"
diff --git a/dev-java/jclasslib/files/jclasslib-3.0-buildxml.patch b/dev-java/jclasslib/files/jclasslib-3.0-buildxml.patch
new file mode 100644
index 000000000000..3ca3d0d0f168
--- /dev/null
+++ b/dev-java/jclasslib/files/jclasslib-3.0-buildxml.patch
@@ -0,0 +1,15 @@
+--- build.xml.orig	2005-05-16 14:43:46.000000000 +0200
++++ build.xml	2005-05-16 14:44:27.000000000 +0200
+@@ -59,10 +59,10 @@
+     <pathelement location="${lib-compile.dir}/java.jar"/>
+   </path>
+ 
+-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${lib-compile.dir}/antnbm.jar"/>
++  <!-- <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${lib-compile.dir}/antnbm.jar"/>
+   <taskdef name="install4j"
+     classname="com.install4j.Install4JTask"
+-    classpath="/opt/install4j/bin/install4j.jar:/Program Files/install4j/bin/install4j.jar:/Programme/install4j/bin/install4j.jar"/>
++    classpath="/opt/install4j/bin/install4j.jar:/Program Files/install4j/bin/install4j.jar:/Programme/install4j/bin/install4j.jar"/> -->
+ 
+   <!-- Make all standard directories -->
+   <target name="init">
diff --git a/dev-java/jclasslib/jclasslib-3.0-r1.ebuild b/dev-java/jclasslib/jclasslib-3.0-r1.ebuild
new file mode 100644
index 000000000000..e99feea0682b
--- /dev/null
+++ b/dev-java/jclasslib/jclasslib-3.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV=${PV/./_}
+DESCRIPTION="A bytecode viewer is a tool"
+HOMEPAGE="http://www.ej-technologies.com/products/jclasslib/overview.html"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_unix_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v bin/*.jar lib-compile/*.jar .install4j/*.jar || die
+	epatch "${FILESDIR}/${PN}-3.0-buildxml.patch"
+	epatch "${FILESDIR}/3.0-browser.patch"
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+
+	#-pre relies on -java_args not being used
+	#if you need that, patch java-utils-2.eclass
+	java-pkg_dolauncher ${PN} \
+		-pre "${FILESDIR}/3.0-pre"
+
+	# has stuff other than javadoc too
+	use doc && java-pkg_dohtml -r doc/*
+	use source && java-pkg_dosrc src/*
+}
+
+pkg_postinst() {
+	elog "jclasslib by default uses firefox as the browser."
+	elog "Use the BROWSER environment variable to use something else."
+}
diff --git a/dev-java/jclasslib/metadata.xml b/dev-java/jclasslib/metadata.xml
new file mode 100644
index 000000000000..53357752d126
--- /dev/null
+++ b/dev-java/jclasslib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jclasslib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jcmdline/Manifest b/dev-java/jcmdline/Manifest
new file mode 100644
index 000000000000..c8d91e9a71b1
--- /dev/null
+++ b/dev-java/jcmdline/Manifest
@@ -0,0 +1 @@
+DIST jcmdline-1.0.2.zip 397472 SHA256 a042f7061c79629cdf298ee4f7b334c3ece9c1a4d87acf7c2f051ae0372bf43b SHA512 b261856eed9426257fd6391d45760f96f0085a40167632bfb2f85d35071e58d766553819bc0f8022b92fa193d47464928d09d2b0772a08ba484dd954b6206fd7 WHIRLPOOL a62bf4ab0c3e5236655d246a193135f23b52f692d1e1865d194dcaa03e1a0db6249f32142c212e34661d62fd2c4ae4714e18687b97f2bd2ab08141ff1c76ef3b
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..6eeb6a8b25d8
--- /dev/null
+++ b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/metadata.xml b/dev-java/jcmdline/metadata.xml
new file mode 100644
index 000000000000..df9de2927648
--- /dev/null
+++ b/dev-java/jcmdline/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..1287b1c5e0be
--- /dev/null
+++ b/dev-java/jcodings/Manifest
@@ -0,0 +1,3 @@
+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
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..eac57c8a5116
--- /dev/null
+++ b/dev-java/jcodings/jcodings-1.0.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Byte-based encoding support library for Java"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ppc 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..766eaf4fd955
--- /dev/null
+++ b/dev-java/jcodings/jcodings-1.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://jruby.codehaus.org/"
+#SRC_URI="http://github.com/jruby/${PN}/tarball/${PV} -> ${P}-git.tar.gz"
+SRC_URI="mirror://gentoo/${P}-git.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc 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..37230b79510b
--- /dev/null
+++ b/dev-java/jcodings/jcodings-1.0.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Byte-based encoding support library for Java"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="http://github.com/jruby/${PN}/tarball/${PV} -> ${P}-git.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc 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..6f87dc795546
--- /dev/null
+++ b/dev-java/jcodings/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..5725b416cb5e
--- /dev/null
+++ b/dev-java/jcommander/Manifest
@@ -0,0 +1 @@
+DIST jcommander-1.32.tar.gz 61837 SHA256 21f8dd9aaae91800648a81d44a71b6b7574e828de7faa1667c9c4c64c653f6c5 SHA512 dd23674e5ca91f770ec677579f3c2eb16cbf4f82154f9d1a728debeaef75f0e00e50d58336e7b05b63f601188380d62075df0889b2df8e1fffe48c472cfa5df0 WHIRLPOOL 3971b6c7b2d799f1d1063167d4079365d77086bbf0a76e9f8990febc01e82f78f7c2aa9dc809b04acbf21af5bd8cfb5b5c1de6fd506951e031d5b01e512076b6
diff --git a/dev-java/jcommander/files/jcommander-1.32-build.xml b/dev-java/jcommander/files/jcommander-1.32-build.xml
new file mode 100644
index 000000000000..641cbbf54461
--- /dev/null
+++ b/dev-java/jcommander/files/jcommander-1.32-build.xml
@@ -0,0 +1,278 @@
+<?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/16/13 6:06 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jcommander-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="jcommander-1.32"/>
+  <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}/org/testng/testng/6.1.1/testng-6.1.1.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/>
+    <pathelement location="${maven.repo.local}/org/yaml/snakeyaml/1.6/snakeyaml-1.6.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"/>
+          <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/testng/testng/6.1.1"/>
+    <get src="http://oss.sonatype.org/content/repositories/snapshots/org/testng/testng/6.1.1/testng-6.1.1.jar" 
+         dest="${maven.repo.local}/org/testng/testng/6.1.1/testng-6.1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/testng/testng/6.1.1/testng-6.1.1.jar" 
+         dest="${maven.repo.local}/org/testng/testng/6.1.1/testng-6.1.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/>
+    <get src="http://oss.sonatype.org/content/repositories/snapshots/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}/org/beanshell/bsh/2.0b4"/>
+    <get src="http://oss.sonatype.org/content/repositories/snapshots/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar" 
+         dest="${maven.repo.local}/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar" 
+         dest="${maven.repo.local}/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/yaml/snakeyaml/1.6"/>
+    <get src="http://oss.sonatype.org/content/repositories/snapshots/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" 
+         dest="${maven.repo.local}/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" 
+         dest="${maven.repo.local}/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/jcommander/jcommander-1.32.ebuild b/dev-java/jcommander/jcommander-1.32.ebuild
new file mode 100644
index 000000000000..8c593f557f07
--- /dev/null
+++ b/dev-java/jcommander/jcommander-1.32.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+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.5"
+RDEPEND=">=virtual/jre-1.5"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+# Depends on itself through dev-java/testng (BGO) for building tests, bad idea.
+RESTRICT="test"
+
+# EANT_GENTOO_CLASSPATH_REWRITE="true"
+# EANT_TEST_GENTOO_CLASSPATH="..."
+
+src_test() {
+	EANT_TEST_EXTRA_ARGS="-Djunit.present=true" java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	dodoc README.markdown CHANGELOG
+	use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-java/jcommander/metadata.xml b/dev-java/jcommander/metadata.xml
new file mode 100644
index 000000000000..22361399799c
--- /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>
+  <herd>java</herd>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </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..af8db85e32fb
--- /dev/null
+++ b/dev-java/jcommon/Manifest
@@ -0,0 +1,3 @@
+DIST jcommon-1.0.16.tar.gz 1130148 SHA256 033fd5506d10dcfc7814180b09627e66232fd1ee29b769fc283aa936d7dd607d SHA512 81152e6d19f10eec2abe7704c8bb138448c25f39dcf42a9379e488e9163db041dec18b9407fca4c94e514801af5373c698d3867facc9887f98fb7d8e18086fae WHIRLPOOL e87eaec68455a89ac538ce9fcd3ccbea70efe6f2e5ccb0033c77b823ca5499686b3aaf7b13b29c4187b8b2c9e864cf1ecca2794d5fa37f6dde40da774c94c2c1
+DIST jcommon-1.0.18.tar.gz 1133961 SHA256 a4daf9ed40712bfe9564dcd6eb8392711325aec78fa7c03e57c195f63413e3fd SHA512 83a4dfe7c7f631ee251cd1c133726060d8d380366ba0b39b043327c20e8128fd882b7374448738dcad3e1b6eadc0221242588c15c6feaa3c06101beafe2e79bb WHIRLPOOL cae9c1ff0d3658199378baf2ce58d25710aac17b7bca4d5e31136133868ebb41c6a71fd384a3ba1da2e800d364dd0bf5e70ef768148bbb56d440c78b8fe1e6d4
+DIST jcommon-1.0.23.zip 1373666 SHA256 6351512b94fc2228034a5c43da52d9ef8ecb7781dcecdeba733441de7d7e18f1 SHA512 c358239da8b1ddf53ce94bebb00b6518456aa921dd3aa84fc6a23144d499f14a85ba421cd71f3880e8d10153a6ab816f54c1fa872a4ab694ce3c7b8d69bc2a4b WHIRLPOOL 467d7400a7009c38b86041977dd59f8a309f7a8ecf02226b80112d12aa3d472c9a42a9cc3e5620b64b0333d44f497f85d95a2184603df9eb21ad66a51ca7fa6c
diff --git a/dev-java/jcommon/jcommon-1.0.16.ebuild b/dev-java/jcommon/jcommon-1.0.16.ebuild
new file mode 100644
index 000000000000..138717e1f7f2
--- /dev/null
+++ b/dev-java/jcommon/jcommon-1.0.16.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects"
+HOMEPAGE="http://www.jfree.org/jcommon"
+MY_P=${PN}-$(replace_version_separator 3 -)
+SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.tar.gz"
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+DEPEND=">=virtual/jdk-1.4
+		test? ( dev-java/junit:0 )"
+RDEPEND=">=virtual/jdk-1.4"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	rm -v *.jar lib/*.jar || 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_test() {
+	java-pkg_jar-from  --into lib junit
+	eant -f ant/build.xml compile-junit-tests
+	ejunit -cp "./lib/jcommon-${PV}-junit.jar:$(java-pkg_getjars junit)" \
+		org.jfree.junit.JCommonTestSuite
+}
+
+src_install() {
+	java-pkg_newjar ${P}.jar ${PN}.jar
+	dodoc README.txt || die
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc source/com source/org
+}
diff --git a/dev-java/jcommon/jcommon-1.0.18.ebuild b/dev-java/jcommon/jcommon-1.0.18.ebuild
new file mode 100644
index 000000000000..c209a85a505e
--- /dev/null
+++ b/dev-java/jcommon/jcommon-1.0.18.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_P=${PN}-$(replace_version_separator 3 -)
+DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects"
+HOMEPAGE="http://www.jfree.org/jcommon"
+SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	>=virtual/jdk-1.4"
+DEPEND="
+	>=virtual/jdk-1.4
+	test? ( dev-java/junit:4 )"
+
+S=${WORKDIR}/${MY_P}
+
+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_test() {
+	java-pkg_jar-from --into lib junit-4
+	eant -f ant/build.xml compile-junit-tests
+	ejunit4 -cp "./lib/jcommon-${PV}-junit.jar:$(java-pkg_getjars junit-4)" \
+		org.jfree.junit.JCommonTestSuite
+}
+
+src_install() {
+	java-pkg_newjar ${P}.jar ${PN}.jar
+	dodoc README.txt
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc source/com source/org
+}
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..827b3f1788aa
--- /dev/null
+++ b/dev-java/jcommon/jcommon-1.0.23.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_P=${PN}-$(replace_version_separator 3 -)
+DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects"
+HOMEPAGE="http://www.jfree.org/jcommon"
+SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.zip"
+
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~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..b23178874827
--- /dev/null
+++ b/dev-java/jcommon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..80846b57bf12
--- /dev/null
+++ b/dev-java/jcs/Manifest
@@ -0,0 +1 @@
+DIST commons-jcs-dist-2.0-beta-1-src.tar.gz 825048 SHA256 2ff60facc31b52625f1f2d8907380947508790bd864e2fea03625dee0c36ffa5 SHA512 56d68807de6d47debc893584a738bc797c2a150503ae460dc1444e9434b438926f6ad9fe8c1292250f6a0b2936210084cbd512083b5a8cc4f20e692b759a314f WHIRLPOOL e5e67465a7c318ec73de3ffacc566cce48304a3379885dd814f0c32f362c1d2e24abf2935e090056df0bd8db0fa85cb36553203e5eb6e837e23e888ca6cd137f
diff --git a/dev-java/jcs/files/build-1.2.7.8.xml b/dev-java/jcs/files/build-1.2.7.8.xml
new file mode 100644
index 000000000000..f3623a42de76
--- /dev/null
+++ b/dev-java/jcs/files/build-1.2.7.8.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="Gentoo_Builder" default="jar" basedir=".">
+  <property name="src" value="src/java"/>
+  <property name="build" value="build"/>
+  <property name="dist" value="dist"/>
+  <property name="pkg" value="${package.name}"/>
+  <property name="jar" value="${project.name}.jar"/>
+  <property file="build.properties"/>
+  <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}"/>
+  </target>
+  <target name="manifest" depends="init">
+    <manifest file="${build}/MANIFEST.MF" mode="update">
+      <attribute name="Built-By" value="Gentoo Portage"/>
+    </manifest>
+  </target>
+  <target name="jar" depends="compile,manifest">
+    <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+      <fileset dir="${build}"/>
+      <fileset dir="${src}">
+        <include name="**/*.vm"/>
+      </fileset>
+    </jar>
+  </target>
+  <target name="javadoc" depends="compile">
+    <javadoc destdir="${dist}/doc/api">
+      <fileset dir="${src}"/>
+    </javadoc>
+  </target>
+  <target name="clean">
+    <delete dir="${build}"/>
+    <delete dir="${dist}"/>
+  </target>
+</project>
diff --git a/dev-java/jcs/files/build-1.2.7.9.xml b/dev-java/jcs/files/build-1.2.7.9.xml
new file mode 100644
index 000000000000..f3623a42de76
--- /dev/null
+++ b/dev-java/jcs/files/build-1.2.7.9.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="Gentoo_Builder" default="jar" basedir=".">
+  <property name="src" value="src/java"/>
+  <property name="build" value="build"/>
+  <property name="dist" value="dist"/>
+  <property name="pkg" value="${package.name}"/>
+  <property name="jar" value="${project.name}.jar"/>
+  <property file="build.properties"/>
+  <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}"/>
+  </target>
+  <target name="manifest" depends="init">
+    <manifest file="${build}/MANIFEST.MF" mode="update">
+      <attribute name="Built-By" value="Gentoo Portage"/>
+    </manifest>
+  </target>
+  <target name="jar" depends="compile,manifest">
+    <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+      <fileset dir="${build}"/>
+      <fileset dir="${src}">
+        <include name="**/*.vm"/>
+      </fileset>
+    </jar>
+  </target>
+  <target name="javadoc" depends="compile">
+    <javadoc destdir="${dist}/doc/api">
+      <fileset dir="${src}"/>
+    </javadoc>
+  </target>
+  <target name="clean">
+    <delete dir="${build}"/>
+    <delete dir="${dist}"/>
+  </target>
+</project>
diff --git a/dev-java/jcs/files/build-1.3.xml b/dev-java/jcs/files/build-1.3.xml
new file mode 100644
index 000000000000..c7b94bf6371c
--- /dev/null
+++ b/dev-java/jcs/files/build-1.3.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="Gentoo_Builder" default="jar" basedir=".">
+  <property name="src" value="src/java"/>
+  <property name="build" value="build"/>
+  <property name="dist" value="dist"/>
+  <property name="pkg" value="${package.name}"/>
+  <property name="jar" value="${project.name}.jar"/>
+  <property file="build.properties"/>
+  <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}"/>
+  </target>
+  <target name="manifest" depends="init">
+    <manifest file="${build}/MANIFEST.MF" mode="update">
+      <attribute name="Built-By" value="Gentoo Portage"/>
+    </manifest>
+  </target>
+  <target name="jar" depends="compile,manifest">
+    <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+      <fileset dir="${build}"/>
+      <fileset dir="${src}">
+        <include name="**/*.vm"/>
+      </fileset>
+    </jar>
+  </target>
+  <target name="javadoc" depends="compile">
+    <javadoc destdir="${dist}/doc/api" sourcepath="${src}" />
+  </target>
+  <target name="clean">
+    <delete dir="${build}"/>
+    <delete dir="${dist}"/>
+  </target>
+</project>
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..e31677d17053
--- /dev/null
+++ b/dev-java/jcs/jcs-2.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="JCS is a distributed caching system written in Java 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 ppc 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..106955320fec
--- /dev/null
+++ b/dev-java/jcs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..888a53c56791
--- /dev/null
+++ b/dev-java/jdbc-informix/Manifest
@@ -0,0 +1 @@
+DIST JDBC.3.00.JC3.tar 18447872 RMD160 f38781b5deb7076e854000849e1c1d41231439dc SHA1 856ca3f54433cd3220ce598fde75bbf13cb31839 SHA256 b8a894c0aff02bd690d2082cb4e0e4d2f8e73ff59e3cbdafd28562346902ced7
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..0795867b0f2b
--- /dev/null
+++ b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..838c00a4a448
--- /dev/null
+++ b/dev-java/jdbc-informix/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
new file mode 100644
index 000000000000..ed9c4a7fdadc
--- /dev/null
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -0,0 +1,4 @@
+DIST Jaybird-2.1.5-src.zip 6047595 SHA256 3b475bca2cc5c3cbf6032c75ff2ea47d2e77abad18df36e149c1eaccfc15a868 SHA512 e6d7eb70cf59d5d9a2dd7817bc11574ba5f014f2aae6cb6c4b141e7d0a172cf091b950e3475ee5d4389f3ca3efae3f34ed1efbc694b74a2a99adc2694c936a7e WHIRLPOOL ca5e3fedce5f13a00ea37f946f9f0141d3132ea3b9209623961b32868946dd0e36621d0280716263031bc02dbcc7f8cd80de29da5e0235127d9c0d9e4deea54e
+DIST Jaybird-2.1.6-src.zip 5849860 SHA256 819d47e37b91d0ea23f8b043d504a00f5b19d207d80556f2bf465abf1e50fa48 SHA512 756ad70e3eb7c80d59afffba132c207310c2e9346c6f08b6a023305db36fd46a351c33259ca7d73eff853e9f7ff2245234297de33c7d9042fe87c3a8df204014 WHIRLPOOL aa1c4bd03373dd7671c5d15db4210e1ccd319b41fd0259033944d1cfa75dac17a22293cf25a4c922dc17f4649ca4315d6136a878e1dad758664db7e6e03019ad
+DIST Jaybird-2.2.7-src.tar.gz 9548804 SHA256 ff88c4b2297b153a9693bc6fd57761f6c0472518f12dcd5892cf72e31721cbad SHA512 53a5fb13f82f57cb1dd1febba81cb43d92dabe4973b4cb0df185188e3a48bbb0a206132297759459708b2e44d155f5936015f547fed834f7cc2287d5aa423f22 WHIRLPOOL 0297f49d2c866ba2dbd250fea5f928d2e04cbab4f22497c4d12449295054ba33d109e21260ab6cf0bdf41b8cfbb539018994432c4e8f418bfe10cb46322edaf7
+DIST v2.2.8.zip 10235590 SHA256 6345bc37c958f8bb6a69b07281b6a4e1bd643e822f3223b4a171d1fc74253b77 SHA512 05689c86bcde9bb7611052168414c75bffac2a30c984f0c3db602baf6c463c6a9d2f424fddb94bfd00634a399901edbf37700f6cb3ac0d8fa246006f3add1e15 WHIRLPOOL 01e6e38014cf7d43410677dc115747c796811ed1b514998de296b9d6ce585c2b5efb427df220f8c471dfcc21df9aa312fbf2f9889a5649525daf15bd8108e267
diff --git a/dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch b/dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch
new file mode 100644
index 000000000000..2a32c5a4126f
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/2.1.6-remove-unused-ant-import.patch
@@ -0,0 +1,12 @@
+diff --git a/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java b/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java
+index 179f58b..fec2ac7 100644
+--- a/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java
++++ b/src/main/org/firebirdsql/jdbc/AbstractDatabaseMetaData.java
+@@ -23,7 +23,6 @@ package org.firebirdsql.jdbc;
+ import java.sql.*;

+ import java.util.*;

+ 

+-import org.apache.tools.ant.taskdefs.Get.DownloadProgress;

+ import org.firebirdsql.gds.*;

+ import org.firebirdsql.gds.impl.AbstractGDS;

+ import org.firebirdsql.gds.impl.AbstractIscDbHandle;

diff --git a/dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch b/dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch
new file mode 100644
index 000000000000..a6d36de8a7db
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/archive-xml-2.1.0.patch
@@ -0,0 +1,11 @@
+--- client-java/build/archive.xml	2005-06-25 19:26:26.000000000 -0400
++++ build/archive.xml	2006-05-09 12:41:03.000000000 -0400
+@@ -57,7 +57,7 @@
+ 

+   </target>

+ 

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

++  <target name="jar-test" depends="compile" if="tests">

+ 

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

+     <jar jarfile="${build.lib}/${archive.name.test}" manifest="${build.etc}/default.mf">

diff --git a/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch b/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch
new file mode 100644
index 000000000000..d66e7bf40049
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch
@@ -0,0 +1,21 @@
+diff -Naur client-java_orig/build/compile.xml client-java/build/compile.xml
+--- client-java_orig/build/compile.xml	2008-02-07 20:46:24.000000000 -0500
++++ client-java/build/compile.xml	2008-02-13 14:46:08.000000000 -0500
+@@ -13,7 +13,7 @@
+     <ant antfile="build_native.xml"/>

+   </target>

+  

+-  <target name="compile-examples">

++  <target name="compile-examples" if="examples">

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

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

+            destdir="${build.examples}"

+@@ -154,7 +154,7 @@
+     </path>

+   </target>

+ 

+-  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test,set-jdbc-30-test">

++  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test,set-jdbc-30-test" if="tests">

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

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

+            destdir="${build.test}"

diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild
new file mode 100644
index 000000000000..e17706848838
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source examples test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+At="Jaybird-${PV/_/}-src"
+DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
+HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
+SRC_URI="mirror://sourceforge/firebird/${At}.zip"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6
+	dev-java/ant-core
+	dev-java/log4j"
+DEPEND="=virtual/jdk-1.6*
+	app-arch/unzip
+	dev-java/ant-core
+	dev-java/log4j
+	test? (
+		=dev-java/junit-3.8*
+		dev-java/ant-junit
+	)"
+
+S="${WORKDIR}/client-java"
+
+MY_PN="jaybird"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/archive-xml-2.1.0.patch"
+	epatch "${FILESDIR}/compile_xml-2.1.2.patch"
+
+	cd "${S}/lib/"
+	rm -v *.jar
+	use test && java-pkg_jar-from --build-only junit junit.jar
+
+	cd "${S}/src/lib/"
+	# the build.xml unpacks this and uses stuff
+	mv mini-j2ee.jar "${T}" || die "Failed to move mini-j2ee.jar to ${T}"
+	rm -v *.jar *.zip
+	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
+
+	# Hack to add ant.jar to classpath without patch
+	java-pkg_jar-from ant-core ant.jar jaas.jar
+	java-pkg_jar-from log4j log4j.jar log4j-core.jar
+}
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+	eant $(use test && echo "-Dtests=true") jars \
+		$(use_doc javadocs)
+}
+
+src_install() {
+	cd "${S}/output/lib/"
+	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
+
+	for jar in full pool; do
+		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	done
+	if use test; then
+		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	fi
+
+	cd "${S}"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r examples || die "installing examples failed"
+	fi
+
+	use source && java-pkg_dosrc "${S}"/src/*/org
+
+	cd "${S}/output"
+	use doc && java-pkg_dohtml -r docs/
+	dodoc etc/{*.txt,default.mf}
+	dohtml etc/*.html
+}
+
+src_test() {
+	#
+	# Warning about timeouts without Firebird installed and running Locally
+	#
+	ewarn "You will experience long timeouts when running junit tests"
+	ewarn "without Firebird installed and running locally. The tests will"
+	ewarn "complete without Firebird, but network timeouts prolong the"
+	ewarn "testing phase considerably."
+	ANT_TASKS="ant-junit" eant all-tests-pure-java
+}
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild
new file mode 100644
index 000000000000..fbd292b0d7fc
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source examples test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+At="Jaybird-${PV/_/}-src"
+DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
+HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
+SRC_URI="mirror://sourceforge/firebird/${At}.zip"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="jni"
+
+RDEPEND=">=virtual/jre-1.6
+	dev-java/ant-core
+	dev-java/log4j"
+DEPEND="=virtual/jdk-1.6*
+	app-arch/unzip
+	dev-java/ant-core
+	dev-java/log4j
+	jni? ( dev-java/cpptasks )
+	test? (
+		=dev-java/junit-3.8*
+		dev-java/ant-junit
+	)"
+
+S="${WORKDIR}/client-java"
+
+MY_PN="jaybird"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/archive-xml-2.1.0.patch"
+	epatch "${FILESDIR}/compile_xml-2.1.2.patch"
+
+	# JAVA_ANT_ENCODING doesn't work because it doesn't like entities
+	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
+
+	cd "${S}/lib/"
+	rm -v *.jar
+	use test && java-pkg_jar-from --build-only junit junit.jar
+
+	cd "${S}/src/lib/"
+	# the build.xml unpacks this and uses stuff
+	mv mini-j2ee.jar "${T}" || die "Failed to move mini-j2ee.jar to ${T}"
+	rm -v *.jar *.zip
+	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
+
+	# Hack to add ant.jar to classpath without patch
+	java-pkg_jar-from ant-core ant.jar jaas.jar
+	java-pkg_jar-from log4j log4j.jar log4j-core.jar
+}
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+	use jni && ANT_TASKS="cpptasks"
+	eant $(use test && echo "-Dtests=true") jars \
+		$(use jni && echo "compile-native") \
+		$(use_doc javadocs)
+}
+
+src_install() {
+	cd "${S}/output/lib/"
+	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
+
+	for jar in full pool; do
+		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	done
+	if use test; then
+		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	fi
+
+	if use jni; then
+		cd "${S}/output/native"
+		sodest="/usr/lib/"
+		java-pkg_doso libjaybird21.so || die \
+			"java-pkg_doso ${sodest}libjaybird21.so failed"
+	fi
+
+	cd "${S}"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r examples || die "installing examples failed"
+	fi
+
+	use source && java-pkg_dosrc "${S}"/src/*/org
+
+	cd "${S}/output"
+	use doc && java-pkg_dohtml -r docs/
+	dodoc etc/{*.txt,default.mf}
+	dohtml etc/*.html
+}
+
+src_test() {
+	#
+	# Warning about timeouts without Firebird installed and running Locally
+	#
+	ewarn "You will experience long timeouts when running junit tests"
+	ewarn "without Firebird installed and running locally. The tests will"
+	ewarn "complete without Firebird, but network timeouts prolong the"
+	ewarn "testing phase considerably."
+	ANT_TASKS="ant-junit" eant all-tests-pure-java
+}
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.6.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.6.ebuild
new file mode 100644
index 000000000000..573b69a9bb35
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.6.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source examples test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+At="Jaybird-${PV/_/}-src"
+DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
+HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
+SRC_URI="mirror://sourceforge/firebird/${At}.zip"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="jni"
+
+RDEPEND=">=virtual/jre-1.6
+	dev-java/log4j:0
+	dev-java/glassfish-connector-api:0"
+DEPEND=">=virtual/jdk-1.6
+	${RDEPEND}
+	app-arch/unzip
+	jni? ( dev-java/cpptasks )
+	test? (
+		dev-java/ant-junit
+	)"
+
+S="${WORKDIR}/client-java.sources"
+
+MY_PN="jaybird"
+
+java_prepare() {
+
+	epatch "${FILESDIR}/archive-xml-2.1.0.patch"
+	epatch "${FILESDIR}/compile_xml-2.1.2.patch"
+	epatch "${FILESDIR}/2.1.6-remove-unused-ant-import.patch"
+
+	# JAVA_ANT_ENCODING doesn't work because it doesn't like entities
+	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
+
+	cd "${S}/lib/"
+	rm -v *.jar
+	use test && java-pkg_jar-from --build-only junit junit.jar
+
+	cd "${S}/src/lib/"
+	rm -v *.jar *.zip
+	# the build.xml unpacks this and uses stuff
+	touch empty
+	jar cf mini-j2ee.jar empty
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="glassfish-connector-api,log4j"
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="javadocs"
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+	use jni && ANT_TASKS="cpptasks"
+	java-pkg-2_src_compile $(use test && echo "-Dtests=true") \
+		$(use jni && echo "compile-native")
+}
+
+src_install() {
+	cd "${S}/output/lib/"
+	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
+
+	for jar in full pool; do
+		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	done
+	if use test; then
+		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	fi
+
+	if use jni; then
+		cd "${S}/output/native"
+		sodest="/usr/lib/"
+		java-pkg_doso libjaybird21.so || die \
+			"java-pkg_doso ${sodest}libjaybird21.so failed"
+	fi
+
+	cd "${S}"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r examples || die "installing examples failed"
+	fi
+
+	use source && java-pkg_dosrc "${S}"/src/*/org
+
+	cd "${S}/output"
+	use doc && java-pkg_dohtml -r docs/
+	dodoc etc/{*.txt,default.mf}
+	dohtml etc/*.html
+}
+
+src_test() {
+	#
+	# Warning about timeouts without Firebird installed and running Locally
+	#
+	ewarn "You will experience long timeouts when running junit tests"
+	ewarn "without Firebird installed and running locally. The tests will"
+	ewarn "complete without Firebird, but network timeouts prolong the"
+	ewarn "testing phase considerably."
+	ANT_TASKS="ant-junit" eant all-tests-pure-java
+}
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.7.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.7.ebuild
new file mode 100644
index 000000000000..bffa22cb1fb0
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.7.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source examples test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+At="Jaybird-${PV/_/}-src"
+DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
+HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
+SRC_URI="mirror://sourceforge/firebird/${At}.tar.gz"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jni"
+
+RDEPEND=">=virtual/jre-1.6
+	dev-java/junit:4
+	dev-java/antlr:4
+	dev-java/log4j:0
+	dev-java/glassfish-connector-api:0"
+DEPEND=">=virtual/jdk-1.6
+	${RDEPEND}
+	app-arch/unzip
+	jni? ( dev-java/cpptasks )
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${At}"
+
+MY_PN="jaybird"
+
+java_prepare() {
+	# prevent test/sources/javadoc from being built unless wanted
+	sed -i -e 's|name="jar-test" depends="compile"|name="jar-test" depends="compile" if="tests"|' \
+		"${S}/build/archive.xml" || die
+	sed -i -e 's|name="compile-examples"|name="compile-examples" if="examples"|' \
+		-e 's|,set-jdbc-42-test"|,set-jdbc-42-test" if="tests"|' \
+		"${S}/build/compile.xml" || die
+
+	# JAVA_ANT_ENCODING doesn't work because it doesn't like entities
+	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
+
+	cd "${S}/lib/"
+	rm -v *.jar
+
+	cd "${S}/src/lib/"
+	rm -v *.jar *.zip
+
+	java-pkg_jar-from --build-only glassfish-connector-api \
+		glassfish-connector-api.jar connector-api-1.5.jar
+
+	# the build.xml unpacks this and uses stuff
+	touch empty
+	jar cf mini-j2ee.jar empty
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="antlr:4,glassfish-connector-api,log4j"
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="javadocs"
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+	use jni && ANT_TASKS="cpptasks"
+
+	# This is nonsense, I know, but it works.
+	if use test; then
+		EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+	fi
+
+	java-pkg-2_src_compile $(use test && echo "-Dtests=true") \
+		$(use jni && echo "compile-native")
+}
+
+src_install() {
+	cd "${S}/output/lib/"
+	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
+
+	for jar in full; do
+		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	done
+	if use test; then
+		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	fi
+
+	if use jni; then
+		cd "${S}/output/native"
+		sodest="/usr/lib/"
+		local so_arch
+		if use amd64; then
+			so_arch="x64"
+		elif use x86; then
+			so_arch="x86"
+		fi
+		java-pkg_doso libjaybird22_${so_arch}.so || die \
+			"java-pkg_doso ${sodest}libjaybird22.so failed"
+	fi
+
+	cd "${S}"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r examples || die "installing examples failed"
+	fi
+
+	use source && java-pkg_dosrc "${S}"/src/*/org
+
+	cd "${S}/output"
+	use doc && java-pkg_dohtml -r docs/
+	dodoc etc/default.mf
+	dohtml etc/*.html
+}
+
+src_test() {
+	#
+	# Warning about timeouts without Firebird installed and running Locally
+	#
+	ewarn "You will experience long timeouts when running junit tests"
+	ewarn "without Firebird installed and running locally. The tests will"
+	ewarn "complete without Firebird, but network timeouts prolong the"
+	ewarn "testing phase considerably."
+	ANT_TASKS="ant-junit" eant all-tests-pure-java
+}
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.8.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.8.ebuild
new file mode 100644
index 000000000000..1d2513a017ce
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.8.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source examples test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="${PN/jdbc-/}"
+DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
+HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
+SRC_URI="https://github.com/FirebirdSQL/${MY_PN}/archive/v${PV}.zip"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="jni"
+
+CDEPEND="dev-java/junit:4
+	dev-java/antlr:4
+	dev-java/log4j:0
+	dev-java/glassfish-connector-api:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip
+	jni? ( dev-java/cpptasks )
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+java_prepare() {
+	# prevent test/sources/javadoc from being built unless wanted
+	sed -i -e 's|name="jar-test" depends="compile"|name="jar-test" depends="compile" if="tests"|' \
+		"${S}/build/archive.xml" || die
+	sed -i -e 's|name="compile-examples"|name="compile-examples" if="examples"|' \
+		-e 's|,set-jdbc-42-test"|,set-jdbc-42-test" if="tests"|' \
+		"${S}/build/compile.xml" || die
+
+	# JAVA_ANT_ENCODING doesn't work because it doesn't like entities
+	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
+
+	cd "${S}/lib/"
+	rm -v *.jar
+
+	cd "${S}/src/lib/"
+	rm -v *.jar *.zip
+
+	java-pkg_jar-from --build-only glassfish-connector-api \
+		glassfish-connector-api.jar connector-api-1.5.jar
+
+	# the build.xml unpacks this and uses stuff
+	touch empty
+	jar cf mini-j2ee.jar empty
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="antlr:4,glassfish-connector-api,log4j"
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="javadocs"
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+	use jni && ANT_TASKS="cpptasks"
+
+	# This is nonsense, I know, but it works.
+	if use test; then
+		EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+	fi
+
+	java-pkg-2_src_compile $(use test && echo "-Dtests=true") \
+		$(use jni && echo "compile-native")
+}
+
+src_install() {
+	cd "${S}/output/lib/"
+	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
+
+	for jar in full; do
+		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	done
+	if use test; then
+		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	fi
+
+	if use jni; then
+		cd "${S}/output/native"
+		sodest="/usr/lib/"
+		local so_arch
+		if use amd64; then
+			so_arch="x64"
+		elif use x86; then
+			so_arch="x86"
+		fi
+		java-pkg_doso libjaybird22_${so_arch}.so || die \
+			"java-pkg_doso ${sodest}libjaybird22.so failed"
+	fi
+
+	cd "${S}"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r examples || die "installing examples failed"
+	fi
+
+	use source && java-pkg_dosrc "${S}"/src/*/org
+
+	cd "${S}/output"
+	use doc && java-pkg_dohtml -r docs/
+	dodoc etc/default.mf
+	dohtml etc/*.html
+}
+
+src_test() {
+	#
+	# Warning about timeouts without Firebird installed and running Locally
+	#
+	ewarn "You will experience long timeouts when running junit tests"
+	ewarn "without Firebird installed and running locally. The tests will"
+	ewarn "complete without Firebird, but network timeouts prolong the"
+	ewarn "testing phase considerably."
+	ANT_TASKS="ant-junit" eant all-tests-pure-java
+}
diff --git a/dev-java/jdbc-jaybird/metadata.xml b/dev-java/jdbc-jaybird/metadata.xml
new file mode 100644
index 000000000000..4ba4af7fc1c1
--- /dev/null
+++ b/dev-java/jdbc-jaybird/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+	Jaybird is a JCA/JDBC driver suite for the Firebird database server.
+	This package includes both a type 2 and 4 JDBC driver.
+	</longdescription>
+	<use>
+		<flag name="jni">Build/Install JDBC Type 2 native components</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">firebird</remote-id>
+		<remote-id type="github">FirebirdSQL/jaybird</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jdbc-mssqlserver/Manifest b/dev-java/jdbc-mssqlserver/Manifest
new file mode 100644
index 000000000000..5825ea4d4208
--- /dev/null
+++ b/dev-java/jdbc-mssqlserver/Manifest
@@ -0,0 +1 @@
+DIST sqljdbc_4.0.2206.100_enu.tar.gz 2391092 SHA256 9bc2b6c216e1a82eedcde2ad10ef2fbd9629aab6806544596639fe080f914423 SHA512 7b18d56552f08976b2da5216f3f5504bc8b3db02c072a696115bbee1f5bb35e7125d4880e8e0e034116378b479465315df530eee7eb8a73e90467e1a67265084 WHIRLPOOL 92d20517c6068475c916cffde922fa597eaad4d08eae62f5c74ff59698f0caf0509d19ea1f07cabfed861b0b725ed13a2e4e1416c6dd67d34ba6119303e869bc
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..30b2dd9f6090
--- /dev/null
+++ b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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..838c00a4a448
--- /dev/null
+++ b/dev-java/jdbc-mssqlserver/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
new file mode 100644
index 000000000000..67a26867f79a
--- /dev/null
+++ b/dev-java/jdbc-mysql/Manifest
@@ -0,0 +1,4 @@
+DIST mysql-connector-java-5.1.14.tar.gz 3272153 SHA256 ca6f873a4da59cfe1f464ccee29672dc3bc56ef79cc6a1e9aefba2449c7a32d0 SHA512 42568335dce2e1dbce3e885dfbaafcba8456bf0bcdd9bcc3ec23f3c36af65d05b62968b56c0cda89f803e4d52f15effec8ae7ef40d16993ac542ae981991b6c6 WHIRLPOOL a9f4bb2ed433eb078208f0780ca4a1d76d4b0e83c0c8f46e73fb80a1a00789266904dc4121dab7d227c3fe5752032cbee14e3cd0502cfac9a6ad2e10071dc4d3
+DIST mysql-connector-java-5.1.18.tar.gz 3834947 SHA256 e67216a40fba486dbba9d93fca8e2d5bd6e434edb08f4b47b07e08f27555f414 SHA512 ec6ac3892c9df1abe26a93b5b60f0ca6350dc4e35f3ba9862754d30c1e4a2a5ecb51eda3b2d8cb32a1b1503a472de0ccedc579144de30cbc12a40264f4e8b90d WHIRLPOOL 3efcf5227ab8ce5d802f44458764d35a0705c89ff946902402c5e3e64a31bddd244f382622d9cecab18092df13e4da251894fc12a391f4cb53eddca29706e116
+DIST mysql-connector-java-5.1.23.tar.gz 3683852 SHA256 133e74bd7cd0cd5f20dd8d2a365f5fc0274693517b323a6faa960ff46e2c68dc SHA512 adeb464b52b4df717a81ceb0677901ce52e11d04b13f47c1f5312e1f4c45ab1be1a149acbbe147f73875330a0d5ed50265a1e5430657571d9223b39b34de6061 WHIRLPOOL 501b1558a4c6e1d07cc68e3d4764c4aba057436a46b075e30e852bca37db12570b8243744e58e81caaf02ac6ffed85d35cfa3b56823483ad6743037928dbdaad
+DIST mysql-connector-java-5.1.26.tar.gz 3724076 SHA256 fade4caa398c41f537d9b7bcaf83aabaa1eab1ef23c81de49979b5b04ba395bd SHA512 93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879 WHIRLPOOL 9ecf39094c1a07f5658a24574f7852aadf51c024495572bedf38ee74f83f6380159e60ce8b6a415480d8e9ec923174a0f6ba2209cdcb96167bcf8ed4e1e3a9b9
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.11-java6.patch b/dev-java/jdbc-mysql/files/5.1.11-java6.patch
new file mode 100644
index 000000000000..1e3c21d16612
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/5.1.11-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
+@@ -124,7 +124,7 @@
+ 		</if>	
+ 	</target>
+ 
+-	<target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
++	<target name="init" depends="-init-copy, -init-no-crypto">
+ 		<!-- If we're building under cruise control, update ourself -->
+ 		
+ 		<if>
+@@ -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/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.14.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
new file mode 100644
index 000000000000..5e4cb515fdb0
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+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="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
+
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+IUSE="c3p0 log4j"
+
+COMMON_DEP="
+	log4j? ( dev-java/log4j )
+	c3p0? ( dev-java/c3p0 )
+	dev-java/commons-logging"
+
+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"
+
+	rm -v *.jar || die
+
+	# use test && mkdir src/lib-nodist # needed, or ant will fail
+
+	cd src/lib
+	rm -v *.jar || die
+	java-pkg_jar-from commons-logging
+	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
+	local bcp="$(java-pkg_get-bootclasspath 1.5)"
+	java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}"
+}
+
+# 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 || die
+	dohtml docs/*.html || die
+	use source && java-pkg_dosrc src/com src/org
+}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild
new file mode 100644
index 000000000000..d3aee2653532
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+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="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
+
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
+IUSE="c3p0 log4j"
+
+COMMON_DEP="
+	dev-java/slf4j-api:0
+	log4j? ( dev-java/log4j )
+	c3p0? ( dev-java/c3p0 )"
+
+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"
+
+	rm -v *.jar || die
+
+	# use test && mkdir src/lib-nodist # needed, or ant will fail
+
+	cd src/lib
+	rm -v *.jar || die
+	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
+	local bcp="$(java-pkg_get-bootclasspath 1.5)"
+	java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}"
+}
+
+# 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 || die
+	dohtml docs/*.html || die
+	use source && java-pkg_dosrc src/com src/org
+}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
new file mode 100644
index 000000000000..f3b85571a355
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
+
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="c3p0 log4j"
+
+COMMON_DEP="
+	dev-java/slf4j-api:0
+	log4j? ( dev-java/log4j )
+	c3p0? ( dev-java/c3p0 )"
+
+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
+
+	# use test && mkdir src/lib-nodist # needed, or ant will fail
+
+	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/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
new file mode 100644
index 000000000000..9a29bc16f575
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
+
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="amd64 ppc 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..958717a296e1
--- /dev/null
+++ b/dev-java/jdbc-mysql/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <use>
+    <flag name="c3p0">Enable c3p0 support</flag>
+    <flag name="log4j">Enable log4 support</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/jdbc-oracle-bin/Manifest b/dev-java/jdbc-oracle-bin/Manifest
new file mode 100644
index 000000000000..f2e210064bfa
--- /dev/null
+++ b/dev-java/jdbc-oracle-bin/Manifest
@@ -0,0 +1,26 @@
+DIST jdbc-oracle-bin-10.1.0.5-demo.tar 532480 RMD160 17ce3eb29e3e21853fd6fa7a607e1690d19b0c63 SHA1 bc7e82acea0fdafcb9838629dbab5cce2cb7f10f SHA256 180320ec23785209d262c970b7911f47a07715ed3da6be93219e860f64a2892f
+DIST jdbc-oracle-bin-10.1.0.5-javadoc.zip 6022949 RMD160 c6c44394e348645d83964246d3b1f1820212d077 SHA1 f78a6ccf02d976280e0f21c2e429082dccccd754 SHA256 fca8c01131d1b30e7e728128e9531dad55bb317ee05bb71dbe2ee3936d50b3d6
+DIST jdbc-oracle-bin-10.1.0.5-ocrs12.jar 55434 RMD160 8d9f29bac3a0ec48e93df3933b7f088ec5edbff6 SHA1 eff40abece165906acc7452f3216202f8aad70c9 SHA256 a1c05e06f68742bd5aa4d6083f7e1b5648d9f577e0202065c87d3d6384c5ebf6
+DIST jdbc-oracle-bin-10.1.0.5-ojdbc14.jar 1378346 RMD160 e49f1f0236ae202afeedcedbc8ae3ef0f9111eef SHA1 625a76a551491229201739ce7e80a3842b265b4c SHA256 8cdb4596f6b74ed57d81eccf3d55ddbf123c078f6cb73da43a9f56dd7f247484
+DIST jdbc-oracle-bin-10.1.0.5-ojdbc14_g.jar 1722779 RMD160 0316c4a9fd66a21fe815589b80c047ed9c1a89e0 SHA1 7b55a67f66a1b9863d1a45cf1f929a0caa1ce256 SHA256 113d346536ee96d453348aa362f2f5df415b6fa63f719d6c841ecca398c55b2e
+DIST jdbc-oracle-bin-10.1.0.5-ojdbc14dms.jar 1385754 RMD160 7fc80a74e2e5f30714039b94fb74ded7cc363418 SHA1 004240ab0ea8314a4c6fe8dcc479bf8ed6a3029b SHA256 d43ad156c6be8c2b610fcd7e64f1c8c05871eb757c9f45f9b7c578855fbb658b
+DIST jdbc-oracle-bin-10.1.0.5-ojdbc14dms_g.jar 1730818 RMD160 c23a64e3eb8512cf85c193c85963aaa50161348a SHA1 e0d81ab4201c463693313a296ca6e28dc195a499 SHA256 4b12a4337c6133682199016098180caa4cf7e1f401b47636906c563972b829b6
+DIST jdbc-oracle-bin-10.1.0.5-orai18n.jar 5110629 RMD160 67dbf3b48a2e5d237fe6f0745e13e24b3ac710a0 SHA1 64374a32ebba96d9b21dcab4a55fb8470c5ae9d4 SHA256 184c250eb91b7dfcf832d3c0309f27c509ec1df24a673c67cde3c867ce099ab4
+DIST jdbc-oracle-bin-10.2.0.1-javadoc.zip 4383404 RMD160 10e5bc9ec86ef6db9602c8b2c255ff817ec00bfb SHA1 4879d35e38fdca9c123b87ddc24c5aa11273be85 SHA256 058a94c351f7128e7c1ee61190ec9d88750bf065eeefd8aca421b4a80233c77e
+DIST jdbc-oracle-bin-10.2.0.3-demo.tar 573440 RMD160 ea4dd0f85ef1403e1136a54ee1747c1429bdd123 SHA1 1f1fa55e872b10e9e2dc04ef947452b18b732e11 SHA256 8082525083733e9b61195b4cf7ad5052ab21bbe3eef6caa3c527e8e66dba5bc2
+DIST jdbc-oracle-bin-10.2.0.3-ojdbc14.jar 1545954 RMD160 29c778ee11b8a799eef0f7e9d678218819f03056 SHA1 c19f869a5b401bc526a5149bd4b6b6314a688be9 SHA256 58828dfbda5c7fbd08bca87de1d623dadcaedd409c07eaa4fc426b7388113a49
+DIST jdbc-oracle-bin-10.2.0.3-ojdbc14_g.jar 1938906 RMD160 5d29ec854a4288ffb17cac0ff8c9ff4c4bc38a7a SHA1 d87755a2d55c943a82258b120a225f4ac50f7c4f SHA256 c713ec8b0c643e624e1623c583890b56b328a28b08eaa221f9fe1c43eadc9a59
+DIST jdbc-oracle-bin-10.2.0.3-ojdbc14dms.jar 1553561 RMD160 08516d993307b4ba5b4671c3c346daf768cd1556 SHA1 ac425870d54ee92bcb5fd61ace0b602567f3857d SHA256 863650044e9be32969cad07582cb78ce6d827d477b80031e450e58a697dad0d4
+DIST jdbc-oracle-bin-10.2.0.3-ojdbc14dms_g.jar 1947136 RMD160 c78a475dd713a0d649a6984b4d796254273c07d9 SHA1 77054185fa34c9bc12db7609ca2c0e556363a571 SHA256 f6932195c87e462ceaeb2688e9a22f7b24371a5e76a2db2afbe3cf44f44e7c71
+DIST jdbc-oracle-bin-10.2.0.3-ons.jar 48492 RMD160 127eb1dc88bf48a19c0a14e5d8a8c2ef2d3259e5 SHA1 2d090de2c54102867af028a7f160d294a3d00f40 SHA256 24767407b08abce4f4d00f795a87639515fb22a317a5817dd35a21d559302d77
+DIST jdbc-oracle-bin-10.2.0.3-orai18n.jar 1645114 RMD160 6a405f60ab369576662f5a994c0b3e07645f95f7 SHA1 75b73408f5ced657ff05f737e5420c5618c1c483 SHA256 808f034fdf50d528771e808751e180a58f27f8b7f6a20875accafc2ec395e76e
+DIST jdbc-oracle-bin-10.2.0.4-demo.tar 604160 RMD160 cc38181b1bc0bcc68a7d92bcbf27da373a76c5c6 SHA1 7fffadc6c6bc8f2d7e85ad235fa6a003088fcdc7 SHA256 a4361db75c29bf279fda05eccaf8cb6ed348eda47f3162e350559052f5c1bc89
+DIST jdbc-oracle-bin-10.2.0.4-ojdbc14.jar 1555682 RMD160 22b83916159db4b3d494d76404b2a39d03ba8be3 SHA1 02d09fd52e5496261dd7f72a17cdd496d0f9b045 SHA256 7ba80b6ee4f3433f88c8d878fb0dbc7d04fea736c2a6df8d34af1a4f970670a6
+DIST jdbc-oracle-bin-10.2.0.4-ojdbc14_g.jar 1950033 RMD160 a1930f1bd1e10e5f6e63b30804f591b161a26ed9 SHA1 a0cb43e971e200e08d3e24f2cb9273daf77ce914 SHA256 ad0750b6da73f3ed956e042182dbe0fd9e0b158f8e01b6838c98d6040c4c669b
+DIST jdbc-oracle-bin-10.2.0.4-ojdbc14dms.jar 1563375 RMD160 de1719ff5e702f177bb5a138debeff0f734a3fbf SHA1 1d2c821fb336c328af6e3355d573996ba439bbba SHA256 3f8d5749c0bc9c5ac6ba4bdd82e2a47f02f7d23dbb87bfe12ee0d33ea8a201e0
+DIST jdbc-oracle-bin-10.2.0.4-ojdbc14dms_g.jar 1958237 RMD160 b7006940b48776ede3c3efa7a7216156a847febd SHA1 783ee523e02e313b4e1e305d1a53a94e9c774b36 SHA256 d6345c9b9e82db6998a3d1770c428032741ce8bdc756369e7f91323a7233da77
+DIST jdbc-oracle-bin-10.2.0.4-orai18n.jar 1646178 RMD160 004ebb0368a3d3ad140730b737532d18bcf93dc8 SHA1 0cca1b8a5e6a67ac453cfedc547269769049b840 SHA256 54821ffa7effd453f3b01cea5590bba248cb74df43fe760601474d4c6c53d8ab
+DIST jdbc-oracle-bin-9.2.0.8-javadoc.tar 3619840 RMD160 2be8a7ec0e404c44027e8b4d29b732c3cf7aadcb SHA1 8c10073ed83143be64b6362c26dba02cb47634d0 SHA256 3e5090064a4e66aac7023caee7c2289e38829702c1f63722a3aab0192e479572
+DIST jdbc-oracle-bin-9.2.0.8-ocrs12.jar 37761 RMD160 fee7825956cccbfbf78e17e735b636dc347ed900 SHA1 a8f182e2e7db14fc17fde527c287362b335293e9 SHA256 861d7aba603bbde9b0b460eb423c38f05b0b32ab86989696875038e56069e57a
+DIST jdbc-oracle-bin-9.2.0.8-ojdbc14.jar 1212964 RMD160 d331144b61f52d40736feb2d8c21e5b5996246f6 SHA1 4df82933396360211955b7414a43c5f72523a411 SHA256 2ce752c137d5ec18505abb4f4cc1093e15058c95cbddecbb4e0c296f71eeb632
+DIST jdbc-oracle-bin-9.2.0.8-ojdbc14_g.jar 1427311 RMD160 50c2c1ddf034a4689af315ea824d7effc53355a3 SHA1 baf9db85a022f789f24c1a6f28f5fd3114e9661a SHA256 e090b9f8f76fe1674a179566b3f51b07c1dd8e05e51f77aeff992043effc4fa0
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild
new file mode 100644
index 000000000000..c6b0c37fe729
--- /dev/null
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.1.0.5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+IUSE="debug dms doc examples nls"
+
+file_main_orig="ojdbc14.jar"
+file_main_dms_orig="ojdbc14dms.jar"
+file_main_debug_orig="ojdbc14_g.jar"
+file_main_dms_debug_orig="ojdbc14dms_g.jar"
+file_rowset_orig="ocrs12.jar"
+file_doc_orig="javadoc.zip"
+file_demo_orig="demo.tar"
+file_nls_orig="orai18n.jar"
+
+file_main="${P}-${file_main_orig}"
+file_main_dms="${P}-${file_main_dms_orig}"
+file_main_debug="${P}-${file_main_debug_orig}"
+file_main_dms_debug="${P}-${file_main_dms_debug_orig}"
+file_rowset="${P}-${file_rowset_orig}"
+file_doc="${P}-${file_doc_orig}"
+file_demo="${P}-${file_demo_orig}"
+file_nls="${P}-${file_nls_orig}"
+
+DESCRIPTION="JDBC 3.0 Drivers for Oracle"
+HOMEPAGE="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html"
+DOWNLOAD_PAGE="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/htdocs/jdbc101040.html"
+SRC_URI="
+	!dms? (
+		!debug? ( ${file_main} )
+		debug? ( ${file_main_debug} )
+	)
+	dms? (
+		!debug? ( ${file_main_dms} )
+		debug? ( ${file_main_dms_debug} )
+	)
+	${file_rowset}
+	doc? ( ${file_doc} )
+	examples? ( ${file_demo} )
+	nls? ( ${file_nls} )"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="oracle-jdbc"
+SLOT="10.1"
+DEPEND="doc? ( app-arch/unzip )"
+RDEPEND=">=virtual/jre-1.4"
+RESTRICT="fetch"
+
+S="${WORKDIR}"
+
+determine_files() {
+	if use dms; then
+		if use debug; then
+			file_main_used=${file_main_dms_debug}
+			file_main_used_orig=${file_main_dms_debug_orig}
+		else
+			file_main_used=${file_main_dms}
+			file_main_used_orig=${file_main_dms_orig}
+		fi
+	else
+		if use debug; then
+			file_main_used=${file_main_debug}
+			file_main_used_orig=${file_main_debug_orig}
+		else
+			file_main_used=${file_main}
+			file_main_used_orig=${file_main_orig}
+		fi
+	fi
+}
+
+pkg_nofetch() {
+	determine_files
+
+	einfo
+	einfo " Because of license terms and file name conventions, please:"
+	einfo
+	einfo " 1. Visit ${DOWNLOAD_PAGE}"
+	einfo "    (you may need to create an account on Oracle's site)"
+	einfo " 2. Download the appropriate files:"
+	einfo "    - ${file_main_used_orig}"
+	einfo "    - ${file_rowset_orig}"
+	use doc && einfo "    - ${file_doc_orig}"
+	use examples && einfo "    - ${file_demo_orig}"
+	use nls && einfo "    - ${file_nls_orig}"
+	einfo " 3. Rename the files:"
+	einfo "    - ${file_main_used_orig} --> ${file_main_used}"
+	einfo "    - ${file_rowset_orig} --> ${file_rowset}"
+	use doc && einfo "    - ${file_doc_orig} --> ${file_doc}"
+	use examples && einfo "    - ${file_demo_orig} --> ${file_demo}"
+	use nls && einfo "    - ${file_nls_orig} --> ${file_nls}"
+	einfo " 4. Place the files in ${DISTDIR}"
+	einfo " 5. Resume the installation."
+	einfo
+}
+
+src_unpack() {
+	determine_files
+	cp "${DISTDIR}/${file_main_used}" ${PN}.jar || die
+	cp "${DISTDIR}/${file_rowset}" ${file_rowset_orig} || die
+
+	if use nls; then
+		cp "${DISTDIR}/${file_nls}" ${file_nls_orig} || die
+	fi
+
+	if use doc; then
+		mkdir "${S}/javadoc" && cd "${S}/javadoc"
+		unpack ${file_doc}
+	fi
+
+	if use examples; then
+		cd "${S}"
+		unpack ${file_demo}
+		mv Samples-Readme.txt samples/ || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+
+	use doc && java-pkg_dojavadoc javadoc
+	use examples && java-pkg_doexamples samples
+}
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild
new file mode 100644
index 000000000000..0c64d700f549
--- /dev/null
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.3.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+IUSE="debug dms doc examples nls ons"
+
+file_main_orig="ojdbc14.jar"
+file_main_dms_orig="ojdbc14dms.jar"
+file_main_debug_orig="ojdbc14_g.jar"
+file_main_dms_debug_orig="ojdbc14dms_g.jar"
+file_doc_orig="javadoc.zip"
+file_demo_orig="demo.tar"
+file_nls_orig="orai18n.jar"
+file_ons_orig="ons.jar"
+
+file_main="${P}-${file_main_orig}"
+file_main_dms="${P}-${file_main_dms_orig}"
+file_main_debug="${P}-${file_main_debug_orig}"
+file_main_dms_debug="${P}-${file_main_dms_debug_orig}"
+file_doc="${PN}-10.2.0.1-${file_doc_orig}"
+file_demo="${P}-${file_demo_orig}"
+file_nls="${P}-${file_nls_orig}"
+file_ons="${P}-${file_ons_orig}"
+
+DESCRIPTION="JDBC 3.0 Drivers for Oracle"
+HOMEPAGE="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html"
+DOWNLOAD_PAGE="http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-10201-088211.html"
+SRC_URI="
+	!dms? (
+		!debug? ( ${file_main} )
+		debug? ( ${file_main_debug} )
+	)
+	dms? (
+		!debug? ( ${file_main_dms} )
+		debug? ( ${file_main_dms_debug} )
+	)
+	doc? ( ${file_doc} )
+	examples? ( ${file_demo} )
+	nls? ( ${file_nls} )
+	ons? ( ${file_ons} )"
+KEYWORDS="amd64 ppc x86"
+LICENSE="oracle-jdbc"
+SLOT="10.2"
+DEPEND="doc? ( app-arch/unzip )"
+RDEPEND=">=virtual/jre-1.4"
+RESTRICT="fetch"
+
+S="${WORKDIR}"
+
+determine_files() {
+	if use dms; then
+		if use debug; then
+			file_main_used=${file_main_dms_debug}
+			file_main_used_orig=${file_main_dms_debug_orig}
+		else
+			file_main_used=${file_main_dms}
+			file_main_used_orig=${file_main_dms_orig}
+		fi
+	else
+		if use debug; then
+			file_main_used=${file_main_debug}
+			file_main_used_orig=${file_main_debug_orig}
+		else
+			file_main_used=${file_main}
+			file_main_used_orig=${file_main_orig}
+		fi
+	fi
+}
+
+pkg_nofetch() {
+	determine_files
+
+	einfo
+	einfo " Because of license terms and file name conventions, please:"
+	einfo
+	einfo " 1. Visit ${DOWNLOAD_PAGE}"
+	einfo "    (you may need to create an account on Oracle's site)"
+	einfo " 2. Download the appropriate files:"
+	einfo "    - ${file_main_used_orig}"
+	use doc && einfo "    - ${file_doc_orig}"
+	use examples && einfo "    - ${file_demo_orig}"
+	use nls && einfo "    - ${file_nls_orig}"
+	use ons && einfo "    - ${file_ons_orig}"
+	einfo " 3. Rename the files:"
+	einfo "    - ${file_main_used_orig} --> ${file_main_used}"
+	use doc && einfo "    - ${file_doc_orig} --> ${file_doc}"
+	use examples && einfo "    - ${file_demo_orig} --> ${file_demo}"
+	use nls && einfo "    - ${file_nls_orig} --> ${file_nls}"
+	use ons && einfo "    - ${file_ons_orig} --> ${file_ons}"
+	einfo " 4. Place the files in ${DISTDIR}"
+	einfo " 5. Resume the installation."
+	einfo
+}
+
+src_unpack() {
+	determine_files
+	cp "${DISTDIR}/${file_main_used}" ${PN}.jar || die
+
+	if use nls; then
+		cp "${DISTDIR}/${file_nls}" ${file_nls_orig} || die
+	fi
+
+	if use ons; then
+		cp "${DISTDIR}/${file_ons}" ${file_ons_orig} || die
+	fi
+
+	if use doc; then
+		mkdir "${S}/javadoc" && cd "${S}/javadoc"
+		unpack ${file_doc}
+	fi
+
+	if use examples; then
+		cd "${S}"
+		unpack ${file_demo}
+		mv Samples-Readme.txt samples/ || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+
+	use doc && java-pkg_dojavadoc javadoc
+	use examples && java-pkg_doexamples samples
+}
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild
new file mode 100644
index 000000000000..ef3a07fbe42b
--- /dev/null
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-10.2.0.4.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+IUSE="debug dms doc examples nls ons"
+
+file_main_orig="ojdbc14.jar"
+file_main_dms_orig="ojdbc14dms.jar"
+file_main_debug_orig="ojdbc14_g.jar"
+file_main_dms_debug_orig="ojdbc14dms_g.jar"
+file_doc_orig="javadoc.zip"
+file_demo_orig="demo.tar"
+file_nls_orig="orai18n.jar"
+file_ons_orig="ons.jar"
+
+file_main="${P}-${file_main_orig}"
+file_main_dms="${P}-${file_main_dms_orig}"
+file_main_debug="${P}-${file_main_debug_orig}"
+file_main_dms_debug="${P}-${file_main_dms_debug_orig}"
+file_doc="${PN}-10.2.0.1-${file_doc_orig}"
+file_demo="${P}-${file_demo_orig}"
+file_nls="${P}-${file_nls_orig}"
+file_ons="${PN}-10.2.0.3-${file_ons_orig}"
+
+DESCRIPTION="JDBC 3.0 Drivers for Oracle"
+HOMEPAGE="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html"
+DOWNLOAD_PAGE="http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-10201-088211.html"
+SRC_URI="
+	!dms? (
+		!debug? ( ${file_main} )
+		debug? ( ${file_main_debug} )
+	)
+	dms? (
+		!debug? ( ${file_main_dms} )
+		debug? ( ${file_main_dms_debug} )
+	)
+	doc? ( ${file_doc} )
+	examples? ( ${file_demo} )
+	nls? ( ${file_nls} )
+	ons? ( ${file_ons} )"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="oracle-jdbc"
+SLOT="10.2"
+DEPEND="doc? ( app-arch/unzip )"
+RDEPEND=">=virtual/jre-1.4"
+RESTRICT="fetch"
+
+S="${WORKDIR}"
+
+determine_files() {
+	if use dms; then
+		if use debug; then
+			file_main_used=${file_main_dms_debug}
+			file_main_used_orig=${file_main_dms_debug_orig}
+		else
+			file_main_used=${file_main_dms}
+			file_main_used_orig=${file_main_dms_orig}
+		fi
+	else
+		if use debug; then
+			file_main_used=${file_main_debug}
+			file_main_used_orig=${file_main_debug_orig}
+		else
+			file_main_used=${file_main}
+			file_main_used_orig=${file_main_orig}
+		fi
+	fi
+}
+
+pkg_nofetch() {
+	determine_files
+	einfo
+	einfo " Because of license terms and file name conventions, please:"
+	einfo
+	einfo " 1. Visit ${DOWNLOAD_PAGE}"
+	einfo "    (you may need to create an account on Oracle's site)"
+	einfo " 2. Download the appropriate files:"
+	einfo "    - ${file_main_used_orig}"
+	use doc && einfo "    - ${file_doc_orig}"
+	use examples && einfo "    - ${file_demo_orig}"
+	use nls && einfo "    - ${file_nls_orig}"
+	use ons && einfo "    - ${file_ons_orig}"
+	einfo " 3. Rename the files:"
+	einfo "    - ${file_main_used_orig} --> ${file_main_used}"
+	use doc && einfo "    - ${file_doc_orig} --> ${file_doc}"
+	use examples && einfo "    - ${file_demo_orig} --> ${file_demo}"
+	use nls && einfo "    - ${file_nls_orig} --> ${file_nls}"
+	use ons && einfo "    - ${file_ons_orig} --> ${file_ons}"
+	einfo " 4. Place the files in ${DISTDIR}"
+	einfo " 5. Resume the installation."
+	einfo
+}
+
+src_unpack() {
+	determine_files
+	cp "${DISTDIR}/${file_main_used}" ${PN}.jar || die
+
+	if use nls; then
+		cp "${DISTDIR}/${file_nls}" ${file_nls_orig} || die
+	fi
+
+	if use ons; then
+		cp "${DISTDIR}/${file_ons}" ${file_ons_orig} || die
+	fi
+
+	if use doc; then
+		mkdir "${S}/javadoc" && cd "${S}/javadoc"
+		unpack ${file_doc}
+	fi
+
+	if use examples; then
+		cd "${S}"
+		unpack ${file_demo}
+		mv Samples-Readme.txt samples/ || die
+	fi
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+
+	use doc && java-pkg_dojavadoc javadoc
+	use examples && java-pkg_doexamples samples
+}
diff --git a/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild
new file mode 100644
index 000000000000..4c5b2d48af65
--- /dev/null
+++ b/dev-java/jdbc-oracle-bin/jdbc-oracle-bin-9.2.0.8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+IUSE="debug doc"
+
+file_main_orig=ojdbc14.jar
+file_main_debug_orig=ojdbc14_g.jar
+file_rowset_orig=ocrs12.jar
+file_doc_orig=javadoc.tar
+
+file_main=${P}-${file_main_orig}
+file_main_debug=${P}-${file_main_debug_orig}
+file_rowset=${P}-${file_rowset_orig}
+file_doc=${P}-${file_doc_orig}
+
+DESCRIPTION="JDBC 3.0 Drivers for Oracle"
+HOMEPAGE="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html"
+DOWNLOAD_PAGE="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/htdocs/jdbc9201.html"
+SRC_URI="
+	!debug? ( ${file_main} )
+	debug? ( ${file_main_debug} )
+	${file_rowset}
+	doc? ( ${file_doc} )"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="oracle-jdbc"
+SLOT="9.2"
+DEPEND=""
+RDEPEND=">=virtual/jre-1.4"
+RESTRICT="fetch"
+
+S="${WORKDIR}"
+
+determine_files() {
+	if use debug; then
+		file_main_used=${file_main_debug}
+		file_main_used_orig=${file_main_debug_orig}
+	else
+		file_main_used=${file_main}
+		file_main_used_orig=${file_main_orig}
+	fi
+}
+
+pkg_nofetch() {
+	determine_files
+
+	einfo
+	einfo " Because of license terms and file name conventions, please:"
+	einfo
+	einfo " 1. Visit ${DOWNLOAD_PAGE}"
+	einfo "    (you may need to create an account on Oracle's site)"
+	einfo " 2. Download the appropriate files:"
+	einfo "    - ${file_main_used_orig}"
+	einfo "    - ${file_rowset_orig}"
+	use doc && einfo "    - ${file_doc_orig}"
+	einfo " 3. Rename the files:"
+	einfo "    - ${file_main_used_orig} --> ${file_main_used}"
+	einfo "    - ${file_rowset_orig} --> ${file_rowset}"
+	use doc && einfo "    - ${file_doc_orig} --> ${file_doc}"
+	einfo " 4. Place the files in ${DISTDIR}"
+	einfo " 5. Resume the installation."
+	einfo
+}
+
+src_unpack() {
+	determine_files
+	cp "${DISTDIR}/${file_main_used}" ${PN}.jar || die
+	cp "${DISTDIR}/${file_rowset}" ${file_rowset_orig} || die
+
+	if use doc; then
+		mkdir javadoc && cd javadoc
+		unpack ${file_doc}
+	fi
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/jdbc-oracle-bin/metadata.xml b/dev-java/jdbc-oracle-bin/metadata.xml
new file mode 100644
index 000000000000..48cc1ddff0e9
--- /dev/null
+++ b/dev-java/jdbc-oracle-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>
+  <herd>java</herd>
+  <use>
+    <flag name="dms">Enable support for the Oracle Dynamic Monitoring Service</flag>
+    <flag name="ons">Enable support for the Oracle Notification Services (ONS) deamon</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
new file mode 100644
index 000000000000..0ace2c641275
--- /dev/null
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -0,0 +1,6 @@
+DIST postgresql-jdbc-8.3-603.src.tar.gz 521517 SHA256 d7fa28a6f059887ae8d692c0e8a8befac688b3755ac6f46ab07e2119018e4f2d SHA512 e8caa83fead9e94333b28a33b9e9849b1800f3215025a9fc6ea04bd926af9d814fb56993b209749942c737cfcba578b7289a63a4438d941b8a9a63f1cf1c8c74 WHIRLPOOL 242939633995f33acbcbb0b9e89bcf3ca4faaf62d0242eb1fa967528152880ee7ccbbf0f7a3eb70a450f94ba9e8ae2692154716b4ad71a4ce3c651507f836604
+DIST postgresql-jdbc-8.4-701.src.tar.gz 551752 SHA256 d2748885b99b414fb2a1d68659b18effb87c9d3379181ad1f3d3e1e40cf61d90 SHA512 9ded77cdee133bde196cbfcf4ee425365620038c211714ed7e20e99012c7e3ff0834da4140bc4839e96fbe986591ec82227f3bf26a86b1f22ec5b5ee0be54d40 WHIRLPOOL 15ca28c3cab0c72ce6ab01771797fe6e78149290e8777f51e36c7943e2339361b68f9f089fb14036f76bbaba79755fc2006ad4eb3e737ac93eba26cb50b4e550
+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-1201.src.tar.gz 1909810 SHA256 96b079611038c0ffff6bb8d22d51ada0cb82c8eb3bd3a9294055963cc638fda7 SHA512 6fd543e325de931ee6c33fe4b1daf53d7baa91061afc9dc1687c4b202430cbcf2a7e3fb047f9e1d88f4d39b8f4f85a98f2b930205ceba414212dfcbaaf108883 WHIRLPOOL 3245227c875d44d82109a5700e06ed3d5bcc75469cd9333c98a7b396b2db1e2ac1da002db19f632afed262929cd7e9a3d8f93d2b24321e103b815383f8fc0a05
diff --git a/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.4_p701-stray-com.sun-import.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.4_p701-stray-com.sun-import.patch
new file mode 100644
index 000000000000..18921f3edcc1
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/jdbc-postgresql-8.4_p701-stray-com.sun-import.patch
@@ -0,0 +1,10 @@
+--- org/postgresql/gss/MakeGSS.java.orig	2010-04-11 19:04:07.000000000 +0200
++++ org/postgresql/gss/MakeGSS.java	2010-04-11 19:04:14.000000000 +0200
+@@ -18,7 +18,6 @@
+ import java.io.IOException;
+ import java.sql.SQLException;
+ 
+-import com.sun.security.auth.callback.TextCallbackHandler;
+ import org.postgresql.core.PGStream;
+ import org.postgresql.core.Logger;
+ import org.postgresql.util.*;
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_p1201-remove-sspi.patch b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-sspi.patch
new file mode 100644
index 000000000000..9d65b4b60bf5
--- /dev/null
+++ b/dev-java/jdbc-postgresql/files/jdbc-postgresql-9.4_p1201-remove-sspi.patch
@@ -0,0 +1,138 @@
+--- a/org/postgresql/core/v3/ConnectionFactoryImpl.java	2015-03-23 07:32:15.000000000 +0100
++++ b/org/postgresql/core/v3/ConnectionFactoryImpl.java	2015-03-23 07:41:53.160058718 +0100
+@@ -19,7 +19,6 @@
+ 
+ import org.postgresql.PGProperty;
+ import org.postgresql.core.*;
+-import org.postgresql.sspi.SSPIClient;
+ import org.postgresql.hostchooser.GlobalHostStatusTracker;
+ import org.postgresql.hostchooser.HostChooser;
+ import org.postgresql.hostchooser.HostChooserFactory;
+@@ -387,11 +386,7 @@
+         // or an authentication request
+ 
+         String password = PGProperty.PASSWORD.get(info);
+-        
+-        /* SSPI negotiation state, if used */
+-        SSPIClient sspiClient = null;
+ 
+-        try {
+ 	        authloop:
+ 	        while (true)
+ 	        {
+@@ -507,88 +502,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())
+@@ -609,18 +532,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-8.3_p603.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild
new file mode 100644
index 000000000000..a2e85111d092
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p603.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+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="~x86-fbsd"
+IUSE="test"
+
+DEPEND=">=dev-java/java-config-2.0.31
+	=virtual/jdk-1.5*
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	!test? ( >=dev-java/ant-core-1.6 )
+	test? (
+		=dev-java/junit-3.8*
+		>=dev-java/ant-1.6
+		dev-java/ant-junit
+		dev-db/postgresql[server]
+	)"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	eant jar $(use_doc publicapi)
+
+	# 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-8.4_p701-r1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701-r1.ebuild
new file mode 100644
index 000000000000..e8b4e18186f0
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+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 ppc ppc64 x86"
+IUSE="test"
+
+DEPEND=">=dev-java/java-config-2.0.31
+	=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}/${MY_P}"
+
+EANT_DOC_TARGET="publicapi"
+
+java_prepare() {
+	# bug 314647
+	epatch "${FILESDIR}/${P}-stray-com.sun-import.patch"
+	# needed for src_test
+	java-ant_rewrite-classpath
+}
+
+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 || die
+	fi
+
+	use source && java-pkg_dosrc org
+}
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..fdc31c5e31a4
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..2ce76d975b4d
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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..03294cf8ff8c
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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_p1201.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild
new file mode 100644
index 000000000000..23db74b0a561
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.4_p1201.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+		>=dev-db/postgresql-9.3[server]
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/postgresql-jdbc-${MY_PV}.src"
+
+java_prepare() {
+	find -name "*.class" -type f -exec rm -v {} + || die
+
+	# 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}"/${P}-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}"/${P}-remove-osgi.patch
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_DOC_TARGET="publicapi"
+
+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"
+		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 '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)
+}
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/jdbc-postgresql/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jdbc2-stdext/Manifest b/dev-java/jdbc2-stdext/Manifest
new file mode 100644
index 000000000000..2e1a72d534f8
--- /dev/null
+++ b/dev-java/jdbc2-stdext/Manifest
@@ -0,0 +1 @@
+DIST jdbc2_0-stdext-src.zip 21642 SHA256 70470d9f3a2e1f4e29b909bf9c89005a9d2523825eb50cf70b2fa2957ff8b2aa SHA512 5157a5835983c094b13d947a39311d08ea57cd8e60197176681289d41a209f3f8b464e1e0dd97ed714534ba5afb749807e02efb3edba4e2c91e273e71f6f1ce3 WHIRLPOOL a57f77ae2b268b21e7733b7cf4edf1cd8751c8c5c25f1b7a6ae78677c14d5f499a9a05c36cd88a3c9ec9c4fc361476cc7433fa81cb94ed51b09ac4a2bca341a5
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..f7926bff22f9
--- /dev/null
+++ b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/jdbc2-stdext/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jdbm/Manifest b/dev-java/jdbm/Manifest
new file mode 100644
index 000000000000..a39f418caae9
--- /dev/null
+++ b/dev-java/jdbm/Manifest
@@ -0,0 +1 @@
+DIST jdbm-0.12-src.zip 969490 SHA256 ec431becfd915f4908e5e3f71dc13b05310890ac2ad1664e508a9890151ea10a SHA512 cf65a89d1b3262aba40a2b10cdf3bbc1ed75fd60facfbd22baad2cfbcf81b5d67d3b7a372c7018907eedbcbb0114ddbb8d13b6cb7bc47896c47997996b0d57ec WHIRLPOOL 2504311219194c370509f91bad895d2b8818221f3d1ad454936484cd63fa028958d0c1e92c322bfefafff6a017a441ecaf952a151b5947fca73ddb922d717b51
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..c93a9f49cfcb
--- /dev/null
+++ b/dev-java/jdbm/jdbm-0.12-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc 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..47a0ce099855
--- /dev/null
+++ b/dev-java/jdbm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..6504cfdc894c
--- /dev/null
+++ b/dev-java/jdepend/Manifest
@@ -0,0 +1 @@
+DIST jdepend-2.9.zip 302836 SHA256 202de62e2f3d0667cc464720d5897d0ccb29767ec24e0a4d4c5bd6c4d37425a4 SHA512 93ae1ca82422be0dce9794f25ad98c078da7437bca59c697405806a462f81b52028e0536075e2a2f428d8f8c5a27ae50fa7a580b75edbd4e8c9c750315b1c919 WHIRLPOOL a6552404d405e2ef51a40c508737ff00fd7a5350f71f4c5913563b588903279e4a49bef71b9af0c10032f4ad5e45afeb2bba55cca9cbe1c8aeb0451ac0c337d3
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..4e91a5c05618
--- /dev/null
+++ b/dev-java/jdepend/jdepend-2.9-r5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JDepend traverses Java class file directories and generates design quality metrics per package"
+HOMEPAGE="http://www.clarkware.com/software/JDepend.html"
+SRC_URI="http://www.clarkware.com/software/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..838c00a4a448
--- /dev/null
+++ b/dev-java/jdepend/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jdom-jaxen/Manifest b/dev-java/jdom-jaxen/Manifest
new file mode 100644
index 000000000000..248ee9d39934
--- /dev/null
+++ b/dev-java/jdom-jaxen/Manifest
@@ -0,0 +1,3 @@
+DIST jdom-1.0.tar.gz 3571788 SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24 WHIRLPOOL 329163b0a6838322be5174e7a6eddcafeddecc54e541cbdb28748f99da88c79349f67bd79c88bda6944d142440df8d21b21cb0fbb2b1497a6fc84f30a531f8f3
+DIST jdom-b10.tar.gz 3565663 SHA256 be6771052ec6d33a192416a9acd0694f1ee2bb5a8eaf506f927a74f56d648a66 SHA512 afea09b55815d021691b682e0a2e006ebbee699e0fa879ffb17712896eea6453016ec49fd6eee8758565eae68f236d5dddcc7fc940dca76c0e580e69bb544f52 WHIRLPOOL 69e555bb7edbf6fd107f58e0f06954683e25f9be46bc9668cce2570ed1d20f285e09b19372288b8a7cd3c4de955f4d16ca54c9cb6c20c1f5966865f439f0b8d3
+DIST jdom-b9.tar.gz 3417274 SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676 SHA512 b210938c2ec539a59664586ef979d834817fba08c96d30fd9696a72ce3961693faa3ea3718687cd208cb35c4227c2e908b2ea9f981ba97b1991414f6347e0963 WHIRLPOOL f5059bb062986ace5ae4872afbf59333c8d9fbf676066135d5fe79806c28bea4c5e3ec8071e2c3fd546c6b4e4c4adafdbae187cc2c340cd78912f6b5d6a4b356
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..465a0d153548
--- /dev/null
+++ b/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/jdom-jaxen-1.0_beta10-r1.ebuild b/dev-java/jdom-jaxen/jdom-jaxen-1.0_beta10-r1.ebuild
new file mode 100644
index 000000000000..313769e4850b
--- /dev/null
+++ b/dev-java/jdom-jaxen/jdom-jaxen-1.0_beta10-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+
+inherit base java-pkg-2
+
+MY_PN="jdom"
+MY_PV="b10"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Jaxen binding for jdom"
+HOMEPAGE="http://www.jdom.org"
+SRC_URI="http://www.jdom.org/dist/source/${MY_P}.tar.gz"
+
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="amd64 ppc ppc64 ~x86"
+
+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_P}"
+
+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/jdom-jaxen-1.0_beta9-r2.ebuild b/dev-java/jdom-jaxen/jdom-jaxen-1.0_beta9-r2.ebuild
new file mode 100644
index 000000000000..a81b3fd85a8c
--- /dev/null
+++ b/dev-java/jdom-jaxen/jdom-jaxen-1.0_beta9-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+
+inherit base java-pkg-2
+
+MY_PN="jdom"
+MY_PV="b9"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Jaxen binding for jdom"
+HOMEPAGE="http://www.jdom.org"
+SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
+
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="amd64 ppc ppc64 ~x86"
+
+IUSE=""
+
+COMMON_DEP="~dev-java/jdom-1.0_beta9
+			=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_P}"
+
+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-1.0_beta9,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"
+	#use doc && java-pkg_dojavadoc build/javadoc
+	#use source && java-pkg_dosrc src
+}
diff --git a/dev-java/jdom-jaxen/metadata.xml b/dev-java/jdom-jaxen/metadata.xml
new file mode 100644
index 000000000000..878118a705b5
--- /dev/null
+++ b/dev-java/jdom-jaxen/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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..a643f6e1ce3f
--- /dev/null
+++ b/dev-java/jdom/Manifest
@@ -0,0 +1,5 @@
+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
+DIST jdom-2.0.6.zip 7464948 SHA256 86b8683187ca28a935991cbffe5d1a9cfe88e5141e14905694a95e832f775b12 SHA512 dc84ede1eb05f7178a7f5b55f4035655096becee483966d7e0934484522c5981a1fdca836ae9ea6f3d2538c50b7a3cb9029264cd6427f5308d3ac7666e160cff WHIRLPOOL d568a18d8fc369ec0cf2954b16d2360ac934726c93ea31a59d75bc1913a9b1fba5d7cd02f6822ab21000b8df51380f2087e8690a3b66352e8d1267809091b374
+DIST jdom-b10.tar.gz 3565663 SHA256 be6771052ec6d33a192416a9acd0694f1ee2bb5a8eaf506f927a74f56d648a66 SHA512 afea09b55815d021691b682e0a2e006ebbee699e0fa879ffb17712896eea6453016ec49fd6eee8758565eae68f236d5dddcc7fc940dca76c0e580e69bb544f52 WHIRLPOOL 69e555bb7edbf6fd107f58e0f06954683e25f9be46bc9668cce2570ed1d20f285e09b19372288b8a7cd3c4de955f4d16ca54c9cb6c20c1f5966865f439f0b8d3
+DIST jdom-b9.tar.gz 3417274 SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676 SHA512 b210938c2ec539a59664586ef979d834817fba08c96d30fd9696a72ce3961693faa3ea3718687cd208cb35c4227c2e908b2ea9f981ba97b1991414f6347e0963 WHIRLPOOL f5059bb062986ace5ae4872afbf59333c8d9fbf676066135d5fe79806c28bea4c5e3ec8071e2c3fd546c6b4e4c4adafdbae187cc2c340cd78912f6b5d6a4b356
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..b076ce432651
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..24afcdf4a806
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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.0_beta10-r4.ebuild b/dev-java/jdom/jdom-1.0_beta10-r4.ebuild
new file mode 100644
index 000000000000..975fcac3056f
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0_beta10-r4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="jdom"
+MY_PV="b10"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="amd64 ppc x86"
+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=""
+
+S="${WORKDIR}/${MY_P}"
+
+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_beta10-r6.ebuild b/dev-java/jdom/jdom-1.0_beta10-r6.ebuild
new file mode 100644
index 000000000000..60cd4223e8d6
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0_beta10-r6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="jdom"
+MY_PV="b10"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="amd64 ppc ppc64 ~x86"
+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=""
+
+S="${WORKDIR}/${MY_P}"
+
+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
+}
+
+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_beta9-r2.ebuild b/dev-java/jdom/jdom-1.0_beta9-r2.ebuild
new file mode 100644
index 000000000000..bf931f200fb6
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0_beta9-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="jdom"
+MY_PV="b9"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="amd64 ppc 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=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -rf build/apidocs || 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_beta9-r4.ebuild b/dev-java/jdom/jdom-1.0_beta9-r4.ebuild
new file mode 100644
index 000000000000..f8186630f4d7
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0_beta9-r4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="jdom"
+MY_PV="b9"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="amd64 ppc ppc64 ~x86"
+
+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=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+		|| die "Unable to remove Jaxen Binding class."
+	rm -rf build/apidocs || die
+
+	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..dbf6f1e135c7
--- /dev/null
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86"
+COMMON_DEP="dev-java/saxpath
+		>=dev-java/xerces-2.7"
+RDEPEND=">=virtual/jre-1.6"
+#	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6"
+#	${COMMON_DEP}"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	find "${S}" -name '*.jar' -delete || die
+
+	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"
+#EANT_GENTOO_CLASSPATH="saxpath,xerces-2"
+
+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-2.0.6.ebuild b/dev-java/jdom/jdom-2.0.6.ebuild
new file mode 100644
index 000000000000..76dcf19c1d4e
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="source test"
+
+#JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/binary/${P}.zip"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="2"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+COMMON_DEP="dev-java/iso-relax
+		dev-java/jaxen:1.1
+		dev-java/xalan
+		dev-java/xml-commons-external:1.4"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+	app-arch/unzip
+	test? ( dev-java/junit:0 )
+	>=virtual/jdk-1.6"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	unpack ./${P}-sources.jar
+}
+
+java_prepare() {
+	find "${S}" -name '*.jar' -delete || die
+	mkdir "${S}"/classes "${S}"/docs
+}
+
+src_compile() {
+	find org -name "*.java" > "${T}"/src.list
+
+	local cp="$(java-pkg_getjars iso-relax,jaxen-1.1,xalan,xml-commons-external-1.4)"
+	if use test ; then
+		cp="${cp}:junit.jar"
+	else
+		sed -i 's/PerfTest/PerfTemp/' "${T}"/src.list || die "Failed to rename PerfTest"
+		sed -i '/test/Id' "${T}"/src.list || die "Failed to remove test classes"
+		sed -i 's/PerfTemp/PerfTest/' "${T}"/src.list || die "Failed to rename PerfTest"
+	fi
+
+	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
+
+	# Disabled for the time being.
+	# if use doc; then
+	# 	ejavadoc -d "${S}"/docs -classpath ${cp} "@${T}"/src.list -quiet || die "javadoc failed"
+	# fi
+
+	cd "${S}"/classes
+	jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	# Disabled for the time being.
+	# if use doc; then
+	# 	java-pkg_dojavadoc docs
+	# fi
+
+	dodoc README.txt LICENSE.txt || die
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/jdom/metadata.xml b/dev-java/jdom/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/jdom/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jdynamite/Manifest b/dev-java/jdynamite/Manifest
new file mode 100644
index 000000000000..fa882160a0db
--- /dev/null
+++ b/dev-java/jdynamite/Manifest
@@ -0,0 +1 @@
+DIST jdynamite1_2.tar.gz 216501 SHA256 cc7fade32f35f84bc0cf64a37b205c45f719b7234299f523e9da58546d9e57de SHA512 922dc3755fc673d228edcbb7d20084a7d2123b936b5c38514781bd0c5eeef4a6420a4ca7256fb3ca8796fb057b854c49c6bacd9ca76ac9fdb24b3d3404ea4aea WHIRLPOOL d1a1f1f43aa73dcad9dae1646b9069945cb4ec0f6fc1833dd88e64dbdf7cd9fa526d16d8a7683cac9f56a88d6a4fc4c8737c1c753b3cee2956b58ea74caa09c9
diff --git a/dev-java/jdynamite/files/1.2-build.xml b/dev-java/jdynamite/files/1.2-build.xml
new file mode 100644
index 000000000000..86bd14df4658
--- /dev/null
+++ b/dev-java/jdynamite/files/1.2-build.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<project name="jdynamite" default="all" basedir=".">
+
+	<target name="compile">
+		<javac debug="true" srcdir="src" classpath="${gentoo.classpath}" destdir="build"/>
+	</target>
+
+	<target name="jar" depends="compile">
+		<jar destfile="jdynamite.jar" basedir="build"/>
+	</target>
+
+</project>
diff --git a/dev-java/jdynamite/jdynamite-1.2.ebuild b/dev-java/jdynamite/jdynamite-1.2.ebuild
new file mode 100644
index 000000000000..4b84de3d2031
--- /dev/null
+++ b/dev-java/jdynamite/jdynamite-1.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~x86"
+
+DEPEND=">=virtual/jdk-1.2
+	dev-java/gnu-regexp:1"
+RDEPEND=">=virtual/jre-1.2"
+
+S="${WORKDIR}/${PN}${PV}"
+
+# Do not generate docs that don't exist, use bundled.
+EANT_DOC_TARGET=""
+
+java_prepare() {
+	# Yuck! Already compiled!
+	cd "${S}"
+	rm -fr lib/*
+	rm -fr cb
+	rm -fr src/gnu
+
+	cp "${FILESDIR}/${PV}-build.xml" build.xml || die
+	mkdir build || die
+}
+
+src_compile() {
+	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only gnu-regexp-1 gnu-regexp.jar)"
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r doc/*
+	fi
+
+	use source && java-pkg_dosrc src/cb
+}
diff --git a/dev-java/jdynamite/metadata.xml b/dev-java/jdynamite/metadata.xml
new file mode 100644
index 000000000000..414086548e0d
--- /dev/null
+++ b/dev-java/jdynamite/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..a7efae69bc1e
--- /dev/null
+++ b/dev-java/jebl/Manifest
@@ -0,0 +1 @@
+DIST jebl-2013.02.18.tar.xz 306444 SHA256 b20a815980241b8e9c113f1b0fd08361f1bfb10b69ae3f471c8a8c62bed4060f SHA512 2f18ebbe30efbaab879a290a771a6e3d8fd1ba8afb6b8e0b3e9fb36252a4f65adf0929b77ef6922def61f9430ffcfc8486d822cd463f7ca6752418139d41aafb WHIRLPOOL b7687fc6a1975298e73d9bfc353a51a9197de514a72f72797ee8bf5c7926b28791acd790847414101d7bc0fc369cedb723f8f30e9485d3e90bd6a87ed8bcb088
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..ec0d291ab926
--- /dev/null
+++ b/dev-java/jebl/jebl-2013.02.18.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#ESVN_REPO_URI="https://jebl.svn.sourceforge.net/svnroot/jebl/trunk/jebl"
+#ESVN_REPO_URI="https://jebl.svn.sourceforge.net/svnroot/jebl/tags/${P//./_}"
+
+JAVA_PKG_IUSE="doc"
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET="document"
+
+#inherit subversion java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Evolutionary Biology Library"
+HOMEPAGE="http://jebl.sourceforge.net/"
+#SRC_URI=""
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+
+CDEPEND=""
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+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/jebl-9999.ebuild b/dev-java/jebl/jebl-9999.ebuild
new file mode 100644
index 000000000000..32115c9f4878
--- /dev/null
+++ b/dev-java/jebl/jebl-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+ESVN_REPO_URI="https://jebl.svn.sourceforge.net/svnroot/jebl/trunk/jebl"
+#ESVN_REPO_URI="https://jebl.svn.sourceforge.net/svnroot/jebl/tags/${P//./_}"
+
+JAVA_PKG_IUSE="doc"
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET="document"
+
+inherit subversion java-pkg-2 java-ant-2
+#inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Evolutionary Biology Library"
+HOMEPAGE="http://jebl.sourceforge.net/"
+SRC_URI=""
+#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+KEYWORDS=""
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE=""
+
+CDEPEND=""
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+S="${WORKDIR}/${P//./_}"
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/jebl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jempbox/Manifest b/dev-java/jempbox/Manifest
new file mode 100644
index 000000000000..2eac58363ba0
--- /dev/null
+++ b/dev-java/jempbox/Manifest
@@ -0,0 +1,2 @@
+DIST JempBox-0.2.0.zip 6131627 SHA256 a4c6def91c31aaae4b8ee4b3f9ecebef73fce2f608bf7fc906a89a9bef17978e SHA512 8468028cf04d78e4bcbd2108f21c26e70d23a39f9ee897c2edf0a982c8981cdcbf1f6474f222021ac68e65dc0e5f6063d2603658f694a99ccac6ee52715c3aad WHIRLPOOL bb8659ab900b8920ace7afb8787d30ed4a00c701f0962106dcb1891f7829c83a04a4f9de09c9b7b682340bed06fb58622ffd4ff60d0defd39c5485363161137f
+DIST pdfbox-1.7.1-src.zip 9167805 SHA256 805c6b893ff10216cc826aa44e7a2eaf35bb43ca8ed19896c43132d253d3145e SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0 WHIRLPOOL 438fcd6f2d0128b972dfd5be83b2bc455daf9f126ac5b7a6a5de8a41e29f482b462e8e48e07a21ac1e896de4daa5ffed2eee400ec96ac93fbbce25fef99b0ade
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-0.2.0.ebuild b/dev-java/jempbox/jempbox-0.2.0.ebuild
new file mode 100644
index 000000000000..8fce8938680d
--- /dev/null
+++ b/dev-java/jempbox/jempbox-0.2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source test"
+WANT_ANT_TASKS="ant-nodeps"
+inherit java-pkg-2 java-ant-2
+
+MY_PN="JempBox"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Java library that implements Adobe's XMP specification"
+HOMEPAGE="http://www.jempbox.org"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v lib/*.jar
+	rm -rf docs/javadoc
+
+	if use test; then
+		java-ant_xml-rewrite -f build.xml --change -e junit \
+			-a haltonfailure -v true
+		cd lib
+		java-pkg_jar-from --build-only junit
+	else
+		# no way to separate building of tests in build.xml
+		# at least it doesn't include them in <jar>
+		rm -rf src/test
+	fi
+}
+
+src_compile() {
+	eant package $(use_doc)
+
+	#tests delete the jar and javadocs so newjar, dojavadoc will fail to
+	#install jar and javadoc.
+	mkdir gentoo-dist
+	cp "lib/${MY_P}.jar" "gentoo-dist/${MY_P}.jar" || die "Failed to copy jar."
+	if use doc; then
+		cp -R website/build/site/javadoc gentoo-dist || die \
+			"Unable to copy javadoc"
+	fi
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant junit
+}
+
+src_install() {
+	java-pkg_newjar "gentoo-dist/${MY_P}".jar
+
+	if use doc; then
+		dohtml -r docs/*
+		java-pkg_dojavadoc gentoo-dist/javadoc
+	fi
+
+	use source && java-pkg_dosrc src/org
+}
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..06251c03ceb3
--- /dev/null
+++ b/dev-java/jempbox/jempbox-1.7.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/metadata.xml b/dev-java/jempbox/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/jempbox/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jettison/Manifest b/dev-java/jettison/Manifest
new file mode 100644
index 000000000000..98ef625b4fe7
--- /dev/null
+++ b/dev-java/jettison/Manifest
@@ -0,0 +1 @@
+DIST jettison-1.0-sources.jar 54344 SHA256 4e52b63e8c84718ed6e7ab75618825e970df3169fb999f38ea54ea8a8d88e23b SHA512 f5eacfd15e43de61462413c6e7fde713c7baf632e26cd1c686818c9b992ac6734e4813ec5ad0ba6810e66bdd59d4007c73ad132e15c1ca0ae23a328916aa645c WHIRLPOOL a8fda2a165e06e39f87b7b6b8587f421451ca66334852844d81eb9c25cbe8d47a323fd2a6aee2a24d119fd35ed66fa5d815f0e8985681da23f8f6bacf08f00c0
diff --git a/dev-java/jettison/files/build.xml b/dev-java/jettison/files/build.xml
new file mode 100644
index 000000000000..b6b95dff7a2a
--- /dev/null
+++ b/dev-java/jettison/files/build.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+
+<project name="jettison" default="jar" basedir=".">
+	<!-- some properties -->
+	<property name="src.dir" value="org/codehaus/jettison" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="docs" />
+	<property name="lib.dir" value="lib"/>
+	<property name="dist.dir" value="dist" />
+	<property name="jarfile" value="${dist.dir}/jettison.jar" />
+	<property name="pkg" value="${package.name}"/>
+	<property name="target.jdk" value="1.5" />
+
+
+	<available file="${lib}" type="dir" property="libdir.exists"/>
+
+
+	<!-- init -->
+	<target name="init">		
+		<tstamp/>
+		<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}"
+			classpath="${gentoo.classpath}">
+		</javac>
+	</target>
+
+	<!-- build the jar file -->
+	<target name="jar" depends="compile">
+		<jar jarfile="${jarfile}" basedir="${build.dir}" />
+	</target>
+	
+	<!-- generate javadocs -->
+	<target name="javadoc" depends="compile">
+		<javadoc packagenames="org.*"
+			sourcepath="${src.dir}"
+			defaultexcludes="yes"
+			destdir="./${docs.dir}"
+           		author="true"
+           		version="true"
+           		use="true"
+			windowtitle="${ant.project.name} API" >
+			<fileset dir="${src.dir}"/>
+		</javadoc>	
+	</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/jettison/jettison-1.0.ebuild b/dev-java/jettison/jettison-1.0.ebuild
new file mode 100644
index 000000000000..e526e90468b0
--- /dev/null
+++ b/dev-java/jettison/jettison-1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A JSON StAX implementation"
+HOMEPAGE="http://jettison.codehaus.org/"
+SRC_URI="http://repository.codehaus.org/org/codehaus/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+IUSE=""
+
+COMMON_DEP="java-virtuals/jaxp-virtual"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+#Don't need to make one
+S="${WORKDIR}"
+
+src_prepare(){
+	#no supplied Build file
+	cp -v "${FILESDIR}"/build.xml "${S}/build.xml" || die
+}
+
+EANT_GENTOO_CLASSPATH="jaxp-virtual"
+
+src_install() {
+	java-pkg_dojar dist/"${PN}.jar"
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/jettison/metadata.xml b/dev-java/jettison/metadata.xml
new file mode 100644
index 000000000000..842debf1aa32
--- /dev/null
+++ b/dev-java/jettison/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>mike@weisso.com</email>
+		<name>Mike Weissman</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>
+</pkgmetadata>
+
diff --git a/dev-java/jexcelapi/Manifest b/dev-java/jexcelapi/Manifest
new file mode 100644
index 000000000000..f400130f3224
--- /dev/null
+++ b/dev-java/jexcelapi/Manifest
@@ -0,0 +1 @@
+DIST jexcelapi_2_6_8.tar.gz 1925926 SHA256 12f05e4453c203b91329a65329b564e86aaa77a005101f876c4de7b648c36034 SHA512 c649dcff8647530ca719f3e546d45ac585fed46d0a220763848f6d97b3f42c871b6520aee3575202598c7aba3391f647690075b6d9d52d1c2920817ff69548c1 WHIRLPOOL 24d60ad81961b224c6d63267ee4cb4432bca5bb89c1462797dc96dce4f7fb6403741c34819c78a36312a1df9f0fce756c1d026b1672c751fc8b3a42cc9f0e3c7
diff --git a/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild b/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild
new file mode 100644
index 000000000000..a8eaffc24a92
--- /dev/null
+++ b/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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"
+
+LICENSE="LGPL-2.1"
+SLOT="2.5"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${PN}
+
+EANT_BUILD_XML="build/build.xml"
+EANT_FILTER_COMPILER="jikes"
+EANT_BUILD_TARGET="jxl"
+EANT_DOC_TARGET="docs"
+
+java_prepare() {
+	find "${S}" -name "*.jar" -o -name "*.class" -delete || die
+}
+
+src_install() {
+	java-pkg_newjar jxl.jar  ${PN}.jar
+
+	java-pkg_dohtml index.html tutorial.html
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc "${S}"/src/*
+}
diff --git a/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild b/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild
new file mode 100644
index 000000000000..a7c08f70fd3d
--- /dev/null
+++ b/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+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"
+
+LICENSE="LGPL-2.1"
+SLOT="2.5"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	find -name "*.jar" | xargs rm -v
+	find -name "*.class" -delete
+	rm -fr docs
+
+	# sun-jdk-1.5/jikes fails
+	java-pkg_filter-compiler jikes
+}
+
+src_compile() {
+	eant -f build/build.xml jxl $(use_doc docs)
+}
+
+src_install() {
+	java-pkg_newjar jxl.jar  ${PN}.jar
+
+	java-pkg_dohtml index.html tutorial.html
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc "${S}"/src/*
+}
diff --git a/dev-java/jexcelapi/metadata.xml b/dev-java/jexcelapi/metadata.xml
new file mode 100644
index 000000000000..51e8d055387b
--- /dev/null
+++ b/dev-java/jexcelapi/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..e6419066fa3d
--- /dev/null
+++ b/dev-java/jffi/Manifest
@@ -0,0 +1,5 @@
+DIST jffi-1.0.11.tar.gz 1899655 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a SHA512 0f98c1aa55dfd9fd9338399e173f118ef12d01a65429a49ed5264a23fa6700e7ebdf13ffb6b6318fcd8ea9dce66a47524c5cefa50f3f11a251ca44a4f38fd6aa WHIRLPOOL aa8c3f88b75a26221b3c41ed552fdd83c551ae05fc7455f072b8a3d7f3190cad26a638d1800a67b09d8074b5dfdd04f2be73287a7f22c0cfcc5dbc8df0d2ae12
+DIST jffi-1.2.5.tar.gz 1798081 SHA256 2101c48855558902f2e21baacd0b2c8b7098feb3ca1487a195c2bc3d9116ebd4 SHA512 2613a1874899e1a734ad54d68f7d969fe3bc12bd1ae1aaf5a63a17d63ac6ac6b9812740b7c7a771e66ba0e4ff02105c6a2427771d4571be40ae869f3d6f077e3 WHIRLPOOL 174303fc9f10cf295e009ef2320f9b13295f5e96187ab2ae4599de891b27e1279645ea47409eb8aec9a8b247a5568cddd6f8566950b64be37e399cb0eda0219f
+DIST jffi-1.2.6.tar.gz 1850410 SHA256 b568d832828bf0cb980c545e8fd16147034048ca2d3ffc62cae4f844c8cc6cec SHA512 df178691e6894599f2a45146950cca7e4c81e92c38fc751c40b39e660970c19d0dce41c9192053dddf07f42317d28033f59b7140c904784c477526e7471b6938 WHIRLPOOL adb57b9ac981177ae7d697aae41bbaaff3a38dab4c4364258b13272023076dacdd93a751eb24a339ae17a4162d4511685a4aa67afd5d8fab2f852e0403ee73f1
+DIST jffi-1.2.7.tar.gz 1908203 SHA256 25f1930f294cec9651447edd08a51a990b7c92c69eca87257233e86e4dd5f979 SHA512 837ebb0085ec2acc5dc688c3e1883a7c986df62a32a41887196b88f5b5714ee667f918f2bdf005f019faae02df2f7903f291fa32c5ec3cabc360d9b1d8e4548d WHIRLPOOL 0e9824d54b21eb61142f4a868cd10122d9837c34732fc4ff9ba3093c0d4c11ee25dc0e045a40a4157faed201de9498e7cea28df85e7f14d07b58d2f4d1fb26e1
+DIST jffi-1.2.8.tar.gz 1988785 SHA256 445263cd24dccc34e2bd7fb3c488aa182697b1bc3f86d3343e07183161e2986c SHA512 c6622a2cc0cd040d871417d66a074aeaad57f266559c8135692e2b76bb00f05287a4e4c4f17e8e4225c4d5e7e8941d9c883fbb4cfe5db920a79dd9a29ffea105 WHIRLPOOL 165f44b195310cf2826359d00ba74bb0eac66a47c566ec1a522df50627721c6564bd1730459098a8aa973433978fa815b3a418bbcf787b75ebf1cc3cd585909d
diff --git a/dev-java/jffi/files/1.0.0-gcc-3.4.patch b/dev-java/jffi/files/1.0.0-gcc-3.4.patch
new file mode 100644
index 000000000000..fc2bd5cae10a
--- /dev/null
+++ b/dev-java/jffi/files/1.0.0-gcc-3.4.patch
@@ -0,0 +1,14 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index 7a027af..eaba319 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -188,9 +188,6 @@ endif
+ 
+ ifeq ($(CPU), i386)
+   MODEL = 32
+-  ifeq ($(findstring $(OS), openbsd darwin mingw32 win32),)
+-    CFLAGS += -march=i586 -mtune=generic
+-  endif
+ endif
+ 
+ ifeq ($(CPU), amd64)
diff --git a/dev-java/jffi/files/jffi-1.0.0-makefile.patch b/dev-java/jffi/files/jffi-1.0.0-makefile.patch
new file mode 100644
index 000000000000..11ca2ed68530
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.0.0-makefile.patch
@@ -0,0 +1,82 @@
+--- jni/GNUmakefile	2010-03-12 12:06:39.000000000 +1300
++++ jni/GNUmakefile	2010-03-12 12:13:44.000000000 +1300
+@@ -65,7 +65,7 @@
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+ ifneq ($(OS),darwin)
+-  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
++  WFLAGS = -W -Wall -Wno-unused -Wno-parentheses -Wundef
+ endif
+ PICFLAGS = -fPIC
+ SOFLAGS = # Filled in for each OS specifically
+@@ -78,9 +78,9 @@
+ 
+ JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
+ IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)"
+-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
++CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
+ CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
+-CXXFLAGS = $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
++CXXFLAGS += $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
+ 
+ ifeq ($(OS), win64)
+   override CPU = x86_64
+@@ -258,58 +258,6 @@
+ 	@mkdir -p $(@D)
+ 	$(CCACHE) $(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+-
+-ifeq ($(OS), darwin)
+-build_ffi = \
+-	mkdir -p $(BUILD_DIR)/libffi-darwin-$(1); \
+-	(if [ ! -f $(BUILD_DIR)/libffi-darwin-$(1)/Makefile ]; then \
+-	    echo "Configuring libffi for $(1)"; \
+-	    cd $(BUILD_DIR)/libffi-darwin-$(1) && \
+-	      env CC="$(CCACHE) $(CC)" CFLAGS="-arch $(1) $(FFI_CFLAGS)" LDFLAGS="-arch $(1)" \
+-		$(LIBFFI_CONFIGURE) --host=$(1)-apple-darwin > /dev/null; \
+-	fi); \
+-	env MACOSX_DEPLOYMENT_TARGET=10.5 $(MAKE) -C $(BUILD_DIR)/libffi-darwin-$(1)
+-	
+-$(LIBFFI):
+-	@mkdir -p $(@D)
+-	@for arch in $(ARCHES); do $(call build_ffi,$$arch);done
+-	
+-	# Assemble into a FAT (i386, x86_64, ppc) library
+-	@mkdir -p $(BUILD_DIR)/libffi/.libs
+-	@env MACOSX_DEPLOYMENT_TARGET=10.5 /usr/bin/libtool -static -o $@ \
+-	    $(foreach arch, $(ARCHES),$(BUILD_DIR)/libffi-darwin-$(arch)/.libs/libffi_convenience.a)
+-	@mkdir -p $(LIBFFI_BUILD_DIR)/include
+-	$(RM) $(LIBFFI_BUILD_DIR)/include/ffi.h
+-	@( \
+-		printf "#if defined(__i386__)\n"; \
+-		printf "#include \"libffi-darwin-i386/include/ffi.h\"\n"; \
+-		printf "#elif defined(__x86_64__)\n"; \
+-		printf "#include \"libffi-darwin-x86_64/include/ffi.h\"\n";\
+-		printf "#elif defined(__ppc__)\n"; \
+-		printf "#include \"libffi-darwin-ppc/include/ffi.h\"\n";\
+-		printf "#endif\n";\
+-	) > $(LIBFFI_BUILD_DIR)/include/ffi.h
+-	@( \
+-		printf "#if defined(__i386__)\n"; \
+-		printf "#include \"libffi-darwin-i386/include/ffitarget.h\"\n"; \
+-		printf "#elif defined(__x86_64__)\n"; \
+-		printf "#include \"libffi-darwin-x86_64/include/ffitarget.h\"\n";\
+-		printf "#elif defined(__ppc__)\n"; \
+-		printf "#include \"libffi-darwin-ppc/include/ffitarget.h\"\n";\
+-		printf "#endif\n";\
+-	) > $(LIBFFI_BUILD_DIR)/include/ffitarget.h
+-else
+-$(LIBFFI):		
+-	@mkdir -p $(LIBFFI_BUILD_DIR)
+-	@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
+-	    echo "Configuring libffi for $(PLATFORM)"; \
+-	    cd $(LIBFFI_BUILD_DIR) && env CC="$(FFI_CC)" LD="$(FFI_LD)" CFLAGS="$(FFI_CFLAGS)" \
+-		$(LIBFFI_CONFIGURE) > /dev/null; \
+-	fi
+-	$(MAKE) -C $(LIBFFI_BUILD_DIR)
+-endif
+-
+-
+ clean::
+ 	# nothing to do - ant will delete the build dir
+ 
diff --git a/dev-java/jffi/files/jffi-1.0.11_no-werror.patch b/dev-java/jffi/files/jffi-1.0.11_no-werror.patch
new file mode 100644
index 000000000000..25b7e4f8ec00
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.0.11_no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index efe6230..25053c7 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
+ OFLAGS = -O2 $(JFLAGS)
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+-WERROR = -Werror
++WERROR =
+ ifneq ($(OS),darwin)
+   WFLAGS += -Wundef $(WERROR)
+ endif
diff --git a/dev-java/jffi/files/jffi-1.2.5_no-werror.patch b/dev-java/jffi/files/jffi-1.2.5_no-werror.patch
new file mode 100644
index 000000000000..25b7e4f8ec00
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.2.5_no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index efe6230..25053c7 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
+ OFLAGS = -O2 $(JFLAGS)
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+-WERROR = -Werror
++WERROR =
+ ifneq ($(OS),darwin)
+   WFLAGS += -Wundef $(WERROR)
+ endif
diff --git a/dev-java/jffi/files/jffi-1.2.6_no-werror.patch b/dev-java/jffi/files/jffi-1.2.6_no-werror.patch
new file mode 100644
index 000000000000..25b7e4f8ec00
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.2.6_no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index efe6230..25053c7 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
+ OFLAGS = -O2 $(JFLAGS)
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+-WERROR = -Werror
++WERROR =
+ ifneq ($(OS),darwin)
+   WFLAGS += -Wundef $(WERROR)
+ endif
diff --git a/dev-java/jffi/files/jffi-1.2.7-junit-4.11.patch b/dev-java/jffi/files/jffi-1.2.7-junit-4.11.patch
new file mode 100644
index 000000000000..ac3843a0053a
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.2.7-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.7-makefile.patch b/dev-java/jffi/files/jffi-1.2.7-makefile.patch
new file mode 100644
index 000000000000..ed17f7882ce5
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.2.7-makefile.patch
@@ -0,0 +1,62 @@
+diff --git a/jffi-1.2.7/jni/GNUmakefile b/jffi-1.2.7/jni/GNUmakefile
+index 27737be..2e709d9 100755
+--- a/jffi-1.2.7/jni/GNUmakefile
++++ b/jffi-1.2.7/jni/GNUmakefile
+@@ -47,7 +47,6 @@ else
+   LIBFFI_SRC_DIR = $(SRC_DIR)/libffi
+   LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi-$(PLATFORM)
+   LIBFFI = $(LIBFFI_BUILD_DIR)/.libs/libffi_convenience.a
+-  LIBFFI_LIBS = $(LIBFFI)
+   LIBFFI_CFLAGS = -I"$(LIBFFI_BUILD_DIR)"/include
+ endif
+ 
+@@ -64,11 +63,11 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
+ OFLAGS = -O2 $(JFLAGS)
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+-WERROR = -Werror
++WERROR =
+ ifneq ($(OS),darwin)
+   WFLAGS += -Wundef $(WERROR)
+ endif
+-WFLAGS += -W -Wall -Wno-unused -Wno-parentheses
++WFLAGS += -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
+ PICFLAGS = -fPIC
+ SOFLAGS = # Filled in for each OS specifically
+ FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT
+@@ -279,7 +278,7 @@ debug:
+ 	@echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)"
+ 	@echo "OBJS=$(OBJS)"
+ 
+-$(LIBJFFI):  $(OBJS) $(LIBFFI_LIBS)
++$(LIBJFFI):  $(OBJS)
+ 	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
+ 	$(STRIP) $@
+ 
+@@ -291,7 +290,7 @@ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h)
+ 	@mkdir -p $(@D)
+ 	@$(CC) $(CFLAGS) -o $@ -c $<
+ 
+-$(OBJS) : $(LIBFFI_LIBS)
++$(OBJS) : 
+ 
+ ifeq ($(OS), darwin)
+ build_ffi = \
+diff --git a/jffi-1.2.7/libtest/GNUmakefile b/jffi-1.2.7/libtest/GNUmakefile
+index 9e70664..3e279a3 100644
+--- a/jffi-1.2.7/libtest/GNUmakefile
++++ b/jffi-1.2.7/libtest/GNUmakefile
+@@ -44,10 +44,10 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS))
+ # 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-parentheses
++OFLAGS = $(JFLAGS)
++WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
+ PICFLAGS = -fPIC
+-SOFLAGS = -shared -Wl,-O1
++SOFLAGS = -shared
+ LDFLAGS += $(SOFLAGS)
+ 
+ IFLAGS = -I"$(BUILD_DIR)"
diff --git a/dev-java/jffi/files/jffi-1.2.7_no-werror.patch b/dev-java/jffi/files/jffi-1.2.7_no-werror.patch
new file mode 100644
index 000000000000..517a1e546d8b
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.2.7_no-werror.patch
@@ -0,0 +1,31 @@
+diff --git a/jffi-1.2.7/jni/GNUmakefile b/jffi-1.2.7/jni/GNUmakefile
+index 27737be..98f147e 100755
+--- a/jffi-1.2.7/jni/GNUmakefile
++++ b/jffi-1.2.7/jni/GNUmakefile
+@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
+ OFLAGS = -O2 $(JFLAGS)
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+-WERROR = -Werror
++WERROR =
+ ifneq ($(OS),darwin)
+   WFLAGS += -Wundef $(WERROR)
+ endif
+diff --git a/jffi-1.2.7/libtest/GNUmakefile b/jffi-1.2.7/libtest/GNUmakefile
+index 9e70664..72e4cc9 100644
+--- a/jffi-1.2.7/libtest/GNUmakefile
++++ b/jffi-1.2.7/libtest/GNUmakefile
+@@ -44,10 +44,10 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS))
+ # 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-parentheses
++OFLAGS = $(JFLAGS)
++WFLAGS = -W -Wall -Wno-unused -Wno-parentheses
+ PICFLAGS = -fPIC
+-SOFLAGS = -shared -Wl,-O1
++SOFLAGS = -shared
+ LDFLAGS += $(SOFLAGS)
+ 
+ IFLAGS = -I"$(BUILD_DIR)"
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.0.11-r1.ebuild b/dev-java/jffi/jffi-1.0.11-r1.ebuild
new file mode 100644
index 000000000000..1f4dad71570b
--- /dev/null
+++ b/dev-java/jffi/jffi-1.0.11-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://github.com/jnr"
+SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="
+	virtual/libffi"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jffi-* "${P}" || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${P}_no-werror.patch
+	sed -i -e 's/-Werror //' libtest/GNUmakefile || die
+
+	find "${WORKDIR}" -iname '*.jar' -delete || die
+
+	# Fix build with GCC 4.7 #421501
+	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile libtest/GNUmakefile || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+src_compile() {
+	# generate Version.java
+	cat <<-EOF > src/main/java/com/kenai/jffi/Version.java
+		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 || die
+	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
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
+
+	# must by after _doso to have JAVA_PKG_LIBDEST set
+	cat <<-EOF > boot.properties
+		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/jffi-1.0.11.ebuild b/dev-java/jffi/jffi-1.0.11.ebuild
new file mode 100644
index 000000000000..6fc2b5a3c665
--- /dev/null
+++ b/dev-java/jffi/jffi-1.0.11.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+COMMON_DEP="
+	virtual/libffi"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jffi-* "${P}" || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${P}_no-werror.patch
+	sed -i -e 's/-Werror //' libtest/GNUmakefile || die
+
+	find "${WORKDIR}" -iname '*.jar' -delete
+
+	# Fix build with GCC 4.7 #421501
+	sed -i -e "s|-mimpure-text||g" jni/GNUmakefile libtest/GNUmakefile || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+src_compile() {
+	# generate Version.java
+	cat <<-EOF > src/main/java/com/kenai/jffi/Version.java
+		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
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	cat <<-EOF > boot.properties
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf target/${PN}.jar boot.properties || die
+
+	java-pkg_dojar target/${PN}.jar
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jffi/jffi-1.2.5.ebuild b/dev-java/jffi/jffi-1.2.5.ebuild
new file mode 100644
index 000000000000..d7b2899f000a
--- /dev/null
+++ b/dev-java/jffi/jffi-1.2.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator vcs-snapshot
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="
+	virtual/libffi"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${P}_no-werror.patch
+
+	find "${WORKDIR}" -iname '*.jar' -delete
+}
+
+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
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	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
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jffi/jffi-1.2.6.ebuild b/dev-java/jffi/jffi-1.2.6.ebuild
new file mode 100644
index 000000000000..c9f8a54a7318
--- /dev/null
+++ b/dev-java/jffi/jffi-1.2.6.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator vcs-snapshot
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+COMMON_DEP="
+	virtual/libffi"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${P}_no-werror.patch
+
+	# 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
+}
+
+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
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	local libname=".so"
+
+	cat > boot.properties <<-EOF
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf target/${PN}.jar boot.properties || die
+
+	[[ ${CHOST} == *-darwin* ]] && libname=.jnilib
+
+	java-pkg_dojar target/${PN}.jar
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname}
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jffi/jffi-1.2.7-r2.ebuild b/dev-java/jffi/jffi-1.2.7-r2.ebuild
new file mode 100644
index 000000000000..151d77b05abc
--- /dev/null
+++ b/dev-java/jffi/jffi-1.2.7-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator vcs-snapshot
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.2"
+KEYWORDS="amd64 ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos"
+
+COMMON_DEP="virtual/libffi:0"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-junit-4.11.patch
+
+	# 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
+		-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/jffi-1.2.7.ebuild b/dev-java/jffi/jffi-1.2.7.ebuild
new file mode 100644
index 000000000000..7fef0f629439
--- /dev/null
+++ b/dev-java/jffi/jffi-1.2.7.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator vcs-snapshot
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.2"
+KEYWORDS="amd64 ppc x86 ~ppc-macos ~x64-macos ~x86-macos"
+
+COMMON_DEP="virtual/libffi:0"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${P}_no-werror.patch
+	epatch "${FILESDIR}"/${P}-junit-4.11.patch
+
+	# 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
+}
+
+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
+		-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=build/jni" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	local libname=".so"
+
+	cat > boot.properties <<-EOF
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf target/${PN}.jar boot.properties || die
+
+	[[ ${CHOST} == *-darwin* ]] && libname=.jnilib
+
+	java-pkg_dojar target/${PN}.jar
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname}
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jffi/jffi-1.2.8.ebuild b/dev-java/jffi/jffi-1.2.8.ebuild
new file mode 100644
index 000000000000..064bc69413d6
--- /dev/null
+++ b/dev-java/jffi/jffi-1.2.8.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+
+COMMON_DEP="virtual/libffi:0"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${PN}-1.2.8-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.2.8-junit-4.11.patch
+
+	# 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..16e36e4cef41
--- /dev/null
+++ b/dev-java/jffi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..439770adbc5c
--- /dev/null
+++ b/dev-java/jflex/Manifest
@@ -0,0 +1,4 @@
+DIST jflex-1.4.3.tar.gz 1214420 SHA256 6ccdcf15fe9f1d863d538e8b1cfd428b8628a645d247adc40071d1ae70ede2f2 SHA512 901106ea5a9108ba6016da55093801fbaee50f8f8fb45f290cae3bb989663838e83a4d8484bc633b9acf2c085c83304a47d9348255d106117dace3d5f44ea835 WHIRLPOOL 709c130037be6491ea1a9d6301dcc4acc643c9d1127d11a0dccb9d7339fda7fe06ba159100c3f4ad34d7b34c6b5336f2328f6bdf7ee8cdf87e752e371120ff8d
+DIST jflex-1.5.0.tar.gz 2827866 SHA256 76b11d00fe94f79331a74045c7aaea292a80cb311a6840d0dd53209e81d4cb64 SHA512 5d46d3339a8e435228e8dab55ac52bbb40b4b39ea9c28963c5d02298f0ed8a7e8a66573003f165badb4c3939d6bd88852343d886d3b6c2bd78d17320201c3137 WHIRLPOOL 22d44cc90bf09666f0139c83cde2f9330ed12e2dd3313573d948527d2a0d420b71512a764c5579a94d4d30f4a573180bec2c08c37c3e3c81f079a018bee1a3b1
+DIST jflex-1.5.1.tar.gz 2764584 SHA256 3b24ed6ace401e70d71f82a65179a4eb958756f43ed4c647ce75f340f644becd SHA512 e0bb95fd70add73b662c34ff5821f9822bf1e982bd669bc4497bf210555ccd455b1d216391864e9983a4f90d430e0f8b57667c0f0623a8dfb0ff1ef97b2f5572 WHIRLPOOL 123668156410891a9a4c755cd7fbb4464c88b57c00d01ed4d4679c6b5b66e3d355b7006356937c54cc7a14a4b9bd7619912bd0186fc5b8a19294406fa432008b
+DIST jflex-1.6.0.tar.gz 3035885 SHA256 0774da0ee2d01fc9274179de4243e0d229c01b5cf0fbb78952fb7fdc4672190c SHA512 16ce4a89f75ce5f3da02433ff66d39ed4db567b4cf7469997dd2617b82e52d589bb17ec3a2f36b4d00a62233e48820bc2e043dcc9ae3c01f1eeca323c0166eba WHIRLPOOL 4d9e7e8c3a0da66d860b895699d5b50e29f781f1cf18cab436f545b1fb007297ca9433694ce3808452c5d9340eddc978c2b32019b5a8d5d8c6cb0558543ea18e
diff --git a/dev-java/jflex/files/jflex-1.4.1-build.xml.patch b/dev-java/jflex/files/jflex-1.4.1-build.xml.patch
new file mode 100644
index 000000000000..8353cbe52a76
--- /dev/null
+++ b/dev-java/jflex/files/jflex-1.4.1-build.xml.patch
@@ -0,0 +1,30 @@
+--- build.xml	2009-01-31 16:14:57.000000000 +0200
++++ build.xml.fixed	2009-01-31 16:17:14.000000000 +0200
+@@ -35,7 +35,7 @@
+ 
+   <target name="declare" description="define tasks for jflex and cup">
+     <taskdef classname="JFlex.anttask.JFlexTask" name="jflex" classpath="${jflex.jar}"/>
+-    <taskdef classname="java_cup.AntTask" name="cup" classpath="${cup.jar}"/>
++    <taskdef classname="java_cup.anttask.CUPTask" name="cup" classpath="${cup.jar}"/>
+   </target>
+ 
+   <target name="gettools" description="download development tools">
+@@ -69,7 +69,7 @@
+   </target>
+ 
+   <target name="cup" depends="declare" description="generate parser">
+-    <cup file="JFlex/LexParse.cup" dir="JFlex" interface="true" parser="LexParse" />
++    <cup srcfile="JFlex/LexParse.cup" interface="true" parser="LexParse" />
+   </target>
+ 
+   <target name="copy" description="copy resources to build dir">
+@@ -79,7 +79,8 @@
+ 
+   <target name="jar" depends="compile,copy" description="make JFlex.jar">
+     <jar basedir="../lib" 
+-    	 includes="JFlex/**,java_cup/**,skeleton" 
++    	 includes="JFlex/**,java_cup/**,skeleton"
++    	 excludes="JFlex/tests/*" 
+     	 jarfile="../lib/JFlex.jar" 
+     	 manifest="manifest"/>
+   </target>
diff --git a/dev-java/jflex/files/jflex-1.5.0-build.xml b/dev-java/jflex/files/jflex-1.5.0-build.xml
new file mode 100644
index 000000000000..9ac1be49a7d6
--- /dev/null
+++ b/dev-java/jflex/files/jflex-1.5.0-build.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<project name="JFlex" default="help">
+
+  <property name="version" value="1.5.0" />
+  <property name="bootstrap.version" value="1.5.0" />
+  <property name="junit.version" value="4.11" />
+  <property name="cup.version" value="11a" />
+  <property name="java.source.version" value="1.5" />
+    
+  <!-- use any of these files to override properties -->
+  <property file="build.properties" />
+  <property file="${user.home}/.jflex.properties" />
+  
+  <!-- location of development tools necessary for the build -->
+  <property name="lib.dir" value="lib"/>
+    
+  <!-- override these if you want to use your own versions -->
+  <property name="bootstrap.jflex.jar" value="${lib.dir}/jflex-${bootstrap.version}.jar" />
+  <property name="cup.jar" value="${lib.dir}/java-cup-${cup.version}.jar" />
+  <property name="junit.jar" value="${lib.dir}/junit-${junit.version}.jar" />
+
+  <!-- where to get tool jars from -->
+  <property name="maven.central.url" value="http://central.maven.org/maven2" />
+  <property name="bootstrap.jflex.jar.url" 
+  	        value="${maven.central.url}/de/jflex/jflex/${bootstrap.version}/jflex-${bootstrap.version}.jar" />
+  <property name="junit.jar.url"
+            value="${maven.central.url}/junit/junit/${junit.version}/junit-${junit.version}.jar" />
+
+  <!-- where build output goes, including the jflex jar -->
+  <property name="build.dir" value="build"/>
+  <property name="generated.sources.dir" value="${build.dir}/generated-sources"/>
+  <property name="compile.output.dir" value="${build.dir}/classes"/>
+  <property name="test.compile.output.dir" value="${build.dir}/test-classes"/>
+  <property name="tests.dir" value="${build.dir}/tests"/>
+
+  <!-- where the output jar goes -->
+  <property name="output.jar.name" value="${build.dir}/jflex-${version}.jar" />
+  	        
+  <target name="help" description="show help message">
+  	<echo message="Ant build file for JFlex. Useful targets:"/> 
+  	<echo message=""/> 
+  	<echo message="gettools:  download development tools for the build"/> 
+  	<echo message="clean:     remove all generated and compiled files"/>
+    <echo message="compile:   generates sources and compiles non-test classes"/>
+  	<echo message="jar:       make ${output.jar.name}"/>
+    <echo message="build:     complete build from scratch (clean jar)"/>
+    <echo message="test:      run the unit tests"/>
+  	<echo message=""/> 
+  	<echo message="Use the gettool target or override the *.jar properties"/>
+  	<echo message="before you do the first build."/> 
+  </target> 
+
+  <target name="gettools" description="download development tools">
+    <get src="${bootstrap.jflex.jar.url}" dest="${bootstrap.jflex.jar}"/>
+    <get src="${junit.jar.url}" dest="${junit.jar}"/>
+  </target>
+
+  <target name="build" depends="clean,jar" 
+          description="complete build from scratch (clean jar)"/>
+
+  <target name="clean" description="remove all generated and compiled files">
+    <delete includeemptydirs="true">
+      <fileset dir="${build.dir}" includes="**/*"/>
+    </delete>
+  </target>
+
+  <target name="jar" depends="compile,-copy-resources" 
+          description="make ${output.jar.name}">
+    <jar basedir="${compile.output.dir}" jarfile="${output.jar.name}">
+      <manifest>
+        <attribute name="Main-Class" value="jflex.Main"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <target name="compile" depends="-generate-scanner,-generate-parser"
+          description="generate sources and compile all non-test classes">
+    <mkdir dir="${compile.output.dir}" />
+    <javac destdir="${compile.output.dir}"
+           target="${java.source.version}"
+           source="${java.source.version}"
+           debug="on"
+           includeantruntime="true">
+      <src path="src/main/java"/>
+      <src path="${generated.sources.dir}"/>
+    </javac>
+  </target>
+    
+  <target name="test" depends="compile,-copy-resources,-compile-test">
+    <mkdir dir="${tests.dir}"/>
+    <junit dir="." printsummary="true" errorproperty="junit.failed">
+      <classpath>
+        <file file="${junit.jar}"/>
+        <pathelement location="${compile.output.dir}"/>
+        <pathelement location="${test.compile.output.dir}"/>
+      </classpath>
+      <assertions>
+        <enable/>
+      </assertions>
+      <batchtest fork="yes" todir="${tests.dir}">
+        <formatter type="plain"/>
+        <fileset dir="src/test/java">
+          <include name="**/*Test*.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+    <fail if="junit.failed"/>
+  </target>
+
+  <target name="-copy-resources">
+    <copy todir="${compile.output.dir}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+
+  <target name="-generate-scanner">
+    <taskdef classname="jflex.anttask.JFlexTask" 
+             name="jflex" classpath="${bootstrap.jflex.jar}"/>
+    <mkdir dir="${generated.sources.dir}/jflex"/>
+    <jflex file="src/main/jflex/LexScan.flex"
+           outdir="${generated.sources.dir}/jflex"
+           skeleton="src/main/jflex/skeleton.nested"
+           nobak="on"/>
+  </target>
+
+  <target name="-generate-parser">
+    <taskdef classname="java_cup.anttask.CUPTask" 
+             name="cup" classpath="${cup.jar}"/>
+    <mkdir dir="${generated.sources.dir}"/>
+    <cup srcfile="src/main/cup/LexParse.cup" 
+         destdir="${generated.sources.dir}" 
+         interface="true" 
+         parser="LexParse"/>
+  </target>
+    
+  <target name="-compile-test" depends="compile">
+    <mkdir dir="${test.compile.output.dir}"/>
+    <javac srcdir="src/test/java"
+           destdir="${test.compile.output.dir}"
+           target="${java.source.version}"
+           source="${java.source.version}"
+           classpath="${compile.output.dir}:${junit.jar}"
+           includeantruntime="true"/>
+  </target>
+
+  <target depends="compile" name="javadoc">
+    <javadoc packagenames="jflex" sourcepath="src/main/java:build/generated-sources" destdir="javadoc" version="true" />
+  </target>
+</project>
diff --git a/dev-java/jflex/jflex-1.4.3-r1.ebuild b/dev-java/jflex/jflex-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..ef42be61a7b6
--- /dev/null
+++ b/dev-java/jflex/jflex-1.4.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Currently, this package uses an included JFlex.jar file to bootstrap.
+# Upstream was contacted and this bootstrap is really needed. The only way to avoid it would be to use a supplied pre-compiled .scanner file.
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.jflex.de/"
+LICENSE="GPL-2"
+SLOT="1.4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+RDEPEND=">=virtual/jre-1.4
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	>=dev-java/ant-core-1.7.0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/junit:0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+IUSE="doc source vim-syntax"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}/src"
+
+	mkdir "${S}/tools"
+	cp "${S}/lib/JFlex.jar" "${S}/tools/JFlex.jar"
+	rm -rf java_cup "${S}/lib/JFlex.jar"
+
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	ANT_TASKS="javacup"
+	jflex_cp="$(java-pkg_getjars --build-only junit):$(java-pkg_getjars ant-core,javacup)"
+	cd "${S}/src"
+	eant realclean
+	eant -Dgentoo.classpath="${jflex_cp}" jar
+
+	rm "${S}/tools/JFlex.jar"
+	cp "${S}/lib/JFlex.jar" "${S}/tools/"
+	rm "${S}/lib/JFlex.jar"
+
+	eant realclean
+	einfo "Recompiling using the newly generated JFlex library"
+	eant -Dgentoo.classpath="${jflex_cp}" jar
+}
+
+src_install() {
+	java-pkg_dojar lib/JFlex.jar
+	java-pkg_dolauncher "${PF}" --main JFlex.Main
+	java-pkg_register-ant-task
+
+	dodoc doc/manual.pdf doc/manual.ps.gz src/changelog
+	dohtml -r doc/*
+
+	use source && java-pkg_dosrc src/JFlex
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/jflex.vim"
+	fi
+}
diff --git a/dev-java/jflex/jflex-1.4.3-r2.ebuild b/dev-java/jflex/jflex-1.4.3-r2.ebuild
new file mode 100644
index 000000000000..027d1625482e
--- /dev/null
+++ b/dev-java/jflex/jflex-1.4.3-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Currently, this package uses an included JFlex.jar file to bootstrap.
+# Upstream was contacted and this bootstrap is really needed. The only way to avoid it would be to use a supplied pre-compiled .scanner file.
+
+EAPI="3"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.jflex.de/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+RDEPEND=">=virtual/jre-1.4
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	>=dev-java/ant-core-1.7.0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/junit:0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+IUSE="doc source vim-syntax"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}/src"
+
+	mkdir "${S}/tools"
+	cp "${S}/lib/JFlex.jar" "${S}/tools/JFlex.jar"
+	rm -rf java_cup "${S}/lib/JFlex.jar"
+
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	ANT_TASKS="javacup"
+	jflex_cp="$(java-pkg_getjars --build-only junit):$(java-pkg_getjars ant-core,javacup)"
+	cd "${S}/src"
+	eant realclean
+	eant -Dgentoo.classpath="${jflex_cp}" jar
+
+	rm "${S}/tools/JFlex.jar"
+	cp "${S}/lib/JFlex.jar" "${S}/tools/"
+	rm "${S}/lib/JFlex.jar"
+
+	eant realclean
+	einfo "Recompiling using the newly generated JFlex library"
+	eant -Dgentoo.classpath="${jflex_cp}" jar
+}
+
+src_install() {
+	java-pkg_dojar lib/JFlex.jar
+	java-pkg_dolauncher "${PN}" --main JFlex.Main
+	java-pkg_register-ant-task
+
+	dodoc doc/manual.pdf doc/manual.ps.gz src/changelog
+	dohtml -r doc/*
+
+	use source && java-pkg_dosrc src/JFlex
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/jflex.vim"
+	fi
+}
diff --git a/dev-java/jflex/jflex-1.5.0.ebuild b/dev-java/jflex/jflex-1.5.0.ebuild
new file mode 100644
index 000000000000..73016544dafa
--- /dev/null
+++ b/dev-java/jflex/jflex-1.5.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="http://www.jflex.de/"
+SRC_URI="http://${PN}.de/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND=">=virtual/jre-1.5
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	>=dev-java/ant-core-1.7.0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/junit:0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+IUSE="${JAVA_PKG_IUSE} source vim-syntax"
+
+java_prepare() {
+	cp "${FILESDIR}"/"${P}"-build.xml "${S}"/build.xml
+}
+
+# TODO: Try to avoid using bundled jar (See bug #498874)
+#
+# Currently, this package uses an included JFlex.jar file to bootstrap.
+# Upstream was contacted and this bootstrap is really needed. The only way to
+# avoid it would be to use a supplied pre-compiled .scanner file.
+
+EANT_GENTOO_CLASSPATH="ant-core"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+WANT_ANT_TASKS="javacup"
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	# Compile another time, using our generated jar; for sanity.
+	cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA}
+	java-pkg-2_src_compile
+}
+
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet.
+RESTRICT="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	java-pkg_dolauncher "${P}" --main jflex.Main
+	java-pkg_register-ant-task
+
+	if use doc ; then
+		dodoc doc/manual.pdf changelog.md
+		dohtml -r doc/*
+		java-pkg_dojavadoc javadoc
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/main
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/jflex.vim"
+	fi
+}
diff --git a/dev-java/jflex/jflex-1.5.1.ebuild b/dev-java/jflex/jflex-1.5.1.ebuild
new file mode 100644
index 000000000000..ea44f064676f
--- /dev/null
+++ b/dev-java/jflex/jflex-1.5.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="http://www.jflex.de/"
+SRC_URI="http://${PN}.de/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND=">=virtual/jre-1.5
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	>=dev-java/ant-core-1.7.0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/junit:0
+	>=dev-java/javacup-0.11a_beta20060608:0"
+
+IUSE="${JAVA_PKG_IUSE} source vim-syntax"
+
+java_prepare() {
+	# use a more convenient version number
+	sed -i s:"\(name=\"version\" value=\"\)[^\"]*\"":"\1${PV}\"":g build.xml
+	# fix bootstrapping
+	sed -i s:"\(name=\"bootstrap.version\" value=\"\)[^\"]*\"":"\1${PV}\"":g \
+		build.xml
+	# add javadoc capability to build.xml
+	sed -i s,"\(</project>\)",\
+"\n  <target depends=\"compile\" name=\"javadoc\">\n    <javadoc \
+packagenames=\"jflex\" sourcepath=\"src/main/java:build/generated-\
+sources\" destdir=\"javadoc\" version=\"true\" />\n  </target>\n\1",g \
+		build.xml
+}
+
+# TODO: Try to avoid using bundled jar (See bug #498874)
+#
+# Currently, this package uses an included JFlex.jar file to bootstrap.
+# Upstream was contacted and this bootstrap is really needed. The only way to
+# avoid it would be to use a supplied pre-compiled .scanner file.
+
+EANT_GENTOO_CLASSPATH="ant-core"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+WANT_ANT_TASKS="javacup"
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	# Compile another time, using our generated jar; for sanity.
+	cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA}
+	java-pkg-2_src_compile
+}
+
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet.
+RESTRICT="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	java-pkg_dolauncher "${P}" --main jflex.Main
+	java-pkg_register-ant-task
+
+	if use doc ; then
+		dodoc doc/manual.pdf changelog.md
+		dohtml -r doc/*
+		java-pkg_dojavadoc javadoc
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/main
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/jflex.vim"
+	fi
+}
diff --git a/dev-java/jflex/jflex-1.6.0.ebuild b/dev-java/jflex/jflex-1.6.0.ebuild
new file mode 100644
index 000000000000..d23a6cee6dee
--- /dev/null
+++ b/dev-java/jflex/jflex-1.6.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="http://www.jflex.de/"
+SRC_URI="http://${PN}.de/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.6"
+KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="dev-java/ant-core:0
+	>=dev-java/javacup-0.11a_beta20060608:0
+	dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.5
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+
+IUSE="${JAVA_PKG_IUSE} source vim-syntax"
+
+java_prepare() {
+	# use a more convenient version number
+	sed -i s:"\(name=\"version\" value=\"\)[^\"]*\"":"\1${PV}\"":g build.xml
+	# fix bootstrapping
+	sed -i s:"\(name=\"bootstrap.version\" value=\"\)[^\"]*\"":"\1${PV}\"":g \
+		build.xml
+	# add javadoc capability to build.xml
+	sed -i s,"\(</project>\)",\
+"\n  <target depends=\"compile\" name=\"javadoc\">\n    <javadoc \
+packagenames=\"jflex\" sourcepath=\"src/main/java:build/generated-\
+sources\" destdir=\"javadoc\" version=\"true\" />\n  </target>\n\1",g \
+		build.xml
+}
+
+# TODO: Try to avoid using bundled jar (See bug #498874)
+#
+# Currently, this package uses an included JFlex.jar file to bootstrap.
+# Upstream was contacted and this bootstrap is really needed. The only way to
+# avoid it would be to use a supplied pre-compiled .scanner file.
+
+EANT_GENTOO_CLASSPATH="ant-core"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+WANT_ANT_TASKS="javacup"
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	# Compile another time, using our generated jar; for sanity.
+	cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA}
+	java-pkg-2_src_compile
+}
+
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet.
+RESTRICT="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	java-pkg_dolauncher "${PN}-${SLOT}" --main jflex.Main
+	java-pkg_register-ant-task
+
+	if use doc ; then
+		dodoc doc/manual.pdf changelog.md
+		dohtml -r doc/*
+		java-pkg_dojavadoc javadoc
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/main
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/jflex.vim"
+	fi
+}
diff --git a/dev-java/jflex/metadata.xml b/dev-java/jflex/metadata.xml
new file mode 100644
index 000000000000..7b350e8431cd
--- /dev/null
+++ b/dev-java/jflex/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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..314794ab58a0
--- /dev/null
+++ b/dev-java/jformatstring/Manifest
@@ -0,0 +1 @@
+DIST findbugs-3.0.1-source.zip 9625065 SHA256 bd8ec66550d419ed40283bd78a6268f9af57dcad20b732a9309fd1835abd33ff SHA512 d967769f2356f28b34d92c7451cf3e2ac004e667bfc3b049b5b10b1c19d7be2cfa0db132a77698d042300330f77a2bb5dd8c4baa0d67c37b7e5ae6da9e83a64f WHIRLPOOL 9e407cb5733560d6a548da37becdf1b1b120459a2453d85d4a345a7ff30a3ba1d92179a2586ebfac3c23c6d20f591aed6429b501d6ec791f4b1a390ab77ce387
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..43592fa3ebba
--- /dev/null
+++ b/dev-java/jformatstring/jformatstring-2.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://code.google.com/p/j-format-string"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~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..be188d74bc12
--- /dev/null
+++ b/dev-java/jformatstring/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..7c0cd27b6cb3
--- /dev/null
+++ b/dev-java/jfreechart/Manifest
@@ -0,0 +1,3 @@
+DIST jfreechart-1.0.13.tar.gz 6306139 SHA256 8b8286cc86d898961f307bcba1f8b6f6471bd0e921562adf573f2758b090c175 SHA512 6b4e2079fa4eb4cebec709a95e7b1bff4d7233dbdd26c7e3173e75fc29facc9accc64039a62e5d89c83c3aedbd9cd9bc42d5de79f77de08d7027dba8ba9a4d68 WHIRLPOOL 0dbf55f4b53687eb31116c9ba6ab556296a7f915ffc859ddda739ca2bf633e31da6c692289a08859a315e7cb53e571c54fa117d666ed9ca3f789c891597444b6
+DIST jfreechart-1.0.14.tar.gz 6376551 SHA256 9250d0ab465fed67aa6f48090854258d9d0053f519ca534e267a8bb84a6727f2 SHA512 4d2344553032aa138143d88ad91942ffc66385d90b3d8f279f4257ef2273012580e99a60107baffefa3ea4e33cb0bad9e656a42747a4d0132642d5b9cb27da7b WHIRLPOOL 13cd39d4f287291eed725ba0229f44187b63466348c347c7acb0e6137d3c638136d1d973e8fdac31c7aec32793bf3864cc339df01abf0588763a77052a351e4d
+DIST jfreechart-1.0.19.zip 8050676 SHA256 bfe8d38fd48250dc04a3ff1aff477f2d226f49ba1ec2732ded981a3fccfc66f2 SHA512 6345e6a6b4a82862f3908794efb70a6f5413f313ba5bcff1dfb713d21948034d80c743a0cea61be81921c62736b07209ed4b942fedca0c76226b1202a4596b31 WHIRLPOOL 69a5d4c1851fd613a70cdc49904671f22cd7edd25b956c67cdcda5f5960228bfa0932907f0f4432685d4310851ffcd4e1e7283d2f2187a06666b296e84606cc0
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch
new file mode 100644
index 000000000000..8665a15aa0e2
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch
@@ -0,0 +1,58 @@
+diff -Nur jfreechart-1.0.13/ant/build.xml jfreechart-1.0.13_patched/ant/build.xml
+--- jfreechart-1.0.13/ant/build.xml	2009-04-20 11:23:40.000000000 +0300
++++ jfreechart-1.0.13_patched/ant/build.xml	2009-05-11 23:36:27.000000000 +0300
+@@ -40,11 +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"/>
+-                <include name="gnujaxp.jar" unless="JDK1.4+"/>
+-            </fileset>
++            <pathelement location="${jcommon.jar}"/>
++            <pathelement location="${servlet.jar}"/>
++            <pathelement location="${gnujaxp.jar}"/>
+         </path>
+ 
+     </target>
+@@ -324,7 +322,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"/>
+@@ -338,8 +336,8 @@
+             <classpath>
+                 <path refid="build.classpath"/>
+                 <pathelement location="${junit.jar}"/>
+-                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"/>
+-                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
++                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
++                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
+                 <pathelement location="${basedir}/build-tests"/>
+             </classpath>
+         </javac>
+@@ -357,7 +355,7 @@
+         <junit printSummary="yes" 
+                haltonerror="true" 
+                haltonfailure="true"
+-               fork="true" 
++               fork="false" 
+                dir=".">
+             
+             <sysproperty key="basedir" value="."/>
+@@ -365,8 +363,8 @@
+             <classpath>
+                 <path refid="build.classpath"/>
+                 <pathelement location="${junit.jar}"/>
+-                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"/>
+-                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
++                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
++                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
+                 <pathelement location="${basedir}/build-tests"/>
+             </classpath>
+             <batchtest todir="${basedir}/build-tests-reports">
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch
new file mode 100644
index 000000000000..f07e5be5df41
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch
@@ -0,0 +1,35 @@
+--- 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,11 +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"/>
+-                <include name="gnujaxp.jar" unless="JDK1.4+"/>
+-            </fileset>
++            <pathelement location="${jcommon.jar}"/>
++            <pathelement location="${servlet.jar}"/>
++            <pathelement location="${gnujaxp.jar}"/>
+         </path>
+ 
+     </target>
+@@ -321,7 +319,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"/>
+@@ -354,7 +352,7 @@
+         <junit printSummary="yes"
+                haltonerror="true"
+                haltonfailure="true"
+-               fork="true"
++               fork="false"
+                dir=".">
+ 
+             <sysproperty key="basedir" value="."/>
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch b/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch
new file mode 100644
index 000000000000..b932d863bf83
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch
@@ -0,0 +1,24 @@
+--- a/tests/org/jfree/data/time/junit/TimeSeriesCollectionTests.java	2011-11-20 22:40:13.000000000 +0100
++++ b/tests/org/jfree/data/time/junit/TimeSeriesCollectionTests.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/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/files/jfreechart-1.0.4-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.4-build.xml.patch
new file mode 100644
index 000000000000..cf4c9ada537f
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.4-build.xml.patch
@@ -0,0 +1,11 @@
+--- ant/build.xml.original	2007-02-09 23:44:42.000000000 +0100
++++ ant/build.xml	2007-02-09 23:45:01.000000000 +0100
+@@ -338,7 +338,7 @@
+         <junit printSummary="yes" 
+                haltonerror="true" 
+                haltonfailure="true"
+-               fork="true" 
++               fork="false" 
+                dir=".">
+             
+             <sysproperty key="basedir" value="."/>
diff --git a/dev-java/jfreechart/jfreechart-1.0.13.ebuild b/dev-java/jfreechart/jfreechart-1.0.13.ebuild
new file mode 100644
index 000000000000..b2e51e4ff9a8
--- /dev/null
+++ b/dev-java/jfreechart/jfreechart-1.0.13.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+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}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+COMMON_DEPEND="
+	>=dev-java/itext-1.4.6:0
+	dev-java/jcommon:1.0
+	java-virtuals/servlet-api:2.3"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}
+	test? ( dev-java/ant-junit:0 )"
+RDEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	rm -v *.jar lib/*.jar || die
+}
+
+src_compile() {
+	# Note that compile-experimental depends on compile so it is sufficient to run
+	# just compile-experimental
+	eant -f ant/build.xml compile-experimental $(use_doc) $(get_jars)
+}
+
+src_test() {
+	# X11 tests are disabled using java.awt.headless=true
+	ANT_TASKS="ant-junit" \
+	ANT_OPTS="-Djava.awt.headless=true -Duser.timezone=UTC" \
+		eant -f ant/build.xml test $(get_jars)
+}
+
+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 || die
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc source/org
+}
+
+get_jars() {
+	local antflags="
+		-Ditext.jar=$(java-pkg_getjar itext iText.jar) \
+		-Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar) \
+		-Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)"
+	use test && antflags="${antflags} \
+		-Djunit.jar=$(java-pkg_getjars --build-only junit)"
+	echo "${antflags}"
+}
diff --git a/dev-java/jfreechart/jfreechart-1.0.14.ebuild b/dev-java/jfreechart/jfreechart-1.0.14.ebuild
new file mode 100644
index 000000000000..360f185d4333
--- /dev/null
+++ b/dev-java/jfreechart/jfreechart-1.0.14.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="+servlet test"
+
+COMMON_DEPEND="
+	>=dev-java/itext-2.1.5:0
+	>=dev-java/jcommon-1.0.17:1.0
+	servlet? ( java-virtuals/servlet-api:2.3 )"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# Fix test failure, obtained from
+	# http://sourceforge.net/p/jfreechart/bugs/1100/
+	epatch "${FILESDIR}/${P}-fix-TimeSeriesCollectionTests.patch"
+
+	rm -v *.jar lib/*.jar || die
+
+	if ! use servlet; then
+		rm -rf source/org/jfree/chart/servlet || die
+	fi
+}
+
+src_compile() {
+	# Note that compile-experimental depends on compile so it is sufficient to run
+	# just compile-experimental
+	eant -f ant/build.xml compile-experimental $(use_doc) $(get_jars)
+}
+
+src_test() {
+	# X11 tests are disabled using java.awt.headless=true
+	ANT_TASKS="ant-junit" \
+	ANT_OPTS="-Djava.awt.headless=true -Duser.timezone=UTC" \
+		eant -f ant/build.xml test $(get_jars)
+}
+
+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
+}
+
+get_jars() {
+	local antflags="
+		-Ditext.jar=$(java-pkg_getjar itext iText.jar) \
+		-Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar)"
+
+	use servlet && antflags="${antflags} \
+		-Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)"
+
+	use test && antflags="${antflags} \
+		-Djunit.jar=$(java-pkg_getjars --build-only junit)"
+
+	echo "${antflags}"
+}
diff --git a/dev-java/jfreechart/jfreechart-1.0.19.ebuild b/dev-java/jfreechart/jfreechart-1.0.19.ebuild
new file mode 100644
index 000000000000..01e0668935b7
--- /dev/null
+++ b/dev-java/jfreechart/jfreechart-1.0.19.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+servlet test"
+
+CDEPEND=">=dev-java/jcommon-1.0.23:1.0
+	dev-java/jfreesvg:2.1
+	servlet? ( java-virtuals/servlet-api:2.3 )"
+
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+RESTRICT='test'
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.0.19-build.xml.patch"
+
+	# Fix test failure, obtained from
+	# http://sourceforge.net/p/jfreechart/bugs/1100/
+	epatch "${FILESDIR}/${PN}-1.0.19-fix-TimeSeriesCollectionTest.patch"
+
+	rm -v lib/*.jar || die
+
+	# links to orsonpdf which is only available for purchase under a commercial license
+	rm -v "${P}-demo.jar" || die
+
+	if ! use servlet; then
+		rm -rf source/org/jfree/chart/servlet || die
+	fi
+}
+
+src_compile() {
+	# Note that compile-experimental depends on compile so it is sufficient to run
+	# just compile-experimental
+	eant -f ant/build.xml compile-experimental $(use_doc) $(get_jars)
+}
+
+# Tests fail due to:
+# Caught an exception while logging the end of the build.  Exception was:
+# java.lang.OutOfMemoryError: PermGen space
+# java.lang.OutOfMemoryError: PermGen space
+# I don't think there's much we can do here.
+# src_test() {
+# 	# X11 tests are disabled using java.awt.headless=true
+# 	ANT_TASKS="ant-junit" \
+# 	ANT_OPTS="-Djava.awt.headless=true -Duser.timezone=UTC" \
+# 		eant -f ant/build.xml test $(get_jars)
+# }
+
+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
+}
+
+get_jars() {
+	local antflags="
+		-Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar) \
+		-Djfreesvg.jar=$(java-pkg_getjar jfreesvg-2.1 jfreesvg.jar)"
+
+	use servlet && antflags="${antflags} \
+		-Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)"
+
+	use test && antflags="${antflags} \
+		-Djunit.jar=$(java-pkg_getjars --build-only junit-4)"
+
+	echo "${antflags}"
+}
diff --git a/dev-java/jfreechart/metadata.xml b/dev-java/jfreechart/metadata.xml
new file mode 100644
index 000000000000..c70c3f8a99f0
--- /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>
+	<herd>java</herd>
+	<use>
+		<flag name="servlet">Build a servlet using the servlet API.</flag>
+	</use>
+	<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..81a143fbd335
--- /dev/null
+++ b/dev-java/jfreesvg/Manifest
@@ -0,0 +1,2 @@
+DIST jfreesvg-2.1.zip 2042545 SHA256 51601035bd7d35c16c2bb7ffafa38e94ffa57f52c7df37a9a7f53e773a89be46 SHA512 6c1556c640e749778aeb969540db7724895fe2113a7ceea732793730301dd04a1beafef35249b27b75696271bcd67a59236a15c106f7717482561011a1a08bc4 WHIRLPOOL b4e6e4c527822ed6729910059b480a3213e7c3b11f34b55c197793e84f3e9de54986fc2480f03f353ad019935fd927e4d57b61c55c01128a8b93545e5653b10c
+DIST jfreesvg-3.0.zip 1946062 SHA256 b7045b95ef51ef68b3c48308b72d5aee666a02606ace938bd1e54e3eca4502d0 SHA512 7d0bdcbf56f0a7110058137d53e291c41e53040cbc19442989a0c6d28f5d6d3ed26ecedbfc947ce845b8a971729e2d784e8ce5a041f6f095ff626a3494a55715 WHIRLPOOL e179d71b71ca25171f58baf729e89e0cea9a6ebd9ea7c723ee6391fdb2fa2c59a4aef73d4d42e49335b53b78cdd4b3813ac9c3aef990ac8ce7881f8b666ee957
diff --git a/dev-java/jfreesvg/jfreesvg-2.1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1.ebuild
new file mode 100644
index 000000000000..4678b34b1b7d
--- /dev/null
+++ b/dev-java/jfreesvg/jfreesvg-2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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/jfreesvg-3.0.ebuild b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
new file mode 100644
index 000000000000..527cda860757
--- /dev/null
+++ b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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..3253c0e8b45d
--- /dev/null
+++ b/dev-java/jfreesvg/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>
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+	<herd>java</herd>
+	<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..5e581c7b7cbe
--- /dev/null
+++ b/dev-java/jgoodies-animation/Manifest
@@ -0,0 +1 @@
+DIST animation-1_2_0.zip 728028 SHA256 a981ee7e9028158b77a10be4f748bfeb3b486dfcdf1e6abf2f4b3da94ee765b3 SHA512 2220630d7fd70a98b6d9605de7a1d6fc3470cc19b39815b9777e6bc8cf7db74ce77338861dde45aafbe336ce8b48ee00bcd8149af701a7001869cd3da3cf6a72 WHIRLPOOL 3e42585c5f31b7f6db5faba70bd19147a16cb061a4965f1b8746a79c74ce1553ecde98378a255e8d33d78b8b033789f448df23f881025c262cc082916b50a3fb
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..67b072564242
--- /dev/null
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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..d76e113857fb
--- /dev/null
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc 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..604e0a4238bb
--- /dev/null
+++ b/dev-java/jgoodies-animation/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/jgoodies-binding/Manifest b/dev-java/jgoodies-binding/Manifest
new file mode 100644
index 000000000000..cf2bd059a38d
--- /dev/null
+++ b/dev-java/jgoodies-binding/Manifest
@@ -0,0 +1 @@
+DIST binding-1_1_2.zip 1265099 SHA256 dcefcf854c9cfad7281ba86f767191ab657a0e34afe83075c96925fb44cf2958 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7 WHIRLPOOL 9660c62af445d28632c31a2fc0d7266d9bbbb8dcecb9080d63d2bbefc750d7501468dc8759c887c3019371595267af7b955717c6d13e2bce118be1c2c6358e1d
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..736d3e014154
--- /dev/null
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
new file mode 100644
index 000000000000..381d4513c7a1
--- /dev/null
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc 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..fa29e527abcb
--- /dev/null
+++ b/dev-java/jgoodies-binding/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..92618081e07e
--- /dev/null
+++ b/dev-java/jgoodies-common/Manifest
@@ -0,0 +1,2 @@
+DIST jgoodies-common-1_2_1.zip 271803 SHA256 0fe2ede31e70a633c2a157b99594701e4206c4207f7a3f6e97b15121cac32dfb SHA512 c31c00e9a79eacec92a20cecd0b3e8c3a5739e14f46bdc1b348c801925777d5433077c5f0c81e5526f95aa2d993449115c517945a3381185663494c6e4577d92 WHIRLPOOL 3edbddb83405867437ca2ef97466b4e9a3509c2b117ca6666425679cbb6ef7d7e44bdbd615728efdbc687e81e6602e7057b57f26af1b55b3a94114d598ae2362
+DIST jgoodies-common-1_8_0.zip 575972 SHA256 602873af50ca8251623cb7f2fcfb9d4289844834670dba10c143e70380cad685 SHA512 c00ffb6498b40b214bccad3ee8f0f3a9231bb8e67243be5ea15956694466485ac75aeed09f340aea323c6989190c10015b7a72b82d5a251bb5ea12ddaedb6b25 WHIRLPOOL 61dc47e3c00842999572b49c61d6fa6383f44dbe658647202f6599ea00b76e301903af2386bce4134a777fed00f5f307f6e16d1a31fd821700fed4d2216d18a8
diff --git a/dev-java/jgoodies-common/jgoodies-common-1.2.1.ebuild b/dev-java/jgoodies-common/jgoodies-common-1.2.1.ebuild
new file mode 100644
index 000000000000..380240e588a6
--- /dev/null
+++ b/dev-java/jgoodies-common/jgoodies-common-1.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+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="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+java_prepare() {
+	# Remove the packaged jars
+	find . -name "*.jar" -delete || die "rm failed"
+}
+
+src_compile() {
+	# it does not like unset ${build.compiler.executable}
+	# feel free to fix if you want jikes back
+	java-pkg_filter-compiler jikes
+	# not setting the bootcp breaks ecj, javac apparently ignores nonsense
+	eant -Dbuild.boot.classpath="$(java-config -g BOOTCLASSPATH)" jar
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+
+	dodoc RELEASE-NOTES.txt README.html || die
+
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/core/com
+}
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..d1077902aae9
--- /dev/null
+++ b/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-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..604e0a4238bb
--- /dev/null
+++ b/dev-java/jgoodies-common/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/jgoodies-forms/Manifest b/dev-java/jgoodies-forms/Manifest
new file mode 100644
index 000000000000..55cf18c64d9f
--- /dev/null
+++ b/dev-java/jgoodies-forms/Manifest
@@ -0,0 +1,2 @@
+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
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..8192263eb065
--- /dev/null
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 Forms 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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+EANT_FILTER_COMPILTER="jikes"
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar build/${MY_PN}.jar
+
+	dodoc RELEASE-NOTES.txt README.html || die
+
+	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.3.0.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0.ebuild
new file mode 100644
index 000000000000..db3897209d9a
--- /dev/null
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="forms"
+MY_PV=${PV//./_}
+MY_P="${MY_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="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	unpack ${A} || die "Unpack failed"
+	cd "${S}"
+
+	# Remove the packaged jars
+	rm -v *.jar || die "rm failed"
+}
+
+src_compile() {
+	# it does not like unset ${build.compiler.executable}
+	# feel free to fix if you want jikes back
+	java-pkg_filter-compiler jikes
+	# not setting the bootcp breaks ecj, javac apparently ignores nonsense
+	eant -Dbuild.boot.classpath="$(java-config -g BOOTCLASSPATH)" jar
+}
+
+#Needs X
+#src_test() {
+#	ANT_TASKS="ant-junit" eant test \
+#		-Djunit.jar="$(java-pkg_getjars junit)"
+#}
+
+src_install() {
+	java-pkg_dojar build/${MY_PN}.jar
+
+	dodoc RELEASE-NOTES.txt README.html || die
+
+	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..e014cf0f0adf
--- /dev/null
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..604e0a4238bb
--- /dev/null
+++ b/dev-java/jgoodies-forms/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/jgoodies-looks/Manifest b/dev-java/jgoodies-looks/Manifest
new file mode 100644
index 000000000000..7aa430b6b3be
--- /dev/null
+++ b/dev-java/jgoodies-looks/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/dev-java/jgoodies-looks/files/build.xml b/dev-java/jgoodies-looks/files/build.xml
new file mode 100644
index 000000000000..b24ec32156b4
--- /dev/null
+++ b/dev-java/jgoodies-looks/files/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-2.0.4-build.xml.patch b/dev-java/jgoodies-looks/files/jgoodies-looks-2.0.4-build.xml.patch
new file mode 100644
index 000000000000..e6c0a4be2330
--- /dev/null
+++ b/dev-java/jgoodies-looks/files/jgoodies-looks-2.0.4-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/files/plastic.txt b/dev-java/jgoodies-looks/files/plastic.txt
new file mode 100644
index 000000000000..ab3737ca6a30
--- /dev/null
+++ b/dev-java/jgoodies-looks/files/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/jgoodies-looks-1.2.2-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..d41641f7c421
--- /dev/null
+++ b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.4.2
+	dev-java/ant-core
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4.2"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm *.jar
+	unzip ${MY_PN}-${PV}-src.zip &> /dev/null || die "Unpack Failed"
+	cp "${FILESDIR}/build.xml" "${FILESDIR}/plastic.txt" .
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar ${MY_PN}.jar
+
+	dodoc RELEASE-NOTES.txt
+	use doc && java-pkg_dohtml -r build/doc
+}
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..9747aba4322c
--- /dev/null
+++ b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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() {
+	find -name "*.jar" -delete || die
+	cp "${FILESDIR}/build.xml" "${FILESDIR}/plastic.txt" "${S}" || 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..35f874770460
--- /dev/null
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit eutils 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 ~ppc ~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}/${PN}-2.0.4-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
+
+	find -name "*.jar" -delete || die
+}
+
+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.3.1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild
new file mode 100644
index 000000000000..ee85bbf3c55b
--- /dev/null
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils 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 ppc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# remove the bootclasspath brokedness, make building demo optional
+	epatch "${FILESDIR}/${PN}-2.0.4-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
+
+	rm -v *.jar demo/*.jar lib/*.jar || die
+	rm -rv docs/api || die
+}
+
+src_compile() {
+	# bug #150970
+	java-pkg_filter-compiler jikes
+
+	# jar target fails unless we make descriptors.dir an existing directory
+	# I checked the ustream binary distribution and they also don't actually
+	# put anything there.
+	# 31.7.2006 betelgeuse@gentoo.org
+	# update: it's where it looks for all.txt file
+	# 16.1.2007 caster@gentoo.org
+	eant -Ddescriptors.dir="${S}" jar-all $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar build/looks.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml README.html || die
+	if use doc; then
+		java-pkg_dohtml -r docs/*
+		java-pkg_dojavadoc build/docs/api
+	fi
+	use source && java-pkg_dosrc src/core/com
+}
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..06e388c00a32
--- /dev/null
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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=""
+
+COMMON_DEPEND="dev-java/jgoodies-common:1.8"
+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-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..604e0a4238bb
--- /dev/null
+++ b/dev-java/jgoodies-looks/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/jgraph/Manifest b/dev-java/jgraph/Manifest
new file mode 100644
index 000000000000..de6210a0c329
--- /dev/null
+++ b/dev-java/jgraph/Manifest
@@ -0,0 +1 @@
+DIST jgraph-5.12.0.4-lgpl-src.jar 3460750 SHA256 73b8b6a656a0c8ae8ec0b42ea27633c3bab22e981859aa3570c597f7f051ac04 SHA512 0832afeb28c4d5abb9288de4e1b74eefc432bb98f622e71f0d192bf9f01741feb406ba0473b923e0cb93401120c1456a00eec4653355c37bff7e9e1863e81b5d WHIRLPOOL 89b21eea236717aaf9cd885c227b43d8a81702ee1f51fcacd8139df474dda3ac1bfa2892a17d998efbacf147ebd29c71bbb555d7a0a40561bedecba839d0944c
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..e18fae7f354f
--- /dev/null
+++ b/dev-java/jgraph/jgraph-5.12.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..675eebf3a12f
--- /dev/null
+++ b/dev-java/jgraph/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..bcdcc18a4217
--- /dev/null
+++ b/dev-java/jgrapht/Manifest
@@ -0,0 +1 @@
+DIST jgrapht-0.8.3.tar.gz 1268147 SHA256 be8232508220773b7b94928da17547d32a68ba9697f7ff15f4f09bd9b2a7aa45 SHA512 964790dc74fea1d84f4a4cda4a253ede810725ee7173a2b376acb3f0e10baa2eefcbc38c76441600e0c282e0486243a464116cb803308eac134561181a2c28e6 WHIRLPOOL 53cc13347c092b70210b5246692cf71261c5014706dc6adcca16fbf8ed0b774b20a41a00c6f8e819d5e52e78ddcd84c48ae339cde45d7314f1ad39cfb2823670
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..e62efc8d3108
--- /dev/null
+++ b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc 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..b6ac288e0445
--- /dev/null
+++ b/dev-java/jgrapht/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..67812756fb7d
--- /dev/null
+++ b/dev-java/jgroups/Manifest
@@ -0,0 +1 @@
+DIST JGroups-2.9.0.GA.src.zip 9227273 SHA256 d8094e696b399e109a71289ddb4dc62c0ac52000528bc800056d225b80871a53 SHA512 5482e3a7d895db4d455f92d14c27559eca9370146b397efa4dc17c416a3b833fcfe0753117ca00e1445e49be239f817aad9bb8b626c1b0fb68869f7d1c9ad0df WHIRLPOOL cd46cb18db2b5fdda63f11b76793e58e2b2d8cad1a7e9d391c315b383498bc592ac6ac463dffdae1a33d9e01973fb9030b147b945a72d2ee2a81c692fb2c8f37
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..810dd77bea48
--- /dev/null
+++ b/dev-java/jgroups/jgroups-2.9.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..135a729b92b4
--- /dev/null
+++ b/dev-java/jgroups/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..bca36240efff
--- /dev/null
+++ b/dev-java/jibx-tools/Manifest
@@ -0,0 +1 @@
+DIST jibx_1_1_5.zip 6788994 SHA256 121dbe5b7338081ffbf09cd1175afe5e1862a63673f467d560e0ab4c27fb3f17 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7 WHIRLPOOL 427b9970850f5497796e65e43200262e567965bd5ae07f59893f00eba4cf6942a70cf15fb0985d99e26c649e56f175b8dd0b1451b77c27a9859b196bc5cd9d91
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..62045bb241da
--- /dev/null
+++ b/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/metadata.xml b/dev-java/jibx-tools/metadata.xml
new file mode 100644
index 000000000000..bc6fbe14e0bb
--- /dev/null
+++ b/dev-java/jibx-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..bca36240efff
--- /dev/null
+++ b/dev-java/jibx/Manifest
@@ -0,0 +1 @@
+DIST jibx_1_1_5.zip 6788994 SHA256 121dbe5b7338081ffbf09cd1175afe5e1862a63673f467d560e0ab4c27fb3f17 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7 WHIRLPOOL 427b9970850f5497796e65e43200262e567965bd5ae07f59893f00eba4cf6942a70cf15fb0985d99e26c649e56f175b8dd0b1451b77c27a9859b196bc5cd9d91
diff --git a/dev-java/jibx/jibx-1.1.5-r1.ebuild b/dev-java/jibx/jibx-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..859cfc2ec047
--- /dev/null
+++ b/dev-java/jibx/jibx-1.1.5-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x64-macos ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+COMMON_DEP="dev-java/dom4j:1
+	dev-java/ant-core:0
+	dev-java/bcel:0
+	java-virtuals/stax-api
+	dev-java/xpp3:0"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	cd lib || die
+	rm -v *.jar || die
+	java-pkg_jar-from ant-core,bcel,dom4j-1,stax-api,xpp3
+}
+
+EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="small-jars"
+
+src_install() {
+	java-pkg_dojar "${S}"/lib/${PN}*.jar
+
+	dodoc changes.txt docs/binding.dtd docs/binding.xsd
+	dohtml readme.html
+
+	use doc && {
+		java-pkg_dohtml -r docs/*
+		cp -R starter "${ED}/usr/share/doc/${PF}"
+		cp -R tutorial "${ED}/usr/share/doc/${PF}"
+	}
+
+	use source && java-pkg_dosrc build/src/* build/extras/*
+}
diff --git a/dev-java/jibx/metadata.xml b/dev-java/jibx/metadata.xml
new file mode 100644
index 000000000000..bc6fbe14e0bb
--- /dev/null
+++ b/dev-java/jibx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..1d09189805fc
--- /dev/null
+++ b/dev-java/jicmp/Manifest
@@ -0,0 +1 @@
+DIST jicmp-1.0.2.tar.gz 348805 SHA256 3661c2dd59d8be3c72904fe2cd4e0d06054eef5f8e7f68023b6d241a594fe0db SHA512 8633f12fdbf978e0312c07966fa37ddb9d904fc9845343e7d947400352d3a42d53e83a97a847cd61cf44f4fd1a6a47bab208525155eadadf62c222995a6e2d7d WHIRLPOOL 003590f3f785b88fb739ae7a54b364a1ffe09213da03f081b7b88e49ea2d4af7f28bcaf8cb7ffa30eec5fecc524c0ec2f0bd8556c1eaa7d8acb09ac83630b7d7
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..3484acf856bd
--- /dev/null
+++ b/dev-java/jicmp/jicmp-1.0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1827a10ec19a
--- /dev/null
+++ b/dev-java/jicmp/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+	</longdescription>
+	<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..7c1a92eeb7af
--- /dev/null
+++ b/dev-java/jid3/Manifest
@@ -0,0 +1 @@
+DIST jid3_0.46.tar.gz 972609 SHA256 eab5813cf0268c4a114f0ac361e6ffbfc6e233d493cee8a6dba00334b1833491 SHA512 478a78601613ab0e7965145733f1adec10005ef8069deb0595880feb47b065573d66cb5eb2b810869970a6b0272f8fb3363e4946ba5737ad740e372875cfa707 WHIRLPOOL fbe23739d84e8bbc1134780c1788f45a8442ec309bbc9eb92724d4c226dbb0d2b6fdd42a10cb5fc82765423c0b5652a82b2fd11f8a42672bb2048640b6789127
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/files/0.46-tests.patch b/dev-java/jid3/files/0.46-tests.patch
new file mode 100644
index 000000000000..7c557a6a8528
--- /dev/null
+++ b/dev-java/jid3/files/0.46-tests.patch
@@ -0,0 +1,21 @@
+diff -ur src.old/org/blinkenlights/jid3/test/ID3V2Test.java src/org/blinkenlights/jid3/test/ID3V2Test.java
+--- src.old/org/blinkenlights/jid3/test/ID3V2Test.java	2007-05-05 14:15:53.000000000 +0300
++++ src/org/blinkenlights/jid3/test/ID3V2Test.java	2007-05-05 14:17:02.000000000 +0300
+@@ -2612,7 +2612,7 @@
+         throws Exception

+     {

+         File[] aoMP3File = getMP3FileList(oDirectory);

+-        for (int i=0; i < aoMP3File.length; i++)

++        for (int i=0; aoMP3File != null && i < aoMP3File.length; i++)

+         {

+             // mp3 file to read

+             MP3File oMP3File = new MP3File(aoMP3File[i]);

+@@ -2626,7 +2626,7 @@
+             }

+         }

+         File[] aoDirectory = getSubDirectories(oDirectory);

+-        for (int i=0; i < aoDirectory.length; i++)

++        for (int i=0; aoDirectory != null && i < aoDirectory.length; i++)

+         {

+             // subdirectory to recurse into

+             System.out.println("Recursing into subdirectory: " + aoDirectory[i].getAbsolutePath());

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..e0124316e0c1
--- /dev/null
+++ b/dev-java/jid3/jid3-0.46-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..5c85ecc2bd69
--- /dev/null
+++ b/dev-java/jid3/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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/jigsaw/Manifest b/dev-java/jigsaw/Manifest
new file mode 100644
index 000000000000..81940823e23f
--- /dev/null
+++ b/dev-java/jigsaw/Manifest
@@ -0,0 +1 @@
+DIST jigsaw_2.2.6.tar.bz2 4674802 SHA256 9d0b177c6e2bc07aff91648270ef09e50d3fc2fee0ce87940e29b43695265342 SHA512 99fb362468b13d250d4e5fe33e0dc397b3bd6a98e3c012da10bfdef93511bdf5ae7c0ad3498bbd191b6c07cc658ce55d3737721fdec8f474470cbfc66c4e049a WHIRLPOOL df879de51a084a187a1172212157c486192c5af891be4ebf3c721340bd28cfd78618349bfc0573ee334e54efc87fb170c4257f0263024afd1fc6624f80985020
diff --git a/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch b/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch
new file mode 100644
index 000000000000..d0225de839b8
--- /dev/null
+++ b/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch
@@ -0,0 +1,48 @@
+--- build.xml.vanilla	2012-02-23 01:17:09.137602588 +0100
++++ build.xml	2012-02-23 01:21:35.431836983 +0100
+@@ -79,6 +79,9 @@
+     <pathelement path="classes/xp.jar"/>
+     <pathelement path="classes/servlet.jar"/>
+     <pathelement path="${build.core.classes}"/>
++    <fileset dir="jars">
++        <include name="**/*.jar"/>
++    </fileset>
+   </path>
+ 
+   <!-- =================================================================== -->
+@@ -99,6 +102,7 @@
+   <!-- =================================================================== -->
+   <target name="compile.core" depends="prepare">
+     <javac srcdir="${src.dir}" 
++	   encoding="iso-8859-1"
+ 	   destdir="${build.core.classes}" 
+ 	   debug="${debug}"
+ 	   excludes="org/w3c/jigadm/** org/w3c/jigedit/**"
+@@ -111,6 +115,7 @@
+   <!-- =================================================================== -->
+   <target name="compile.admin" depends="compile.core">
+     <javac srcdir="${src.dir}" 
++	   encoding="iso-8859-1"
+ 	   destdir="${build.admin.classes}" 
+ 	   debug="${debug}"
+ 	   includes="org/w3c/jigadm/**"
+@@ -122,7 +127,8 @@
+   <!-- Compiles the edit package                                           -->
+   <!-- =================================================================== -->
+   <target name="compile.edit" depends="compile.core">
+-    <javac srcdir="${src.dir}" 
++    <javac srcdir="${src.dir}"
++	   encoding="iso-8859-1"
+ 	   destdir="${build.edit.classes}" 
+ 	   debug="${debug}"
+ 	   includes="org/w3c/jigedit/**"
+@@ -173,7 +179,9 @@
+   <target name="javadocs" depends="prepare">
+     <mkdir dir="${build.javadocs}"/>
+     <javadoc packagenames="${packages}"
++	     encoding="iso-8859-1"
+ 	     sourcepath="${src.dir}"
++		 classpathref="build.classpath"
+              destdir="${build.javadocs}"
+              author="true"
+              version="true"
diff --git a/dev-java/jigsaw/jigsaw-2.2.6.ebuild b/dev-java/jigsaw/jigsaw-2.2.6.ebuild
new file mode 100644
index 000000000000..db4345bf12ea
--- /dev/null
+++ b/dev-java/jigsaw/jigsaw-2.2.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+# Jigsaw is actually a WWW server, it would be nice to package it as such, not
+# as a raw library like this ebuild does.
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="W3 Consortium's Java-based Web server libraries"
+HOMEPAGE="http://jigsaw.w3.org/"
+SRC_URI="http://jigsaw.w3.org/Distrib/${PN}_${PV}.tar.bz2"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEP="dev-java/jakarta-oro:2.0
+	java-virtuals/servlet-api:2.3
+	dev-java/xerces:2
+	dev-java/jtidy"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+EANT_DOC_TARGET="javadocs"
+
+S="${WORKDIR}/Jigsaw"
+
+src_prepare() {
+	rm -f classes/*.jar
+	mkdir -p "${S}/jars" || die "mkdir failed"
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	java-pkg_jar-from --into jars/ jakarta-oro-2.0
+	java-pkg_jar-from --into jars/ servlet-api-2.3
+	java-pkg_jar-from --into jars/ xerces-2
+	java-pkg_jar-from --into jars/ jtidy
+
+	cd jars/
+	ln -s $(java-config --tools)
+}
+
+src_install() {
+	java-pkg_dojar classes/jigsaw.jar
+	java-pkg_dojar classes/jigadmin.jar
+	java-pkg_dojar classes/jigedit.jar
+
+	use doc && java-pkg_dojavadoc ant.build/javadocs
+
+	dodoc ANNOUNCE README
+}
diff --git a/dev-java/jigsaw/metadata.xml b/dev-java/jigsaw/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/jigsaw/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jikes/Manifest b/dev-java/jikes/Manifest
new file mode 100644
index 000000000000..90ddb1822d10
--- /dev/null
+++ b/dev-java/jikes/Manifest
@@ -0,0 +1 @@
+DIST jikes-1.22.tar.bz2 616655 SHA256 0cb02c763bc441349f6d38cacd52adf762302cce3a08e269f1f75f726e6e14e3 SHA512 6b318f49f075da0cf0558512748bd77072f5b5b0428160538bcba01201c94719ec0f4b0cd0159ddb04fb3a86c323c8f11f09dc4b31cf880fb94e00c1ee0bbc58 WHIRLPOOL 1c97d130c72933d2eb302e3de782f33c0ef2ca59377df554b6391f6eece41d7142a8652d9e9b5e49e0ab134dc7223793b7ef1f67c0fe2ad787993587a87855aa
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..1405cab6ca79
--- /dev/null
+++ b/dev-java/jikes/jikes-1.22-r13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..42250a2eee59
--- /dev/null
+++ b/dev-java/jikes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..752a22bdeb10
--- /dev/null
+++ b/dev-java/jinklevel/Manifest
@@ -0,0 +1 @@
+DIST jinklevel-0.1.tar.bz2 7892 SHA256 56a9fe8c21611d116662974e1dcf70157ce8d454abebb5705df349f17968f928 SHA512 6ec30afd7331e3ef3393f17495a3b0f5f89a014f5f5b3bb45113c1564e856e46b79d7c7f6fa079ed6436f28034175db84aa6ec69b2b662967808bd22b2d47797 WHIRLPOOL 5a0c72503f250fcdb0729b981199f3fb1e72c98f8071fc6743e70a9488d545646d848315287f4a4c55bc046c6fc780ebd27d9369f09d094d8f2f2273c9dbf48d
diff --git a/dev-java/jinklevel/jinklevel-0.1.ebuild b/dev-java/jinklevel/jinklevel-0.1.ebuild
new file mode 100644
index 000000000000..4739f81506b6
--- /dev/null
+++ b/dev-java/jinklevel/jinklevel-0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java binding for libinklevel"
+HOMEPAGE="http://mso.googlecode.com/"
+SRC_URI="http://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..6a298fd15827
--- /dev/null
+++ b/dev-java/jinklevel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+		<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..042f4a5faf6e
--- /dev/null
+++ b/dev-java/jinput/Manifest
@@ -0,0 +1 @@
+DIST jinput-2.0.6.tar.gz 1590738 SHA256 220f5cb5c9ab8d3fdce4429393f1cba4fb47f835c5cfb9a982292709d39b02f4 SHA512 770b3a0724334b9182098797923cc11e575b42cb67c5583d8aac7aeb432ec80189199daf1ef624a56923c4ecce271f05adf0481c13b8cd6997bb1862a7a91eba WHIRLPOOL 04e487510976980891b588c56be2245bce8d13145579f192761621c2b43511060c7a06fcbc3baf27f3ab31a55d735d0fa66bc0c3e2bdb068032014f118743bd0
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..63af1e2c156e
--- /dev/null
+++ b/dev-java/jinput/jinput-2.0.6-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e00447ceff66
--- /dev/null
+++ b/dev-java/jinput/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..9fed833d76e9
--- /dev/null
+++ b/dev-java/jisp/Manifest
@@ -0,0 +1 @@
+DIST jisp-2.5.1-source.tar.gz 63282 SHA256 fc45285b818f69aa92cab72f8a87a070eba9e8ee2c199b9d0e170fb2cf7ab7ba SHA512 b82bea547e6725e37285a5d332daeb8ecf300a6f69004845a308a3ee87f143e7a7e8be34925fd288523e36eea64479010915306ac33871b3bf4310c54a1c26d0 WHIRLPOOL 850f0b617066c30f347ff2d5c0e78b423be3ef062bd481f5610f43774a64421df7ca59613b30deceb152b055479b6392a9474d82094f25acdaa4ca4dc6df21af
diff --git a/dev-java/jisp/files/build-2.5.1.xml b/dev-java/jisp/files/build-2.5.1.xml
new file mode 100644
index 000000000000..1b8684e5d786
--- /dev/null
+++ b/dev-java/jisp/files/build-2.5.1.xml
@@ -0,0 +1,55 @@
+<?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="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <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}"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+         <fileset dir="${build}"/>
+		 <fileset dir="." includes="svfl.txt"/>
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+      <javadoc destdir="${dist}/doc/api">
+      	<fileset dir="${src}"/>
+      </javadoc>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
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-r2.ebuild b/dev-java/jisp/jisp-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..602a02f6adb3
--- /dev/null
+++ b/dev-java/jisp/jisp-2.5.1-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java Indexed Serialization Package: A small, embedded database engine written in Pure Java"
+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 ppc x86"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-java15.patch
+
+	mkdir src
+	mv com src
+	cp ${FILESDIR}/build-${PV}.xml build.xml
+}
+
+src_compile() {
+	eant jar -Dproject.name=${PN} $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	use doc && java-pkg_dohtml -r dist/doc/api
+}
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..48f0a2ce9b69
--- /dev/null
+++ b/dev-java/jisp/jisp-2.5.1-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 written in Pure Java"
+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 ppc 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..250f2d1940ea
--- /dev/null
+++ b/dev-java/jisp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jjtraveler/Manifest b/dev-java/jjtraveler/Manifest
new file mode 100644
index 000000000000..5e89abbe922a
--- /dev/null
+++ b/dev-java/jjtraveler/Manifest
@@ -0,0 +1 @@
+DIST JJTraveler-0.4.3.tar.gz 219594 SHA256 e873a57e59661b557bd73181c398c88efa1898dbb277df791cebc6ba6c8a1ad0 SHA512 fcaa2bbc736af95a0477f1d9a39d7d1410505c02214759baf3bed77b45d8bc9667cacbb7fdd954925038b6c67535bcf7af6c264347af18b150240d9796372c32 WHIRLPOOL 1ab5857492393843c7ba44024a165b8dd6a022c04a7a8e71ac3f02d98ac6e86b82c9b05efbfefd124a898a598eb80462606f3829d0a13027e6b6118ac902e94c
diff --git a/dev-java/jjtraveler/files/0.4.3-makefile.am.patch b/dev-java/jjtraveler/files/0.4.3-makefile.am.patch
new file mode 100644
index 000000000000..a15e304df8c4
--- /dev/null
+++ b/dev-java/jjtraveler/files/0.4.3-makefile.am.patch
@@ -0,0 +1,20 @@
+diff -ru JJTraveler-0.4.3-vanilla/Makefile.am JJTraveler-0.4.3-patched/Makefile.am
+--- JJTraveler-0.4.3-vanilla/Makefile.am	2004-04-14 08:55:45.000000000 -0400
++++ JJTraveler-0.4.3-patched/Makefile.am	2007-02-26 09:12:28.000000000 -0500
+@@ -26,5 +26,4 @@
+ noinst_SCRIPTS = ${PACKAGE}-${VERSION}.pkg
+ 
+ ${PACKAGE}-${VERSION}.pkg: ${PACKAGE}.pkg Makefile
+-	sed 's#__VERSION__#${VERSION}#g;\
+-             s#__PACKAGE__#${PACKAGE}#g' < $< > $@
++	sed 's#__VERSION__#${VERSION}#g;s#__PACKAGE__#${PACKAGE}#g' < $< > $@
+diff -ru JJTraveler-0.4.3-vanilla/scripts/Makefile.am JJTraveler-0.4.3-patched/scripts/Makefile.am
+--- JJTraveler-0.4.3-vanilla/scripts/Makefile.am	2004-02-02 10:12:10.000000000 -0500
++++ JJTraveler-0.4.3-patched/scripts/Makefile.am	2007-02-26 09:11:03.000000000 -0500
+@@ -5,5 +5,4 @@
+ EXTRA_DIST = jjtraveler-config.sh.src
+ 
+ % : %.sh.src Makefile
+-	sed 's@__PREFIX__@${prefix}@g;\
+-             s@__VERSION__@${VERSION}@g;' < $< > $@ && chmod +x $@
++	sed 's@__PREFIX__@${prefix}@g;s@__VERSION__@${VERSION}@g;' < $< > $@ && chmod +x $@
diff --git a/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild b/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild
new file mode 100644
index 000000000000..665943d168e8
--- /dev/null
+++ b/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source doc"
+
+inherit autotools java-pkg-2
+
+DESCRIPTION="A visitor combinator framework for Java"
+HOMEPAGE="http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATermLibrary"
+MY_P=JJTraveler-${PV}
+SRC_URI="http://www.cwi.nl/projects/MetaEnv/jjtraveler/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+S=${WORKDIR}/${MY_P}
+
+DEPEND="
+	>=virtual/jdk-1.4
+	=dev-java/junit-3.8*"
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/junit-3.8*"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/0.4.3-makefile.am.patch"
+	eautoreconf
+
+	(
+		echo "#!/bin/sh"
+		echo "java-config -p ${PN}"
+	) > "${S}/jjtraveler-config"
+
+	rm -v jars/*.jar || die
+	cd jars
+	java-pkg_jar-from junit
+}
+
+src_compile() {
+	econf \
+		--with-javac-flags="$(java-pkg_javac-args)"
+	emake || die "emake failed"
+	if use doc; then
+		cd src/jjtraveler
+		make htmljava.stamp || die "Failed to create javadoc"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar ./src/${P}.jar
+
+	dobin jjtraveler-config || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+
+	use source && java-pkg_dosrc src/jjtraveler
+	use doc && java-pkg_dojavadoc src/jjtraveler/doc
+}
diff --git a/dev-java/jjtraveler/metadata.xml b/dev-java/jjtraveler/metadata.xml
new file mode 100644
index 000000000000..1fa958f67ed4
--- /dev/null
+++ b/dev-java/jjtraveler/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<longdescription>
+JJTraveler: a visitor combinator framework for Java.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jlayer/Manifest b/dev-java/jlayer/Manifest
new file mode 100644
index 000000000000..b7701f4dded6
--- /dev/null
+++ b/dev-java/jlayer/Manifest
@@ -0,0 +1 @@
+DIST jlayer1.0.1.tar.gz 370583 SHA256 1492b28a62fdf13d3f42bb2ffa5628c33327c42df5d7b66194937c65deb6382f SHA512 904c3aa049d9be4c5569a233abd8c933fe85c58b26cf9e467d01e09a4245fe9933f8e7d8e3b2abf328e6f7a197f69acdcbde494b99c97056eab2e4936060ee08 WHIRLPOOL 50ab10177a2df905d478bcc8bd21f7cf12d89620c8f557994e9f52a9e48cfb5d3980f98e5d3706b65b95359a26677aa47c4546924432d885c5c51eb11f3fa216
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..eafa8fe026f3
--- /dev/null
+++ b/dev-java/jlayer/jlayer-1.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7303cef96964
--- /dev/null
+++ b/dev-java/jlayer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jldap/Manifest b/dev-java/jldap/Manifest
new file mode 100644
index 000000000000..8c798001c035
--- /dev/null
+++ b/dev-java/jldap/Manifest
@@ -0,0 +1 @@
+DIST jldap-4.6.tar.gz 527547 SHA256 58772b10c86f7a76a9889f3077cfdacaf1427451bcd5669deeaf986aa0c0dd2f SHA512 e949b8ee8d262a88db913a3359ad536d958c69c12c1baeaf32f7f0006d1354c7c5128e20bd557a281da3a99b20522692f7417c6d4c76fc8b5743d91f8b342ddb WHIRLPOOL 498994cc1f63be57816e73b40b797936572ffad0e60f53784d8833b30e66e50f40f819a81ae90299973653a376421e5d6a4413f72cba2ac2b9d092e8fc86de7d
diff --git a/dev-java/jldap/files/jldap-4.6-Debug.java.patch b/dev-java/jldap/files/jldap-4.6-Debug.java.patch
new file mode 100644
index 000000000000..9da540fd5536
--- /dev/null
+++ b/dev-java/jldap/files/jldap-4.6-Debug.java.patch
@@ -0,0 +1,11 @@
+--- com/novell/ldap/client/Debug.java.orig	2015-07-05 13:50:26.469000000 +0000
++++ com/novell/ldap/client/Debug.java	2015-07-05 13:53:12.456000000 +0000
+@@ -80,7 +80,7 @@
+      * The value for this variable is set during compile time
+      *  TRUE = Debug build, FALSE = Release build
+      */
+-    public static final boolean LDAP_DEBUG = true;
++    public static final boolean LDAP_DEBUG = false;
+ 
+     /**
+      * The string value used to enable all debug tracing.
diff --git a/dev-java/jldap/files/jldap-4.6-build.xml.patch b/dev-java/jldap/files/jldap-4.6-build.xml.patch
new file mode 100644
index 000000000000..f5bcefa507ff
--- /dev/null
+++ b/dev-java/jldap/files/jldap-4.6-build.xml.patch
@@ -0,0 +1,257 @@
+--- build.xml.orig	2015-07-05 18:20:19.947000000 +0000
++++ build.xml	2015-07-05 18:20:34.996000000 +0000
+@@ -42,12 +42,20 @@
+ <property name="src" value="."/>
+ <property name="ext" value="ext"/>
+ <property name="ldap" value="ldap"/>
++<property name="jldap" value ="jldap"/>
++
++
+ 
+ <property name="lib" value="lib"/>
+ <property name="lib.debug" value="lib_debug"/>
+ 
+ <property name="build" value="classes"/>
+ <property name="build.debug" value="classes_debug"/>
++<property name="build.testDir" value="tests/junit/"/>
++<property name="build.testOutputDir" value="${build.testDir}/test-classes"/>
++<property name="build.testResourceDir" value="src/test/resources"/>
++
++<property name="test.reports" value="${build}/test-reports"/>
+ 
+ <property name="doc" value="doc"/>
+ <property name="ietfdoc" value="ietfdoc"/>
+@@ -60,6 +68,9 @@
+ <property name="pkg.ietfdoc" value="${pkg}/${ietfdoc}"/>
+ <property name="pkg.wars" value="${pkg}/wars"/>
+ 
++<path id="build.test.classpath">
++</path>
++
+     <!-- =================================================================== -->
+     <!-- Initialization                                                      -->
+     <!-- =================================================================== -->
+@@ -166,12 +177,12 @@
+     <!-- =================================================================== -->
+     <!-- build Servlets                                                       -->
+     <!-- =================================================================== -->
+-    <target name="servlet_stream" depends="debug, release">
++    <target name="servlet_stream" depends="debug">
+         <ant dir="${basedir}/com/novell/services/dsml/stream" target="all">
+             <property name="top" location="."/>
+         </ant>
+     </target>
+-    <target name="servlet_dom" depends="debug, release">
++    <target name="servlet_dom" depends="debug">
+         <ant dir="${basedir}/com/novell/services/dsml/dom" target="all">
+             <property name="top" location="."/>
+         </ant>
+@@ -201,42 +212,152 @@
+     
+     <target name="clone_wars" depends="wars"/>
+ 
++    <!-- Imported from javac.xml -->
++    <!-- START -->
++
+     <!-- =================================================================== -->
+     <!-- build debug classes                                                 -->
+     <!-- =================================================================== -->
+-    <target name="debug" depends="init">
+-        <ant antfile="javac.xml" target="debug">
+-            <property name="DEBUG_VALUE" value="true"/>
+-        </ant>
++    <target name="debug" >
++
++        <echo message="DEBUG compile in com/novell"/>
++        <mkdir dir="${build.debug}"/>
++        <javac
++                srcdir="${src}"
++                includes="com/novell/**/*.java,jldap/com/novell/security/sasl/*.java,org/ietf/**/*.java"
++                excludes="com/novell/services/**/*.java,${exclude.dsmlconnection},${exclude.spmlconnection}"
++                destdir="${build.debug}"
++                target="1.2"
++                deprecation="off"
++                debug="on"
++                optimize="off">
++                <classpath>
++                	<pathelement location="external/ssl/domestic/nssl1.2_dom.jar"/>
++					<pathelement location="external/jsse/lib/jcert.jar"/>
++					<pathelement location="external/jsse/lib/jnet.jar"/>
++					<pathelement location="external/jsse/lib/jsse.jar"/>
++					
++					<!-- Take care of optional components -->
++					<fileset dir="${ext}">
++						<include name="commons-httpclient-*.jar"/>	
++						<include name="openspml*.jar"/>	
++					</fileset>
++                </classpath>
++        </javac>
++
++        <echo message="Creating DEBUG ${lib.debug}/${ldap}.jar file"/>
++        <mkdir dir="${lib.debug}"/>
++        <jar
++            jarfile="${lib.debug}/${ldap}.jar"
++            basedir="${build.debug}"
++        />
+     </target>
+ 
+     <!-- =================================================================== -->
+     <!-- build release classes                                               -->
+     <!-- =================================================================== -->
+-    <target name="release" depends="init">
+-        <ant antfile="javac.xml" target="release">
+-            <property name="DEBUG_VALUE" value="false"/>
+-        </ant>
++    <target name="release">
++
++        <echo message="RELEASE compile in com/novell"/>
++        <mkdir dir="${build}"/>
++        <javac
++                srcdir="."
++                includes="com/novell/**/*.java,jldap/com/novell/security/sasl/*.java,org/ietf/**/*.java"
++                excludes="com/novell/services/**/*.java"
++                destdir="${build}"
++                encoding="UTF-8"
++                target="1.6"
++                source="1.6"
++                deprecation="off"
++                debug="off"
++                optimize="on">
++                <classpath>
++                	<pathelement location="external/ssl/domestic/nssl1.2_dom.jar"/>
++					<pathelement location="external/jsse/lib/jcert.jar"/>
++					<pathelement location="external/jsse/lib/jnet.jar"/>
++					<pathelement location="external/jsse/lib/jsse.jar"/>
++					<pathelement location="external/commons-httpclient-2.0-rc2.jar"/>
++                </classpath>
++        </javac>
++
++        <echo message="Creating RELEASE ${lib}/${ldap}.jar file"/>
++        <mkdir dir="${lib}"/>
++        <jar jarfile="${lib}/${jldap}.jar"
++            basedir="${build}"
++        />
+     </target>
+ 
+-    <!-- =================================================================== -->
+-    <!-- setup for javadoc                                                   -->
+-    <!-- =================================================================== -->
+-    <target name="setupDoc" depends="init">
+-        <ant antfile="javac.xml" target="setupDebug">
+-            <property name="DEBUG_VALUE" value="true"/>
+-        </ant>
++    <!-- ====================================================================== -->
++    <!-- Test-compilation target                                                -->
++    <!-- ====================================================================== -->
++
++    <target name="compile-tests" 
++        description="Compile the test code">
++        <mkdir dir="${build.testOutputDir}"/>
++        <mkdir dir="${build.testResourceDir}"/>
++        <javac destdir="${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="${build.testDir}"/>
++            </src>
++            <classpath>
++                <path refid="build.test.classpath"/>
++                <pathelement location="${build.outputDir}"/>
++            </classpath>
++        </javac>
++        <copy todir="${build.testOutputDir}">
++            <fileset dir="${build.testResourceDir}"/>
++        </copy>
+     </target>
+ 
+-    <!-- =================================================================== -->
+-    <!-- final is synonym for build release classes                          -->
+-    <!-- =================================================================== -->
+-    <target name="final" depends="release" />
++    <!-- ====================================================================== -->
++    <!-- Run all tests                                                          -->
++    <!-- ====================================================================== -->
++
++    <target name="test" 
++        depends="compile-tests"
++        description="Run the test cases">
++        <mkdir dir="${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="${build.outputDir}"/>
++                <pathelement location="${build.testOutputDir}"/>
++            </classpath>
++            <batchtest todir="${test.reports}" unless="test">
++                <fileset dir="${build.testDir}">
++                    <include name="**/Test*.java"/>
++                    <include name="**/*Test.java"/>
++                    <include name="**/*TestCase.java"/>
++                    <exclude name="**/*Abstract*Test.java"/>
++                </fileset>
++            </batchtest>
++            <batchtest todir="${test.reports}" if="test">
++                <fileset dir="${build.testDir}">
++                    <include name="**/${test}.java"/>
++                    <exclude name="**/*Abstract*Test.java"/>
++                </fileset>
++            </batchtest>
++        </junit>
++    </target>
++
++    <!-- END -->
+ 
+     <!-- =================================================================== -->
+     <!-- build lib files                                                     -->
+     <!-- =================================================================== -->
+-    <target name="lib" depends="debug, release"/>
++    <target name="lib" depends="debug"/>
+ 
+     <!-- =================================================================== -->
+     <!-- jar is synonym for build lib files                                  -->
+@@ -284,7 +405,7 @@
+     <!-- =================================================================== -->
+     <!-- create javadoc for Novell ldap classes                              -->
+     <!-- =================================================================== -->
+-    <target name="docnovellldap" depends="init, setupDoc">
++    <target name="docnovellldap" depends="init">
+         <delete dir="${pkg.doc}"/>
+         <echo message="Creating distribution ldap javadoc"/>
+         <mkdir dir="${pkg.doc}"/>
+@@ -305,7 +426,7 @@
+     <!-- =================================================================== -->
+     <!-- create javadoc for IETF ldap classes                                -->
+     <!-- =================================================================== -->
+-    <target name="docietfldap" depends="init, setupDoc">
++    <target name="docietfldap" depends="init">
+         <delete dir="${pkg.ietfdoc}"/>
+         <echo message="Creating distribution ldap javadoc"/>
+         <mkdir dir="${pkg.ietfdoc}"/>
+@@ -326,7 +447,7 @@
+     <!-- =================================================================== -->
+     <!-- create javadoc for all LDAP classes for internal developer use only -->
+     <!-- =================================================================== -->
+-    <target name="docdeveloper" depends="init, setupDoc">
++    <target name="docdeveloper" depends="init">
+         <delete dir="${pkg.developer}"/>
+         <echo message="Creating internal developer ldap javadoc"/>
+         <mkdir dir="${doc.developer}"/>
+@@ -335,6 +456,8 @@
+             destdir="${doc.developer}"
+             classpath="${lib.debug}/${ldap}.jar;external/jsse/lib/jcert.jar;external/jsse/lib/jnet.jar;external/jsse/lib/jsse.jar;external/jaxp/jaxp.jar;external/jaxp/xerces.jar"
+             packagenames="org.ietf.ldap,com.novell.security.sasl,com.novell.sasl.client,com.novell.ldap.asn1,com.novell.ldap.client,com.novell.ldap.rfc2251,com.novell.ldap.resources,com.novell.ldap.extensions,com.novell.ldap.controls,com.novell.ldap.util,com.novell.ldap"
++            encoding="UTF-8"
++            failonerror="no"
+             Windowtitle="LDAP Classes"
+             Splitindex="true"
+             Private="true"
diff --git a/dev-java/jldap/jldap-4.6.ebuild b/dev-java/jldap/jldap-4.6.ebuild
new file mode 100644
index 000000000000..5f201cb1e4db
--- /dev/null
+++ b/dev-java/jldap/jldap-4.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="LDAP Class Libraries for Java (JLDAP)"
+HOMEPAGE="http://www.openldap.org/jldap/"
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc source"
+
+CDEPEND="dev-java/openspml:0
+	dev-java/openspml2:0
+	dev-java/commons-httpclient:3
+	dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/zip
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="openspml,openspml2,commons-httpclient-3"
+
+EANT_BUILD_TARGET="release"
+EANT_BUILD_XML="build.xml"
+
+EANT_DOC_TARGET="docdeveloper"
+
+# [0]: complete rewrite of build.xml
+# [1]: disable debugging at compile time
+PATCHES=(
+	"${FILESDIR}"/${P}-build.xml.patch
+	"${FILESDIR}"/${P}-Debug.java.patch
+)
+
+java_prepare() {
+	epatch ${PATCHES[@]}
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
+EANT_TEST_TARGET="test"
+
+src_test() {
+	EANT_GENTOO_CLASSPATH_EXTRA="${S}/lib/${PN}.jar"
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+
+	dodoc README README.dsml || die
+	dohtml *.html || die
+
+	if use doc; then
+		dodoc design/* || die
+		java-pkg_dojavadoc doc
+	fi
+
+	use source && java-pkg_dosrc org com
+}
diff --git a/dev-java/jldap/metadata.xml b/dev-java/jldap/metadata.xml
new file mode 100644
index 000000000000..277fc50e2f5e
--- /dev/null
+++ b/dev-java/jldap/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+	<email>monsieurp@gentoo.org</email>
+</maintainer>
+<longdescription>
+	The LDAP Class Libraries for Java (JLDAP) enable you to write applications to
+	access, manage, update, and search for information stored in directories
+	accessible using LDAPv3. JLDAP was developed by Novell.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jlex/Manifest b/dev-java/jlex/Manifest
new file mode 100644
index 000000000000..fbd52f407c59
--- /dev/null
+++ b/dev-java/jlex/Manifest
@@ -0,0 +1 @@
+DIST jlex-1.2.6.tar.bz2 45868 SHA256 8367edecc3f31f0f55d6b1d92146d6ca9eeaf76de5eb0ff8614a0a2e38e4a2b5 SHA512 ebe16f87fe5b524de5c31651b0d5a0c282fdac99814c8f432a850a394657da4016880fba0f7418c8c42a989e78145d39188c3e68b79ed64fa1911d5680b00b9c WHIRLPOOL 43c51ca8b3ce452329bc7681f34bfb7304a0c9f6f2bf1d83eb8d048bed8863d7f037c38444146234160345692bcd3a3838279ffe7746e3919c37710edf156d9f
diff --git a/dev-java/jlex/jlex-1.2.6-r1.ebuild b/dev-java/jlex/jlex-1.2.6-r1.ebuild
new file mode 100644
index 000000000000..5957697e0389
--- /dev/null
+++ b/dev-java/jlex/jlex-1.2.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86"
+LICENSE="jlex"
+SLOT="0"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+IUSE=""
+
+src_compile() {
+	ejavac -nowarn Main.java
+}
+
+src_install() {
+	dodoc README Bugs
+
+	if use doc ; then
+		dohtml manual.html
+		dodoc sample.lex
+	fi
+
+	mkdir JLex && mv *.class JLex/
+	jar cf jlex.jar JLex/ || die "failed to jar"
+	java-pkg_dojar jlex.jar
+
+	if use source ; then
+		rm JLex/*
+		cp Main.java JLex
+		java-pkg_dosrc JLex
+	fi
+}
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..1c64fabca23e
--- /dev/null
+++ b/dev-java/jlex/jlex-1.2.6-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86"
+LICENSE="jlex"
+SLOT="0"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+IUSE=""
+
+src_compile() {
+	ejavac -nowarn Main.java
+}
+
+src_install() {
+	dodoc README Bugs
+
+	if use doc ; then
+		dohtml manual.html
+		dodoc sample.lex
+	fi
+
+	mkdir JLex && mv *.class JLex/
+	jar cf jlex.jar JLex/ || die "failed to jar"
+	java-pkg_dojar jlex.jar
+	java-pkg_dolauncher jlex --main JLex.Main jlex.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..838c00a4a448
--- /dev/null
+++ b/dev-java/jlex/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jlfgr/Manifest b/dev-java/jlfgr/Manifest
new file mode 100644
index 000000000000..7fb1f29f1d6c
--- /dev/null
+++ b/dev-java/jlfgr/Manifest
@@ -0,0 +1 @@
+DIST jlfgr-1_0.zip 66708 SHA256 808e70ffb84c0b948638bfb799be42ad9eebb026a6fcd322704086dfb257af1a SHA512 a6d9b6a617508bbe95afba23eed414c609078fc76dbb0bb86d1a7aecdb7d2e3ba57d58c7d60d29b0f7f36e12937e2838ad335db7fc714efe8f062b84dcab674d WHIRLPOOL 95612d1241f5c4143e66e99708bde25e9279a64767380cddd5c780a4a113eff88bb626ac71c3341fb9d6fe0a42312645c04ef6bb12ae4307511b77ac0918f3ab
diff --git a/dev-java/jlfgr/jlfgr-1.0-r1.ebuild b/dev-java/jlfgr/jlfgr-1.0-r1.ebuild
new file mode 100644
index 000000000000..97513bbc11df
--- /dev/null
+++ b/dev-java/jlfgr/jlfgr-1.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+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..7303cef96964
--- /dev/null
+++ b/dev-java/jlfgr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jlibeps/Manifest b/dev-java/jlibeps/Manifest
new file mode 100644
index 000000000000..273339114298
--- /dev/null
+++ b/dev-java/jlibeps/Manifest
@@ -0,0 +1 @@
+DIST jlibeps-0.1-src.zip 85686 SHA256 078fcf9ed6720f693f6eaa669e340e84ab67b938d9cd92357783194596017d44 SHA512 ce28d31d8aafaac2e493fecf8cf95e84ff5076fde7e4d2be8abcca5d849b823ab2b31303fa4f24450ce29aa1bc71f451c880213f820343a98f1aff0036693b5a WHIRLPOOL 0802ba9d4e0560b5bca9ba97112cadaac8d6911acf5774afad98adb106201d1624349d1e84a445c1d818c3bff9319204a5ddb87f4880a3595fe2eac3eedce871
diff --git a/dev-java/jlibeps/files/jlibeps-build.xml.patch b/dev-java/jlibeps/files/jlibeps-build.xml.patch
new file mode 100644
index 000000000000..99df166ad317
--- /dev/null
+++ b/dev-java/jlibeps/files/jlibeps-build.xml.patch
@@ -0,0 +1,20 @@
+--- build.xml.old	2012-04-04 16:52:56.948652156 +0200
++++ build.xml	2012-04-05 17:35:30.360517235 +0200
+@@ -19,9 +19,15 @@
+ 	    </javadoc>

+ 	</target>

+ 		

+-		

++	<!-- Builds classes -->

++	<target name="compile" description="Builds classes">

++		<javac srcdir="src" destdir="bin">

++			<classpath />

++			<include name="**/*.java" />

++		</javac>

++	</target>

+ 	<!-- Creates the jar -->

+-	<target name="jar" description="Generates jlibeps.jar">

++	<target name="jar" description="Generates jlibeps.jar" depends="compile">

+ 		

+ 		<jar jarfile="${dir.out}/jlibeps.jar" >

+ 		 <!-- Filters the files -->

diff --git a/dev-java/jlibeps/jlibeps-0.1.ebuild b/dev-java/jlibeps/jlibeps-0.1.ebuild
new file mode 100644
index 000000000000..db3770549b27
--- /dev/null
+++ b/dev-java/jlibeps/jlibeps-0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A java development library which allows the creation of an EPS file from a Graphics2D"
+HOMEPAGE="http://jlibeps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.4"
+
+EANT_DOC_TARGET="doc"
+
+S=${WORKDIR}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-build.xml.patch
+	find . -name '*.class' -exec rm -v {} + || die "Class removal failed"
+}
+
+src_install() {
+	java-pkg_dojar out/${PN}.jar
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/jlibeps/metadata.xml b/dev-java/jlibeps/metadata.xml
new file mode 100644
index 000000000000..ed6cb4271158
--- /dev/null
+++ b/dev-java/jlibeps/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</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..ddd6296356cb
--- /dev/null
+++ b/dev-java/jline/Manifest
@@ -0,0 +1,2 @@
+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
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..41faa57e1609
--- /dev/null
+++ b/dev-java/jline/jline-1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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.ebuild b/dev-java/jline/jline-2.12.1.ebuild
new file mode 100644
index 000000000000..a8372f325443
--- /dev/null
+++ b/dev-java/jline/jline-2.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/jline2/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="dev-java/jansi:1.11
+	dev-java/jansi-native:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+S="${WORKDIR}/${PN}2-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="jansi-1.11,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..dd088ba5da47
--- /dev/null
+++ b/dev-java/jline/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="github">jline/jline2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jmdns/Manifest b/dev-java/jmdns/Manifest
new file mode 100644
index 000000000000..e486518335c0
--- /dev/null
+++ b/dev-java/jmdns/Manifest
@@ -0,0 +1,3 @@
+DIST jmdns-1.0-Final.tar.gz 157799 SHA256 eed717e220f13e0063f09cd9b0bb9fe43dbe9d8ac68b7fa184bae5ce2864295b SHA512 62fc4e0a8ce42acb8f414299d6d59a313a3a201fb634777a77be78bff679eae4c2068959e035d82d6b6159cb1a42abfdce02509d9b511f36d8aea6eb3a19c6b4 WHIRLPOOL 060b316324596157a056abda9cdf5114b5801702ea948e8c5c44755cb32d15e919647fadfba2826766337e7525a0dbaf56c85335ce443455c047e1361190533d
+DIST jmdns-3.1.4.tgz 275127 SHA256 3824642f040d358745952e8e5e8686d45a4f18a9ed4605e5b72eae8e082386ab SHA512 4c644b02f814fb8c6ea81d74ee18697eecfa2e57de73bebe2b3b1ac89c7f5b45143c55c343426bce2ac38bd0ac82aa316b5af6a704bd9732ebac6224c3ed8e44 WHIRLPOOL ba4e27f9d3f42656df816a02b41d5a81bfa866727c3a6c513607bc3d35152e66a082f809ccaada69d82dc9cf5a9d2e1af55333070161762fa14a6ea6f35bf856
+DIST jmdns-3.4.1.tgz 665503 SHA256 aefc28fcb0a8d8d563abfe0b764fa91a2737aa8b19f8a8f859a96a50fe663ebe SHA512 06e01dc7ef9eabd1ba75be016d688294043a6eec53de40d20026587f2c3d82bd0b025efd9b662bbe28450940d277da0fbc30ef69293ca3e81426212d8e85d7fb WHIRLPOOL 1df820435d9d1ad72daaff2d2467eb0d5080b8e74bbb9b18da7333feabdf48b25b39cdd29d453535b00ea3f2a20231282e49a9bf845075815bef6eb498bdd9f8
diff --git a/dev-java/jmdns/jmdns-1.0.ebuild b/dev-java/jmdns/jmdns-1.0.ebuild
new file mode 100644
index 000000000000..48803902de0c
--- /dev/null
+++ b/dev-java/jmdns/jmdns-1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2
+
+DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}-Final.tar.gz"
+HOMEPAGE="http://jmdns.sourceforge.net"
+IUSE=""
+DEPEND=">=virtual/jdk-1.3.1"
+RDEPEND=">=virtual/jre-1.3.1"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm lib/*.jar
+}
+
+src_compile() {
+	echo "Compiling JmDNS..."
+	ejavac "${S}"/src/javax/jmdns/* || die
+	echo "Compiling tools..."
+	ejavac -classpath "${S}/src" "${S}"/src/com/strangeberry/jmdns/tools/* || die
+	echo "Making jars..."
+	echo "Main-class: com.strangeberry.jmdns.tools.Main" > jmdns-tools-manifest
+	jar cmf jmdns-tools-manifest jmdns.jar -C "${S}/src" com -C "${S}/src" javax || die
+}
+
+src_install() {
+	java-pkg_dojar jmdns*.jar
+	java-pkg_dolauncher
+	dodoc README.txt CHANGELOG.txt
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/{com,javax}
+
+	if use examples; then
+		insinto /usr/share/doc/${P}/
+		doins -r src/samples
+	fi
+}
diff --git a/dev-java/jmdns/jmdns-3.1.4.ebuild b/dev-java/jmdns/jmdns-3.1.4.ebuild
new file mode 100644
index 000000000000..20ddd5ec7ee4
--- /dev/null
+++ b/dev-java/jmdns/jmdns-3.1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
+SRC_URI="mirror://sourceforge/${PN}/${PF}.tgz"
+HOMEPAGE="http://jmdns.sourceforge.net"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	rm "${S}"/build.xml
+	rm "${S}"/lib/*.jar || die
+}
diff --git a/dev-java/jmdns/jmdns-3.4.1.ebuild b/dev-java/jmdns/jmdns-3.4.1.ebuild
new file mode 100644
index 000000000000..5b50bcc61b28
--- /dev/null
+++ b/dev-java/jmdns/jmdns-3.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}/${PF}.tgz"
+HOMEPAGE="http://jmdns.sourceforge.net"
+
+LICENSE="Apache-2.0"
+SLOT="3.4"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}"
+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..d35fc3014bda
--- /dev/null
+++ b/dev-java/jmdns/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jmdns</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jmf-bin/Manifest b/dev-java/jmf-bin/Manifest
new file mode 100644
index 000000000000..2f3c149286ca
--- /dev/null
+++ b/dev-java/jmf-bin/Manifest
@@ -0,0 +1 @@
+DIST jmf-2_1_1e-alljava.zip 1959196 RMD160 bc376ac1a933979943af7c98b7550e9c739e0e3c SHA1 69a363e2dfb43787adabff87ae14a9bda6608d24 SHA256 6961ee0c8de9de245ebc9abdfd69640e8cc42c6b8d1bd43783a8b8eec4124160
diff --git a/dev-java/jmf-bin/files/jmfcustomizer b/dev-java/jmf-bin/files/jmfcustomizer
new file mode 100644
index 000000000000..f6de6e48a115
--- /dev/null
+++ b/dev-java/jmf-bin/files/jmfcustomizer
@@ -0,0 +1,31 @@
+#!/bin/sh
+# jmfcustomizer
+# Author: Dylan Carlson
+# May 2003
+# $Id$
+
+JAVA_HOME=`/usr/bin/java-config --jdk-home`
+if [ -z "${JAVA_HOME}" ] ; then
+	JAVA_HOME=`/usr/bin/java-config --jre-home`
+fi
+CLASSPATH="`/usr/bin/java-config --classpath=jmf-bin`:${CLASSPATH}"
+
+if [ ! -f ${JAVA_HOME}/bin/java ] ; then
+	echo " "
+	echo "I tried using the following Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Java Runtime missing.  Please run java-config(1) and ensure"
+	echo "your environment is configured properly."
+	exit 1
+else
+	echo " "
+	echo "Using Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Using CLASSPATH:"
+	echo "${CLASSPATH}"
+	echo " "
+fi
+
+exec ${JAVA_HOME}/bin/java JMFCustomizer $*
diff --git a/dev-java/jmf-bin/files/jmfinit b/dev-java/jmf-bin/files/jmfinit
new file mode 100644
index 000000000000..40c1e8ae1521
--- /dev/null
+++ b/dev-java/jmf-bin/files/jmfinit
@@ -0,0 +1,31 @@
+#!/bin/sh
+# jmfinit
+# Author: Dylan Carlson
+# May 2003
+# $Id$
+
+JAVA_HOME=`/usr/bin/java-config --jdk-home`
+if [ -z "${JAVA_HOME}" ] ; then
+	JAVA_HOME=`/usr/bin/java-config --jre-home`
+fi
+CLASSPATH="`/usr/bin/java-config --classpath=jmf-bin`:${CLASSPATH}"
+
+if [ ! -f ${JAVA_HOME}/bin/java ] ; then
+	echo " "
+	echo "I tried using the following Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Java Runtime missing.  Please run java-config(1) and ensure"
+	echo "your environment is configured properly."
+	exit 1
+else
+	echo " "
+	echo "Using Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Using CLASSPATH:"
+	echo "${CLASSPATH}"
+	echo " "
+fi
+
+exec ${JAVA_HOME}/bin/java JMFInit $*
diff --git a/dev-java/jmf-bin/files/jmfregistry b/dev-java/jmf-bin/files/jmfregistry
new file mode 100644
index 000000000000..db7a1fd56dd8
--- /dev/null
+++ b/dev-java/jmf-bin/files/jmfregistry
@@ -0,0 +1,31 @@
+#!/bin/sh
+# jmfregistry
+# Author: Dylan Carlson
+# May 2003
+# $Id$
+
+JAVA_HOME=`/usr/bin/java-config --jdk-home`
+if [ -z "${JAVA_HOME}" ] ; then
+	JAVA_HOME=`/usr/bin/java-config --jre-home`
+fi
+CLASSPATH="`/usr/bin/java-config --classpath=jmf-bin`:${CLASSPATH}"
+
+if [ ! -f ${JAVA_HOME}/bin/java ] ; then
+	echo " "
+	echo "I tried using the following Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Java Runtime missing.  Please run java-config(1) and ensure"
+	echo "your environment is configured properly."
+	exit 1
+else
+	echo " "
+	echo "Using Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Using CLASSPATH:"
+	echo "${CLASSPATH}"
+	echo " "
+fi
+
+exec ${JAVA_HOME}/bin/java JMFRegistry $*
diff --git a/dev-java/jmf-bin/files/jmstudio b/dev-java/jmf-bin/files/jmstudio
new file mode 100644
index 000000000000..5c96746bdd7f
--- /dev/null
+++ b/dev-java/jmf-bin/files/jmstudio
@@ -0,0 +1,31 @@
+#!/bin/sh
+# jmstudio
+# Author: Dylan Carlson
+# May 2003
+# $Id$
+
+JAVA_HOME=`/usr/bin/java-config --jdk-home`
+if [ -z "${JAVA_HOME}" ] ; then
+	JAVA_HOME=`/usr/bin/java-config --jre-home`
+fi
+CLASSPATH="`/usr/bin/java-config --classpath=jmf-bin`:${CLASSPATH}"
+
+if [ ! -f ${JAVA_HOME}/bin/java ] ; then
+	echo " "
+	echo "I tried using the following Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Java Runtime missing.  Please run java-config(1) and ensure"
+	echo "your environment is configured properly."
+	exit 1
+else
+	echo " "
+	echo "Using Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Using CLASSPATH:"
+	echo "${CLASSPATH}"
+	echo " "
+fi
+
+exec ${JAVA_HOME}/bin/java -Dawt.toolkit=sun.awt.motif.MToolkit JMStudio $*
diff --git a/dev-java/jmf-bin/jmf-bin-2.1.1e-r2.ebuild b/dev-java/jmf-bin/jmf-bin-2.1.1e-r2.ebuild
new file mode 100644
index 000000000000..ac381780fd4e
--- /dev/null
+++ b/dev-java/jmf-bin/jmf-bin-2.1.1e-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+At="${PN%-bin}-2_1_1e-alljava.zip"
+S="${WORKDIR}/JMF-${PV}"
+DESCRIPTION="The Java Media Framework API (JMF)"
+SRC_URI="${At}"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/tech/index-jsp-140239.html"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+LICENSE="sun-bcla-jmf"
+SLOT="0"
+DEPEND=">=app-arch/unzip-5.50-r1"
+RDEPEND=">=virtual/jre-1.4"
+RESTRICT="fetch"
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/download-142937.html"
+
+pkg_nofetch() {
+	elog
+	elog " Due to license restrictions, we cannot fetch the"
+	elog " distributables automatically."
+	elog
+	elog " 1. Visit ${DOWNLOAD_URL} and select 'Linux'"
+	elog " 2. Download ${At}"
+	elog " 3. Move file to ${DISTDIR}"
+	elog " 4. Run emerge on this package again to complete"
+	elog
+}
+
+src_unpack() {
+	unzip -qq "${DISTDIR}"/${At} || die
+}
+
+src_install() {
+	dobin \
+		"${FILESDIR}"/jmfcustomizer \
+		"${FILESDIR}"/jmfinit \
+		"${FILESDIR}"/jmfregistry \
+		"${FILESDIR}"/jmstudio
+	dohtml "${S}"/doc/*.html
+	java-pkg_dojar "${S}"/lib/*.jar
+	insinto /usr/share/${PN}/lib
+	doins lib/jmf.properties
+}
diff --git a/dev-java/jmf-bin/metadata.xml b/dev-java/jmf-bin/metadata.xml
new file mode 100644
index 000000000000..c91146ece995
--- /dev/null
+++ b/dev-java/jmf-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>
+	<herd>java</herd>
+	<longdescription>
+		The Java Media Framework API (JMF) enables audio, video and other
+		time-based media to be added to Java applications and applets.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/jmi-interface/Manifest b/dev-java/jmi-interface/Manifest
new file mode 100644
index 000000000000..802a1127c364
--- /dev/null
+++ b/dev-java/jmi-interface/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/jmi-interface/files/jmi-interface-1.0-build.xml b/dev-java/jmi-interface/files/jmi-interface-1.0-build.xml
new file mode 100644
index 000000000000..c14915fd1761
--- /dev/null
+++ b/dev-java/jmi-interface/files/jmi-interface-1.0-build.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+
+<project name="jmi" default="jar">
+	<!-- some properties -->
+	<property name="src.dir"     value="src"   />
+	<property name="build.dir"   value="build" />
+	<property name="dist.dir"    value="dist"  />
+    <property name="doc.dir"     value="doc"   />
+	<property name="jarfile"     value="${ant.project.name}.jar"/>
+	<property name="source.jdk.version" value="1.4" />
+
+	<!-- init -->
+   <target name="init">
+      <tstamp/>
+	   <mkdir dir="${dist.dir}"/>
+	   <mkdir dir="${build.dir}"/>
+   </target>	
+
+	<!-- compile everything -->
+   <target name="compile" depends="init">
+      <javac srcdir="${src.dir}" destdir="${build.dir}" 
+       source="${source.jdk.version}" target="${source.jdk.version}"/>
+   </target>
+
+	<!-- build the jar file -->
+   <target name="jar" depends="compile">
+
+      <jar jarfile="${dist.dir}/jmi.jar" basedir="${build.dir}"
+      	   excludes="javax/jmi/primitivetypes/** javax/jmi/model/** javax/jmi/corbaidltypes/**" />
+
+      <jar jarfile="${dist.dir}/mof.jar" basedir="${build.dir}"
+      	   excludes="javax/jmi/reflect/** javax/jmi/xmi/**" />
+
+   </target>
+
+   <!-- generate javadocs -->
+    <target name="javadoc">
+        <mkdir dir="${doc.dir}" />
+        <javadoc sourcepath="${src.dir}"
+                 packagenames="*"
+                 destdir="${doc.dir}"
+                 author="true"
+                 version="true"
+                 use="true"
+                 windowtitle="${ant.project.name} API"
+                 source="${source.jdk.version}"
+        />
+    </target>
+
+   
+	<!-- clean up -->
+   <target name="clean">
+	   <delete dir="${build.dir}"/>
+	   <delete dir="${dist.dir}"/>
+   </target>
+</project>
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-r3.ebuild b/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild
new file mode 100644
index 000000000000..c399c5a7bda9
--- /dev/null
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Metadata Interface Sample Class Interface"
+HOMEPAGE="http://java.sun.com/products/jmi/"
+JMI_ZIP="jmi-${PV/./_}-fr-interfaces.zip"
+MOF_XML="mof-${PV}.xml.bz2"
+SRC_URI="mirror://gentoo/${JMI_ZIP}
+		 mirror://gentoo/${MOF_XML}"
+
+LICENSE="sun-bcla-jmi"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	mkdir "${S}/src" && cd "${S}/src"
+	unpack ${JMI_ZIP}
+
+	cd "${S}"
+	# rename enum keywords because javadoc hates them
+	# even with -source 1.4, bummer
+	epatch "${FILESDIR}/${P}-enum.patch"
+	cp "${FILESDIR}/${P}-build.xml" build.xml
+
+	#adding mof.xml required by Netbeans #98603
+	mkdir -p "${S}/build/javax/jmi/model/resources"
+	cd "${S}/build/javax/jmi/model/resources"
+	unpack ${MOF_XML}
+	# bug #162328
+	cp mof-1.0.xml mof.xml
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc src/javax
+}
diff --git a/dev-java/jmi-interface/metadata.xml b/dev-java/jmi-interface/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/jmi-interface/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
new file mode 100644
index 000000000000..a2bec409f5e7
--- /dev/null
+++ b/dev-java/jmock/Manifest
@@ -0,0 +1,3 @@
+DIST jmock-1.2.0-jars.zip 153318 SHA256 c98e8dd0e5ebb590578baf4eb095b0c69084cd448269cac6c7dd52075ced5b36 SHA512 7b854c462e04642444f8994875d496655986a094b113f888c8dd5f07149c41c4e97e23f8f0cf75822b4e8281ffb90054ac44024cacd3f6e55ef0659e463f0cc5 WHIRLPOOL b2563df867f481706a9a7ebf4b5535321bcb295c42233575fb657908c232cda8416d3e1a5c78b67d41a311efdb0760ad5984278ae9cc02ea81868184767cc88a
+DIST jmock-2.5.1-jars.zip 758019 SHA256 e5f8d704d732a4e0d2a7788d966e6c8cfc722707bf278b6c0618f9d46eae6e7a SHA512 97032dd3f7f2b8e4e310e04722af0f444a60b0908ca45111b0ad1578f92ddac411c9d66f6eb696f45134c8baced86c10194b5ebbd8974090a585e95583dd2a9c WHIRLPOOL 1e50a9da3f8a16f4f706f2631f2a9aee89a89067c1a365284c116e6bdd7a4e5c4ac9a828317e13e49d097ad59bb7cd4f7d49cf99ed47055a17b2faa418300f94
+DIST jmock-2.6.1-jars.zip 1249841 SHA256 e49a0f7628c6368e46de1c48dfd8aed084f03661d87cf3a78025fdec367021fb SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e WHIRLPOOL e67be30e6718b998a34a52cdaa59ba7afc19969b5fe08529ea056867c0b8b3fad2628eb04b8b0b778bd215d29fe4aa962b0021afbb64835eac845f76c4b5987d
diff --git a/dev-java/jmock/files/1.1.0-build.xml.patch b/dev-java/jmock/files/1.1.0-build.xml.patch
new file mode 100644
index 000000000000..22b47eefa23a
--- /dev/null
+++ b/dev-java/jmock/files/1.1.0-build.xml.patch
@@ -0,0 +1,21 @@
+diff -ur jmock-1.1.0.old/build.xml jmock-1.1.0/build.xml
+--- jmock-1.1.0.old/build.xml	2006-12-23 00:06:19.000000000 +0200
++++ jmock-1.1.0/build.xml	2006-12-23 00:06:49.000000000 +0200
+@@ -116,7 +116,7 @@
+         </junit>
+     </target>
+ 
+-    <target name="core.jar" depends="core.test.unit">
++    <target name="core.jar" depends="core.compile">
+         <mkdir dir="${build.dist.bin.dir}"/>
+         <jar basedir="${core.build.dir}" destfile="${core.jar}" excludes="test/**" index="true"/>
+     </target>
+@@ -181,7 +181,7 @@
+         </junit>
+     </target>
+ 
+-    <target name="cglib.jar" depends="cglib.test.unit">
++    <target name="cglib.jar" depends="cglib.compile">
+         <mkdir dir="${build.dist.bin.dir}"/>
+         <jar basedir="${cglib.build.dir}" destfile="${cglib.jar}" excludes="test/**" index="true"/>
+     </target>
diff --git a/dev-java/jmock/files/1.1.0-junit-3.8.2.patch b/dev-java/jmock/files/1.1.0-junit-3.8.2.patch
new file mode 100644
index 000000000000..411e2423a0a7
--- /dev/null
+++ b/dev-java/jmock/files/1.1.0-junit-3.8.2.patch
@@ -0,0 +1,12 @@
+diff -ur jmock-1.1.0.old/core/src/org/jmock/expectation/AssertMo.java jmock-1.1.0/core/src/org/jmock/expectation/AssertMo.java
+--- jmock-1.1.0.old/core/src/org/jmock/expectation/AssertMo.java	2006-12-22 23:56:07.000000000 +0200
++++ jmock-1.1.0/core/src/org/jmock/expectation/AssertMo.java	2006-12-22 23:56:17.000000000 +0200
+@@ -73,7 +73,7 @@
+         assertTrue("Should not have verified", threwException);
+     }
+ 
+-    static protected void failNotEquals( String message,
++    static public void failNotEquals( String message,
+                                          Object expected,
+                                          Object actual ) {
+         String formatted = "";
diff --git a/dev-java/jmock/files/2.5.1-invokeAll-invokeAny.patch b/dev-java/jmock/files/2.5.1-invokeAll-invokeAny.patch
new file mode 100644
index 000000000000..7acfc8598f03
--- /dev/null
+++ b/dev-java/jmock/files/2.5.1-invokeAll-invokeAny.patch
@@ -0,0 +1,30 @@
+diff --git a/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java b/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java
+index 6dbc020..0dce41c 100644
+--- a/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java
++++ b/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java
+@@ -110,21 +110,21 @@ public class DeterministicScheduler implements ScheduledExecutorService {
+         throw blockingOperationsNotSupported();
+     }
+ 
+-    public <T> List<Future<T>> invokeAll(Collection<Callable<T>> tasks) throws InterruptedException {
++    public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
+         throw blockingOperationsNotSupported();
+     }
+ 
+-    public <T> List<Future<T>> invokeAll(Collection<Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
++    public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
+         throw blockingOperationsNotSupported();
+     }
+     
+-    public <T> T invokeAny(Collection<Callable<T>> tasks)
++    public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
+         throws InterruptedException, ExecutionException 
+     {
+         throw blockingOperationsNotSupported();
+     }
+ 
+-    public <T> T invokeAny(Collection<Callable<T>> tasks, long timeout, TimeUnit unit) 
++    public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) 
+         throws InterruptedException, ExecutionException, TimeoutException 
+     {
+         throw blockingOperationsNotSupported();
diff --git a/dev-java/jmock/jmock-1.2.0.ebuild b/dev-java/jmock/jmock-1.2.0.ebuild
new file mode 100644
index 000000000000..f525933753cf
--- /dev/null
+++ b/dev-java/jmock/jmock-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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://${PN}.codehaus.org/dist/${P}-jars.zip"
+HOMEPAGE="http://jmock.codehaus.org"
+
+LICENSE="BSD"
+SLOT="1.0"
+KEYWORDS="amd64 ppc 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"
+
+JAVA_GENTOO_CLASSPATH="junit"
+
+src_unpack() {
+	unpack ${A}
+	unzip ${PN}-core-${PV}.jar -d src || die
+}
+
+java_prepare() {
+	rm *.jar || die
+	find -name "*.class" -delete || die
+	epatch "${FILESDIR}/1.1.0-junit-3.8.2.patch"
+}
diff --git a/dev-java/jmock/jmock-2.5.1.ebuild b/dev-java/jmock/jmock-2.5.1.ebuild
new file mode 100644
index 000000000000..fc9f6e59fb30
--- /dev/null
+++ b/dev-java/jmock/jmock-2.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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://${PN}.codehaus.org/dist/${P}-jars.zip"
+HOMEPAGE="http://jmock.codehaus.org"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/hamcrest-library:1.3"
+
+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"
+
+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
+
+	epatch "${FILESDIR}/${PV}-invokeAll-invokeAny.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..56b0a25fb94a
--- /dev/null
+++ b/dev-java/jmock/jmock-2.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..838c00a4a448
--- /dev/null
+++ b/dev-java/jmock/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
new file mode 100644
index 000000000000..f99a71650af0
--- /dev/null
+++ b/dev-java/jna/Manifest
@@ -0,0 +1 @@
+DIST jna-3.4.0.tar.gz 34547165 SHA256 bff8fb935044a1e5de611e576e30a08c263e6a26a9f4c631dbe3a0cac2d79f14 SHA512 30c4e6a3a5ac133095248d3eb7d4983a91e11a267a581268a91316927ac75c5a133a58625d321276ac0b229c42c502f85492672d99713c90de98a648bd008b35 WHIRLPOOL 0a5a9d35db0e0090375235048c985fd8bd9ccf319d03c1c3db33e81d3e1a1bec8718a48f6b8180c7531d3963ae91b5337f539eb69e3db73b3f87ea693706fe08
diff --git a/dev-java/jna/files/3.4.0-build.xml.patch b/dev-java/jna/files/3.4.0-build.xml.patch
new file mode 100644
index 000000000000..c907b592b040
--- /dev/null
+++ b/dev-java/jna/files/3.4.0-build.xml.patch
@@ -0,0 +1,31 @@
+--- build.xml.orig	2011-01-25 17:33:24.750473340 +0100
++++ build.xml	2011-01-25 17:07:14.657410373 +0100
+@@ -176,7 +176,9 @@
+     <path id="test.runpath">
+       <pathelement path="${build}/${jar}"/>
+       <pathelement path="${test.classes}"/>
++      <!--
+       <pathelement path="lib/clover.jar"/>
++      -->
+       <path refid="test.libs"/>
+     </path>
+   </target>
+@@ -433,13 +435,17 @@
+     <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>
++    <!--
+     <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
+-      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
++      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/>
+     </signjar>
++    -->
+   </target>
+ 	
+   <!-- When running tests from an IDE, be sure to set jna.library.path -->
diff --git a/dev-java/jna/files/3.4.0-makefile-flags.patch b/dev-java/jna/files/3.4.0-makefile-flags.patch
new file mode 100644
index 000000000000..90d96e00f1ce
--- /dev/null
+++ b/dev-java/jna/files/3.4.0-makefile-flags.patch
@@ -0,0 +1,53 @@
+diff --git a/native/Makefile b/native/Makefile
+index 75246a8..7bdcf04 100644
+--- a/native/Makefile
++++ b/native/Makefile
+@@ -83,10 +83,10 @@ CFLAGS_EXTRA=
+ 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)
+@@ -149,7 +149,7 @@ ifneq ($(MINGW),)
+ CDEFINES=-DPSAPI_VERSION=1
+ CC = $(MINGW) -m64 -mno-cygwin
+ LD = $(CC)
+-LDFLAGS=-o $@ -shared
++LDFLAGS+=-o $@ -shared
+ LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt 
+ FFI_CONFIG += --host=x86_64-pc-mingw32
+ else
+@@ -169,14 +169,14 @@ ifeq ($(OS),linux)
+ ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+ PCFLAGS+=-fPIC
+ CDEFINES+=-DHAVE_PROTECTION
+-LDFLAGS+=-Wl,-soname,$@
++LDFLAGS+= -Wl,-soname,$(shell basename $@)
+ endif
+ 
+ ifneq (,$(findstring bsd,$(OS)))
+ ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+ PCFLAGS+=-fPIC
+ CINCLUDES+=-I/usr/X11R6/include
+-LDFLAGS=-o $@ -shared 
++LDFLAGS+= -o $@ -shared 
+ CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
+ endif
+ 
+@@ -239,7 +239,7 @@ endif
+ 
+ PCFLAGS+=$(ISYSROOT) -x objective-c
+ CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
+-LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
++LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
+   -compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
+   -current_version $(JNA_JNI_VERSION) \
+   -mmacosx-version-min=10.3 \
diff --git a/dev-java/jna/files/jna-3.4.0-makefile-flags.patch b/dev-java/jna/files/jna-3.4.0-makefile-flags.patch
new file mode 100644
index 000000000000..e4ff00bf69da
--- /dev/null
+++ b/dev-java/jna/files/jna-3.4.0-makefile-flags.patch
@@ -0,0 +1,62 @@
+diff --git a/native/Makefile b/native/Makefile
+index 75246a8..a1c3e66 100644
+--- a/native/Makefile
++++ b/native/Makefile
+@@ -70,7 +70,7 @@ LIBPFX=lib
+ LIBSFX=.so
+ ARSFX=.a
+ JNISFX=$(LIBSFX)
+-CC=gcc
++CC?=gcc
+ LD=$(CC)
+ LIBS=
+ # Default to Sun recommendations for JNI compilation
+@@ -83,10 +83,10 @@ CFLAGS_EXTRA=
+ 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)
+@@ -149,7 +149,7 @@ ifneq ($(MINGW),)
+ CDEFINES=-DPSAPI_VERSION=1
+ CC = $(MINGW) -m64 -mno-cygwin
+ LD = $(CC)
+-LDFLAGS=-o $@ -shared
++LDFLAGS+=-o $@ -shared
+ LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt 
+ FFI_CONFIG += --host=x86_64-pc-mingw32
+ else
+@@ -169,14 +169,14 @@ ifeq ($(OS),linux)
+ ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+ PCFLAGS+=-fPIC
+ CDEFINES+=-DHAVE_PROTECTION
+-LDFLAGS+=-Wl,-soname,$@
++LDFLAGS+= -Wl,-soname,$(shell basename $@)
+ endif
+ 
+ ifneq (,$(findstring bsd,$(OS)))
+ ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+ PCFLAGS+=-fPIC
+ CINCLUDES+=-I/usr/X11R6/include
+-LDFLAGS=-o $@ -shared 
++LDFLAGS+= -o $@ -shared 
+ CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
+ endif
+ 
+@@ -239,7 +239,7 @@ endif
+ 
+ PCFLAGS+=$(ISYSROOT) -x objective-c
+ CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
+-LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
++LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
+   -compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
+   -current_version $(JNA_JNI_VERSION) \
+   -mmacosx-version-min=10.3 \
diff --git a/dev-java/jna/jna-3.4.0-r1.ebuild b/dev-java/jna/jna-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..c6d40bd7bc97
--- /dev/null
+++ b/dev-java/jna/jna-3.4.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Java Native Access (JNA)"
+HOMEPAGE="https://github.com/twall/jna#readme"
+SRC_URI="https://github.com/twall/jna/tarball/3.4.0 -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="+awt +nio-buffers"
+REQUIRED_USE="test? ( awt nio-buffers )"
+
+COMMON_DEP="
+	virtual/libffi"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.6
+	dev-java/ant-nodeps:0
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit:0
+		dev-java/ant-trax:0
+	)"
+
+java_prepare() {
+	# delete bundled jars and copy of libffi
+	find -name "*.jar" -exec rm -v {} + || die
+	rm -r native/libffi || die
+
+	epatch "${FILESDIR}/${PV}-build.xml.patch"
+	# respect CFLAGS, don't inhibit warnings, honour CC
+	epatch "${FILESDIR}/${P}-makefile-flags.patch"
+	tc-export CC
+
+	# 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_BUILD_TARGET="jar contrib-jars"
+EANT_ANT_TASKS="ant-nodeps"
+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
+
+	java-pkg_register-optional-dependency emul-linux-x86-jna #313209
+
+	use source && java-pkg_dosrc src/com
+	use doc && java-pkg_dojavadoc doc/javadoc
+}
diff --git a/dev-java/jna/jna-3.4.0.ebuild b/dev-java/jna/jna-3.4.0.ebuild
new file mode 100644
index 000000000000..8d90aa387892
--- /dev/null
+++ b/dev-java/jna/jna-3.4.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+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/3.4.0 -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="+awt +nio-buffers"
+REQUIRED_USE="test? ( awt nio-buffers )"
+
+COMMON_DEP="
+	virtual/libffi"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+	>=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() {
+	# delete bundled jars and copy of libffi
+	find -name "*.jar" -exec rm -v {} + || die
+	rm -r native/libffi || die
+
+	# respect CFLAGS, don't inhibit warnings, honour CC
+	# fix build.xml file
+	epatch "${FILESDIR}/${PV}-makefile-flags.patch" "${FILESDIR}/${PV}-build.xml.patch"
+
+	# 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/metadata.xml b/dev-java/jna/metadata.xml
new file mode 100644
index 000000000000..ee633d5a6f4e
--- /dev/null
+++ b/dev-java/jna/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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#readme</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/jnlp-api/Manifest b/dev-java/jnlp-api/Manifest
new file mode 100644
index 000000000000..87f6191af26f
--- /dev/null
+++ b/dev-java/jnlp-api/Manifest
@@ -0,0 +1 @@
+DIST jnlp-api-6.0.18.tar.bz2 10518 SHA256 880c3961f99c8d8895a972d44425066b173804f67169538bba5b9ab3a5eb8489 SHA512 e3b7ed5092255b665feac2c37341be81bd71c1f2c925851338f1dbfb05bf1e1a8f09f5fea63c08ca1e737db7072b6ee25ec55cfaa18789e40101d6930785209f WHIRLPOOL 94590d3d345b6d5cfba8cc35d583fe4f527ba988fefb44dcadafc538057b1fe472e9c464c25fcaa788bfbd450a0a9ec1a4cb50e9a4709c7f3b12f3d4485ab8f8
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..fab983ca8d04
--- /dev/null
+++ b/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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..52eb200eefa7
--- /dev/null
+++ b/dev-java/jnlp-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>
+	<herd>java</herd>
+	<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..c7086c565ea2
--- /dev/null
+++ b/dev-java/jnr-constants/Manifest
@@ -0,0 +1,2 @@
+DIST jnr-constants-0.8.3.tar.gz 110622 SHA256 e4dec305fa7c703dd9a693f9d417d7a16cec8b690c122078fb3518b0f4c258c8 SHA512 1d37596b1a791e4b727c51de4732512d4dcb14ab8cfe6ff0fe4f42c8c253cf8e69c5808f8e408a14d7e752fe13bf6c39b015a81bc3c3610f43ca4bd8161a7694 WHIRLPOOL 40d2d3309984971421bcc7bea7331860bb3875e50b4b57e27f6a10e5e360c55e30623af42de65b171be00244919f81f35b96ca98dd8cd474f6bebc081400cefa
+DIST jnr-constants-0.8.6.tar.gz 71080 SHA256 6c90abaa12004962032dcc4958adcb256b663840b082b07f3fee8e038c30cf26 SHA512 2098f8e1869b9c018ba3afa70ef386fce2609d9c650ee851dcd7cf7dc9d4d87dbe26886eb2e744d96cc11425f6b66144a018826360b7bab48a4b99e323f3717a WHIRLPOOL 108fbe7cceb25b21192047761e418e56e6939e62116a8896f14a804f56c541e58b43c5904df972075b8307dabb8134b83555c13a2cce5af294677ac5d0e6591b
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.3-r1.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..1d4fff8363b5
--- /dev/null
+++ b/dev-java/jnr-constants/jnr-constants-0.8.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="A set of platform constants (e.g. errno values)"
+HOMEPAGE="https://github.com/jnr/jnr-constants"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0.8.2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=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
+}
+
+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/jnr-constants-0.8.6.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
new file mode 100644
index 000000000000..07c6da4d0464
--- /dev/null
+++ b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..ba2f491aacad
--- /dev/null
+++ b/dev-java/jnr-constants/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <longdescription lang="en">
+</longdescription>
+  <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..73ec25501444
--- /dev/null
+++ b/dev-java/jnr-enxio/Manifest
@@ -0,0 +1 @@
+DIST jnr-enxio-0.7.tar.gz 10520 SHA256 6fa9757b7bea93e780f536a124d73dbabecfe0a3badd78cca33021a9ac8244ee SHA512 ed8c13ae4de2334aa9ddd9a13534e0c49fb1bde48e3bd5085a62c96f2b9fe6970b4ba08fe6b27901c5e6db1b360511265ac276ca56f89fddf5e18db9726bd834 WHIRLPOOL e5d0d4f3408578e5f92e2b7dd330f19b484018ed1ab90221164a947e938adbe6e8b679796f5e21a2c031484fb974c2b5bca591b5d3ef6cc0a0c9cd9be65b2b18
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.ebuild b/dev-java/jnr-enxio/jnr-enxio-0.7.ebuild
new file mode 100644
index 000000000000..b360fc1e8b9d
--- /dev/null
+++ b/dev-java/jnr-enxio/jnr-enxio-0.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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.6"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+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..a491448173c8
--- /dev/null
+++ b/dev-java/jnr-enxio/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..e3a0316ac28a
--- /dev/null
+++ b/dev-java/jnr-ffi/Manifest
@@ -0,0 +1,5 @@
+DIST jnr-ffi-0.5.10.tar.gz 559174 SHA256 6d13ae0ca2a63bcee0fcdb81263d676925658b0b466769e893279b453b636c9a SHA512 dc1eff430ab87dcecb798466088cc81fd92d5c44dfe473673635c3dfd7ad7e3e416d2086377b5b93b134902e7e6c3a736ef235f17a358a5a7f541dbaea41b2e5 WHIRLPOOL cef64a4e2db33262c4864b03c95303394c937682ceb9f9fad821932099c1f6e4eb6de36ae655c564aebf69bd4a99a1753839e49396b1adf1c9399bd8a16ef53f
+DIST jnr-ffi-0.6.0.tar.gz 97712 SHA256 91f7a1c21020892332849b9edc5ab7ad98dd7fabe03756fe0a48189ab796a24a SHA512 ea5997de1201c4d326ecd4753ed2ac11ba288d029508891a38e8a8ee8929b3622865057f9276373585414f88b48389ef607fd00474998ca4ce372a2cfc1e9170 WHIRLPOOL b205ecbce04e65981dc890fc0494dac01f5d47090535a336efc980f8877b64ceaf930fd157dd0a5de97987da61a0bbdb4b9cdfce9547d000f4f7c299d7167d60
+DIST jnr-ffi-0.7.11.tar.gz 131566 SHA256 a7045b072762e0905161a7792f60ed66798f298d589ee87262bf1cd75af447b5 SHA512 ddfacafbb5c7764692ef40db082bccb7a635916db9c5ff90ba0720a141e4b61072baaf4b4f5b985ef74fc5e8cb59753b93f7ffddb6f89c8a8ebcd0067ee0178b WHIRLPOOL 41d3308df161db08708fd05b12d9b3c49aba884523c0f19d4eb4531edf4c54316f12255f72a2d45e5ed720a619b2df024c06c7bf96fd252184344af3f8887db0
+DIST jnr-ffi-1.0.10.tar.gz 169196 SHA256 8d37e264705551a0f6b0283046dcc1264b311925874d7f674a6abc1f1f85775b SHA512 a46899e6a71c6fc5ad8586eae8dd718998de1ab30fe7c4b396a6291a54a63057c229c86c195c59e790bff13daa628adcb0caaacb05b1d58683e493fd6aa7fc3b WHIRLPOOL 467b1730a6e6ad494a00063c85bd90c34019df8730ce3a74b60d635f6f574ca0542fa3e2769beb1cecbe0feba2356662f0a2f35021ae425be52cdf1e63d73a1c
+DIST jnr-ffi-2.0.2.tar.gz 170707 SHA256 a79772f3c46cd5afaf272752bc9a8292c8fd53c8302f8dc825a3cf2444ee2ab8 SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0 WHIRLPOOL cdd7b4b27dd2018747d0a669f7237f30def64bbde18486e81ac99c538a8d0c4679237c2402f955cbada773558a54492cfdc9f0a127d3de4007472339215891e8
diff --git a/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch b/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch
new file mode 100644
index 000000000000..f47e8d259b15
--- /dev/null
+++ b/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch
@@ -0,0 +1,18 @@
+diff --git a/jnr-ffi-0.7.11/libtest/GNUmakefile b/jnr-ffi-0.7.11/libtest/GNUmakefile
+index 1906219..c9a9c11 100644
+--- a/jnr-ffi-0.7.11/libtest/GNUmakefile
++++ b/jnr-ffi-0.7.11/libtest/GNUmakefile
+@@ -37,10 +37,10 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS))
+ # 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-parentheses
++OFLAGS = $(JFLAGS)
++WFLAGS = -W -Wall -Wno-unused -Wno-parentheses
+ PICFLAGS = -fPIC
+-SOFLAGS = -shared -Wl,-O1
++SOFLAGS = -shared
+ LDFLAGS += $(SOFLAGS)
+ 
+ IFLAGS = -I"$(BUILD_DIR)"
diff --git a/dev-java/jnr-ffi/files/jnr-ffi-1.0.6-junit48.patch b/dev-java/jnr-ffi/files/jnr-ffi-1.0.6-junit48.patch
new file mode 100644
index 000000000000..92b4cb2bcfc3
--- /dev/null
+++ b/dev-java/jnr-ffi/files/jnr-ffi-1.0.6-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-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-0.5.10.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild
new file mode 100644
index 000000000000..50bff85580df
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0.5"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jffi:1.0
+	dev-java/jnr-x86asm:1.0
+	dev-java/asm:3"
+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
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jnr-ffi-* "${P}" || die
+}
+
+java_prepare() {
+	sed -i -e 's/-Werror //' libtest/GNUmakefile || die
+	sed -i -e "s|-mimpure-text||g" libtest/GNUmakefile || die # Fix gcc-4.7
+
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+
+	find "${WORKDIR}" -name '*.jar' -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="asm-3,jffi-1.0,jnr-x86asm-1.0"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN} -Dmaven.build.srcDir.0=src"
+
+EANT_TEST_EXTRA_ARGS="-Dmaven.build.testDir.0=test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djna.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/*
+}
diff --git a/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild
new file mode 100644
index 000000000000..2ab51ce827db
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0.6"
+KEYWORDS="amd64 x86"
+IUSE=""
+# Fail, upstream pom has ignore test failures enabled.
+RESTRICT="test"
+
+COMMON_DEP="
+	dev-java/jffi:1.0
+	dev-java/jnr-x86asm:1.0
+	dev-java/asm:3"
+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
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jnr-ffi-* "${P}" || die
+}
+
+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_GENTOO_CLASSPATH="asm-3,jffi-1.0,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/jnr-ffi-0.7.11-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild
new file mode 100644
index 000000000000..405c96341aec
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="https://github.com/jnr/jnr-ffi"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0.7"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="
+	>=dev-java/jffi-1.2.7-r1: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}-flags.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() {
+	# Fails, upstream pom has ignore test failures enabled.
+	rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
+
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+#	_JAVA_OPTIONS="-Djffi.boot.library.path=${EPREFIX}/usr/$(get_libdir)/jffi-1.2 -Djffi.boot.library.path=${EPREFIX}/usr/$(get_libdir)/jffi -Djava.library.path=${EPREFIX}/usr/$(get_libdir)/jffi"
+	_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/jnr-ffi-1.0.10.ebuild b/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
new file mode 100644
index 000000000000..d36ed8543702
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="1"
+KEYWORDS="amd64 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}"/${PN}-1.0.6-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/jnr-ffi-2.0.2.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
new file mode 100644
index 000000000000..42e47e0bff1a
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..17c4d243e37c
--- /dev/null
+++ b/dev-java/jnr-ffi/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <longdescription lang="en">
+</longdescription>
+  <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..47737614da0d
--- /dev/null
+++ b/dev-java/jnr-netdb/Manifest
@@ -0,0 +1,2 @@
+DIST jnr-netdb-1.0.1.tar.gz 670834 SHA256 654360f56c4a0131df293b6dcaa96618dfa9ded549180284dbaa20e6305d8906 SHA512 d62718de9e9b0a0bb1463f6bf9dc22ca00d5d107f22fea77af0b5cf77ffb6d681d0ea345cad0301e0f9053f797fd0a502325c71b3bf8aea989232f73e3f18cbc WHIRLPOOL f4e0493a0df380fd372e407d2e5014c40dda88e832ab6324fc579d6a2469cad9a3aed98f268c43aaa35b966324de7b746287fb075a16ddd58068b5fa00f04523
+DIST jnr-netdb-1.1.4.tar.gz 648347 SHA256 d67327943c8ca59432bda152bd4a8611ff1eab099f2d4bf08a743dfd5f963c69 SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195 WHIRLPOOL 0319025334a12e59df01da1f13e74401373ec7e7e2ea30db549e9e19e226d74cdc74b62e9c5c78d74374d05f98adcc3d18bdfc40a8e760a4c5f2b5fa3c7d4a76
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.0.1.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.0.1.ebuild
new file mode 100644
index 000000000000..9a0ac58b08f6
--- /dev/null
+++ b/dev-java/jnr-netdb/jnr-netdb-1.0.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Network services database access for java"
+HOMEPAGE="http://github.com/wmeissner/jnr-netdb"
+SRC_URI="http://github.com/wmeissner/jnr-netdb/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+COMMON_DEP=">=dev-java/jaffl-0.5.1:0"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}
+	test?
+	(
+		dev-java/ant-junit4:0
+		dev-java/hamcrest-core:0
+		java-virtuals/jdk-with-com-sun:0
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv w* "${P}" || die
+}
+
+src_prepare() {
+	mkdir -p lib
+	find . -iname 'junit*.jar' -delete
+	sed -i -e "s|run.test.classpath=|run.test.classpath=lib/hamcrest-core.jar:|g" nbproject/project.properties
+	java-pkg_jar-from --into lib jaffl jaffl.jar
+}
+
+EANT_EXTRA_ARGS="-Dreference.jaffl.jar=lib/jaffl.jar \
+	-Dproject.jaffl=\"${S}\" \
+	-D\"already.built.${S}\"=true"
+
+src_test() {
+	java-pkg_jar-from --build-only --into lib/junit_4 junit-4 \
+		junit.jar junit-4.5.jar
+	java-pkg_jar-from --build-only --into lib hamcrest-core \
+		hamcrest-core.jar
+	sed -i -e \
+	"s_\${file.reference.jffi-complete.jar}_$(java-pkg_getjars --build-only --with-dependencies jaffl)_" \
+		nbproject/project.properties
+
+	ANT_TASKS="ant-junit4 ant-nodeps" eant test \
+		${EANT_EXTRA_ARGS} \
+		-Djava.library.path="$(java-config -di jaffl)"
+}
+
+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/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..2ba128d59cf6
--- /dev/null
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..9aec21dc0728
--- /dev/null
+++ b/dev-java/jnr-netdb/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..600a28ded712
--- /dev/null
+++ b/dev-java/jnr-posix/Manifest
@@ -0,0 +1,3 @@
+DIST jnr-posix-1.1.8.tar.gz 206617 SHA256 c66c469cd97ed5a1f1cee10f71ea4a50c18c96f47019d93508aaef3d2a6fa9b1 SHA512 566289eefcf4c277145621aefcd5c412b38e2feb5d1c0297ee9b3945223278aca4ee4914c55c638230ec968ead3c952773aeb49072b3883c0bb04fe7c0d7cae5 WHIRLPOOL d74ba3c21c419cf9c0f02abbe76728a61f622a8c8e03da84c661ad9690cce1f8238003d15e0349ed12220c581fdbfc05c9b3cc436286bb400a40b30500ce5783
+DIST jnr-posix-2.4.0.tar.gz 64601 SHA256 773e5d70c538493a6e8dad2b74e039368d3536b7159d24d02128d2201e15537f SHA512 5e59eaa30b7177cee8fcd57ecd88038e0c043bb5f929cbcc808f24088b19b0ba464dc2af68d7cf94f7508281d1bc6ea26f1f39b8651727b75fae6eeb71c2c2dd WHIRLPOOL aa0711d8706032aea264682c414f46409e71abe1fa6e447b3c2d52f0af6e58442073e8e72721098f87ebaa116a5677830d3a50934799a28acf2b85d9b4e1aece
+DIST jnr-posix-3.0.10.tar.gz 85912 SHA256 bb68f39e911563458cea6334cb32733618836b5f96d996528a300a457a1e3746 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1 WHIRLPOOL 169a774516eda1176e8b631bbb16bcaebef287bf5c9ce1da871071df40081842e5405e7c4dae15f1c7054554b2d8e907bfeb3dba20db176912082cba1b83a525
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-1.1.8-r1.ebuild b/dev-java/jnr-posix/jnr-posix-1.1.8-r1.ebuild
new file mode 100644
index 000000000000..4214b5cd41d4
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-1.1.8-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
+HOMEPAGE="http://github.com/jnr/"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="1.1"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jnr-constants:0.8.2
+	dev-java/jnr-ffi:0.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jnr-posix-* ${P} || die
+}
+
+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_GENTOO_CLASSPATH="jnr-constants-0.8.2,jnr-ffi-0.5"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN} -Dmaven.build.srcDir.0=src"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_EXTRA_ARGS="-Dmaven.build.testDir.0=test"
+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/*
+}
diff --git a/dev-java/jnr-posix/jnr-posix-2.4.0.ebuild b/dev-java/jnr-posix/jnr-posix-2.4.0.ebuild
new file mode 100644
index 000000000000..103655838cdd
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-2.4.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
+HOMEPAGE="https://github.com/jnr/jnr-posix"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="2.4"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jnr-constants:0
+	dev-java/jnr-ffi:0.7"
+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() {
+	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-constants,jnr-ffi-0.7"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	# Fails, upstream pom has ignore test failures enabled.
+	rm -v src/test/java/jnr/posix/FileStatTest.java || die
+	rm -v src/test/java/jnr/posix/SpawnTest.java || die
+
+	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/jnr-posix-3.0.10.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
new file mode 100644
index 000000000000..b3d20b9eb194
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..e0a552f82ee5
--- /dev/null
+++ b/dev-java/jnr-posix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..a9a263754033
--- /dev/null
+++ b/dev-java/jnr-unixsocket/Manifest
@@ -0,0 +1 @@
+DIST jnr-unixsocket-0.6.tar.gz 6756 SHA256 f5243dd27559790dcd6a9b70d2671ab2e20f20ff8a1cba9923e9bda4133982b9 SHA512 93ceb4f90b259c94eb0a68f13da1bbdae547b77637102fc36b9aa4427ed079bca1e9d503579c52cb4ea591bf67df30efcb99c6c4d71e7545cc6ff35f5ca65249 WHIRLPOOL 6464e8d6fa895044095c6ddce4dabc761c6f4aeb9e0dfc04df464f3e20b9b4546d16a0fc6f617cec4e937b6bcf59fc690cbf0246fb3dc04ee80b8acb804715fa
diff --git a/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.3-build.xml b/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.3-build.xml
new file mode 100644
index 000000000000..8f2e213ab1e6
--- /dev/null
+++ b/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.3-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.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"/>
+
+  <!-- ====================================================================== -->
+  <!-- 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/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.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild
new file mode 100644
index 000000000000..cce704e93b67
--- /dev/null
+++ b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Unix sockets for Java"
+SRC_URI="http://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:0.7"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="jnr-constants,jnr-enxio,jnr-ffi-0.7,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..73c0445e5459
--- /dev/null
+++ b/dev-java/jnr-unixsocket/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..c44100b6261d
--- /dev/null
+++ b/dev-java/jnr-x86asm/Manifest
@@ -0,0 +1,3 @@
+DIST jnr-x86asm-0.1.tar.gz 83289 SHA256 31c0fbcc1fa3eb9b51a2644bf302dc88afdbbac78537020488403012af552eca SHA512 c2d2f8e60b1ec3940aea641edb98bb391f70fadf33a9ae782df0b24b8442d39a12880393e13fab305a8875a8802f7621e012472f40841e0fae24e16ea96f8043 WHIRLPOOL e49536a1268882c6de24ff5193cf9bc3da0eeb8f48f1b181e99309f5d003c4482808f2a30a32fe86091aab09ef13efb5f9a749dc6df3018f9dad40b8204b795d
+DIST jnr-x86asm-1.0.1.tar.gz 114159 SHA256 7528e5f7103ab1a40e0473cff377eb2c14e616d17c69010a8366658ed2da3f0c SHA512 812bae9acc69d403e188e833e1060786fa17c2807c62e4213b9207d22c388217b7840f7c3fa9b16ae042e293cd821051a69e34ec118af9944fef13bec091774a WHIRLPOOL 8c6bcb2d170eb9aa65944a75a359e828b05efc6695cb7727d112fd84a13366fadbad091e25ca3793ab2ba0138fe71287ab8ab808ca0a67baa413fcd19c868708
+DIST jnr-x86asm-1.0.2.tar.gz 114165 SHA256 2846693c3af607b1b89eba23e290f9dfd0668b45755cfa6f0708714d7a0ccdae SHA512 50ee91cd8931c4310b95276347f7860256843251dd36562350a10e34728e001d9e387ac4c230b4341f602bd9fe7fa8813a46e248b835c7e08801f5a3da04e11e WHIRLPOOL 8b5a5519f756be8c47bfdf6742653f883eed1e78b93abcad32081f18c97d09e855d58384920e731e9d65ef7d5c0135e0398cbc7c5d0abcda9fe7290ee0f998b6
diff --git a/dev-java/jnr-x86asm/files/jnr-x86asm_maven-build.xml b/dev-java/jnr-x86asm/files/jnr-x86asm_maven-build.xml
new file mode 100644
index 000000000000..f78f62e1a937
--- /dev/null
+++ b/dev-java/jnr-x86asm/files/jnr-x86asm_maven-build.xml
@@ -0,0 +1,216 @@
+<?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:35 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jnr-x86asm-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-x86asm-1.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/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}"/>
+  </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="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-x86asm/jnr-x86asm-0.1.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild
new file mode 100644
index 000000000000..a641ba097625
--- /dev/null
+++ b/dev-java/jnr-x86asm/jnr-x86asm-0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A pure-java port of asmjit"
+HOMEPAGE="http://github.com/wmeissner/jnr-x86asm/"
+SRC_URI="http://github.com/wmeissner/${PN}/tarball/0.1 -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}" || die
+	mv w* "${P}" || die
+}
+
+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/jnr-x86asm/jnr-x86asm-1.0.1.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.1.ebuild
new file mode 100644
index 000000000000..49b3aaf02e0b
--- /dev/null
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A pure-java port of asmjit"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jnr-x86asm-* ${P} || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+src_install() {
+	java-pkg_newjar 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-x86asm/jnr-x86asm-1.0.2.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2.ebuild
new file mode 100644
index 000000000000..a04e8391e088
--- /dev/null
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="A pure-java port of asmjit"
+HOMEPAGE="https://github.com/jnr/jnr-x86asm"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+src_install() {
+	java-pkg_newjar 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-x86asm/metadata.xml b/dev-java/jnr-x86asm/metadata.xml
new file mode 100644
index 000000000000..cb30f9995320
--- /dev/null
+++ b/dev-java/jnr-x86asm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..560c8677d97f
--- /dev/null
+++ b/dev-java/joda-convert/Manifest
@@ -0,0 +1 @@
+DIST joda-convert-1.3.1-dist.tar.gz 131288 SHA256 f73decd925a63ff23f010c2e0f894662ccce087eece4027dc0353574a7d2e537 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451 WHIRLPOOL 1ed3df81cd70bfa52bd82b74d5a4e412d46ca54ca250e2d24a0ba6d0711ee29cb82696b9d3e24dc1f43d563506d8334a76646a3902513c2ba221b91f6e79583b
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..981aad7f8dfb
--- /dev/null
+++ b/dev-java/joda-convert/joda-convert-1.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+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..ef639372017b
--- /dev/null
+++ b/dev-java/joda-convert/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..4ecfc932224e
--- /dev/null
+++ b/dev-java/joda-time/Manifest
@@ -0,0 +1,4 @@
+DIST joda-time-1.6-src.tar.gz 1270950 SHA256 4dc645d2ef3c19eebdb388cf22d27fa1c51abcfae87f48f12e2477a91207f92f SHA512 30c1cf558b8dfce67de357dec72c6d64358639f83999eae4f637e436e2e1a4870d09fd4ff86547ece992e49d96fc5113d44cc1dceed910c4de9a65ebc1075c01 WHIRLPOOL fae630d09e01b058e95ebbbceb0f1725580171e0746135dab35f247d1455c712f4f4f6fde7e6edf2cb578cc94fae6b87c202ce581675809b054d05ebcd5c0037
+DIST joda-time-2.2-dist.tar.gz 4397101 SHA256 1cf6176f222f0155b20693dc2a9939e10c766d986d68b144e30f446772596c48 SHA512 8a67b420b4cd179bd80166c930efdf9e32b4813b431329dae7844a078c23688220130c8466993aae4a865bf01e593a8e22b992726d9a1fe64eb0b6f911197f10 WHIRLPOOL 4afb42425e72deaaf25067810538191b6fec1c8e7a214c2230ca98a445d7c5134d881d62bcc9d6b4eedd4776803dcf32a734c8d5c24acd169101a7197d924c57
+DIST joda-time-2.3-dist.tar.gz 3440289 SHA256 f27acf5361e50e0560b349aecf3211e6265b4546d3de0362583390c18cbf4c57 SHA512 b20b0c77878971af99a2e60f01ca73510d4244fc4a069d21a657c79bd3ec482494edd3945c6a98e5313e41e53ede51f1cc98a5396f97e3c3775659a982c0fa0c WHIRLPOOL 6c9c6fe1a4e06e7634a34864f85a70024ddf058c8c3d1a33d83285b1fcee57fc122ce0615e1bca0d15d0387841b91565591a533bcf61a5679a4b69c2efe2c949
+DIST joda-time-2.7-dist.tar.gz 4007765 SHA256 6f29f22ff88d39d988c600f1e274e7a59c451184d7d6d400e2ddb9e4bbb2ceeb SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209 WHIRLPOOL eb2f91d5bbff641495d3a7763872321718415e49c8adb864805a84a73c583ee562f145821621ffd38ce1b41a813a15f4dcf609c5130b7557ef4d5e9fed86b17f
diff --git a/dev-java/joda-time/files/1.5.1-ecj.patch b/dev-java/joda-time/files/1.5.1-ecj.patch
new file mode 100644
index 000000000000..79f3f7863a76
--- /dev/null
+++ b/dev-java/joda-time/files/1.5.1-ecj.patch
@@ -0,0 +1,15 @@
+diff -ur joda-time-1.5.1-src.old/src/test/org/joda/time/convert/MockUnknownCalendar.java joda-time-1.5.1-src/src/test/org/joda/time/convert/MockUnknownCalendar.java
+--- joda-time-1.5.1-src.old/src/test/org/joda/time/convert/MockUnknownCalendar.java	2007-12-21 00:43:52.000000000 +0200
++++ joda-time-1.5.1-src/src/test/org/joda/time/convert/MockUnknownCalendar.java	2007-12-21 00:46:42.000000000 +0200
+@@ -34,7 +34,10 @@
+     MockUnknownCalendar(TimeZone zone) {

+         this.zone = zone;

+     }

+-    

++

++    public int compareTo(Object o) {

++        return super.compareTo((Calendar) o);

++    }

+     public long getTimeInMillis() {

+         return millis;

+     }

diff --git a/dev-java/joda-time/files/joda-time-2.2-build.xml b/dev-java/joda-time/files/joda-time-2.2-build.xml
new file mode 100644
index 000000000000..c90c2273e3ee
--- /dev/null
+++ b/dev-java/joda-time/files/joda-time-2.2-build.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.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 5/9/13 4:05 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.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.resourceDir.2" 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.1}">
+        <include name="LICENSE.txt"/>
+        <include name="NOTICE.txt"/>
+      </fileset>
+    </copy>
+    <mkdir dir="${maven.build.outputDir}/."/>
+    <copy todir="${maven.build.outputDir}/.">
+      <fileset dir="${maven.build.resourceDir.2}">
+        <include name="org/joda/time/tz/data/**"/>
+        <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="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" 
+         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}/org/joda/joda-convert/1.2"/>
+    <get src="http://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="http://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/files/joda-time-2.3-build.xml b/dev-java/joda-time/files/joda-time-2.3-build.xml
new file mode 100644
index 000000000000..5327843a0b9d
--- /dev/null
+++ b/dev-java/joda-time/files/joda-time-2.3-build.xml
@@ -0,0 +1,267 @@
+<?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/25/14 5:06 AM                       -->
+<!-- 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.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="."/>
+  <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>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.1}">
+        <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="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" 
+         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}/org/joda/joda-convert/1.2"/>
+    <get src="http://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="http://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/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-1.6.ebuild b/dev-java/joda-time/joda-time-1.6.ebuild
new file mode 100644
index 000000000000..a2c08291e4ae
--- /dev/null
+++ b/dev-java/joda-time/joda-time-1.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+
+DESCRIPTION="A quality open-source replacement for the Java Date and Time classes"
+HOMEPAGE="http://joda-time.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	>=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v *.jar || die
+	# https://sourceforge.net/tracker/index.php?func=detail&aid=1855430&group_id=97367&atid=617889
+	epatch "${FILESDIR}/1.5.1-ecj.patch"
+}
+
+# chokes on static inner class making instance of non-static inner class
+EANT_FILTER_COMPILER="jikes"
+# little trick so it doesn't try to download junit
+EANT_EXTRA_ARGS="-Djunit.ant=1 -Djunit.present=1"
+
+src_test() {
+	ANT_TASKS="ant-junit" eant -Djunit.jar="$(java-pkg_getjars junit)" test
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar
+
+	dodoc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt ToDo.txt || die
+	use doc && java-pkg_dojavadoc build/docs
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/joda-time/joda-time-2.2.ebuild b/dev-java/joda-time/joda-time-2.2.ebuild
new file mode 100644
index 000000000000..fb1ba07cd91d
--- /dev/null
+++ b/dev-java/joda-time/joda-time-2.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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://joda-time.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+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."
+}
+
+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/joda-time-2.3.ebuild b/dev-java/joda-time/joda-time-2.3.ebuild
new file mode 100644
index 000000000000..26bf61b72193
--- /dev/null
+++ b/dev-java/joda-time/joda-time-2.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+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."
+}
+
+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/joda-time-2.7.ebuild b/dev-java/joda-time/joda-time-2.7.ebuild
new file mode 100644
index 000000000000..4c63fd7c7b2e
--- /dev/null
+++ b/dev-java/joda-time/joda-time-2.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+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..c1cc65c3d37d
--- /dev/null
+++ b/dev-java/joda-time/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="github">JodaOrg/joda-time</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/joni/Manifest b/dev-java/joni/Manifest
new file mode 100644
index 000000000000..d8d7066c424a
--- /dev/null
+++ b/dev-java/joni/Manifest
@@ -0,0 +1,2 @@
+DIST joni-1.1.4.tar.gz 120701 SHA256 644f24378cffa2efe9d59c3a28616c80319693a42eeb0234550f9e1f2e8ba11e SHA512 68ac4559e3b6ac2506126af7c8159a87a7906fe45e71828478051f1a84a10b9b62c966168b260d1e0b0395cbd1792a428b2e1ac458db32b57b7a84c81f9e7804 WHIRLPOOL fce0621bf6302423c31036cb084f92455578321b940ad6b9a91f078fdadd9a94a4e0f52aeb42a9beb7fb6be3b789a54f99becf094c3a7462d3b9246edbb4967f
+DIST joni-2.1.0.tar.gz 125084 SHA256 9c8cb9abd7d8d086b777ade94a7ac68aaf7b9343720f81796d8c1a6c49e4cc39 SHA512 dd40b3a857deb02848d4a87de010ec6b9c96fb962643ea1022833a1bb5ebd76ffac403ff2a54497df288998939ed81910c22c02a2df1f7290112bb2ea506db0e WHIRLPOOL 4f5befc5b9813fb54cf813184fd152bbe3af98c73fda0d9c89dfbc42aa7b2f621b20738c23bad0682954ff8c7566a4053173857f06dac36036d6178c8ae9b89d
diff --git a/dev-java/joni/joni-1.1.4.ebuild b/dev-java/joni/joni-1.1.4.ebuild
new file mode 100644
index 000000000000..536458b1cf67
--- /dev/null
+++ b/dev-java/joni/joni-1.1.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+JAVA_PKG_IUSE="source"
+inherit base java-pkg-2 java-ant-2
+
+DESCRIPTION="Java port of the Oniguruma regular expression engine"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="http://github.com/jruby/joni/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/asm:3
+	dev-java/jcodings:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+src_unpack() {
+	unpack ${A}
+	mv j* "${S}"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="build"
+EANT_GENTOO_CLASSPATH="asm-3 jcodings"
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use source && java-pkg_dosrc src/*
+}
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..cfc2b47b83c0
--- /dev/null
+++ b/dev-java/joni/joni-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit base java-pkg-2 java-ant-2
+
+DESCRIPTION="Java port of the Oniguruma regular expression engine"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ppc ~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..0a200766983d
--- /dev/null
+++ b/dev-java/joni/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..382e4e33e05c
--- /dev/null
+++ b/dev-java/jopt-simple/Manifest
@@ -0,0 +1,2 @@
+DIST jopt-simple-4.4.tar.gz 101940 SHA256 96df6d6a36f28e9c277f1aee83b48d085faba89aa4de02fd518bd81e122d0ffc SHA512 a7b4eb6d46d5f7d52b04d352b787050dbcf080d646f6654514175ff5fed3b031f452706e03a45a0330aaffab8ceaba8363b64716df4dc4c27e0f461cf887d3bd WHIRLPOOL 252a1466c45e715d02a341458fb60d4e1750a43c24e54894ba39056b0d0c45fd8024b4ea17c08cb51c796ad78e949035b4b96ae74e0580fe42132246501844b7
+DIST jopt-simple-4.5.tar.gz 104369 SHA256 844fceb3e0e31d4cdfb2fad97a61b97904e979c8749682fe5758ccda24c54ec6 SHA512 d75747a1bc298cbd5f009a189e175895a8f808f77e6d2d56cb5f6e76f16573b659ba7f7ed5ca94c850e0196d9d831b1d6b14b713764fd599859c652080d741ef WHIRLPOOL a66d7d0e9ec2c5a3cfa04d8cf097d5e615452f1ca1459aae33101ef4b70a7b258e5a88da1a189d4b29600e17674c59bd378e47a8357b365137ee38cbab8aa6d9
diff --git a/dev-java/jopt-simple/jopt-simple-4.4.ebuild b/dev-java/jopt-simple/jopt-simple-4.4.ebuild
new file mode 100644
index 000000000000..a2e98f82b18d
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-4.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit vcs-snapshot java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for parsing command line options"
+HOMEPAGE="http://pholser.github.com/jopt-simple/"
+SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4.4"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/${P}"
+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.5.ebuild b/dev-java/jopt-simple/jopt-simple-4.5.ebuild
new file mode 100644
index 000000000000..efa14aa8dedd
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-4.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit vcs-snapshot java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for parsing command line options"
+HOMEPAGE="http://pholser.github.com/jopt-simple/"
+SRC_URI="https://github.com/pholser/${PN}/tarball/${P} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4.5"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/${P}"
+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/metadata.xml b/dev-java/jopt-simple/metadata.xml
new file mode 100644
index 000000000000..b4f998ddf83e
--- /dev/null
+++ b/dev-java/jopt-simple/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..8a2cbe8ae576
--- /dev/null
+++ b/dev-java/jortho/Manifest
@@ -0,0 +1 @@
+DIST JOrtho_1.0.zip 278599 SHA256 fbe9019ced6d13901024948f9f6dcc14a7faf7bafcae841399c0564d0b0456c2 SHA512 e9d99984e954711125eaace5d6bd3c7ec92dfbcf85cb567f0643a61533334a7d7b3d34bc47e2b2a147631edccc6898b9fbe4c999836f1638ef284aa0479a400c WHIRLPOOL 339735791ad3c6cc7da5a02279d0cc0dd9a8b7f9111a622ea75febe76237e5579bc267d2d069ec6a647e508ac34ed88c58b9b1335c71137ea82497a96a0e529c
diff --git a/dev-java/jortho/jortho-1.0.ebuild b/dev-java/jortho/jortho-1.0.ebuild
new file mode 100644
index 000000000000..aa51666f4570
--- /dev/null
+++ b/dev-java/jortho/jortho-1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..2901eeea8413
--- /dev/null
+++ b/dev-java/jortho/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+  </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jortho</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jpf/Manifest b/dev-java/jpf/Manifest
new file mode 100644
index 000000000000..64718e7683ac
--- /dev/null
+++ b/dev-java/jpf/Manifest
@@ -0,0 +1 @@
+DIST jpf-src-1.5.1.zip 1115573 SHA256 93bc9852b9d86f788f5e3c53650aa11a18758526542e0ebc17a508818e91c2e4 SHA512 90326013b110f5729e25bde3f61985f7bee9f78c58ebc3631c271c3d02fc7e91851adf3aa79de71b8e1a1411a2d3b67ba8e4e13f55c9332505ea2adbbc00149b WHIRLPOOL 8530c8e01e034dcc4a642d6756d1bbf48572ed7dc15548bdd448847c661acfc80b6cc1d60f8bf147aab7e314114d077b6924768cfe2e2e7b04b371f3aacb5d52
diff --git a/dev-java/jpf/jpf-1.5.1.ebuild b/dev-java/jpf/jpf-1.5.1.ebuild
new file mode 100644
index 000000000000..6f637194ccb8
--- /dev/null
+++ b/dev-java/jpf/jpf-1.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Plugin Framework - a runtime engine that dynamically discovers and loads plugins"
+HOMEPAGE="http://${PN}.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
+LICENSE="LGPL-2.1"
+
+SLOT="1.5"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+COMMON_DEP="dev-java/commons-logging:0
+	dev-java/ant-core"
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	java-ant_rewrite-classpath
+	rm -fv lib/*.jar || die
+	# needs some not yet packaged jxp dep, will add only on demand
+	rm -rfv source-tools/org/java/plugin/tools/{docgen,ant/DocTask.java} || die
+}
+
+# doc target is name="-javadoc" and would need a patch, on demand
+EANT_GENTOO_CLASSPATH="commons-logging,ant-core"
+
+src_install() {
+	java-pkg_dojar build/lib/jpf*.jar
+	java-pkg_register-ant-task
+
+	newdoc README.txt README || die
+	dodoc changelog.txt || die
+}
diff --git a/dev-java/jpf/metadata.xml b/dev-java/jpf/metadata.xml
new file mode 100644
index 000000000000..9c3dfc5d5f17
--- /dev/null
+++ b/dev-java/jpf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jpf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jpfcodegen/Manifest b/dev-java/jpfcodegen/Manifest
new file mode 100644
index 000000000000..a6157e49a569
--- /dev/null
+++ b/dev-java/jpfcodegen/Manifest
@@ -0,0 +1 @@
+DIST jpfcodegen-0.4.tar.bz2 27201 SHA256 c88401b6d872bf52aeb473bda16a77fb51b2f0236a4fb88ba4847d1bde174699 SHA512 9af5de54621afc941ac56f463b76a31732d97ad4fbbeabf43772c27e91f0e8fdfe5c089fc1cd22b2ad0bbac88d624086c94d751110bc77348706b39cedd45897 WHIRLPOOL c7005df485de6694658444cabdbcfa5ce20b35fe563f253a5b213801e98ee19eae48087df688281edc5ffd6f99eb481478ade568c2da3fc49287ac7e6795fe49
diff --git a/dev-java/jpfcodegen/jpfcodegen-0.4.ebuild b/dev-java/jpfcodegen/jpfcodegen-0.4.ebuild
new file mode 100644
index 000000000000..27a86ec635ab
--- /dev/null
+++ b/dev-java/jpfcodegen/jpfcodegen-0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Generator of classes for accessing the attributes and extensions of JPF plug-ins"
+HOMEPAGE="http://jabref.sourceforge.net/"
+
+# packaging instructions:
+# svn export https://jabref.svn.sourceforge.net/svnroot/jabref/tags/jpfcodegen-0.4
+# rm jpfcodegen-0.4/lib/*.jar
+# sed -i 's/, unjarlib"/"/' jpfcodegen-0.4/build.xml
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="LGPL-3"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+COMMON_DEP="dev-java/velocity:0
+	dev-java/jpf:1.5"
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+# doc target is name="-javadoc" and would need a patch, on demand
+EANT_BUILD_TARGET="jars"
+EANT_GENTOO_CLASSPATH="jpf-1.5,velocity"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_install() {
+	java-pkg_newjar JPFCodeGenerator-${PV}.jar JPFCodeGenerator.jar
+	java-pkg_newjar JPFCodeGenerator-${PV}-rt.jar JPFCodeGenerator-rt.jar
+	dohtml index.html
+}
diff --git a/dev-java/jpfcodegen/metadata.xml b/dev-java/jpfcodegen/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jpfcodegen/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jreleaseinfo/Manifest b/dev-java/jreleaseinfo/Manifest
new file mode 100644
index 000000000000..130a163c29d0
--- /dev/null
+++ b/dev-java/jreleaseinfo/Manifest
@@ -0,0 +1 @@
+DIST jreleaseinfo-1.3.0-src.zip 38437 SHA256 a06af23a25f10a9ea943b4119cb4bfe79554e4a8fb87d13f2074de1e4b5d646e SHA512 6c339787085ad0701f1054ebb96e387168e0ea5997a977d01dd758b6a5cd9090fee1f63124960112f2a0c8db3685e98fc8c3ec90821b13a70b0dac8cbf25c38f WHIRLPOOL 2acb87fdf056fae8521b8038a22e4fbb81f9df31abaa12c6fa555ca40f430daf4014f7c841e446530196b929351e3303c0c2e5add6e0d3b24e8bf7bb307b8e89
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..17b1ba2531e9
--- /dev/null
+++ b/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Ant Task for build-time creation of Java source file with version, build number or other info"
+HOMEPAGE="http://${PN}.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..65839deefef8
--- /dev/null
+++ b/dev-java/jreleaseinfo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..12fcf0d7c0a5
--- /dev/null
+++ b/dev-java/jrexx/Manifest
@@ -0,0 +1 @@
+DIST jrexx-1.1.1-src.zip 62878 SHA256 6655b611c7693f20da86cd8e933908483615341a916556e777535192aa8f1b0d SHA512 dc3e84e9c6313d8fc4c8fb57bc2713976d07284eae5d36ca4411d0e28eaae36351bbf7a6a16d9db365105e592d2e0cbccf7c3662f8d24114662422f02f0707d1 WHIRLPOOL 1f2e4451672c1c557efd5edca511504095196746b529e14a9ab1a7bbe82a243cd59ffc047561e066f4f54a65356e6c14e88e0b809609b3ba2ae12a696c0792d8
diff --git a/dev-java/jrexx/jrexx-1.1.1-r1.ebuild b/dev-java/jrexx/jrexx-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..a0a881ab72f0
--- /dev/null
+++ b/dev-java/jrexx/jrexx-1.1.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+DESCRIPTION="Regular expression API for textual pattern matching based on the finite state automaton theory"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+HOMEPAGE="http://www.karneim.com/jrexx/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		source? ( app-arch/zip )"
+IUSE="doc source"
+JAVA_PKG_FILTER_COMPILER="jikes"
+S=${WORKDIR}
+
+src_compile() {
+	mkdir build
+
+	cd src
+	ejavac -nowarn -d "${S}"/build $(find . -name "*.java") \
+		|| die "Failed to compile ${i}"
+
+	if use doc ; then
+		mkdir "${S}"/javadoc
+		javadoc -encoding ISO8859_1 -d "${S}"/javadoc $(find * -type d | tr '/' '.') \
+			|| die "failed to build javadocs"
+	fi
+
+	cd ..
+	jar cf ${PN}.jar -C build com || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jrexx/metadata.xml b/dev-java/jrexx/metadata.xml
new file mode 100644
index 000000000000..83e2fb6cc275
--- /dev/null
+++ b/dev-java/jrexx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..d5bac1796d65
--- /dev/null
+++ b/dev-java/jrobin/Manifest
@@ -0,0 +1 @@
+DIST jrobin-1.6.0-1.tar.gz 7340700 SHA256 0e00afc9b0fdd45bd7e62b3857fc7bd40f08e5f0cf155e0ba614cdabe58fcf5b SHA512 c5428906bf975f6c31f90185da3f0cbcaaff74d68e35e37b5e425340899fe01290d3d9813f1ecd60bd599512e3d62f635de290db9a9a1bd45292ac9c187b15c7 WHIRLPOOL b83007fb4aea92aaad62842b56b4e3bff98ce6ee509684536176420869228c8a86057f03bcebc2a1a637a9ffd2ba794d05756cc479901fff2765ced352ef5d25
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..2257f1c64e79
--- /dev/null
+++ b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a99edeb6c598
--- /dev/null
+++ b/dev-java/jrobin/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..cc0a17ea3374
--- /dev/null
+++ b/dev-java/jrrd/Manifest
@@ -0,0 +1 @@
+DIST jrrd-1.0.1.tar.gz 320476 SHA256 ec209fc07b5cd776c96e4e2bab817ed7158279e3e0fbec20642b89f95e5d1728 SHA512 f794f052af32544e17d5aef58c7acb068f442c85e991d7f11c25119d94edb4aebb75f744df53caa64f4fd1e9f900f9018a82790a77dcac48e071b13833a8cced WHIRLPOOL 646dea281471da5b5b96878fa9c331d2010b24faadc0baa9cf0749a42fb2f35a16c2404c6f3d2662b531827fdde4ceb59348b752a25807c45244a69a750b1f21
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..6a287212081c
--- /dev/null
+++ b/dev-java/jrrd/jrrd-1.0.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3ca4f82f4e2d
--- /dev/null
+++ b/dev-java/jrrd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+	Java Interface to Tobias Oetiker's RRDtool
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">opennms</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
new file mode 100644
index 000000000000..d3068c236511
--- /dev/null
+++ b/dev-java/jruby/Manifest
@@ -0,0 +1,2 @@
+DIST jruby-1.7.12-mvn-ant-ant.patch 210806 SHA256 3a46445615a3b4c6dcfea5e8b1cbf00177e81516c7fd70c619812be8ae0edf98 SHA512 18ab5e9a0ca04deccfe2ffaeba54c2c79c6f17fc5277bf32b800279f5a2a1c6e62ec273276b5b951d13d78b0de7b535b651a0d564b788cd972186895a3ab96ae WHIRLPOOL 23cdec09c9cae819d184676c57cc6fe2bc01b1c1a3dd574ae264e22796624beec31b2d5f8bec195594292b7dc742427c6e8f2f2bd48fad552a3fdb2cab0a2f07
+DIST jruby-src-1.7.12.tar.gz 10537791 SHA256 c10c0581abe7d55519273b91bddf9d44610baf69b875473593fd739b0c059cc7 SHA512 f68e72c37543a5301041a1700b9a3ef07ea5be43b806187f49e7ef6172315c5cd2aa4d74466273122e35b1a190f9a0fb097127c9530f48740f278ff6f87704fe WHIRLPOOL 5b82c5ac00761a62c6d319dc9ff319a5036c7b30724449149595fbaac117a2dca61bc13480db79ef85f10278607556f7091698021c3a7cfd3b1359603755e01a
diff --git a/dev-java/jruby/files/10jruby b/dev-java/jruby/files/10jruby
new file mode 100644
index 000000000000..13cb1f984cff
--- /dev/null
+++ b/dev-java/jruby/files/10jruby
@@ -0,0 +1 @@
+JRUBY_OPTS="-rgentoo"
diff --git a/dev-java/jruby/files/ftype-test-fixes.patch b/dev-java/jruby/files/ftype-test-fixes.patch
new file mode 100644
index 000000000000..77bdbda1a61f
--- /dev/null
+++ b/dev-java/jruby/files/ftype-test-fixes.patch
@@ -0,0 +1,79 @@
+diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_ftype.rb jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_ftype.rb
+--- jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_ftype.rb	2009-04-26 12:01:41.912584566 +0100
++++ jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_ftype.rb	2009-04-26 12:03:56.000210377 +0100
+@@ -26,28 +26,13 @@
+       else
+          @char = Pathname.new('/dev/null').realpath
+          @fifo = "test_fifo"
++         @link = "test_link"
+ 
+          system("mkfifo #{@fifo}")
++         system("ln -snf . #{@link}")
+ 
+-         if File.exists?("/dev/fd0")
+-            @block = Pathname.new("/dev/fd0").realpath
+-            @link  = "/dev/fd0" if File.symlink?("/dev/fd0")
+-         elsif File.exists?("/dev/diskette")
+-            @block = Pathname.new("/dev/diskette").realpath
+-            @link  = "/dev/diskette" if File.symlink?("/dev/diskette")
+-         elsif File.exists?("/dev/cdrom")
+-            @block = Pathname.new("/dev/cdrom").realpath
+-            @link  = "/dev/cdrom" if File.symlink?("/dev/cdrom")
+-         elsif File.exists?("/dev/sr0") # CDROM
+-            @block = Pathname.new("/dev/sr0").realpath
+-            @link  = "/dev/sr0" if File.symlink?("/dev/sr0") 
+-         elsif File.exists?("/dev/disk0")
+-            @block = "/dev/disk0"
+-            @link  = "/tmp"
+-         else
+-            @block = nil
+-            @link  = nil
+-         end
++         @block = %w( /dev/fd0 /dev/diskette /dev/cdrom /dev/sr0 /dev/disk0 ).find { |dev| File.exists?(dev) }
++         @block = Pathname.new(@block).realpath if @block
+       end
+    end
+ 
+@@ -66,22 +51,21 @@
+    end
+ 
+    # TODO: Find appropriate tests for MS Windows
+-   unless WINDOWS
+-      def test_ftype_char
+-         assert_equal('characterSpecial', File.ftype(@char))
+-      end
++   
++   def test_ftype_char
++      assert_equal('characterSpecial', File.ftype(@char)) if @char
++   end
+ 
+-      def test_ftype_block
+-         assert_equal('blockSpecial', File.ftype(@block), "BLOCK WAS: #{@block}")
+-      end
++   def test_ftype_block
++      assert_equal('blockSpecial', File.ftype(@block), "BLOCK WAS: #{@block}") if @block
++   end
+ 
+-      def test_ftype_link
+-         assert_equal('link', File.ftype(@link))
+-      end
++   def test_ftype_link
++      assert_equal('link', File.ftype(@link)) if @link
++   end
+ 
+-      def test_ftype_fifo
+-         assert_equal('fifo', File.ftype(@fifo))
+-      end
++   def test_ftype_fifo
++      assert_equal('fifo', File.ftype(@fifo)) if @fifo
+    end
+ 
+    def test_ftype_expected_errors
+@@ -91,6 +75,7 @@
+ 
+    def teardown
+       remove_file(@fifo)
++      remove_file(@link)
+       
+       @file   = nil
+       @dir    = nil
diff --git a/dev-java/jruby/files/gentoo.rb b/dev-java/jruby/files/gentoo.rb
new file mode 100644
index 000000000000..20c50f96c0d2
--- /dev/null
+++ b/dev-java/jruby/files/gentoo.rb
@@ -0,0 +1,8 @@
+# Autoload rubygems as with regular Ruby.
+begin
+require 'rubygems'
+rescue LoadError
+end
+
+# Append regular site_ruby to $LOAD_PATH. Unfortunately the -I option prepends instead.
+$LOAD_PATH.insert(-2, '/usr/lib/ruby/site_ruby/1.8', '/usr/lib/ruby/site_ruby')
diff --git a/dev-java/jruby/files/jruby b/dev-java/jruby/files/jruby
new file mode 100755
index 000000000000..804d788037fd
--- /dev/null
+++ b/dev-java/jruby/files/jruby
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export JRUBY_CP=`java-config -d -p jruby`
+exec bash /usr/share/jruby/bin/jruby "${@}"
diff --git a/dev-java/jruby/files/jruby-1.7.12-bash-launcher.patch b/dev-java/jruby/files/jruby-1.7.12-bash-launcher.patch
new file mode 100644
index 000000000000..2fe9eb457de0
--- /dev/null
+++ b/dev-java/jruby/files/jruby-1.7.12-bash-launcher.patch
@@ -0,0 +1,164 @@
+diff -Naur a/bin/jruby.bash b/bin/jruby.bash
+--- a/bin/jruby.bash	2014-05-03 17:55:20.665665383 +0200
++++ b/bin/jruby.bash	2014-05-03 17:58:37.095630622 +0200
+@@ -25,29 +25,7 @@
+   JAVA_VM=-client
+ fi
+ 
+-# get the absolute path of the executable
+-SELF_PATH=$(builtin cd -P -- "$(dirname -- "$0")" >/dev/null && pwd -P) && SELF_PATH=$SELF_PATH/$(basename -- "$0")
+-
+-# resolve symlinks
+-while [ -h $SELF_PATH ]; do
+-    # 1) cd to directory of the symlink
+-    # 2) cd to the directory of where the symlink points
+-    # 3) get the pwd
+-    # 4) append the basename
+-    DIR=$(dirname -- "$SELF_PATH")
+-    SYM=$(readlink $SELF_PATH)
+-    SELF_PATH=$(cd $DIR && cd $(dirname -- "$SYM") && pwd)/$(basename -- "$SYM")
+-done
+-
+-PRG=$SELF_PATH
+-
+-JRUBY_HOME_1=`dirname "$PRG"`           # the ./bin dir
+-if [ "$JRUBY_HOME_1" = '.' ] ; then
+-  cwd=`pwd`
+-  JRUBY_HOME=`dirname $cwd` # JRUBY-2699
+-else
+-  JRUBY_HOME=`dirname "$JRUBY_HOME_1"`  # the . dir
+-fi
++JRUBY_HOME="${JRUBY_HOME:-/usr/share/jruby}"
+ 
+ if [ -z "$JRUBY_OPTS" ] ; then
+   JRUBY_OPTS=""
+@@ -79,17 +57,7 @@
+ done
+ JRUBY_OPTS=${JRUBY_OPTS_TEMP}
+ 
+-if [ -z "$JAVACMD" ] ; then
+-  if [ -z "$JAVA_HOME" ] ; then
+-    JAVACMD='java'
+-  else
+-    if $cygwin; then
+-      JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/java"
+-    else
+-      JAVACMD="$JAVA_HOME/bin/java"
+-    fi
+-  fi
+-fi
++JAVACMD=java
+ 
+ if [ -z "$JAVA_MEM" ] ; then
+   JAVA_MEM=-Xmx500m
+@@ -130,21 +98,7 @@
+ 
+ CP_DELIMITER=":"
+ 
+-# add main jruby jar to the bootclasspath
+-for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
+-    if [ ! -e "$j" ]; then
+-      continue
+-    fi
+-    if [ "$JRUBY_CP" ]; then
+-        JRUBY_CP="$JRUBY_CP$CP_DELIMITER$j"
+-        else
+-        JRUBY_CP="$j"
+-    fi
+-    if [ $JRUBY_ALREADY_ADDED ]; then
+-        echo "WARNING: more than one JRuby JAR found in lib directory"
+-    fi
+-    JRUBY_ALREADY_ADDED=true
+-done
++JRUBY_CP="$(java-config-2 -d -p jruby)"
+ 
+ if $cygwin; then
+     JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
+@@ -152,29 +106,7 @@
+ 
+ # ----- Set Up The System Classpath -------------------------------------------
+ 
+-if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; then
+-    # Use same classpath propagated from parent jruby
+-    CP=$JRUBY_PARENT_CLASSPATH
+-else
+-    # add other jars in lib to CP for command-line execution
+-    for j in "$JRUBY_HOME"/lib/*.jar; do
+-        if [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then
+-          continue
+-        fi
+-        if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
+-          continue
+-        fi
+-        if [ "$CP" ]; then
+-            CP="$CP$CP_DELIMITER$j"
+-            else
+-            CP="$j"
+-        fi
+-    done
+-
+-    if [ "$CP" != "" ] && $cygwin; then
+-        CP=`cygpath -p -w "$CP"`
+-    fi
+-fi
++CP="${JRUBY_PARENT_CLASSPATH}"
+ 
+ if $cygwin; then
+     # switch delimiter only after building Unix style classpaths
+@@ -254,15 +186,7 @@
+         java_args=("${java_args[@]}" "-Djava.awt.headless=true") ;;
+      # Run under JDB
+      --jdb)
+-        if [ -z "$JAVA_HOME" ] ; then
+-          JAVACMD='jdb'
+-        else
+-          if $cygwin; then
+-            JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/jdb"
+-          else
+-            JAVACMD="$JAVA_HOME/bin/jdb"
+-          fi
+-        fi 
++        JAVACMD='jdb' 
+         java_args=("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/ruby/1.8:.")
+         JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C") ;;
+      --client)
+@@ -310,8 +234,6 @@
+ 
+ JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_MEM_MIN $JAVA_STACK"
+ 
+-JFFI_OPTS="-Djffi.boot.library.path=$JRUBY_HOME/lib/jni"
+-
+ if $cygwin; then
+   JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
+   JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"`
+@@ -349,8 +271,9 @@
+     JRUBY_OPTS=''
+   fi
+ 
+-  "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
++  "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
+     "-Djruby.home=$JRUBY_HOME" \
++    "-Djruby.bindir=/usr/bin" \
+     "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+     "-Djruby.shell=$JRUBY_SHELL" \
+     $java_class $JRUBY_OPTS "$@"
+@@ -372,7 +295,7 @@
+ else
+   if $cygwin; then
+     # exec doed not work correctly with cygwin bash
+-    "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
++    "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
+       "-Djruby.home=$JRUBY_HOME" \
+       "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+       "-Djruby.shell=$JRUBY_SHELL" \
+@@ -385,8 +308,9 @@
+ 
+     exit $JRUBY_STATUS
+   else
+-    exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
++    exec "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
+       "-Djruby.home=$JRUBY_HOME" \
++      "-Djruby.bindir=/usr/bin" \
+       "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+       "-Djruby.shell=$JRUBY_SHELL" \
+       $java_class $mode "$@"
diff --git a/dev-java/jruby/files/jruby-bash-launcher.patch b/dev-java/jruby/files/jruby-bash-launcher.patch
new file mode 100644
index 000000000000..d23f6cf200f3
--- /dev/null
+++ b/dev-java/jruby/files/jruby-bash-launcher.patch
@@ -0,0 +1,180 @@
+Author: Ralph Sennhauser <sera@gentoo.org>
+
+Set JRUBY_HOME, JRUBY_CP, CP and JAVACMD as appropriate for Gentoo.
+Remove JFFI_OPTS as the system jar knows where to look for the native lib.
+
+diff --git a/bin/jruby.bash b/bin/jruby.bash
+index 731f85e..8299557 100755
+--- a/bin/jruby.bash
++++ b/bin/jruby.bash
+@@ -25,31 +25,7 @@ if [ -z "$JAVA_VM" ]; then
+   JAVA_VM=-client
+ fi
+ 
+-## resolve links - $0 may be a link to  home
+-PRG=$0
+-progname=`basename "$0"`
+-
+-while [ -h "$PRG" ] ; do
+-  ls=`ls -ld "$PRG"`
+-  link=`expr "$ls" : '.*-> \(.*\)$'`
+-  if expr "$link" : '.*/.*' > /dev/null; then
+-    if expr "$link" : '/' > /dev/null; then
+-      PRG="$link"
+-    else
+-      PRG="`dirname ${PRG}`/${link}"
+-    fi
+-  else
+-    PRG="`dirname $PRG`/$link"
+-  fi
+-done
+-
+-JRUBY_HOME_1=`dirname "$PRG"`           # the ./bin dir
+-if [ "$JRUBY_HOME_1" = '.' ] ; then
+-  cwd=`pwd`
+-  JRUBY_HOME=`dirname $cwd` # JRUBY-2699
+-else
+-  JRUBY_HOME=`dirname "$JRUBY_HOME_1"`  # the . dir
+-fi
++JRUBY_HOME="${JRUBY_HOME:-/usr/share/jruby}"
+ 
+ if [ -z "$JRUBY_OPTS" ] ; then
+   JRUBY_OPTS=""
+@@ -81,17 +57,7 @@ for opt in ${JRUBY_OPTS[@]}; do
+ done
+ JRUBY_OPTS=${JRUBY_OPTS_TEMP}
+ 
+-if [ -z "$JAVACMD" ] ; then
+-  if [ -z "$JAVA_HOME" ] ; then
+-    JAVACMD='java'
+-  else
+-    if $cygwin; then
+-      JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/java"
+-    else
+-      JAVACMD="$JAVA_HOME/bin/java"
+-    fi
+-  fi
+-fi
++JAVACMD=java
+ 
+ if [ -z "$JAVA_MEM" ] ; then
+   JAVA_MEM=-Xmx500m
+@@ -132,21 +98,7 @@ JRUBY_SHELL=/bin/sh
+ 
+ CP_DELIMITER=":"
+ 
+-# add main jruby jar to the bootclasspath
+-for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
+-    if [ ! -e "$j" ]; then
+-      continue
+-    fi
+-    if [ "$JRUBY_CP" ]; then
+-        JRUBY_CP="$JRUBY_CP$CP_DELIMITER$j"
+-        else
+-        JRUBY_CP="$j"
+-    fi
+-    if [ $JRUBY_ALREADY_ADDED ]; then
+-        echo "WARNING: more than one JRuby JAR found in lib directory"
+-    fi
+-    JRUBY_ALREADY_ADDED=true
+-done
++JRUBY_CP="$(java-config-2 -d -p jruby)"
+ 
+ if $cygwin; then
+     JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
+@@ -154,29 +106,7 @@ fi
+ 
+ # ----- Set Up The System Classpath -------------------------------------------
+ 
+-if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; then
+-    # Use same classpath propagated from parent jruby
+-    CP=$JRUBY_PARENT_CLASSPATH
+-else
+-    # add other jars in lib to CP for command-line execution
+-    for j in "$JRUBY_HOME"/lib/*.jar; do
+-        if [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then
+-          continue
+-        fi
+-        if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
+-          continue
+-        fi
+-        if [ "$CP" ]; then
+-            CP="$CP$CP_DELIMITER$j"
+-            else
+-            CP="$j"
+-        fi
+-    done
+-
+-    if $cygwin; then
+-        CP=`cygpath -p -w "$CP"`
+-    fi
+-fi
++CP="${JRUBY_PARENT_CLASSPATH}"
+ 
+ if $cygwin; then
+     # switch delimiter only after building Unix style classpaths
+@@ -254,15 +184,7 @@ do
+         java_args=("${java_args[@]}" "-Djava.awt.headless=true") ;;
+      # Run under JDB
+      --jdb)
+-        if [ -z "$JAVA_HOME" ] ; then
+-          JAVACMD='jdb'
+-        else
+-          if $cygwin; then
+-            JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/jdb"
+-          else
+-            JAVACMD="$JAVA_HOME/bin/jdb"
+-          fi
+-        fi 
++        JAVACMD='jdb'
+         java_args=("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/ruby/1.8:.")
+         JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C") ;;
+      --client)
+@@ -310,18 +232,6 @@ set -- "${ruby_args[@]}"
+ 
+ JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_MEM_MIN $JAVA_STACK"
+ 
+-JFFI_BOOT=""
+-if [ -d "$JRUBY_HOME/lib/native/" ]; then
+-  for d in $JRUBY_HOME/lib/native/*`uname -s`; do
+-    if [ -z "$JFFI_BOOT" ]; then
+-      JFFI_BOOT="$d"
+-    else
+-      JFFI_BOOT="$JFFI_BOOT:$d"
+-    fi
+-  done
+-fi
+-JFFI_OPTS="-Djffi.boot.library.path=$JFFI_BOOT"
+-
+ if $cygwin; then
+   JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
+   JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"`
+@@ -354,7 +264,8 @@ if [ "$VERIFY_JRUBY" != "" ]; then
+       echo "Running with instrumented profiler"
+   fi
+ 
+-  "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
++  "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
+     "-Djruby.home=$JRUBY_HOME" \
++    "-Djruby.bindir=/usr/bin" \
+     "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+     "-Djruby.shell=$JRUBY_SHELL" \
+@@ -377,7 +287,7 @@ if [ "$VERIFY_JRUBY" != "" ]; then
+ else
+   if $cygwin; then
+     # exec doed not work correctly with cygwin bash
+-    "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
++    "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
+       "-Djruby.home=$JRUBY_HOME" \
+       "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+       "-Djruby.shell=$JRUBY_SHELL" \
+@@ -390,7 +300,8 @@ else
+ 
+     exit $JRUBY_STATUS
+   else
+-    exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
++    exec "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
+       "-Djruby.home=$JRUBY_HOME" \
++      "-Djruby.bindir=/usr/bin" \
+       "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+       "-Djruby.shell=$JRUBY_SHELL" \
diff --git a/dev-java/jruby/files/user-test-fixes.patch b/dev-java/jruby/files/user-test-fixes.patch
new file mode 100644
index 000000000000..6688fa9aa01a
--- /dev/null
+++ b/dev-java/jruby/files/user-test-fixes.patch
@@ -0,0 +1,124 @@
+diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/lib/test/helper.rb jruby-1.2.0/test/externals/ruby_test/lib/test/helper.rb
+--- jruby-1.2.0.orig/test/externals/ruby_test/lib/test/helper.rb	2009-03-16 15:16:02.000000000 +0000
++++ jruby-1.2.0/test/externals/ruby_test/lib/test/helper.rb	2009-04-18 00:34:02.198853097 +0100
+@@ -235,31 +235,34 @@
+       # Get the user of the current process.
+       #
+       def get_user
+-         user = ENV['USERNAME'] || ENV['USER']
+          if WINDOWS
+-            if user.nil?
+-               buf = 0.chr * MAX_PATH
+-               if GetUserName.call(buf, buf.length) == 0
+-                  raise "Unable to get user name"
+-               end
+-               user = buf.unpack("A*")
++            buf = 0.chr * MAX_PATH
++            if GetUserName.call(buf, buf.length) != 0
++	       buf.unpack("A*")
++	    elsif user = ENV['USERNAME'] || ENV['USER']
++	       user
++	    else
++               raise "Unable to get user name"
+             end
+          else
+-            user ||= Etc.getpwuid(Process.uid).name
++            Etc.getpwuid(Process.uid).name
+          end
+-         user
+       end
+ 
+-      # Returns the home directory of the current process owner.
+-      # 
++      # Returns the home directory of the current process owner
++      # according to the HOME/USERPROFILE variable.
+       def get_home
+-         home = ENV['HOME'] || ENV['USERPROFILE']
++         ENV['HOME'] || ENV['USERPROFILE'] || get_real_home
++      end
++      
++      # Returns the home directory of the current process owner
++      # according to the system.
++      def get_real_home
+          if WINDOWS
+-            home ||= "C:\\Documents and Settings\\" + get_user
++            "C:\\Documents and Settings\\" + get_user
+          else
+-            home ||= Etc.getpwuid(Process.uid).dir
++            Etc.getpwuid(Process.uid).dir
+          end
+-         home
+       end
+       
+       # Returns the current umask of the process.
+diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb
+--- jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb	2009-03-16 15:15:49.000000000 +0000
++++ jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb	2009-04-18 00:20:58.966617568 +0100
+@@ -12,6 +12,7 @@
+    def setup
+       @user = get_user
+       @home = get_home
++      @real_home = get_real_home
+       @pwd  = Dir.pwd
+       ENV['HOME'] = ENV['USERPROFILE'] if WINDOWS
+    end
+@@ -88,17 +89,21 @@
+    end
+ 
+    def test_expand_path_with_tilde
+-      assert_equal(@home, File.expand_path("~#{@user}"))
+-      assert_equal(File.join(@home, 'bin'), File.expand_path("~#{@user}/bin"))
++      { "~" => @home, "~#{@user}" => @real_home }.each do |tilde,path|
++         assert_equal(path, File.expand_path(tilde))
++         assert_equal(File.join(path, 'bin'), File.expand_path("#{tilde}/bin"))
++      end
+    end
+ 
+    # Second argument ignored if tilde is present and it's at position 0.
+    def test_expand_path_with_tilde_and_dir
+-      assert_equal(@home, File.expand_path("~#{@user}", '.'))
+-      assert_equal(@home, File.expand_path("~#{@user}", '..'))
+-      assert_equal(@home, File.expand_path("~#{@user}", '/tmp'))
+-      assert_equal(@home, File.expand_path("~#{@user}", '../tmp'))
+-      assert_equal(File.join(@home, 'bin'), File.expand_path("~#{@user}/bin", '/tmp'))
++      { "~" => @home, "~#{@user}" => @real_home }.each do |tilde,path|
++         assert_equal(path, File.expand_path(tilde, '.'))
++         assert_equal(path, File.expand_path(tilde, '..'))
++         assert_equal(path, File.expand_path(tilde, '/tmp'))
++         assert_equal(path, File.expand_path(tilde, '../tmp'))
++         assert_equal(File.join(path, 'bin'), File.expand_path("#{tilde}/bin", '/tmp'))
++      end
+    end
+ 
+    def test_expand_path_returns_tainted_string
+@@ -120,5 +126,6 @@
+       @pwd  = nil
+       @user = nil
+       @home = nil
++      @real_home = nil
+    end
+ end
+diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb jruby-1.2.0/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb
+--- jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb	2009-03-16 15:16:00.000000000 +0000
++++ jruby-1.2.0/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb	2009-04-18 21:24:02.653686353 +0100
+@@ -12,7 +12,7 @@
+ 
+    def setup
+       unless WINDOWS
+-         @gid = Etc.getpwnam(Etc.getlogin).gid
++         @gid = `id -g`.to_i
+       end
+    end
+ 
+diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb jruby-1.2.0/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb
+--- jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb	2009-03-16 15:15:50.000000000 +0000
++++ jruby-1.2.0/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb	2009-04-18 21:30:26.748686198 +0100
+@@ -12,7 +12,7 @@
+ 
+    def setup
+       unless WINDOWS
+-         @uid = Etc.getpwnam(Etc.getlogin).uid
++         @uid = `id -u`.to_i
+       end
+    end
+ 
diff --git a/dev-java/jruby/jruby-1.7.12.ebuild b/dev-java/jruby/jruby-1.7.12.ebuild
new file mode 100644
index 000000000000..dee4cd51abd6
--- /dev/null
+++ b/dev-java/jruby/jruby-1.7.12.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java-based Ruby interpreter implementation"
+HOMEPAGE="http://jruby.codehaus.org/"
+SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz
+	http://dev.gentoo.org/~tomwij/files/dist/${P}-mvn-ant-ant.patch"
+
+LICENSE="|| ( EPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+RUBY_VERSION=1.9
+RUBY_REVISION=0
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/asm:4
+	dev-java/bsf:2.3
+	>=dev-java/bytelist-1.0.8:0
+	dev-java/headius-options:0
+	dev-java/invokebinder:0
+	dev-java/jcodings:1
+	dev-java/jffi:1.2
+	dev-java/jnr-constants:0
+	dev-java/jnr-enxio:0
+	dev-java/jnr-ffi:0.7
+	>=dev-java/jnr-netdb-1.0:0
+	dev-java/jnr-posix:2.4
+	dev-java/jnr-unixsocket:0
+	dev-java/joda-time:0
+	dev-java/joni:2.1
+	dev-java/nailgun:0
+	dev-java/osgi-core-api:0
+	dev-lang/ruby:${RUBY_VERSION}
+	>=dev-java/snakeyaml-1.9:0
+	dev-java/jzlib:1.1
+"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8
+"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/ant-trax:0
+		dev-java/commons-logging:0
+		dev-java/junit:4
+		dev-java/xalan:0
+		java-virtuals/jdk-with-com-sun:0
+	)
+"
+
+RUBY_HOME=/usr/share/${PN}/lib/ruby
+SITE_RUBY=${RUBY_HOME}/site_ruby
+GEMS=${RUBY_HOME}/gems
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+
+EANT_GENTOO_CLASSPATH="ant-core asm-4 bsf-2.3 bytelist headius-options \
+invokebinder jcodings-1 jffi-1.2 jnr-constants jnr-enxio jnr-ffi-0.7 jnr-netdb \
+jnr-posix-2.4 jnr-unixsocket joda-time joni-2.1 nailgun osgi-core-api snakeyaml \
+jzlib-1.1"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} ant-junit4 ant-trax \
+commons-logging junit-4 xalan jdk-with-com-sun"
+
+EANT_BUILD_TARGET="package"
+
+pkg_setup() {
+	export RUBYOPT=""
+	java-pkg-2_pkg_setup
+
+	local fail
+	for directory in "${GEMS}" "${SITE_RUBY}"; do
+		if [[ -L ${directory} ]]; then
+			eerror "${directory} is a symlink. Please do the following to resolve the situation:"
+			echo 'emerge -an app-portage/gentoolkit'
+			echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > /tmp/jruby.fix'
+			echo 'emerge -1C $(< /tmp/jruby.fix)'
+			echo "rm ${directory}"
+			echo 'emerge -1 $(< /tmp/jruby.fix)'
+
+			eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187"
+			fail="true"
+		fi
+	done
+
+	if [[ -n ${fail} ]]; then
+		die "Please address the above errors, then run emerge --resume"
+	fi
+}
+
+java_prepare() {
+	einfo "Cleaning up bash launcher ..."
+	epatch "${FILESDIR}"/${P}-bash-launcher.patch
+
+	# When you capture a new patch, and it misses org.jruby.runtime.Constants;
+	# add maven.build.resourceDir.1 as a pathelement to the javac task of the
+	# compilation target. Also add jruby-core-GENTOO_JRUY_VER in ext classpaths.
+	# Also reorder the root maven-build.xml such that core compiles before ext.
+	einfo "Patching build.xml ..."
+	epatch "${DISTDIR}"/${P}-mvn-ant-ant.patch
+	find . -name '*build.xml' -exec \
+		sed -i "s/jruby-core-GENTOO_JRUY_VER/jruby-core-${PV}/" {} \;
+
+	einfo "Removing classes and jars ..."
+	find . -name "*.class" -or -name "*.jar" -print -delete
+
+	einfo "Fixing up properties ..."
+	JRUBY_CONSTANTS="core/src/main/resources/org/jruby/runtime/Constants.java"
+	for repvar in $(grep "@.*@\".*;" ${JRUBY_CONSTANTS} | sed 's:.*@\(.*\)@.*:\1:') ; do
+		VAR=$(grep "<${repvar}>" pom.xml | sed 's/.*>\(.*\)<\/.*/\1/')
+		sed -i "s/@${repvar}@/${VAR}/" \
+			${JRUBY_CONSTANTS} || die
+	done
+	sed -i "s/String VERSION = \".*\"/String VERSION = \"${PV}\"/" \
+		${JRUBY_CONSTANTS} || die
+
+	einfo "Setting Ruby version to use ..."
+	sed -i -e "s/String jruby_revision = \"\"/String jruby_revision = \"${RUBY_REVISION}\"/" \
+		-e "s/String jruby_default_ruby_version = \"\"/String jruby_default_ruby_version = \"${RUBY_VERSION}\"/" \
+		${JRUBY_CONSTANTS} || die
+}
+
+# Java based tests return propertly, I guess that is because there are none;
+# I've found an executable that can you can run, but it bails out about libyaml.
+#
+#  $ bin/testrb test
+# /usr/share/jruby/lib/ruby/1.9/yaml/store.rb:1:in `require':
+# It seems your ruby installation is missing psych (for YAML output).
+# To eliminate this warning, please install libyaml and reinstall your ruby.
+# JRuby 1.9 mode only supports the `psych` YAML engine; ignoring `syck`
+# NoMethodError: undefined method `to_yaml' for {}:Hash
+#        Store at /usr/share/jruby/lib/ruby/1.9/yaml/store.rb:78
+#        ...
+RESTRICT="${RESTRICT} test"
+
+src_test() {
+	export RUBYOPT=""
+
+	mv maven-build.xml build.xml || die
+
+	java-pkg-2_src_test
+
+	bin/testrb test || die ""
+}
+
+src_install() {
+	java-pkg_newjar core/target/${PN}-core-${PV}.jar
+	dodoc README.md docs/{*.txt,README.*} || die
+
+	use doc && java-pkg_dojavadoc core/target/site/apidocs
+	use source && java-pkg_dosrc core/src/main/java/org
+
+	newbin bin/jruby.bash jruby
+	dobin bin/j{irb{,_swing},rubyc}
+
+	insinto "${RUBY_HOME}"
+	doins -r "${S}"/lib/ruby/{1.8,1.9,2.0,shared}
+
+	# Remove all the references to RubyGems as we're just going to
+	# install it through dev-ruby/rubygems.
+	find "${ED}${RUBY_HOME}" -type f \
+		'(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
+		-delete || die
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "Make sure RUBYOPT is unset in the environment when using JRuby:"
+	ewarn ""
+	ewarn "    export RUBYOPT=\"\""
+	ewarn ""
+}
diff --git a/dev-java/jruby/metadata.xml b/dev-java/jruby/metadata.xml
new file mode 100644
index 000000000000..0b153778e653
--- /dev/null
+++ b/dev-java/jruby/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <herd>ruby</herd>
+</pkgmetadata>
diff --git a/dev-java/jsap/Manifest b/dev-java/jsap/Manifest
new file mode 100644
index 000000000000..03b03845a2dd
--- /dev/null
+++ b/dev-java/jsap/Manifest
@@ -0,0 +1 @@
+DIST JSAP-2.1-src.tar.gz 1281840 SHA256 5146bf75cba18fdf9299462a4127e95919c884494aaf3ed023cb2950217a0862 SHA512 5509d67b8af11cfbf94ca1a4d2b055b84c6c025ca26cd70390f63394d112a842fd39271181dfad0a88856964acd66f8abe49c72c58cc0086445d810837ba3352 WHIRLPOOL aecdc479d5d088429ca10a24a90b8aefc849ff7eef03276e9c2667a28420a2fefcf6d6541b1eee5d8c7891c3aa2c7392dc9e943084aaeac86bcc48d4a4d1dc78
diff --git a/dev-java/jsap/files/jsap-2.1-build.xml.patch b/dev-java/jsap/files/jsap-2.1-build.xml.patch
new file mode 100644
index 000000000000..8fae7e812bf7
--- /dev/null
+++ b/dev-java/jsap/files/jsap-2.1-build.xml.patch
@@ -0,0 +1,22 @@
+--- build.xml.original	2007-04-21 12:58:25.000000000 +0200
++++ build.xml	2007-04-21 13:08:39.000000000 +0200
+@@ -124,8 +124,8 @@
+     <!-- compile the JSAP API -->
+     <target name="compile-api" depends="init" >
+         <javac target="1.4" source="1.4" destdir="${build}" srcdir="${javasrc}">
+-<!--        	<exclude name="${testFiles}" />
+-        	<exclude name="${exampleFiles}" /> -->
++        	<exclude name="${testFiles}" />
++        	<exclude name="${exampleFiles}" />
+         	<classpath refid="lib.class.path" />
+         </javac>
+         <copy todir="${build}">
+@@ -168,7 +168,7 @@
+     </target>
+ 
+ 	<!-- make the jar -->
+-    <target name="jar" depends="clean,test">
++    <target name="jar" depends="clean,compile-api">
+         <mkdir dir="${dist}"/>
+         <jar basedir="${build}" jarfile="${dist}/${jarname}">
+         	<exclude name="${testFiles}" />
diff --git a/dev-java/jsap/jsap-2.1.ebuild b/dev-java/jsap/jsap-2.1.ebuild
new file mode 100644
index 000000000000..d558fc5d3b95
--- /dev/null
+++ b/dev-java/jsap/jsap-2.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Simple Arguments Parser (JSAP)"
+HOMEPAGE="http://sourceforge.net/projects/jsap"
+MY_PN=JSAP
+MY_P=${MY_PN}-${PV}
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+COMMON_DEP="
+	>=dev-java/ant-core-1.7.0
+	dev-java/xstream"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}
+	=dev-java/snip-0.11*
+	=dev-java/rundoc-0.11*
+	test? (
+		dev-java/ant-junit
+		=dev-java/junit-3.8*
+	)"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+	java-ant_rewrite-classpath
+	cd "${S}/lib"
+
+	rm -v *.jar
+}
+
+EANT_BUILD_TARGET="jar"
+EANT_JAVADOC_TARGET="javadoc"
+EANT_ANT_TASKS="rundoc snip"
+EANT_GENTOO_CLASSPATH="ant-core xstream"
+
+src_test() {
+	ANT_TASKS="ant-junit rundoc snip" eant test
+}
+
+src_install() {
+	java-pkg_newjar dist/${MY_P}.jar
+
+	if use doc; then
+		dohtml doc/*.html
+		java-pkg_dojavadoc doc/javadoc
+		dosym /usr/share/doc/${PF}/html/api /usr/share/doc/${PF}/html/javadoc
+	fi
+
+	use source && java-pkg_dosrc src/java/com
+}
diff --git a/dev-java/jsap/metadata.xml b/dev-java/jsap/metadata.xml
new file mode 100644
index 000000000000..f67c76a9769d
--- /dev/null
+++ b/dev-java/jsap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..3346a5659185
--- /dev/null
+++ b/dev-java/jsch/Manifest
@@ -0,0 +1,2 @@
+DIST jsch-0.1.49.zip 312322 SHA256 c017dfd2533b86dd751a8b1caea0ab4f19bfb9199c207c94fbdddcfd2ba9bbfe SHA512 6f21db4b561da65d4d22ecaecdc784aaca26b2dc625646a18a27b5dd7ef0eef5596786553e65b2d7f118b4993c4bb4e9561616052d15edf1a1ee1a3a7fd6b4ed WHIRLPOOL 4d09f8d122d1948400825d286718a2ee5cb42df55fbda059ff6c1260c88a5e6318ae9704d2bd7afc1f655b55d9347b39d158a01eaab1d77c506a6b99f117217e
+DIST jsch-0.1.52.zip 363648 SHA256 ceda29572f9bd670e425e48772b066e62e7a728edc6a6e23ba75f10444832ab5 SHA512 a5a998b6139638eee403e120f5f217112a5c09e81db8e1b1240d53ca311df4540b56aaa5f67f7a5c40cbc8420535d72d456e4fbfc95fe86d46376a00295bec4d WHIRLPOOL b820f35aab95e385bf457fbbd3ea4fc3c30057114c5c7025ac56dc435a4c708c51b450bfbac9b8202e23b90f062cced194def4aa8b479d629f1bef8121c66e5b
diff --git a/dev-java/jsch/jsch-0.1.49.ebuild b/dev-java/jsch/jsch-0.1.49.ebuild
new file mode 100644
index 000000000000..2e129d2cddcb
--- /dev/null
+++ b/dev-java/jsch/jsch-0.1.49.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+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 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+RDEPEND=">=virtual/jdk-1.5
+	zlib? ( dev-java/jzlib:0 )"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${RDEPEND}"
+
+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.52.ebuild b/dev-java/jsch/jsch-0.1.52.ebuild
new file mode 100644
index 000000000000..96a541c3d102
--- /dev/null
+++ b/dev-java/jsch/jsch-0.1.52.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+RDEPEND=">=virtual/jdk-1.6
+	zlib? ( dev-java/jzlib:0 )"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${RDEPEND}"
+
+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/metadata.xml b/dev-java/jsch/metadata.xml
new file mode 100644
index 000000000000..50449828380b
--- /dev/null
+++ b/dev-java/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>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jsch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jscience/Manifest b/dev-java/jscience/Manifest
new file mode 100644
index 000000000000..ff0f6a73d119
--- /dev/null
+++ b/dev-java/jscience/Manifest
@@ -0,0 +1 @@
+DIST jscience-1.0.4-src.zip 414755 SHA256 2ab5573ed2e3f0c8975dbf8ce118f1514f4a2e65d5960e7d210b6699790b0639 SHA512 d78b5cf32117d1f6638d00298185fb01dc1d710d38a1894ffa6ac0c436f6eefa6d330025b8d422597d0109b9ad06d3aa43cf6481bc1ebfad88677e14c1927956 WHIRLPOOL 466d5dc12e9402c70eda444afc9d832252b5e86b924470441d76ca0377b049ac6a0d969b21c7e361b6feb60d95dd9b4adb451048b1c310ddf22a76b4b451e67f
diff --git a/dev-java/jscience/jscience-1.0.4-r1.ebuild b/dev-java/jscience/jscience-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..9d73294c0045
--- /dev/null
+++ b/dev-java/jscience/jscience-1.0.4-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Tools and Libraries for the Advancement of Sciences"
+SRC_URI="http://jscience.org/${P}-src.zip"
+HOMEPAGE="http://jscience.org/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEP="~dev-java/javolution-2.2.4"
+
+RDEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/jscience-${PV%.*}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/lib"
+	rm -v *.jar || die
+	java-pkg_jar-from javolution-2.2.4
+}
+
+EANT_BUILD_TARGET="jarfile"
+
+src_test() {
+	# this works here as javolution is in lib/ and referenced in jar's manifest
+	java -jar jscience.jar test || die "test failed"
+}
+
+src_install() {
+	java-pkg_dojar jscience.jar
+
+	dodoc doc/coding_standard.txt || die
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc "${S}/src/org"
+}
diff --git a/dev-java/jscience/metadata.xml b/dev-java/jscience/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/jscience/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
new file mode 100644
index 000000000000..45b03f348f6c
--- /dev/null
+++ b/dev-java/json-simple/Manifest
@@ -0,0 +1 @@
+DIST json_simple-1.1-all.zip 44814 SHA256 007568a235ed018142756080e73ec7582af83bd90bbdc227489d186e1529ccf7 SHA512 02a5300456dbe2a1b5331b247ad964237d11d2281b35351f1f7bed6867eaf5bb6fb07ca1a50f87e30cd93221c5119e8b5f6f273357ab5fcfeda164ec119c0404 WHIRLPOOL f1169a8a52349a65469c8ef5ea61fbde469ebd30fdb57b591b0148e2244edb1f78ef99b5d79bc66e4cbfcced3f74436cbbd71e0463aa5b5e6737e81eccea1c82
diff --git a/dev-java/json-simple/files/build.xml b/dev-java/json-simple/files/build.xml
new file mode 100644
index 000000000000..9157aa4b95a6
--- /dev/null
+++ b/dev-java/json-simple/files/build.xml
@@ -0,0 +1,49 @@
+<project name="TimingFramework" default="dist" basedir=".">
+    <description>
+        simple example build file
+    </description>
+  <!-- set global properties for this build -->
+  <property name="src" location="src"/>
+  <property name="build" location="build"/>
+  <property name="dist"  location="dist"/>
+  <property name="javadoc" location="javadoc"/>
+
+  <target name="init">
+    <!-- Create the time stamp -->
+    <tstamp/>
+    <!-- Create the build directory structure used by compile -->
+    <mkdir dir="${build}"/>
+  </target>
+
+  <target name="compile" depends="init"
+        description="compile the source " >
+    <!-- Compile the java code from ${src} into ${build} -->
+    <javac srcdir="${src}" destdir="${build}"/>
+  </target>
+
+  <target name="dist" depends="compile"
+        description="generate the distribution" >
+    <!-- Create the distribution directory -->
+    <mkdir dir="${dist}/lib"/>
+
+    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
+    <jar jarfile="${dist}/lib/json-simple.jar" basedir="${build}"/>
+  </target>
+
+  <target name="clean"
+        description="clean up" >
+    <!-- Delete the ${build} and ${dist} directory trees -->
+    <delete dir="${build}"/>
+    <delete dir="${dist}"/>
+    <delete dir="${javadoc}"/>
+  </target>
+  
+  <target name="javadoc" description="Produce package javadoc">
+	<javadoc destdir="${javadoc}" >
+		<fileset dir="src" defaultexcludes="yes">
+      			<include name="org/json/**"/>
+    		</fileset>
+	</javadoc>
+  </target>
+	  
+</project>
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..bdd58ca69bc0
--- /dev/null
+++ b/dev-java/json-simple/json-simple-1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://json-simple.googlecode.com/files/${MY_P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc 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..71c785e5bc52
--- /dev/null
+++ b/dev-java/json-simple/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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/jsoup/Manifest b/dev-java/jsoup/Manifest
new file mode 100644
index 000000000000..f587ebb3ea9b
--- /dev/null
+++ b/dev-java/jsoup/Manifest
@@ -0,0 +1,2 @@
+DIST jsoup-1.7.2.tar.gz 292926 SHA256 b778e2b3687c4ca2255e9a9f5038f54470c0dfee8f9758937afc1f50fac78b38 SHA512 de400a755b4ecf7962b66f2a3f232895c5ce365c18e9c4af4dc654094357248e7f694217a33b8a0415767c1c50c532f6d70f01e04475ecf0c7d1b5607432967f WHIRLPOOL 67ae0eb1459161a46a5bb2c2ce8c646febe0fe5c8f0cbae8c4d620d713c2d6cf982fd4d8364204c72d07fbef0a9df32b5226cb65a718e3b811912b09b7a15911
+DIST jsoup-1.8.1.a.tar.gz 303388 SHA256 788832a1a3fa639fecb71b52c5b1c062663f5b3a21c1451968910c4731393b60 SHA512 4afcc42187fd034e2c6f45d369c4fdd0cc7523f4aa2f2526a21aebdebb8608e1ced51f3d6c8de02ac519eccd5ef415e9b7619450fb2e958a0f7a4d5bf492ed8a WHIRLPOOL 7c1f8a0db34b8907bbc2ce849d85a845956059520202346a1d608e43cb264d2b478738868a2d183d97eff85b8df085ced10130400f2612a26faff7f688e4e698
diff --git a/dev-java/jsoup/jsoup-1.7.2.ebuild b/dev-java/jsoup/jsoup-1.7.2.ebuild
new file mode 100644
index 000000000000..1744b83d3da8
--- /dev/null
+++ b/dev-java/jsoup/jsoup-1.7.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple vcs-snapshot
+
+DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
+HOMEPAGE="http://jsoup.org/"
+SRC_URI="https://github.com/jhy/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${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/jsoup-1.8.1.ebuild b/dev-java/jsoup/jsoup-1.8.1.ebuild
new file mode 100644
index 000000000000..bac8d54ce0b7
--- /dev/null
+++ b/dev-java/jsoup/jsoup-1.8.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple vcs-snapshot
+
+MY_PV="${PV}.a"
+
+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}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+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..a2b6848c32f9
--- /dev/null
+++ b/dev-java/jsoup/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..e58a7ee06c95
--- /dev/null
+++ b/dev-java/jspeex/Manifest
@@ -0,0 +1 @@
+DIST jspeex-0.9.7.zip 733580 SHA256 55d04780617d87ea2216401dfb66dfdfda9ecf5c018e48a2e4bcdd5c60910daa SHA512 9673bef155f1cccc45bc0a0d5596e79b48ba044309ba3446548b570bc7bad60b4b22cc7761749b0769114c7341b9fab6db8e8a155070f9de6fe2730c843199fe WHIRLPOOL d7555da834098c223b0b0f7c188d35594ef837a79d044c97ea14504a1173c65cc3741e993d936cda2812d3121d3a57e5226be9502db3fdf918b6e55e89bda5d1
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..5d783e7f947e
--- /dev/null
+++ b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..76fec185fc9b
--- /dev/null
+++ b/dev-java/jspeex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..a574a72dd1b8
--- /dev/null
+++ b/dev-java/jsr101/Manifest
@@ -0,0 +1 @@
+DIST axis-src-1_4.tar.gz 17041546 SHA256 911b4467f3d6cfe2e50fb7baea7a754e6aa717902d6ed91cef78f8f52bef8572 SHA512 7d08212b04702e76c960ad772a475f5765fef7f9ebe0aea3d4b949c6ba28a62500e8a76a43c7364b7caf36b7f27aee8592744256154670c7a24d29c5c1518258 WHIRLPOOL cf359caa9e645bdefb7c2ff012673dc64af9d4cc4bbe2a082cb64bcb0211d3a844ef797738ae1a3e9f978d0bbd8dc42bac9ecbdf4c734dd30ff52da18bdd7a91
diff --git a/dev-java/jsr101/jsr101-1.4-r2.ebuild b/dev-java/jsr101/jsr101-1.4-r2.ebuild
new file mode 100644
index 000000000000..fd4782709ae6
--- /dev/null
+++ b/dev-java/jsr101/jsr101-1.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE=""
+
+inherit versionator java-pkg-2
+
+DESCRIPTION="Java(TM) API for XML-Based RPC Specification Interface Classes"
+HOMEPAGE="http://jcp.org/aboutJava/communityprocess/first/jsr101/"
+MY_PN=axis
+MY_PV=$(replace_all_version_separators _)
+SRC_URI="mirror://apache/ws/${MY_PN}/${MY_PV}/${MY_PN}-src-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+
+IUSE=""
+
+CDEPEND="java-virtuals/servlet-api:2.5
+	java-virtuals/saaj-api:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_compile() {
+	mkdir build
+	ejavac \
+		-classpath $(java-pkg_getjars servlet-api-2.5,saaj-api) \
+		$(find src/javax/xml/rpc -name "*.java") -d build
+	cd build
+	jar cf jaxrpc-api.jar $(find . -type f) || die "jar failed"
+}
+
+src_install() {
+	java-pkg_dojar build/*.jar
+}
diff --git a/dev-java/jsr101/metadata.xml b/dev-java/jsr101/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jsr101/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jsr173/Manifest b/dev-java/jsr173/Manifest
new file mode 100644
index 000000000000..d9f5a74cbe88
--- /dev/null
+++ b/dev-java/jsr173/Manifest
@@ -0,0 +1 @@
+DIST jsr173.jar 639734 SHA256 3f6976396e31836dfe99fdc7aa72ee195546b6b6503618f60e2dc2651ed990ba SHA512 8b299532716682772e5eeafb63a5dd125dec8954a9a284f6766bac05409fff611724ae1a9b6f4f6f303b64c12b19e394371a6b0a87132b36e88f94e20b69efe4 WHIRLPOOL a4d7cc586e774bde385faa5b2ee0dc084bab31b3ae3dca9f862ffd8560fddd8fe76e9a700c1a63f6c02edf63d22733e07eeb14acd02fb4269054e0287bc72f82
diff --git a/dev-java/jsr173/files/build-1.0-r1.xml b/dev-java/jsr173/files/build-1.0-r1.xml
new file mode 100644
index 000000000000..0fadc3fb4655
--- /dev/null
+++ b/dev-java/jsr173/files/build-1.0-r1.xml
@@ -0,0 +1,61 @@
+<?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="dist.docs" value="${dist}/doc/api"/>
+
+   <property name="libdir" value="lib"/>
+
+   <property name="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+    <path id="lib.classpath">
+		<fileset dir="${libdir}">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <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}" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+         <fileset dir="${build}"/>
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+	   <javadoc sourcepath="${src}" destdir="${dist.docs}" packagenames="*" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/jsr173/files/build-1.0.xml b/dev-java/jsr173/files/build-1.0.xml
new file mode 100644
index 000000000000..0fadc3fb4655
--- /dev/null
+++ b/dev-java/jsr173/files/build-1.0.xml
@@ -0,0 +1,61 @@
+<?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="dist.docs" value="${dist}/doc/api"/>
+
+   <property name="libdir" value="lib"/>
+
+   <property name="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+    <path id="lib.classpath">
+		<fileset dir="${libdir}">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <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}" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+         <fileset dir="${build}"/>
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+	   <javadoc sourcepath="${src}" destdir="${dist.docs}" packagenames="*" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/jsr173/jsr173-1.0-r1.ebuild b/dev-java/jsr173/jsr173-1.0-r1.ebuild
new file mode 100644
index 000000000000..75fdc3b5237e
--- /dev/null
+++ b/dev-java/jsr173/jsr173-1.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The Streaming API for XML (StAX) is a Java API for parsing and writing XML easily and efficiently"
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.3
+	dev-java/jaxme"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cd "${S}"
+	jar xvf ${DISTDIR}/${A} || die "failed to unpack"
+
+	cp "${FILESDIR}/build-${PVR}.xml" build.xml
+
+	jar xvf ${P//-/_}_src.jar || die "failed to unpack"
+	rm -v *.jar || die
+	cd lib
+	rm -v *.jar || die
+	java-pkg_jarfrom jaxme
+}
+
+src_compile() {
+	local antflags="-Dproject.name=${PN} jar"
+	eant ${antflags} $(use_doc) || die "Compilation failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	use doc && java-pkg_dojavadoc dist/doc/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jsr173/metadata.xml b/dev-java/jsr173/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/jsr173/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jsr181/Manifest b/dev-java/jsr181/Manifest
new file mode 100644
index 000000000000..7359ea9daf0f
--- /dev/null
+++ b/dev-java/jsr181/Manifest
@@ -0,0 +1 @@
+DIST JAXWS2.0.1m1_source_20060817.jar 8993405 SHA256 9725cfb91cecff833055d7af45c3413ca9d1a818a4cfdb86211ed82f383f3865 SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314 WHIRLPOOL fe0727935c592b538b7042808fffa987ea5ae47554367ea0cfc91f65d765bd234713aaa142b2297988d74eec01fce9cd4bedceb0fb7b0068eb38084a1d5f5ba7
diff --git a/dev-java/jsr181/files/build.xml b/dev-java/jsr181/files/build.xml
new file mode 100644
index 000000000000..cfc6aabd8867
--- /dev/null
+++ b/dev-java/jsr181/files/build.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" standalone="yes"?>
+<project basedir="." default="jar">
+  <target name="compile">
+    <mkdir dir="bin"/>
+    <javac srcdir="src" destdir="bin">
+      <include name="**/*.java"/>
+      <classpath>
+        <fileset dir="lib">
+          <include name="**/*.jar"/>
+        </fileset>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="jsr181.jar" manifest="META-INF/MANIFEST.MF">
+      <zipfileset dir="bin"/>
+    </jar>
+  </target>
+  <target name="doc">
+    <mkdir dir="api"/>
+    <javadoc packagenames="javax.*" destdir="api">
+      <fileset dir="src/" includes="**/*.java"/>
+    </javadoc>
+  </target>
+</project>
diff --git a/dev-java/jsr181/jsr181-1.0-r1.ebuild b/dev-java/jsr181/jsr181-1.0-r1.ebuild
new file mode 100644
index 000000000000..2dce026627a7
--- /dev/null
+++ b/dev-java/jsr181/jsr181-1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2
+
+DESCRIPTION="JSR 181 API classes"
+HOMEPAGE="http://jax-ws.dev.java.net/"
+DATE="20060817"
+MY_P="JAXWS2.0.1m1_source_${DATE}.jar"
+SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${RDEPEND}"
+
+S="${WORKDIR}/jaxws-si"
+
+src_unpack() {
+	printf '%s\n' "A" | $(java-config --java) -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+	unpack ./jaxws-src.zip || die "unzip failed"
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_newjar lib/jsr181-api.jar
+}
diff --git a/dev-java/jsr181/jsr181-1.0.ebuild b/dev-java/jsr181/jsr181-1.0.ebuild
new file mode 100644
index 000000000000..f18794bfea8b
--- /dev/null
+++ b/dev-java/jsr181/jsr181-1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+DESCRIPTION="JSR 181 API classes"
+HOMEPAGE="http://jax-ws.dev.java.net/"
+DATE="20060817"
+MY_P="JAXWS2.0.1m1_source_${DATE}.jar"
+SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${RDEPEND}"
+
+S="${WORKDIR}/jaxws-si"
+
+src_unpack() {
+	printf '%s\n' "A" | $(java-config --java) -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+	unpack ./jaxws-src.zip || die "unzip failed"
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_newjar lib/jsr181-api.jar
+}
diff --git a/dev-java/jsr181/metadata.xml b/dev-java/jsr181/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jsr181/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jsr223/Manifest b/dev-java/jsr223/Manifest
new file mode 100644
index 000000000000..ef9609021886
--- /dev/null
+++ b/dev-java/jsr223/Manifest
@@ -0,0 +1 @@
+DIST jsr223-openjdk-6-src-b19.tar.bz2 15936 SHA256 efbbe1f9a589bc92d8479e793a6486d7c07d452255e6eccdd8252dfe8fcd3646
diff --git a/dev-java/jsr223/jsr223-1.0-r1.ebuild b/dev-java/jsr223/jsr223-1.0-r1.ebuild
new file mode 100644
index 000000000000..8abb2b368f8c
--- /dev/null
+++ b/dev-java/jsr223/jsr223-1.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE=""
+
+inherit java-pkg-2
+
+DESCRIPTION="Scripting for the Java(TM) Platform"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=223"
+
+# http://download.java.net/openjdk/jdk6/promoted/b19/openjdk-6-src-b19-15_apr_2010.tar.gz
+# tar xvf openjdk-6-src-b19-15_apr_2010.tar.gz jdk/src/share/classes/javax/script
+# tar cjvf jsr223-openjdk-6-src-b19.tar.bz2 jdk/
+SRC_URI="mirror://gentoo/jsr223-openjdk-6-src-b19.tar.bz2"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}"
+
+src_compile() {
+	mkdir build || die
+	ejavac -d build jdk/src/share/classes/javax/script/*.java
+	jar -cf script-api.jar -C build javax || die
+}
+
+src_install() {
+	java-pkg_dojar script-api.jar
+}
diff --git a/dev-java/jsr223/metadata.xml b/dev-java/jsr223/metadata.xml
new file mode 100644
index 000000000000..407583277d87
--- /dev/null
+++ b/dev-java/jsr223/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>java@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsr250/Manifest b/dev-java/jsr250/Manifest
new file mode 100644
index 000000000000..23253e2c2997
--- /dev/null
+++ b/dev-java/jsr250/Manifest
@@ -0,0 +1 @@
+DIST jsr250-api-1.0-sources.jar 7680 SHA256 d1c22846dcbb8e69d64e074d2017819e129afa6c4c7e6221d8c078fb7c22fb08 SHA512 3a652db6f78fd74e6256a602ea75d1b3e50fd68aee658e2b8569196710427e00b61c85786a79c094f3820856dd05dbd37cd6afd28b666a7bb1b0805812fa4d63 WHIRLPOOL f8e99af6e6893050480be067a56a0860a092d8894e4f73dddd34ab518b0b9d919267abdb989cbd19b160e2e50237759207e1793615e6919b9aee2042c6b86f7f
diff --git a/dev-java/jsr250/jsr250-1.0-r1.ebuild b/dev-java/jsr250/jsr250-1.0-r1.ebuild
new file mode 100644
index 000000000000..115c04182e79
--- /dev/null
+++ b/dev-java/jsr250/jsr250-1.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JSR 250 Common Annotations"
+HOMEPAGE="https://jcp.org/en/jsr/detail?id=250"
+SRC_URI="http://download.java.net/maven/2/javax/annotation/${PN}-api/${PV}/${PN}-api-${PV}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/jsr250/metadata.xml b/dev-java/jsr250/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jsr250/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jsr305/Manifest b/dev-java/jsr305/Manifest
new file mode 100644
index 000000000000..fbbe8d7d9afc
--- /dev/null
+++ b/dev-java/jsr305/Manifest
@@ -0,0 +1 @@
+DIST jsr-305-source.tar.gz 36865 SHA256 87bcc526872fb430a8f02a1e0445175b38e73b809392398601570158373aa9b6 SHA512 7821865ade33e1ca4f59da3e6c8b888f26c21853aa0f8578299a4205cd931900be294aaf85036ba54646a66efe3d9ae0a5653ef756710521be03882b9e0b82e5 WHIRLPOOL 0768571aeef2ae0758ed70c8569f06567ac45ad7900808ad7843ee01e1311c0521f76ff750e45983cbdf585ab9e4df5eb3a1ffd8bdf27d9fb7afd02cae424007
diff --git a/dev-java/jsr305/jsr305-1.0-r1.ebuild b/dev-java/jsr305/jsr305-1.0-r1.ebuild
new file mode 100644
index 000000000000..7e21ac5cda9d
--- /dev/null
+++ b/dev-java/jsr305/jsr305-1.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc examples source test"
+inherit eutils java-pkg-2 java-ant-2
+MY_PN=jsr-305
+
+DESCRIPTION="Reference implementation for JSR 305: Annotations for Software Defect Detection in Java"
+SRC_URI="mirror://gentoo/${MY_PN}-source.tar.gz"
+HOMEPAGE="http://code.google.com/p/jsr-305/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? ( dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_compile() {
+	# create jar
+	cd ri
+	mkdir -p build/classes
+	ejavac -sourcepath src/main/java -d build/classes $(find src/main/java -name "*.java") \
+		|| die "Cannot compile sources"
+	mkdir dist
+	cd build/classes
+	jar -cvf "${S}"/ri/dist/${PN}.jar javax || die "Cannot create JAR"
+
+	# generate javadoc
+	if use doc ; then
+		cd "${S}"/ri
+		mkdir javadoc
+		javadoc -d javadoc -sourcepath src/main/java -subpackages javax \
+			|| die "Javadoc creation failed"
+	fi
+}
+
+src_install() {
+	cd ri
+	java-pkg_dojar dist/${PN}.jar
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples/
+		cp -r "${S}"/sampleUses/* "${D}"/usr/share/doc/${PF}/examples/ || die "Could not install examples"
+	fi
+
+	if use source ; then
+		cd "${S}"/ri/src/main/java
+		java-pkg_dosrc javax
+	fi
+
+	if use doc ; then
+		cd "${S}"/ri
+		java-pkg_dojavadoc javadoc
+	fi
+}
diff --git a/dev-java/jsr305/metadata.xml b/dev-java/jsr305/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jsr305/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jsr311-api/Manifest b/dev-java/jsr311-api/Manifest
new file mode 100644
index 000000000000..8d3a9823d6d9
--- /dev/null
+++ b/dev-java/jsr311-api/Manifest
@@ -0,0 +1 @@
+DIST jsr311-api-1.1-src.tar.bz2 84225 SHA256 c048e69dae1282e345de8cc169d3ead0a2bde9054b385b8b15f24074d4c779ef SHA512 d7d07b1587914f1b060fb780eb96aae98d4d6d78c6f40822bc5e60e1eb2d0956fe048c7dc3f21a8e40160d67ca208eb2e731ae72215e52a7c545eac79ca4ba76 WHIRLPOOL 4cc66526547dbcefa6f1a300c8d16e6ae3e95423a23d2452fc4fbb0a449af84bff6fb739d167e5f0718bfcfa43d58d379bf24e4a3ed85ead81ff0779105def4e
diff --git a/dev-java/jsr311-api/files/jsr311-api-1.0-build.xml b/dev-java/jsr311-api/files/jsr311-api-1.0-build.xml
new file mode 100644
index 000000000000..00ededecdc10
--- /dev/null
+++ b/dev-java/jsr311-api/files/jsr311-api-1.0-build.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 -->
+<!-- Robin H. Johnson <robbat2@gentoo.org> -->
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<project name="jsr311-api" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Import maven-build.xml into the current project                        -->
+  <!-- ====================================================================== -->
+
+  <import file="maven-build.xml"/>
+  
+  <!-- ====================================================================== -->
+  <!-- Help target                                                            -->
+  <!-- ====================================================================== -->
+
+  <target name="help">
+    <echo message="Please run: $ant -projecthelp"/>
+  </target>
+
+</project>
diff --git a/dev-java/jsr311-api/files/jsr311-api-1.0-manifest b/dev-java/jsr311-api/files/jsr311-api-1.0-manifest
new file mode 100644
index 000000000000..9c4e64da9610
--- /dev/null
+++ b/dev-java/jsr311-api/files/jsr311-api-1.0-manifest
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0

+Extension-Name: javax.ws.rs

+Specification-Title: JAX-RS: Java API for RESTful Web Services

+Specification-Vendor: Sun Microsystems, Inc.

+Specification-Version: 1.0

+Bundle-DocURL: http://www.sun.com/

+Bundle-License: http://www.opensource.org/licenses/cddl1.php

+Bundle-ManifestVersion: 2

+Bundle-Name: jsr311-api

+Bundle-SymbolicName: javax.ws.rs.jsr311-api

+Bundle-Vendor: Sun Microsystems, Inc

+Bundle-Version: 1.0

+Import-Package: javax.ws.rs;version="1.0",javax.ws.rs.core;version="1.

+ 0",javax.ws.rs.ext;version="1.0"

+Export-Package: javax.ws.rs;uses:="javax.ws.rs.core";version="1.0",jav

+ ax.ws.rs.ext;uses:="javax.ws.rs,javax.ws.rs.core";version="1.0",javax

+ .ws.rs.core;uses:="javax.ws.rs,javax.ws.rs.ext";version="1.0"

diff --git a/dev-java/jsr311-api/files/jsr311-api-1.0-maven-build.xml b/dev-java/jsr311-api/files/jsr311-api-1.0-maven-build.xml
new file mode 100644
index 000000000000..d8761bdf621e
--- /dev/null
+++ b/dev-java/jsr311-api/files/jsr311-api-1.0-maven-build.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 -->
+<!-- Robin H. Johnson <robbat2@gentoo.org> -->
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<project name="jsr311-api-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jsr311-api-1.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"/>
+  <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.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+  </path>
+  <path id="build.test.classpath">
+    <fileset dir=".">
+      <include name="lib/junit.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" 
+		   source="1.5"
+		   classpath="${gentoo.classpath}">
+      <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"
+		   classpath="${gentoo.classpath}">
+      <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"
+          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>
+
+  <!-- ====================================================================== -->
+  <!-- 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" 
+		 manifest="manifest"
+         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/jsr311-api/files/jsr311-api-1.1-build.xml b/dev-java/jsr311-api/files/jsr311-api-1.1-build.xml
new file mode 100644
index 000000000000..00ededecdc10
--- /dev/null
+++ b/dev-java/jsr311-api/files/jsr311-api-1.1-build.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 -->
+<!-- Robin H. Johnson <robbat2@gentoo.org> -->
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<project name="jsr311-api" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Import maven-build.xml into the current project                        -->
+  <!-- ====================================================================== -->
+
+  <import file="maven-build.xml"/>
+  
+  <!-- ====================================================================== -->
+  <!-- Help target                                                            -->
+  <!-- ====================================================================== -->
+
+  <target name="help">
+    <echo message="Please run: $ant -projecthelp"/>
+  </target>
+
+</project>
diff --git a/dev-java/jsr311-api/files/jsr311-api-1.1-manifest b/dev-java/jsr311-api/files/jsr311-api-1.1-manifest
new file mode 100644
index 000000000000..93184153e14c
--- /dev/null
+++ b/dev-java/jsr311-api/files/jsr311-api-1.1-manifest
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0

+Extension-Name: javax.ws.rs

+Specification-Title: JAX-RS: Java API for RESTful Web Services

+Specification-Vendor: Sun Microsystems, Inc.

+Specification-Version: 1.1

+Bundle-License: http://www.opensource.org/licenses/cddl1.php

+Import-Package: javax.ws.rs;version="1.1",javax.ws.rs.core;version="1.

+ 0",javax.ws.rs.ext;version="1.1"

+Export-Package: javax.ws.rs;uses:="javax.ws.rs.core";version="1.1",jav

+ ax.ws.rs.ext;uses:="javax.ws.rs,javax.ws.rs.core";version="1.1",javax

+ .ws.rs.core;uses:="javax.ws.rs,javax.ws.rs.ext";version="1.1"

+Bundle-Version: 1.1

+Bundle-Name: jsr311-api

+Bundle-DocURL: http://www.sun.com/

+Bundle-ManifestVersion: 2

+Bundle-Vendor: Sun Microsystems, Inc

+Bundle-SymbolicName: javax.ws.rs.jsr311-api

diff --git a/dev-java/jsr311-api/files/jsr311-api-1.1-maven-build.xml b/dev-java/jsr311-api/files/jsr311-api-1.1-maven-build.xml
new file mode 100644
index 000000000000..326cfda665c2
--- /dev/null
+++ b/dev-java/jsr311-api/files/jsr311-api-1.1-maven-build.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Ant build modified for Gentoo @ Mon, 23 Feb 2009 08:35:22 +0000 -->
+<!-- Robin H. Johnson <robbat2@gentoo.org> -->
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<project name="jsr311-api-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jsr311-api-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"/>
+  <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.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+  </path>
+  <path id="build.test.classpath">
+    <fileset dir=".">
+      <include name="lib/junit.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" 
+		   source="1.5"
+		   classpath="${gentoo.classpath}">
+      <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"
+		   classpath="${gentoo.classpath}">
+      <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"
+          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>
+
+  <!-- ====================================================================== -->
+  <!-- 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" 
+		 manifest="manifest"
+         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/jsr311-api/jsr311-api-1.1.ebuild b/dev-java/jsr311-api/jsr311-api-1.1.ebuild
new file mode 100644
index 000000000000..c3b7c4edf618
--- /dev/null
+++ b/dev-java/jsr311-api/jsr311-api-1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source test"
+PROJ_PN="jsr311"
+PROJ_PV="${PV}"
+PROJ_P="${PROJ_PN}-${PROJ_PV}"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JAX-RS: Java API for RESTful Web Services"
+HOMEPAGE="https://jsr311.dev.java.net/"
+SRC_FILE="${P}-src.tar.bz2"
+SRC_URI="mirror://gentoo/${SRC_FILE}"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+		test? ( dev-java/ant-junit:0 dev-java/junit:0 )"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${P}/${PN}"
+
+# Helper to generate the tarball :-)
+# ( PN=jsr311-api ; PV=1.1 ; P="${PN}-${PV}" ; . ${P}.ebuild  ; src_tarball )
+src_tarball() {
+	SVN_SRC_URI="${HOMEPAGE}/svn/${PROJ_PN}/tags/${P}"
+	tarball="${P}"
+	svn export \
+		--username guest --password '' --non-interactive \
+		${SVN_SRC_URI} ${tarball} \
+		&& \
+	tar cvjf ${SRC_FILE} ${tarball} \
+		&& \
+	echo "New tarball located at ${SRC_FILE}"
+}
+
+java_prepare() {
+	for i in build.xml maven-build.xml manifest ; do
+		cp -f "${FILESDIR}"/"${P}-${i}" "${i}" \
+			|| die "Unable to find ${P}-${i}"
+	done
+}
+
+src_install() {
+	dodoc README.txt || die
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+	use doc	&& java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/javax
+}
+
+src_test() {
+	EANT_GENTOO_CLASSPATH="junit ant-core" \
+	ANT_TASKS="ant-junit" \
+	eant test
+}
diff --git a/dev-java/jsr311-api/metadata.xml b/dev-java/jsr311-api/metadata.xml
new file mode 100644
index 000000000000..0f01f6e07537
--- /dev/null
+++ b/dev-java/jsr311-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>
+<herd>java</herd>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/jsr67/Manifest b/dev-java/jsr67/Manifest
new file mode 100644
index 000000000000..a65da116cf26
--- /dev/null
+++ b/dev-java/jsr67/Manifest
@@ -0,0 +1 @@
+DIST saaj-api.jar 18817 SHA256 d36278c49c50f1fe41c264414a1f572a6578d544b8ca89053597ecb9ca87f63e SHA512 b130ff18fcc3ab04c095ad454c82d83b2c383d4f8eb950291796d41f0f0ee7a15434de282864e778c3692cc3bdf4ab5213050a43ae10a6e308d613f9d477a813 WHIRLPOOL c5596415d9dec81e20b8c5d515388c049820e24467f40f7c0259e9d4169149f36367b1501c227adc738aebcd01ab0875925073c2467a7a6c8bc0d87a44470216
diff --git a/dev-java/jsr67/jsr67-1.3.ebuild b/dev-java/jsr67/jsr67-1.3.ebuild
new file mode 100644
index 000000000000..a17df16457aa
--- /dev/null
+++ b/dev-java/jsr67/jsr67-1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE=""
+
+inherit java-pkg-2
+
+DESCRIPTION="SAAJ 1.3 (AKA JSR-67 MR3) API"
+HOMEPAGE="https://saaj.dev.java.net/spec-1.3/"
+SRC_URI="https://saaj.dev.java.net/spec-${PV}/saaj-api.jar"
+
+LICENSE="sun-jsr67"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}/saaj-api.jar"
+}
diff --git a/dev-java/jsr67/metadata.xml b/dev-java/jsr67/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jsr67/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jsr93/Manifest b/dev-java/jsr93/Manifest
new file mode 100644
index 000000000000..73522cff2d41
--- /dev/null
+++ b/dev-java/jsr93/Manifest
@@ -0,0 +1 @@
+DIST jaxr-1_0-fr-spec.zip 1443243 SHA256 b90e753fa51c6b0ac4cbcffafe73bcdc6a139804fe562916d3604d49e5fe3c58 SHA512 a60f2da27defd5ddecfabf1fb00464c111b4e8264d3bd26f91b9c1195022eecf7e8aeaa904aa8f7cb6f0aa35a713b45d2b7e5fdaa474c2e29341ad64c04ed5e2 WHIRLPOOL 9460536353e73f88298de207e4bba3f13d88a63714ac34be397c60f8973667cd8b68626a987bb35e7594be0ea10d643e438e5aec37bea8624b6e96c340f0fe5a
diff --git a/dev-java/jsr93/files/build.xml-1.0 b/dev-java/jsr93/files/build.xml-1.0
new file mode 100644
index 000000000000..a0c9ed7a88e6
--- /dev/null
+++ b/dev-java/jsr93/files/build.xml-1.0
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<project name="jsr93-api" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac debug="false" srcdir="src" destdir="build" encoding="UTF-8">
+      <classpath>
+        <pathelement path="${classpath}"/>
+        <fileset dir="lib/" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="jsr93-api.jar">
+      <fileset dir="build" includes="**/*.class"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/jsr93/jsr93-1.0-r1.ebuild b/dev-java/jsr93/jsr93-1.0-r1.ebuild
new file mode 100644
index 000000000000..eb0143a23f64
--- /dev/null
+++ b/dev-java/jsr93/jsr93-1.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API for XML Registries (JAXR) - API"
+HOMEPAGE="http://download.oracle.com/otndocs/jcp/jaxr-1.0-fr-oth-JSpec/"
+SRC_URI="jaxr-1_0-fr-spec.zip"
+
+LICENSE="sun-jsr93"
+RESTRICT="fetch"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+CDEPEND="dev-java/sun-jaf:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+pkg_nofetch() {
+
+	einfo "Please go to"
+	einfo " ${HOMEPAGE}"
+	einfo "and download file:"
+	einfo ' "Java API for XML Registries Specification 1.0"'
+	einfo "Place the file ${SRC_URI} in:"
+	einfo " ${DISTDIR}"
+
+}
+
+java_prepare() {
+	cd "${WORKDIR}" || die "can't cd in ${WORKDIR}"
+	mkdir src || die
+	unzip -qq jaxr-apisrc.jar -d src || die "unzip failed"
+	rm -v *.jar || die
+	mkdir lib || die
+	cd lib || die "can't cd in ${WORKDIR}/lib"
+
+	java-pkg_jar-from sun-jaf
+
+	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die
+}
+
+src_install() {
+	java-pkg_dojar "jsr93-api.jar"
+
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jsr93/jsr93-1.0.ebuild b/dev-java/jsr93/jsr93-1.0.ebuild
new file mode 100644
index 000000000000..bf773602756f
--- /dev/null
+++ b/dev-java/jsr93/jsr93-1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API for XML Registries (JAXR) - API"
+HOMEPAGE="http://download.oracle.com/otndocs/jcp/jaxr-1.0-fr-oth-JSpec/"
+SRC_URI="jaxr-1_0-fr-spec.zip"
+
+LICENSE="sun-jsr93"
+RESTRICT="fetch"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+COMMON_DEP="dev-java/sun-jaf"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+
+	einfo "Please go to"
+	einfo " ${HOMEPAGE}"
+	einfo "and download file:"
+	einfo ' "Java API for XML Registries Specification 1.0"'
+	einfo "Place the file ${SRC_URI} in:"
+	einfo " ${DISTDIR}"
+
+}
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd "${WORKDIR}"
+	mkdir src || die
+	unzip -qq jaxr-apisrc.jar -d src || die "unzip failed"
+	rm -v *.jar || die
+	mkdir lib || die
+
+	cd lib
+	java-pkg_jar-from sun-jaf
+
+	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die
+
+}
+
+src_install() {
+
+	java-pkg_dojar "jsr93-api.jar"
+
+	use source && java-pkg_dosrc src/*
+
+}
diff --git a/dev-java/jsr93/metadata.xml b/dev-java/jsr93/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jsr93/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest
new file mode 100644
index 000000000000..3d4420cc70ce
--- /dev/null
+++ b/dev-java/jss/Manifest
@@ -0,0 +1,2 @@
+DIST jss-4.2.5.tar.bz2 390376 SHA256 97fe53b97653a85eadf3b22e5cf9205de7acc0abd694e90216b4475701072f93 SHA512 6cf8f8cf7b9f39c18d8788887a002c3cb1165e40a8f9dba0675edeab70af446e292857901f6cdfd1b04b13c43c2c76229c561d2411a046580b7852dd4c1804cf WHIRLPOOL 357e47faf4443cbbf6672a05d9c368c7189a11a0495c61a606432e4c6f463797597835f3bfd0bd1ff2f438d5ab7fbaecba0abd3b18b7a6523e663389f85aac70
+DIST jss-4.3.tar.bz2 421731 SHA256 e82cdcadd6d7acd0d5f9274134dd5a88f26d7e47e7d9d8b059ce68ca413fb54e SHA512 b1ae0f2dc2ca90a30caca97e4e89a471f4d0a0483dd384f242989de8a21fdd3c99dc4c452e5ef7e23bf3de745e5868f276528f76afc8aef7a9e7fe99722e0b4f WHIRLPOOL 77773968499aa7c88ed14ae4ab899a45935d5a6c4a0b6d455428f62e81d24bd379324726bda61e3c84521040cc3439ae2a5d167f32006d6dc97ba2b3ec923f5f
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-ldflags.patch b/dev-java/jss/files/jss-4.3-ldflags.patch
new file mode 100644
index 000000000000..2706da134464
--- /dev/null
+++ b/dev-java/jss/files/jss-4.3-ldflags.patch
@@ -0,0 +1,14 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=583666
+https://bugs.gentoo.org/show_bug.cgi?id=327619
+
+--- security/coreconf/Linux.mk
++++ security/coreconf/Linux.mk
+@@ -174,7 +174,7 @@
+ ARCH			= linux
+ 
+ DSO_CFLAGS		= -fPIC
+-DSO_LDOPTS		= -shared $(ARCHFLAG) -Wl,-z,defs
++DSO_LDOPTS		= $(LDFLAGS) -shared $(ARCHFLAG) -Wl,-z,defs
+ DSO_LDFLAGS		=
+ LDFLAGS			+= $(ARCHFLAG)
+ 
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/jss-4.2.5.ebuild b/dev-java/jss/jss-4.2.5.ebuild
new file mode 100644
index 000000000000..ca75125748fb
--- /dev/null
+++ b/dev-java/jss/jss-4.2.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit base java-pkg-2 versionator
+
+RTM_NAME="JSS_${PV//./_}_RTM"
+DESCRIPTION="Network Security Services for Java (JSS)"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/jss/"
+# To prepare this tarball
+# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
+#    -r JSS_4_2_RTM mozilla/security/corefonf
+# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
+#    -r JSS_4_2_RTM mozilla/security/jss
+# tar cvjf jss-4.2.tar.bz2 mozilla
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="MPL-1.1"
+SLOT="3.4"
+KEYWORDS="amd64 x86"
+IUSE="doc examples source"
+
+RDEPEND=">=virtual/jre-1.4
+		>=dev-libs/nspr-4.3
+		>=dev-libs/nss-3.9.2"
+DEPEND=">=virtual/jdk-1.4
+		${RDEPEND}
+		app-arch/zip
+		virtual/pkgconfig
+		>=sys-apps/sed-4"
+
+S=${WORKDIR}/mozilla
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4-target_source.patch"
+	"${FILESDIR}/${PN}-4.2.5-use_pkg-config.patch"
+)
+
+src_compile() {
+	export JAVA_GENTOO_OPTS="-target $(java-pkg_get-target) -source $(java-pkg_get-source)"
+	use amd64 && export USE_64=1
+	cd "${S}/security/coreconf" || die
+	emake -j1 BUILD_OPT=1 || die "coreconf make failed"
+
+	cd "${S}/security/jss" || die
+	emake -j1 BUILD_OPT=1 USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr || die "jss make failed"
+	if use doc; then
+		emake -j1 BUILD_OPT=1 javadoc || die "failed to create javadocs"
+	fi
+}
+
+# Investigate why this fails
+RESTRICT="test"
+
+src_test() {
+	BUILD_OPT=1 perl security/jss/org/mozilla/jss/tests/all.pl dist \
+		"${S}"/dist/Linux*.OBJ/
+}
+
+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/jss-4.3-r1.ebuild b/dev-java/jss/jss-4.3-r1.ebuild
new file mode 100644
index 000000000000..846e085a58c5
--- /dev/null
+++ b/dev-java/jss/jss-4.3-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit base java-pkg-2 linux-info versionator
+
+RTM_NAME="JSS_${PV//./_}_RTM"
+
+DESCRIPTION="Network Security Services for Java (JSS)"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/jss/"
+# To prepare this tarball
+# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
+#    -r JSS_4_3_RTM mozilla/security/coreconf
+# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
+#    -r JSS_4_3_RTM mozilla/security/jss
+# tar cvjf jss-4.3.tar.bz2 mozilla
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="MPL-1.1"
+SLOT="3.4"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND=">=dev-libs/nspr-4.7
+	>=dev-libs/nss-3.12"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/zip
+	virtual/pkgconfig
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}/mozilla"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.4-target_source.patch
+	epatch "${FILESDIR}"/${PN}-4.2.5-use_pkg-config.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-secitem.patch
+}
+
+# See bug 539100.
+pkg_setup() {
+	linux-info_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	export JAVA_GENTOO_OPTS="-source $(java-pkg_get-source) -target $(java-pkg_get-target)"
+
+	use amd64 && export USE_64=1
+
+	cd "${S}/security/coreconf" || die
+
+	# Hotfix for kernel 3.x #379283
+	get_running_version || die "Failed to determine kernel version"
+	if [[ ${KV_MAJOR} -ge 3 ]]; then
+		cp Linux2.6.mk Linux${KV_MAJOR}.${KV_MINOR}.mk || die
+	fi
+
+	emake -j1 BUILD_OPT=1
+
+	cd "${S}/security/jss" || die
+	emake -j1 BUILD_OPT=1 USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr
+
+	if use doc; then
+		emake -j1 BUILD_OPT=1 javadoc
+	fi
+}
+
+# Investigate why this fails.
+#
+# cp: cannot stat ‘/var/tmp/portage/dev-java/jss-4.3-r1/work/mozilla/dist/Linux3.8_x86_64_glibc_PTH_64_OPT.OBJ//lib/*nssckbi*’: No such file or directory
+# Failed to copy builtins library at security/jss/org/mozilla/jss/tests/all.pl line 453.
+#
+# There is indeed no nssckbi file, investigation needed if that file can be
+# generated or whether we can remove the broken test; possibly inform upstream.
+RESTRICT="test"
+
+src_test() {
+	BUILD_OPT=1 perl security/jss/org/mozilla/jss/tests/all.pl dist \
+		"${S}"/dist/Linux*.OBJ/
+}
+
+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/jss-4.3.ebuild b/dev-java/jss/jss-4.3.ebuild
new file mode 100644
index 000000000000..e66e6fd1e265
--- /dev/null
+++ b/dev-java/jss/jss-4.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit base java-pkg-2 linux-info versionator
+
+RTM_NAME="JSS_${PV//./_}_RTM"
+DESCRIPTION="Network Security Services for Java (JSS)"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/jss/"
+# To prepare this tarball
+# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
+#    -r JSS_4_3_RTM mozilla/security/coreconf
+# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
+#    -r JSS_4_3_RTM mozilla/security/jss
+# tar cvjf jss-4.3.tar.bz2 mozilla
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="MPL-1.1"
+SLOT="3.4"
+KEYWORDS="amd64 x86"
+IUSE="doc examples source"
+
+RDEPEND=">=dev-libs/nspr-4.7
+	>=dev-libs/nss-3.12"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/zip
+	virtual/pkgconfig
+	>=sys-apps/sed-4
+	${RDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/mozilla
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4-target_source.patch"
+	"${FILESDIR}/${PN}-4.2.5-use_pkg-config.patch"
+	"${FILESDIR}/${P}-ldflags.patch"
+)
+
+src_compile() {
+	export JAVA_GENTOO_OPTS="-target $(java-pkg_get-target) -source $(java-pkg_get-source)"
+	use amd64 && export USE_64=1
+	cd "${S}/security/coreconf" || die
+
+	# Hotfix for kernel 3.x #379283
+	get_running_version || die "Failed to determine kernel version"
+	if [[ ${KV_MAJOR} -ge 3 ]]; then
+		cp Linux2.6.mk Linux${KV_MAJOR}.${KV_MINOR}.mk || die
+	fi
+
+	emake -j1 BUILD_OPT=1 || die "coreconf make failed"
+
+	cd "${S}/security/jss" || die
+	emake -j1 BUILD_OPT=1 USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr || die "jss make failed"
+	if use doc; then
+		emake -j1 BUILD_OPT=1 javadoc || die "failed to create javadocs"
+	fi
+}
+
+# Investigate why this fails
+RESTRICT="test"
+
+src_test() {
+	BUILD_OPT=1 perl security/jss/org/mozilla/jss/tests/all.pl dist \
+		"${S}"/dist/Linux*.OBJ/
+}
+
+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..6b82ef4099b3
--- /dev/null
+++ b/dev-java/jss/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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/jstun/Manifest b/dev-java/jstun/Manifest
new file mode 100644
index 000000000000..13ea15193eaa
--- /dev/null
+++ b/dev-java/jstun/Manifest
@@ -0,0 +1 @@
+DIST jstun-0.7.3.src.tar.gz 173666 SHA256 dba79de7a92ab7f9c9e67e995999db99df75149369eff3571779702351f7509b SHA512 03dd54331c79992ef2c387eb78fde8c98b58e3818515bf57beafb6157914fe9295d3ff043ac8aab78490ac2582969c07e1891ddbefaa702c3816ddac061ceb18 WHIRLPOOL b7d7553b17e656b537b701615d9774b0b814711ee41d100128bcbec30d939962fd8d397fae6cbd0e923f0e45541685f44473aaa8a2edc0751d7a51144fa45202
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..cda937c9cff1
--- /dev/null
+++ b/dev-java/jstun/jstun-0.7.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+COMMON_DEP="dev-java/slf4j-api:0"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/junit:0 )
+	${COMMON_DEP}"
+
+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 || die
+	rm -v 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..838c00a4a448
--- /dev/null
+++ b/dev-java/jstun/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jta/Manifest b/dev-java/jta/Manifest
new file mode 100644
index 000000000000..0f61c038465b
--- /dev/null
+++ b/dev-java/jta/Manifest
@@ -0,0 +1,2 @@
+DIST jta-1_0_1B-classes.zip 8812 SHA256 5bc89d0a1caecd25e9323144624fd26df4326c84da8658f08f5cc588ee25cca9
+DIST jta-1_1-classes.zip 13236 SHA256 6202127f8e3fe63ebbaa8c3ddf455bae862d5563b4c210ea29484df52ce505da SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14 WHIRLPOOL c6b97d35eb09cd027596594ce009c251cc61014ceacd7d49748eb157ddbec6700eb29d07a4f9fd0d6273652cd83e067fc7f2a4d99e584ad13c7f13c2f8a07271
diff --git a/dev-java/jta/jta-1.0.1-r1.ebuild b/dev-java/jta/jta-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..8a3ef8142cd1
--- /dev/null
+++ b/dev-java/jta/jta-1.0.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+At="jta-1_0_1B-classes.zip"
+DESCRIPTION="The Java Transaction API"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javaee/tech/jta-138684.html"
+SRC_URI="${At}"
+LICENSE="sun-bcla-jta"
+SLOT=0
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+DEPEND=">=app-arch/unzip-5.50-r1
+	>=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
+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.0.1B Class Files 1.0.1B'"
+	einfo " 3. Download ${At}"
+	einfo " 4. Move file to ${DISTDIR}"
+	einfo " 5. Restart the emerge process"
+	einfo
+}
+
+src_unpack() {
+	unzip -qq "${DISTDIR}"/${At} || die "failed too 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/jta-1.1.ebuild b/dev-java/jta/jta-1.1.ebuild
new file mode 100644
index 000000000000..719fa261d9c6
--- /dev/null
+++ b/dev-java/jta/jta-1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+inherit java-pkg-2
+
+JTA_ZIP="jta-1_1-classes.zip"
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+DEPEND=">=app-arch/unzip-5.50-r1
+>=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..838c00a4a448
--- /dev/null
+++ b/dev-java/jta/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jtds/Manifest b/dev-java/jtds/Manifest
new file mode 100644
index 000000000000..05879eada824
--- /dev/null
+++ b/dev-java/jtds/Manifest
@@ -0,0 +1,2 @@
+DIST jtds-1.2.5-src.zip 3953955 SHA256 d86c7244826543d2f2f9cdc1d50888003596c1ec18f30808b21627e8889e9114 SHA512 d2b496a7aac4e4c9c0e164c1514d2d21392024903e1376b13fa6a3396d045a1bfc6a085b2beb1202703a6b6e59e8b534bc82508fcb58c71a25b6a13a3d051eda WHIRLPOOL b5e88e6cdb00f797de1d824a7581d693111d4d746ce6d5a709934ce00befbed4fb4c3b248448715bdf27691c33d8f1cca8ca270e942eb27907cd2567e919084d
+DIST jtds-1.3.0-src.zip 3377646 SHA256 9f500d9eb243e87ef16fbec3909d297b7261893a298646223c9722162ab43c75 SHA512 a07b0a69ecf055a6b2fac0a0cdf3f7562fefb7c4e4c65eed96cc9b667a66b4b4a0de543d904d8a9871031e181c0e75c450afb2f01bfb7a504d1abcd9776216e9 WHIRLPOOL 65707009909715fdfbdcc54b0345c657ec226810414b7d5a3fa08ec04b5eaa11950901221f5934a0e81739cfba70d004368dd7e2a95125d93d981204bd67072e
diff --git a/dev-java/jtds/files/jtds-1.2.5-build.xml.patch b/dev-java/jtds/files/jtds-1.2.5-build.xml.patch
new file mode 100644
index 000000000000..333197fbb4c2
--- /dev/null
+++ b/dev-java/jtds/files/jtds-1.2.5-build.xml.patch
@@ -0,0 +1,29 @@
+--- build.xml.orig	2009-11-07 18:55:41.000000000 +0100
++++ build.xml	2009-11-07 18:58:17.000000000 +0100
+@@ -75,13 +75,13 @@
+     </junit>

+   </target>

+ 

+-  <target name="dist" depends="clean,compile,javadoc">

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

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

+     <!-- Runtime jar -->

+     <jar basedir="${build}/classes"

+          excludes="net/sourceforge/jtds/test/*.class"

+          includes="**/*"

+-         jarfile="${build}/${ant.project.name}-${version}.jar">

++         jarfile="${build}/${ant.project.name}.jar">

+         <manifest>

+             <attribute name="Implementation-Title" value="jTDS JDBC Driver"/>

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

+@@ -92,6 +92,10 @@
+             <attribute name="Main-Class" value="net.sourceforge.jtds.jdbc.Driver"/>

+         </manifest>

+     </jar>

++    
++    </target>
++    
++    <target name="dist" depends="jar">

+ 

+     <!-- Source package -->

+     <copy todir="${dist}/tmp/doc">

diff --git a/dev-java/jtds/files/jtds-1.3.0-build.xml.patch b/dev-java/jtds/files/jtds-1.3.0-build.xml.patch
new file mode 100644
index 000000000000..9b3e3cb6901d
--- /dev/null
+++ b/dev-java/jtds/files/jtds-1.3.0-build.xml.patch
@@ -0,0 +1,13 @@
+--- build.xml
++++ build.xml
+@@ -117,7 +117,9 @@
+     </junit>
+   </target>
+ 
+-  <target name="dist" depends="clean,compile,javadoc">
++  <target name="dist" depends="clean,jar,javadoc"/>
++
++  <target name="jar" depends="compile">
+     <mkdir dir="${dist}"/>
+ 
+     <!-- runtime jar -->
diff --git a/dev-java/jtds/jtds-1.2.5-r1.ebuild b/dev-java/jtds/jtds-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..e7d595b92e32
--- /dev/null
+++ b/dev-java/jtds/jtds-1.2.5-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+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.2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# Would need a running server
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-java/jcifs:1.1"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jre:1.6"
+DEPEND="${COMMON_DEPEND}
+	virtual/jdk:1.6
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+
+	rm -vr ./src/test/net/sourceforge/jtds/test || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="jcifs-1.1"
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+
+	dodoc CHANGELOG README*
+	use doc && java-pkg_dojavadoc build/doc
+	use source && java-pkg_dosrc "${S}"/src/main/*
+}
diff --git a/dev-java/jtds/jtds-1.3.0.ebuild b/dev-java/jtds/jtds-1.3.0.ebuild
new file mode 100644
index 000000000000..68ca96ab766a
--- /dev/null
+++ b/dev-java/jtds/jtds-1.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+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"
+IUSE=""
+
+# Would need a running server
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-java/jcifs:1.1"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jre:1.7"
+DEPEND="${COMMON_DEPEND}
+	virtual/jdk:1.7
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+
+	mkdir -p build/doc || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="jcifs-1.1"
+
+src_install() {
+	java-pkg_newjar build/${P}.jar
+
+	dodoc CHANGELOG README*
+	use doc && java-pkg_dojavadoc build/doc
+	use source && java-pkg_dosrc "${S}"/src/main/*
+}
diff --git a/dev-java/jtds/metadata.xml b/dev-java/jtds/metadata.xml
new file mode 100644
index 000000000000..7e2346bcf86f
--- /dev/null
+++ b/dev-java/jtds/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..5c5d3ceb49e9
--- /dev/null
+++ b/dev-java/jtidy/Manifest
@@ -0,0 +1 @@
+DIST jtidy-04aug2000r7-dev.zip 718750 SHA256 18e9fc9bcf2d573a27a466ceee2b75772c6dd830af8e83cadb23df9d772583c6 SHA512 3e8baedd992797d7894b2b47f5e214b55189b34081d276563a152ef8603a22188c64d4a363279d1a400cafefdb24018467249bc67283c547f27da44c77cb261c WHIRLPOOL f90403fb86b9860e355710ce0b638a16979487f6aedb9cc1ee4f23d3d0bddc65689cdd989dcac2391f141bca15429f8aad24228a25dbf50df76802ec6118961c
diff --git a/dev-java/jtidy/files/jtidy-source-1.4.patch b/dev-java/jtidy/files/jtidy-source-1.4.patch
new file mode 100644
index 000000000000..6649fba41224
--- /dev/null
+++ b/dev-java/jtidy/files/jtidy-source-1.4.patch
@@ -0,0 +1,10 @@
+--- jtidy-04aug2000r7-dev/build.xml.jrockit	2005-08-24 23:03:45.000000000 -0400
++++ jtidy-04aug2000r7-dev/build.xml	2005-08-24 23:04:09.000000000 -0400
+@@ -59,6 +59,7 @@
+ 	 destdir="${build.dir}"
+ 	 includes="**/*.java"
+ 	 deprecation="on"
++	 source="1.4"
+ 	 optimize="${optimize}"
+ 	 debug="${debug}"/>
+  </target>
diff --git a/dev-java/jtidy/jtidy-0_pre20010801-r1.ebuild b/dev-java/jtidy/jtidy-0_pre20010801-r1.ebuild
new file mode 100644
index 000000000000..7f9db1a4cd49
--- /dev/null
+++ b/dev-java/jtidy/jtidy-0_pre20010801-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils base java-pkg-2 java-ant-2
+
+MY_PV="04aug2000r7"
+DESCRIPTION="Tidy is a Java port of HTML Tidy , a HTML syntax checker and pretty printer"
+HOMEPAGE="http://jtidy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-dev.zip"
+LICENSE="HTML-Tidy W3C"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${PN}-${MY_PV}-dev
+
+PATCHES=( "${FILESDIR}"/${PN}-source-1.4.patch )
+
+src_compile() {
+	eant jar # Has javadoc premade
+}
+
+src_install() {
+	java-pkg_dojar build/Tidy.jar
+
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/jtidy/metadata.xml b/dev-java/jtidy/metadata.xml
new file mode 100644
index 000000000000..dde84c30de46
--- /dev/null
+++ b/dev-java/jtidy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..785749b29535
--- /dev/null
+++ b/dev-java/jtreemap/Manifest
@@ -0,0 +1 @@
+DIST jtreemap-1.1.0-src.zip 7358161 SHA256 c6e27ec233e0da4e9ca7dc8b9a07ad60e99aad4cf9973c0fc4f37d0e58a158a3 SHA512 61c6b5e22cc839d6cfe8368bbd51db94b3667c8f4064645c3d70f5e6c93b029dd495b64b602570f59559dd99723516a197dcd1d915799411dc7f7c516bfce84c WHIRLPOOL e82944d0317b7ad3848552ebfe474d1bd8b58d13ce59a36f7339c15b8d23ab1ebade829072b79b46606f340c4b664038d1156732d57791cbd191c51d136d7ef2
diff --git a/dev-java/jtreemap/files/jtreemap-1.1.0-build.xml.patch b/dev-java/jtreemap/files/jtreemap-1.1.0-build.xml.patch
new file mode 100644
index 000000000000..fe9769c207fe
--- /dev/null
+++ b/dev-java/jtreemap/files/jtreemap-1.1.0-build.xml.patch
@@ -0,0 +1,30 @@
+diff -Nur jtreemap-site-1.1.0/JTreeMap/build.xml jtreemap-site-1.1.0_patched/JTreeMap/build.xml
+--- jtreemap-site-1.1.0/JTreeMap/build.xml	2007-04-29 11:46:46.000000000 +0300
++++ jtreemap-site-1.1.0_patched/JTreeMap/build.xml	2008-09-27 19:45:03.000000000 +0300
+@@ -33,6 +33,10 @@
+ 				<include name="**/*.class" />

+ 				<include name="**/*.png" />

+ 				<include name="**/*.gif" />

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

++				<include name="**/*.dtd" />

++				<include name="**/*.png" />

+ 			</fileset>

+ 			<manifest>

+ 				<attribute name="Main-Class" value="net.sf.jtreemap.swing.example.JTreeMapExample" />

+@@ -60,7 +64,7 @@
+ 	</target>

+ 

+ 	<target name="javadoc">

+-		<javadoc packagenames="net.sf.jtreemap.swing.*,net.sf.jtreemap.swing.example.*" sourcepath="src" defaultexcludes="yes" destdir="doc" author="true" version="true" use="true" windowtitle="JTreeMap">

++		<javadoc packagenames="net.sf.jtreemap.swing.*,net.sf.jtreemap.swing.example.*" sourcepath="src/main/java" defaultexcludes="yes" destdir="doc" author="true" version="true" use="true" windowtitle="JTreeMap">

+ 			<doctitle>

+ 				<![CDATA[<h1>JTreeMap</h1>]]></doctitle>

+ 		<tag name="todo" scope="all" description="To do:" />

+@@ -78,4 +82,4 @@
+ 	</zip>

+ </target>

+ 

+-</project>
+\ Dosya sonunda yenisatır yok.
++</project>
diff --git a/dev-java/jtreemap/jtreemap-1.1.0.ebuild b/dev-java/jtreemap/jtreemap-1.1.0.ebuild
new file mode 100644
index 000000000000..dda67745dc74
--- /dev/null
+++ b/dev-java/jtreemap/jtreemap-1.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java, open-source library for treemapping"
+HOMEPAGE="http://jtreemap.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}-site-${PV}/JTreeMap"
+EANT_BUILD_TARGET="buildJar"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+	einfo "Removing bundled jars."
+	find . -name "*.jar" -print -delete
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc doc
+	java-pkg_dolauncher ${PN}-demo --main net.sf.jtreemap.swing.example.JTreeMapExample
+	use source && java-pkg_dosrc src/main/java/net
+}
diff --git a/dev-java/jtreemap/metadata.xml b/dev-java/jtreemap/metadata.xml
new file mode 100644
index 000000000000..091965f6213c
--- /dev/null
+++ b/dev-java/jtreemap/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jtreemap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/juel/Manifest b/dev-java/juel/Manifest
new file mode 100644
index 000000000000..1e7ffae69f90
--- /dev/null
+++ b/dev-java/juel/Manifest
@@ -0,0 +1 @@
+DIST juel-2.1.0.zip 477363 SHA256 31e581cc27b9c05d3a545fc399b6340efb1f95e03a5deb8979e24c17b87719d5 SHA512 eec79c301491b8bae5c394591feab0abed302da55e8cded798874286af32f15ce575bdb365ec9f90add89e320d23d3e40fbb5d465d34c66da60df26e1f7cb6f3 WHIRLPOOL 6d4b1b1c6a041738d001cdf5b78d0a831a6762ab2a1286065019a6ec17ae62fed6acaf7e1c43526242ca9948965730bddec8bf61ac5bc83890f0558f4627da9d
diff --git a/dev-java/juel/juel-2.1.0-r0.ebuild b/dev-java/juel/juel-2.1.0-r0.ebuild
new file mode 100644
index 000000000000..5b28af54f654
--- /dev/null
+++ b/dev-java/juel/juel-2.1.0-r0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JUEL is an implementation of the Unified Expression Language (EL), a part of JSP 2.1 (JSR-245)"
+HOMEPAGE="http://juel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+		app-arch/unzip"
+
+java_prepare() {
+	rm -v *.jar || die "Unable to remove jars"
+}
+
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="apidoc"
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/api/* src/impl/*
+}
diff --git a/dev-java/juel/juel-2.1.0.ebuild b/dev-java/juel/juel-2.1.0.ebuild
new file mode 100644
index 000000000000..3af16dc36451
--- /dev/null
+++ b/dev-java/juel/juel-2.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JUEL is an implementation of the Unified Expression Language (EL), a part of JSP 2.1 (JSR-245)"
+HOMEPAGE="http://juel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+		app-arch/unzip"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v *.jar || die "Unable to remove jars"
+}
+
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="apidoc"
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/api/* src/impl/*
+}
diff --git a/dev-java/juel/metadata.xml b/dev-java/juel/metadata.xml
new file mode 100644
index 000000000000..86ea5076699c
--- /dev/null
+++ b/dev-java/juel/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+	</longdescription>
+	<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..2ad6c12d6444
--- /dev/null
+++ b/dev-java/jump/Manifest
@@ -0,0 +1 @@
+DIST jump-0.5.tar.gz 31266 SHA256 608c3ea156cca8ce6890f593467a8b5b41b257479a84178bff8b957ed56ddac0 SHA512 9772ea61e921c4342f0e25a951d74850b9dbdd2bde5de9fabad4d55ddb82b6d09debd478f92f3f8c02a05425244b7eaf12d7b3d7d2876263234bafa27783bba8 WHIRLPOOL 6f32af4aabe2964edc9a450c06d01d7f3d69873cf8d7988826941fa9838e841dd04ea584eca59dd3d1c4dec263f62762ad72a090324f411a63915acd1d8f3140
diff --git a/dev-java/jump/files/0.5-test.patch b/dev-java/jump/files/0.5-test.patch
new file mode 100644
index 000000000000..796d0d022dd0
--- /dev/null
+++ b/dev-java/jump/files/0.5-test.patch
@@ -0,0 +1,14 @@
+diff -Naur jump-0.5.vanilla/src/tests/org/znerd/math/tests/NumberCentralTests.java jump-0.5/src/tests/org/znerd/math/tests/NumberCentralTests.java
+--- jump-0.5.vanilla/src/tests/org/znerd/math/tests/NumberCentralTests.java	2007-10-10 00:27:47.000000000 +0200
++++ jump-0.5/src/tests/org/znerd/math/tests/NumberCentralTests.java	2007-10-10 00:28:38.000000000 +0200
+@@ -220,8 +220,8 @@
+       assertEquals(ONE_HALF,         NumberCentral.valueOf( 0.5));
+       assertEquals(ONE,              NumberCentral.valueOf( 1.0));
+       assertEquals(TWO,              NumberCentral.valueOf( 2.0));
+-      assertEquals(Double.MIN_VALUE, NumberCentral.valueOf(Double.MIN_VALUE).doubleValue(), 0.0);
+-      assertEquals(Double.MIN_VALUE, NumberCentral.valueOf(Double.MAX_VALUE).doubleValue(), 0.0);
++      assertEquals(Double.MIN_VALUE, NumberCentral.valueOf(Double.MIN_VALUE).doubleValue(), Double.MIN_VALUE);
++      assertEquals(Double.MAX_VALUE, NumberCentral.valueOf(Double.MAX_VALUE).doubleValue(), Double.MIN_VALUE);
+    }
+ 
+    /**
diff --git a/dev-java/jump/jump-0.5.ebuild b/dev-java/jump/jump-0.5.ebuild
new file mode 100644
index 000000000000..a9283a86a71d
--- /dev/null
+++ b/dev-java/jump/jump-0.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JUMP Ultimate Math Package (JUMP) is a Java-based extensible high-precision math package"
+SRC_URI="mirror://sourceforge/${PN}-math/${P}.tar.gz"
+HOMEPAGE="http://jump-math.sourceforge.net/"
+KEYWORDS="amd64 ~ppc x86"
+LICENSE="BSD"
+SLOT="0"
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/0.5-test.patch"
+
+	sed -i 's:${java.home}/src::' -i build.xml || die
+	java-ant_rewrite-classpath
+}
+
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="apidocs"
+
+src_test() {
+	local cp="$(java-pkg_getjars junit)"
+	ANT_TASKS="ant-junit" eant do-tests -Dgentoo.classpath="${cp}"
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+
+	use doc && java-pkg_dojavadoc  build/apidocs
+	use examples && java-pkg_doexamples src/examples
+	use source && java-pkg_dosrc src/main/org
+}
diff --git a/dev-java/jump/metadata.xml b/dev-java/jump/metadata.xml
new file mode 100644
index 000000000000..c6c19da3cdd6
--- /dev/null
+++ b/dev-java/jump/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..ebb3a86a6fd5
--- /dev/null
+++ b/dev-java/jung/Manifest
@@ -0,0 +1 @@
+DIST jung-1.7.6.zip 8164548 SHA256 2443f63f8a81a31a9c9aa2a8b8e6864e20e04be220082574536044b4f07b93db SHA512 126f06e34a6db6cc55df2b1c1b52612ddece7db7a1fb45cbc91892122678b0b629eac00276fc501aeab558cf1f01a4e5e7f5d0392bfae977ca1950df2c3d063a WHIRLPOOL 63e37fd53dd3792e8c1bb1b484ec2eda89e5c7768e9b0d3d8a3f5886277556fe8209ccd756fc4cfab26e38519d7cb39b3f31219c3e294718ad007080c58a27c3
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.ebuild b/dev-java/jung/jung-1.7.6.ebuild
new file mode 100644
index 000000000000..cde5e76072aa
--- /dev/null
+++ b/dev-java/jung/jung-1.7.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0d3245c368a0
--- /dev/null
+++ b/dev-java/jung/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..dd9340e88aec
--- /dev/null
+++ b/dev-java/junit-addons/Manifest
@@ -0,0 +1 @@
+DIST junit-addons-1.4.zip 293750 SHA256 8a7456eaabf1c3528b8e73c15df1b8a467386cbf3905b1d5df536201f1981990 SHA512 0ddc9a95d80190417c92e86697669020a2947e2211d2394334b80d76bca5397f132d90e00d0c679bf48607fbadf8d1d6e97d3770d06c35cab78c6cada198434a WHIRLPOOL 2bf3c99b31d0eac1d76e8d6bcd8fbd45f668712798d4ba6ecb019762dbdb045ad877497140a83317bfe1439af33a0637e7964023472ae776d7f457c69cc66be3
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.ebuild b/dev-java/junit-addons/junit-addons-1.4.ebuild
new file mode 100644
index 000000000000..c0b8ddc23679
--- /dev/null
+++ b/dev-java/junit-addons/junit-addons-1.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-3.8*
+	dev-java/ant-core
+	~dev-java/jdom-1.0
+	=dev-java/jaxen-1.1*
+	"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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-1.0 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..f13871da48ea
--- /dev/null
+++ b/dev-java/junit-addons/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..f1c65cbb34a1
--- /dev/null
+++ b/dev-java/junit/Manifest
@@ -0,0 +1,4 @@
+DIST junit3.8.2.zip 461426 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930 WHIRLPOOL 284a51a8b659b8dbce378a381475ae2bcedb78231cfe5435382053335ebe5d44b4eec90b9f14bc510fd5b9060b44672896fe0bfad57743e5aca0128f006781d8
+DIST junit4.10.zip 1781594 SHA256 49d1e176f518730c0d34a361932d9bd79d1bebd555126d95337ad7ad6fc9c6b6 SHA512 07cb518b684a254325d8972132f44dda8f8b52b627232b480bd90766a0f14afc6d8751e44b4162305cf9ab3cedd2858fcd7d388ab01b4f67b706dddb696a8cf6 WHIRLPOOL 72e3f6a3615d1e7f98ac24e7e7f4f634c93cdfdadcaafc0d59d7a1c8b218f019f821d2683c932f3716f1d69b9f0cf5c0fd664be6c35a0f297976b8a745ef612b
+DIST junit4.11.zip 2043600 SHA256 0bbf3818026984fd0c9c4f3cb1a9083d2be545147e13ba1cb101ee14161a3487 SHA512 947ba504aa009afc0773189e6ec89e34d5ff844430b0656cabc7b9f3fe5651c08b5b3c25b848454ee7f0a85e7573155d2c0c86e0ca5502c6e1bb573c970ade62 WHIRLPOOL bf21e351dd47099d3e7c280fe62192aa175c1f251ae4157971cfb69602af2724e6dfcb0592bb6fc8227548abe713c9f1056a22ee49446f48bb00e19ef0fa537b
+DIST r4.12.zip 672377 SHA256 519971406171c580304fdf7b582b5d1df3ff396bb8855a70cb68592f3d53476b SHA512 773f38476cc89f352fe9518f9de27dac32afbd501b498c3a876b7d79ee45a1c567f1ee2064067bc0721dcc06081b3faffe55fe74fbe49d2ce72884b39a2b76f6 WHIRLPOOL f25480ffe47fe615fc7cd7016bf42e037a307879214e21f2b487b4e3d667bb9209f99d372774e5b8e060e0d2678f31d3e10a9b1ea2292a7734f7f26102e3f0ff
diff --git a/dev-java/junit/files/gentoo-manifest.mf b/dev-java/junit/files/gentoo-manifest.mf
new file mode 100644
index 000000000000..f78474422035
--- /dev/null
+++ b/dev-java/junit/files/gentoo-manifest.mf
@@ -0,0 +1 @@
+Class-Path: ../../hamcrest-core/lib/hamcrest-core.jar
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/files/junit-4.11-do-not-unpack-hamcrest-sources.patch b/dev-java/junit/files/junit-4.11-do-not-unpack-hamcrest-sources.patch
new file mode 100644
index 000000000000..d2d6f855323c
--- /dev/null
+++ b/dev-java/junit/files/junit-4.11-do-not-unpack-hamcrest-sources.patch
@@ -0,0 +1,19 @@
+--- a/build.xml	2012-11-14 20:23:00.000000000 +0100
++++ b/build.xml	2013-06-15 23:12:30.981988033 +0200
+@@ -138,7 +138,7 @@
+     </exec>
+   </target>
+   
+-  <target name="javadoc" depends="unjar.hamcrest">
++  <target name="javadoc">
+     <javadoc destdir="${javadocdir}"
+              author="false"
+              version="false"
+@@ -151,7 +151,6 @@
+       <excludepackage name="org.junit.experimental.theories.internal.*" />
+       
+       <sourcepath location="${src}" />
+-      <sourcepath location="${hamcrestsrc}" />
+       <link href="http://java.sun.com/javase/6/docs/api/" />
+     </javadoc>
+   </target>
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..72f66e7316d6
--- /dev/null
+++ b/dev-java/junit/junit-3.8.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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-4.10.ebuild b/dev-java/junit/junit-4.10.ebuild
new file mode 100644
index 000000000000..4a05bd3ad113
--- /dev/null
+++ b/dev-java/junit/junit-4.10.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS
+
+EAPI="3"
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="mirror://github/KentBeck/${PN}/${PN}${PV}.zip"
+HOMEPAGE="http://www.junit.org/"
+LICENSE="CPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/hamcrest-core:0"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+EANT_BUILD_TARGET="jars"
+
+src_unpack() {
+	default
+
+	# Unpack source JAR
+	mkdir -p "${S}/src/main/java" "${S}/src/test/java" \
+		|| die "Unable to create source directories"
+	pushd "${S}/src/main/java" >/dev/null
+	jar xf "${S}/${P}-src.jar" || die "Unable to unpack sources."
+	popd >/dev/null
+
+	# copy Gentoo manifest to working directory
+	cp "${FILESDIR}/gentoo-manifest.mf" "${S}" || die
+}
+
+java_prepare() {
+	# fix javadoc compilation
+	if use doc ; then
+		cp "${S}"/javadoc/stylesheet.css "${S}" \
+			|| die "Unable to copy Javdoc stylesheet"
+	fi
+
+	# remove binary and other generated files
+	rm -rf javadoc temp.hamcrest.source *.jar \
+		|| die "Unable to clean generated files."
+	find . -name "*.class" -delete \
+		|| die "Unable to remove distributed class files"
+
+	# Let Ant know where its hamcrest went
+	EANT_EXTRA_ARGS="-Dhamcrestlib=$(java-pkg_getjars hamcrest-core)"
+
+	# Add Gentoo manifest information to generated JAR files
+	java-ant_xml-rewrite -f build.xml -c \
+		-e jar -a manifest -v "gentoo-manifest.mf"
+}
+
+src_test() {
+	mkdir classes || die "Unable to create build directory for tests"
+
+	local cp=$(java-pkg_getjars hamcrest-core):${S}/${PN}${PV}/${PN}-dep-${PV}.jar
+	ejavac -classpath ${cp} -d classes $(find junit/tests org/junit/tests -name "*.java")
+
+	java -classpath ${cp}:classes org.junit.runner.JUnitCore junit.tests.AllTests \
+		|| die "Tests failed."
+}
+
+src_install() {
+	java-pkg_newjar ${PN}${PV}/${PN}-dep-${PV}.jar
+	dodoc README.html doc/ReleaseNotes${PV}.txt || die
+
+	use examples && java-pkg_doexamples org/junit/samples
+	use source && java-pkg_dosrc src/main/java/org src/main/java/junit
+
+	if use doc; then
+		dohtml -r doc/*
+		java-pkg_dojavadoc ${PN}${PV}/javadoc
+	fi
+}
diff --git a/dev-java/junit/junit-4.11.ebuild b/dev-java/junit/junit-4.11.ebuild
new file mode 100644
index 000000000000..deba38725578
--- /dev/null
+++ b/dev-java/junit/junit-4.11.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="mirror://github/${PN}-team/${PN}/${PN}${PV}.zip"
+HOMEPAGE="http://www.junit.org/"
+
+LICENSE="CPL-1.0"
+SLOT="4"
+
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND="dev-java/hamcrest-core:1.3"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+EANT_BUILD_TARGET="jars samples-and-tests"
+
+src_unpack() {
+	default
+
+	# Unpack the source JAR.
+	mkdir -p "${S}/src/main/java" "${S}/src/test/java" \
+		|| die "Unable to create source directories"
+
+	pushd "${S}/src/main/java" > /dev/null
+		jar xf "${S}/${P}-src.jar" || die "Unable to unpack sources."
+	popd >/dev/null
+
+	# Copy the Gentoo manifest to the working directory.
+	cp "${FILESDIR}/gentoo-manifest.mf" "${S}" || die
+}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-do-not-unpack-hamcrest-sources.patch
+
+	mkdir lib || die
+	java-pkg_jar-from --into lib hamcrest-core{-1.3,.jar,-1.3.jar}
+
+	# Fix javadoc compilation.
+	if use doc ; then
+		cp "${S}"/javadoc/stylesheet.css "${S}" \
+			|| die "Unable to copy Javdoc stylesheet"
+	fi
+
+	# Remove binary and other generated files.
+	rm -rf javadoc temp.hamcrest.source *.jar \
+		|| die "Unable to clean generated files."
+	find . -name "*.class" -delete \
+		|| die "Unable to remove distributed class files"
+
+	# Let Ant know where its hamcrest went.
+	EANT_EXTRA_ARGS="-Dhamcrestlib=$(java-pkg_getjars hamcrest-core-1.3)"
+
+	# Add Gentoo manifest information to generated JAR files.
+	java-ant_xml-rewrite -f build.xml -c \
+		-e jar -a manifest -v "gentoo-manifest.mf"
+}
+
+src_test() {
+	mkdir classes || die "Unable to create build directory for tests."
+
+	local cp=$(java-pkg_getjars hamcrest-core-1.3):"${S}"/target/main
+
+	ejavac -classpath ${cp} \
+		-d classes $(find org/junit/internal -name "*.java")
+	ejavac -classpath ${cp}:"${S}/classes" \
+		-d classes $(find junit/tests org/junit/tests -name "*.java")
+
+	java -classpath ${cp}:classes \
+		org.junit.runner.JUnitCore junit.tests.AllTests || die "Tests failed."
+}
+
+src_install() {
+	java-pkg_newjar ${PN}${PV}-SNAPSHOT/${PN}-dep-${PV}-SNAPSHOT.jar
+	dodoc README.html doc/ReleaseNotes${PV}.txt
+
+	use examples && java-pkg_doexamples org/junit/samples
+	use source && java-pkg_dosrc src/main/java/org src/main/java/junit
+
+	if use doc; then
+		dohtml -r doc/*
+		java-pkg_dojavadoc ${PN}${PV}-SNAPSHOT/javadoc
+	fi
+}
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..52d77aa27ce3
--- /dev/null
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="https://github.com/${PN}-team/${PN}/archive/r${PV}.zip"
+HOMEPAGE="http://junit.org/"
+LICENSE="EPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+CDEPEND="dev-java/hamcrest-core:1.3"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}-r${PV}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
+
+java_prepare() {
+	rm -v lib/*.jar || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc {acknowledgements,{LEGACY_,}CODING_STYLE,NOTICE,to-do}.txt {CONTRIBUTING,README,doc/ReleaseNotes${PV}}.md
+	use examples && java-pkg_doexamples src/test/java/org/junit/samples
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	java -cp "${CP}" -Djava.awt.headless=true org.junit.runner.JUnitCore junit.tests.AllTests || die "Running junit failed"
+}
diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml
new file mode 100644
index 000000000000..651581830ba9
--- /dev/null
+++ b/dev-java/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>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="github">junit-team/junit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/junitperf/Manifest b/dev-java/junitperf/Manifest
new file mode 100644
index 000000000000..08b6abf329b2
--- /dev/null
+++ b/dev-java/junitperf/Manifest
@@ -0,0 +1 @@
+DIST junitperf-1.9.1.zip 110600 SHA256 ff350b8b6bcf79826b96ab786303dc22f0d096d2e9d333c52ac567cc4d26b79a SHA512 35fd3cddf5643ede31a89f39e0149ceb5a07c97521bcb4e661fce32b08a5299064f6b52828889d4918485f3ca000f6020dd6cec802d8b1579f46bd861ad74b1b WHIRLPOOL 0ad8e653f87d5cd34f1c3630a7a185934cf8ae13a8fee05f0cfcd352d6f6aa8896bf8cce3e013e33cb73fa253c16fdad6c5b3edf16e49b3eaf5cd3cd56cf80cb
diff --git a/dev-java/junitperf/junitperf-1.9.1-r1.ebuild b/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..62537d3e2342
--- /dev/null
+++ b/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE=""
+
+COMMON_DEP="=dev-java/junit-3.8*"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	test? ( dev-java/ant-junit )
+	${COMMON_DEP}"
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"/lib || die
+	rm -fv *.jar || die
+	java-pkg_jar-from junit
+}
+
+EANT_DOC_TARGET=""
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+	dodoc README || die
+	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..7303cef96964
--- /dev/null
+++ b/dev-java/junitperf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/junrar/Manifest b/dev-java/junrar/Manifest
new file mode 100644
index 000000000000..b2eefe5ea83b
--- /dev/null
+++ b/dev-java/junrar/Manifest
@@ -0,0 +1 @@
+DIST junrar-0.6.tar.gz 70631 SHA256 999c61f4cdbd0635acb3be2b36390e323f330988eb357c64cf47cf2a51b13721 SHA512 21da07fabb9f9c605191beaadad6a7abbdd1c02c8daab6913232889e735178954c0e2e7c4546734bb3b530d851d9016a549fbb68cc7795d005119fd176c15991 WHIRLPOOL 379bce7cfad99636fa4ecf8819fe02a6bea83845e6300af80f27c9dab871deb757e5817a49cd83ce1001b5d24350933a061b0af588dba04e609a518f1c2f4540
diff --git a/dev-java/junrar/junrar-0.6.ebuild b/dev-java/junrar/junrar-0.6.ebuild
new file mode 100644
index 000000000000..a416381f1a71
--- /dev/null
+++ b/dev-java/junrar/junrar-0.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d3985d9456c2
--- /dev/null
+++ b/dev-java/junrar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..cffaea20f235
--- /dev/null
+++ b/dev-java/jupidator/Manifest
@@ -0,0 +1 @@
+DIST jupidator.0.6.0.tar.bz2 253170 SHA256 00213313f794363cc3b4dd8c335cb35cc8582d0d56d72cb941b3edc8f2b94580 SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415 WHIRLPOOL f8625ac738c610c1b3ed60f05a140b0e7367d97189bc27e70666886879c1da74117df360b938718861a4f8a52fdea7e8ed8355b68b33fb459272145481a3f45a
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..733ce3257c51
--- /dev/null
+++ b/dev-java/jupidator/jupidator-0.6.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..4e84a8985356
--- /dev/null
+++ b/dev-java/jupidator/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jupidator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jusb/Manifest b/dev-java/jusb/Manifest
new file mode 100644
index 000000000000..8d92219610ee
--- /dev/null
+++ b/dev-java/jusb/Manifest
@@ -0,0 +1 @@
+DIST jusb-0.4.4-src.tgz 92432 SHA256 42782637e3cf190bb4bdf46cd16f827976766ca23d7ef737ac3ed7b11fa0d393 SHA512 a071de83de85fee9f7064cece4cc26ad310ccc1d95cae937cbcc826629f670485f10d36494eb8f31fa7a93727a76573cf82305f3f027ad32e18eda4ac4585995 WHIRLPOOL e59b325a05f2d3567b31e364a0f7cb1c054fa802c70644a521a3f1a2e26eaf86f1b60960e543f667962ff30d4b67b497b126aa1700bed2bfeb38910d9de515c1
diff --git a/dev-java/jusb/files/jusb-0.4.4-makefile.patch b/dev-java/jusb/files/jusb-0.4.4-makefile.patch
new file mode 100644
index 000000000000..70d9b4ca4fcf
--- /dev/null
+++ b/dev-java/jusb/files/jusb-0.4.4-makefile.patch
@@ -0,0 +1,15 @@
+--- Makefile.old	2005-04-17 21:50:21.384681513 +0300
++++ Makefile	2005-04-17 21:51:26.854632179 +0300
+@@ -292,11 +292,7 @@
+ # Native compiles
+ #
+ 
+-# using nonstandard kernel?
+-KERNEL_INC ?=	/home/src/linux/include
+-INCLUDES =	-I$(KERNEL_INC)
+-
+-CFLAGS =	-g -O $(INCLUDES) $(RPM_OPT_FLAGS)
++CFLAGS += -g -O $(RPM_OPT_FLAGS)
+ 
+ 
+ native: $(NATIVE)
diff --git a/dev-java/jusb/files/jusb-0.4.4-native.patch b/dev-java/jusb/files/jusb-0.4.4-native.patch
new file mode 100644
index 000000000000..b583569d86e0
--- /dev/null
+++ b/dev-java/jusb/files/jusb-0.4.4-native.patch
@@ -0,0 +1,20 @@
+diff -u native.old/linux.c native/linux.c
+--- native.old/linux.c	2005-04-17 21:43:13.491277758 +0300
++++ native/linux.c	2005-04-17 21:43:21.986973753 +0300
+@@ -226,11 +226,11 @@
+     } else
+ 	buffer = NULL;
+ 
+-    ctrl.requesttype = requestType;
+-    ctrl.request = request;
+-    ctrl.value = value;
+-    ctrl.index = index;
+-    ctrl.length = len & 0xffff;
++    ctrl.bRequestType = requestType;
++    ctrl.bRequest = request;
++    ctrl.wValue = value;
++    ctrl.wIndex = index;
++    ctrl.wLength = len & 0xffff;
+     ctrl.timeout = TIMEOUT;	// USB should t/o after 5 seconds.
+     ctrl.data = buffer + off;
+     if ((retval = ioctl (fd, USBDEVFS_CONTROL, &ctrl)) < 0)
diff --git a/dev-java/jusb/jusb-0.4.4-r1.ebuild b/dev-java/jusb/jusb-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..80aca1eac76e
--- /dev/null
+++ b/dev-java/jusb/jusb-0.4.4-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils java-pkg-2 linux-info flag-o-matic multilib
+
+DESCRIPTION="jUSB provides a Free Software Java API for USB"
+HOMEPAGE="http://jusb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}
+
+CONFIG_CHECK="~USB_DEVICEFS"
+
+ERROR_CONFIG_USB_DEVICEFS="
+You need to turn on the USB device filesystem
+option under USB support in order to use jUSB
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mkdir src
+	tar -xzf src.tgz -C src
+
+	# The struct usbdevfs_ctrltransfer is different
+	# in latest 2.4 and 2.6 kernels. This patch is
+	# to make jusb compile on 2.6 kernels
+	! kernel_is 2 4 && epatch ${FILESDIR}/${P}-native.patch
+
+	epatch ${FILESDIR}/${P}-makefile.patch
+
+	sed -i \
+		-e 's#-shared#-shared -Wl,-soname=libjusb.so#' \
+		-e 's#javac#javac $(JAVACFLAGS)#' \
+		"${S}/Makefile" || die "sed failed"
+}
+
+src_compile() {
+	export OSTYPE="linux-gnu"
+
+	# makefile patching isnt worth the trouble, only
+	# one native source file
+	append-flags -fPIC
+
+	# bug #279088
+	emake -j1 || die "Failed to compile"
+	use doc && make javadoc
+}
+
+src_install() {
+	java-pkg_dojar jusb.jar
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso libjusb.so
+
+	dodoc README*
+
+	if use doc; then
+		java-pkg_dohtml doc/*.html
+		java-pkg_dohtml -r apidoc/*
+	fi
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jusb/metadata.xml b/dev-java/jusb/metadata.xml
new file mode 100644
index 000000000000..90eb95966c36
--- /dev/null
+++ b/dev-java/jusb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jusb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jutils/Manifest b/dev-java/jutils/Manifest
new file mode 100644
index 000000000000..020366cbdb58
--- /dev/null
+++ b/dev-java/jutils/Manifest
@@ -0,0 +1 @@
+DIST jutils-1.0.0-sources.jar 10247 SHA256 f5715ea3c02519553ff1a48129e6fe123c590f8fe8f68f5f27ef4a9b013ea1cd SHA512 3bf29fa8e0ca0cb6cdba022a122f152df929d9738725839234b15eb6ef2f87c72d5a30c8788783e44f73a39aeeba459882d4106ccfd44449e43d838054a1fb01 WHIRLPOOL c430135320837c487301f16cd58d9ca3f10138cad1e072c23b2abe7783c67ef5f6cedf6c8387e1532ee0e19602376000d4ae26a999936fe50ac9635374d7855a
diff --git a/dev-java/jutils/jutils-1.0.0.ebuild b/dev-java/jutils/jutils-1.0.0.ebuild
new file mode 100644
index 000000000000..a115a17ee7ea
--- /dev/null
+++ b/dev-java/jutils/jutils-1.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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://search.maven.org/remotecontent?filepath=net/java/${PN}/${PN}/${PV}/${P}-sources.jar"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
diff --git a/dev-java/jutils/metadata.xml b/dev-java/jutils/metadata.xml
new file mode 100644
index 000000000000..9a92eab9f523
--- /dev/null
+++ b/dev-java/jutils/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..3833ec68f358
--- /dev/null
+++ b/dev-java/jvmstat/Manifest
@@ -0,0 +1 @@
+DIST jvmstat-3_0.zip 153629 SHA256 3d3fad22aa65f356f6ecca050216f814fcdf20c0611a1f689969991d7a1ccb79
diff --git a/dev-java/jvmstat/jvmstat-3.0.ebuild b/dev-java/jvmstat/jvmstat-3.0.ebuild
new file mode 100644
index 000000000000..15b16dc670d6
--- /dev/null
+++ b/dev-java/jvmstat/jvmstat-3.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 versionator
+
+MY_PV=$(replace_version_separator 1 '_')
+DESCRIPTION="Monitoring APIs and tools for monitoring the performance of the JVM in production environments"
+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..7303cef96964
--- /dev/null
+++ b/dev-java/jvmstat/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jvyaml/Manifest b/dev-java/jvyaml/Manifest
new file mode 100644
index 000000000000..2874ef42f511
--- /dev/null
+++ b/dev-java/jvyaml/Manifest
@@ -0,0 +1 @@
+DIST jvyaml-src-0.2.1.tar.gz 202550 SHA256 a21c47679bac174b6185265358c7c8e151ac1ee8c4f9fbceebe9b15a37a10382 SHA512 edac9309c285cf569c453cd63f2cbd5e0a29012936af181616010bebb4eac2c474e2b37463af61b5e66876ffba517040796c596ac2bbcc9dad2af7aedf324221 WHIRLPOOL a30e39f862ed5eefabcb79820f190bffeccffda79ceae1864cb3364fbda1588eb345e7b1fe1264cfd84710e56aadc36e9c816e6371a46e7c1f0225e726065304
diff --git a/dev-java/jvyaml/files/jvyaml-0.2-tests.patch b/dev-java/jvyaml/files/jvyaml-0.2-tests.patch
new file mode 100644
index 000000000000..0f6997ebbc40
--- /dev/null
+++ b/dev-java/jvyaml/files/jvyaml-0.2-tests.patch
@@ -0,0 +1,20 @@
+--- build.xml	2007-01-05 21:30:59.000000000 +0100
++++ build.xml	2007-01-05 21:31:46.000000000 +0100
+@@ -47,7 +47,7 @@
+   </target>
+ 
+   <target name="test" depends="compile-tests" description="Runs all tests">
+-    <junit haltonfailure="false">
++    <junit haltonfailure="true">
+       <classpath>
+       	<pathelement location="${build.dir}/classes/jvyaml"/>
+       	<pathelement location="${build.dir}/test"/>
+@@ -61,7 +61,7 @@
+     </junit>
+   </target>
+ 
+-  <target name="jar" depends="test" description="Create the jvyaml.jar file">
++  <target name="jar" depends="compile" description="Create the jvyaml.jar file">
+     <jar destfile="${lib.dir}/jvyaml.jar">
+       <fileset dir="${jvyaml.classes.dir}">
+         <include name="**/*.class"/>
diff --git a/dev-java/jvyaml/files/jvyaml-0.2.1-tests.patch b/dev-java/jvyaml/files/jvyaml-0.2.1-tests.patch
new file mode 100644
index 000000000000..5dac1832afee
--- /dev/null
+++ b/dev-java/jvyaml/files/jvyaml-0.2.1-tests.patch
@@ -0,0 +1,34 @@
+Only in jvyaml-0.2.1-patched/: build
+Files jvyaml-0.2.1/lib/jvyaml.jar and jvyaml-0.2.1-patched/lib/jvyaml.jar differ
+diff -ru jvyaml-0.2.1/src/test/org/jvyaml/YAMLDumpTest.java jvyaml-0.2.1-patched/src/test/org/jvyaml/YAMLDumpTest.java
+--- jvyaml-0.2.1/src/test/org/jvyaml/YAMLDumpTest.java	2006-09-24 13:07:19.000000000 -0400
++++ jvyaml-0.2.1-patched/src/test/org/jvyaml/YAMLDumpTest.java	2007-03-08 00:39:04.000000000 -0500
+@@ -28,6 +28,8 @@
+ import java.util.List;
+ import java.util.HashMap;
+ import java.util.ArrayList;
++import java.util.TimeZone;
++import java.text.DecimalFormat;
+ 
+ import junit.framework.TestCase;
+ 
+@@ -71,9 +73,18 @@
+         final java.util.Calendar cal = java.util.Calendar.getInstance();
+         cal.clear();
+         cal.set(1982,5-1,3); // Java's months are zero-based...
++
++		// Nasty hack to figure out timezone so we can figure out what to
++		// expect when we do YAML#dump
++		TimeZone tz = cal.getTimeZone();
++		int offset = tz.getOffset(cal.getTimeInMillis()) / 3600000;
++		DecimalFormat format = new DecimalFormat("00");
++		String offsetString = format.format(offset);
++		offsetString = ( offset >= 0 ? "+" : "") + offsetString;
+         
+         final TestBean toDump = new TestBean("Ola Bini", 24, cal.getTime());
+-        assertEquals("--- !java/object:org.jvyaml.TestBean\nname: Ola Bini\nage: 24\nborn: 1982-05-03 00:00:00 +02:00\n", YAML.dump(toDump));
++//		assertEquals("--- !java/object:org.jvyaml.TestBean\nname: Ola Bini\nage: 24\nborn: 1982-05-03 00:00:00 +02:00\n", YAML.dump(toDump));
++        assertEquals("--- !java/object:org.jvyaml.TestBean\nname: Ola Bini\nage: 24\nborn: 1982-05-03 00:00:00 " + offsetString + ":00\n", YAML.dump(toDump));
+        
+     }
+ }// YAMLDumpTest
diff --git a/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild b/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..c1065f4b5b6f
--- /dev/null
+++ b/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source test"
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java YAML parser and emitter"
+HOMEPAGE="https://jvyaml.dev.java.net/"
+SRC_URI="https://${PN}.dev.java.net/files/documents/5215/41455/${PN}-src-${PV}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit
+		=dev-java/junit-3*
+	)"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# https://jvyaml.dev.java.net/issues/show_bug.cgi?id=6
+	epatch "${FILESDIR}/${PN}-0.2-tests.patch"
+
+	# https://jvyaml.dev.java.net/issues/show_bug.cgi?id=5
+	epatch "${FILESDIR}/${P}-tests.patch"
+
+	cd lib
+	rm -v *.jar || die
+	use test && java-pkg_jar-from --build-only junit
+}
+
+#no javadoc target
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+	dodoc README CREDITS || die
+	use source && java-pkg_dosrc src/*
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
+}
diff --git a/dev-java/jvyaml/metadata.xml b/dev-java/jvyaml/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/jvyaml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/jvyamlb/Manifest b/dev-java/jvyamlb/Manifest
new file mode 100644
index 000000000000..035759b93b05
--- /dev/null
+++ b/dev-java/jvyamlb/Manifest
@@ -0,0 +1 @@
+DIST jvyamlb-src-0.2.5.tar.gz 1767828 SHA256 49294affa1a43dbd169c0f983575b4ed4b15e02079740115bd4c9cf9401c8793 SHA512 1e853ff957b888d706a4d264aac4573cf4aced02604e2679d5871f3a92c016136a7fb73adf5d5c0be0cea9f28b4bc6faf11abc0334fe2f96a251a7d9cc228711 WHIRLPOOL 150906b115fa76e0837422d5b139721a072e6ccfda376a9958bc8c7731cdb2c4142fedadd2148bd4cfc35314c8177b34c32819b7716ba212544f4c84543669f1
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..79e5e8d5410d
--- /dev/null
+++ b/dev-java/jvyamlb/jvyamlb-0.2.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JvYAMLb, YAML processor extracted from JRuby"
+HOMEPAGE="http://code.google.com/p/jvyamlb/"
+SRC_URI="http://jvyamlb.googlecode.com/files/jvyamlb-src-${PV}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc 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..46ab2b1323bf
--- /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>
+	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">jvyamlb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
new file mode 100644
index 000000000000..a03255db84d1
--- /dev/null
+++ b/dev-java/jython/Manifest
@@ -0,0 +1,5 @@
+DIST Python-2.2.3.tgz 6709556 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 SHA512 2e2c881f8819ed3d91b3e98e7087b23ced9715c80eb9e5fe4144cca5b82220e035d0f50ac4a098b3bbdca3c588f70b8021f68a5d52f653c013470579342943e4 WHIRLPOOL dbef6f9f0545f4f4ddf6e4535b67bb936a2ef596f17a1ff6acca89755729420588d845bc291eed0d19b433b3eff017166c7d68a1a352a5612b00da2f8f0c20d7
+DIST jython-2.1.tar.bz2 1301528 SHA256 faa57a55d137268e80221cd628b234ca67de13504b813be1c0499c9f4d5872b2 SHA512 397ad2819eb5bb39e1b0c0673922af7fbb75f680d707a7c344d21f680901a6fd96eddbbed8b464fb91cccd6f38a9f9b1a8f8327a530ac870002b72c38bf75ad3 WHIRLPOOL 00a1e7376b1883fc835dc801d718041a623ab0406393135d452df613fbbb9a87ab6bf4429b07260e93530f04031e531d4e041bacf22491d7ec0db76a41d77061
+DIST jython-2.7.0-sources.jar 15371691 SHA256 2b534595d4a08059ebb71b881c58ee830499bb6e9daba7c828a7f1f6c8943f7a SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6 WHIRLPOOL e0dbd289c522b41ef2d3f54b01a2f6d44de8755e2eeb7863c8b807d1b179839f20d925e102db324cf85cd82503cd03106b5287ffa7a322a3902d6f24e9cd2a41
+DIST jython-installer-2.5.3.jar 18487200 SHA256 05405966cdfa57abc8e705dd6aab92b8240097ce709fb916c8a0dbcaa491f99e SHA512 92d00cc8d885806749c67d1dc820e7b402c807b9a40277073fc3ea1f3dd10e1e506dc241a342874db8109120e8f0031a8dc7a4db6a88dfdc6c89906eeb9d454d WHIRLPOOL e8e3adf741a35b5e4de6c67b8805582cabc8590afac28c2e4ae3b61c4bd38d41904d7d1e4a23de21e7870d628e33a52f540fc89780a4724403b0bd92e1159768
+DIST jython_installer-2.2.1.jar 4663097 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68 SHA512 d33262dec95dbecfc007a738ed8d8cd4844c215e451b7ab126940f1157079aa846a104f3587ad84c4a009249632e3aaa3c83479ee8f47c30c4b4833bcdd582b3 WHIRLPOOL bae264f67547a975bf648b3de0cc2becb5d51e14b2ca1a977f7c3d45ec96bd3fd4fd99b0ff6912fb38d54d57656225c51c4b8a474c6ca8fe7fc16e12ab4bbec8
diff --git a/dev-java/jython/files/2.1-assert-SimpleCompiler.py.patch b/dev-java/jython/files/2.1-assert-SimpleCompiler.py.patch
new file mode 100644
index 000000000000..55e154999195
--- /dev/null
+++ b/dev-java/jython/files/2.1-assert-SimpleCompiler.py.patch
@@ -0,0 +1,11 @@
+--- jython-2.1/Tools/jythonc/SimpleCompiler.py.orig	2006-09-08 13:21:29.000000000 -0600
++++ jython-2.1/Tools/jythonc/SimpleCompiler.py	2006-09-08 13:22:15.000000000 -0600
+@@ -577,7 +577,7 @@
+             args.append(message.asAny())
+ 
+         return jast.If(self.frame.getglobal("__debug__").nonzero(),
+-                       jast.InvokeStatic("Py", "assert", args))
++                       jast.InvokeStatic("Py", "assert_", args))
+ 
+     def return_stmt(self, value=None):
+         if value is None:
diff --git a/dev-java/jython/files/2.1-assert.patch b/dev-java/jython/files/2.1-assert.patch
new file mode 100644
index 000000000000..1f06848f2328
--- /dev/null
+++ b/dev-java/jython/files/2.1-assert.patch
@@ -0,0 +1,50 @@
+--- jython-2.1/com/ziclix/python/sql/pipe/Pipe.java.orig	2006-07-29 21:31:34.000000000 +0200
++++ jython-2.1/com/ziclix/python/sql/pipe/Pipe.java	2006-07-29 21:31:41.000000000 +0200
+@@ -93,7 +93,7 @@
+ 													 new Integer(sinkRunner.getCount()) };
+ 			String msg = zxJDBC.getString("inconsistentRowCount", counts);
+ 
+-			Py.assert(Py.Zero, Py.newString(msg));
++			Py.assert_(Py.Zero, Py.newString(msg));
+ 		}
+ 
+ 		return Py.newInteger(sinkRunner.getCount());
+--- jython-2.1/org/python/compiler/CodeCompiler.java.orig	2006-07-29 21:28:47.000000000 +0200
++++ jython-2.1/org/python/compiler/CodeCompiler.java	2006-07-29 21:30:13.000000000 +0200
+@@ -817,14 +817,14 @@
+             node.getChild(1).visit(this);
+             if (mrefs.assert2 == 0) {
+                 mrefs.assert2 = code.pool.Methodref(
+-                    "org/python/core/Py", "assert",
++                    "org/python/core/Py", "assert_",
+                     "(" + $pyObj + $pyObj + ")V");
+             }
+             code.invokestatic(mrefs.assert2);
+         } else {
+             if (mrefs.assert1 == 0) {
+                 mrefs.assert1 = code.pool.Methodref(
+-                    "org/python/core/Py", "assert",
++                    "org/python/core/Py", "assert_",
+                     "(" + $pyObj + ")V");
+             }
+             code.invokestatic(mrefs.assert1);
+--- jython-2.1/org/python/core/Py.java.orig	2006-07-29 21:29:19.000000000 +0200
++++ jython-2.1/org/python/core/Py.java	2006-07-29 21:30:40.000000000 +0200
+@@ -986,14 +986,14 @@
+ 
+ 
+     /* Equivalent to Python's assert statement */
+-    public static void assert(PyObject test, PyObject message) {
++    public static void assert_(PyObject test, PyObject message) {
+         if (!test.__nonzero__()) {
+             throw new PyException(Py.AssertionError, message);
+         }
+     }
+ 
+-    public static void assert(PyObject test) {
+-        assert(test, Py.None);
++    public static void assert_(PyObject test) {
++        assert_(test, Py.None);
+     }
+ 
+     /* Helpers to implement finally clauses */
diff --git a/dev-java/jython/files/jython-2.2.1-build.patch b/dev-java/jython/files/jython-2.2.1-build.patch
new file mode 100644
index 000000000000..29df77621303
--- /dev/null
+++ b/dev-java/jython/files/jython-2.2.1-build.patch
@@ -0,0 +1,76 @@
+--- build.xml.org	2008-02-26 22:35:07.000000000 +1300
++++ build.xml	2008-02-26 22:35:48.000000000 +1300
+@@ -373,21 +373,13 @@
+ 
+     <!-- create checkout directory if necessary -->
+     <target name="prepare-checkout" if="do.checkout">
+-        <mkdir dir="${svn.checkout.dir}" />
++	    <echo message="Removed by patch." />
+     </target>
+ 
+ 
+     <!-- checkout if so defined -->
+     <target name="checkout" depends="prepare" if="do.checkout">
+-        <svn javahl="${javahl.dir}" >
+-        	<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/jython" revision="${svn.revision}" destPath="${svn.checkout.dir}/jython" />
+-        	<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" />
+-        </svn> 
+-
+-        <!-- checkout cpython license from the correct python maintenance branch -->
+-        <svn javahl="${javahl.dir}" >
+-               <checkout url="http://svn.python.org/projects/python/branches/release22-maint/" destPath="${svn.checkout.dir}/python" recurse="false" />
+-        </svn> 
++    	<echo message="removed by patch" />
+     </target>
+ 
+ 	
+@@ -551,28 +543,13 @@
+ 
+ 
+     <!-- build the .html files using the ht2html tool -->
+-    <target name="doc" depends="compile" if="full-build">
+-        <fail unless="ht2html.dir" message="ht2html.dir is not set" />
+-        <copy todir="${dist.dir}/Doc" preservelastmodified="true">
+-            <fileset dir="Doc" includes="*.ht, **/*.gif" />
+-        </copy>
+-        <!-- Create .html files in Doc -->
+-        <apply executable="${python.exe}" dir="Doc">
+-            <env key="PYTHONPATH" path="${jython.base.dir}/Misc/htgen" />
+-            <arg line="${ht2html.dir}/ht2html.py" />
+-            <arg line="-s JyLocalGenerator" />
+-            <fileset dir="${dist.dir}/Doc">
+-                <include name="*.ht" />
+-            </fileset>
+-        </apply>
+-        <delete>
+-            <fileset dir="${dist.dir}/Doc" includes="*.ht" />
+-        </delete>
++    <target name="doc" depends="compile">
++    	<echo message="Functionality removed by gentoo patch" />
+     </target>
+ 
+ 
+     <!-- javadoc -->
+-    <target name="javadoc" depends="compile" if="full-build">
++    <target name="javadoc" depends="compile">
+         <javadoc sourcepath="${source.dir}"
+                  destdir="${apidoc.dir}"
+                  source="${jdk.source.version}"
+@@ -588,7 +565,7 @@
+ 
+ 
+     <!-- copy for full distribution -->
+-    <target name="copy-full" if="full-build">
++    <target name="copy-full">
+         <!-- Misc files -->
+         <echo>copy misc files from ${jython.base.dir}</echo>
+         <copy todir="${dist.dir}" preservelastmodified="true">
+@@ -599,7 +576,7 @@
+ 
+         <!-- copy the CPython license -->
+         <echo>copy CPython LICENSE from ${svn.checkout.dir}/python</echo>
+-        <copy file="${svn.checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
++	<copy file="${python.lib}/../LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
+ 
+         <!-- sources: todir has to correspond with installer/**/JarInstaller.java -->
+         <echo>copy sources from ${jython.base.dir}</echo>
diff --git a/dev-java/jython/files/jython-2.2.1-build.xml.patch b/dev-java/jython/files/jython-2.2.1-build.xml.patch
new file mode 100644
index 000000000000..8ea197476074
--- /dev/null
+++ b/dev-java/jython/files/jython-2.2.1-build.xml.patch
@@ -0,0 +1,92 @@
+--- build.xml.orig	2012-09-27 16:13:40.750930136 +0200
++++ build.xml	2012-09-27 16:16:31.725093475 +0200
+@@ -373,21 +373,13 @@
+ 
+     <!-- create checkout directory if necessary -->
+     <target name="prepare-checkout" if="do.checkout">
+-        <mkdir dir="${svn.checkout.dir}" />
++	    <echo message="Removed by patch." />
+     </target>
+ 
+ 
+     <!-- checkout if so defined -->
+     <target name="checkout" depends="prepare" if="do.checkout">
+-        <svn javahl="${javahl.dir}" >
+-        	<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/jython" revision="${svn.revision}" destPath="${svn.checkout.dir}/jython" />
+-        	<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" />
+-        </svn> 
+-
+-        <!-- checkout cpython license from the correct python maintenance branch -->
+-        <svn javahl="${javahl.dir}" >
+-               <checkout url="http://svn.python.org/projects/python/branches/release22-maint/" destPath="${svn.checkout.dir}/python" recurse="false" />
+-        </svn> 
++    	<echo message="removed by patch" />
+     </target>
+ 
+ 	
+@@ -488,6 +480,7 @@
+         />
+ 
+         <!-- java files used by tests -->
++<!--
+         <javac srcdir="${jython.base.dir}/Lib/test/"
+                includes="javatests/**"
+                destdir="${output.dir}/"
+@@ -498,6 +491,7 @@
+                deprecation="${deprecation}"
+                nowarn="${nowarn}"
+         />
++-->
+ 
+         <copy file="${source.dir}/org/python/modules/ucnhash.dat"
+               todir="${output.dir}/org/python/modules"
+@@ -551,28 +545,13 @@
+ 
+ 
+     <!-- build the .html files using the ht2html tool -->
+-    <target name="doc" depends="compile" if="full-build">
+-        <fail unless="ht2html.dir" message="ht2html.dir is not set" />
+-        <copy todir="${dist.dir}/Doc" preservelastmodified="true">
+-            <fileset dir="Doc" includes="*.ht, **/*.gif" />
+-        </copy>
+-        <!-- Create .html files in Doc -->
+-        <apply executable="${python.exe}" dir="Doc">
+-            <env key="PYTHONPATH" path="${jython.base.dir}/Misc/htgen" />
+-            <arg line="${ht2html.dir}/ht2html.py" />
+-            <arg line="-s JyLocalGenerator" />
+-            <fileset dir="${dist.dir}/Doc">
+-                <include name="*.ht" />
+-            </fileset>
+-        </apply>
+-        <delete>
+-            <fileset dir="${dist.dir}/Doc" includes="*.ht" />
+-        </delete>
++    <target name="doc" depends="compile">
++    	<echo message="Functionality removed by gentoo patch" />
+     </target>
+ 
+ 
+     <!-- javadoc -->
+-    <target name="javadoc" depends="compile" if="full-build">
++    <target name="javadoc" depends="compile">
+         <javadoc sourcepath="${source.dir}"
+                  destdir="${apidoc.dir}"
+                  source="${jdk.source.version}"
+@@ -588,7 +567,7 @@
+ 
+ 
+     <!-- copy for full distribution -->
+-    <target name="copy-full" if="full-build">
++    <target name="copy-full">
+         <!-- Misc files -->
+         <echo>copy misc files from ${jython.base.dir}</echo>
+         <copy todir="${dist.dir}" preservelastmodified="true">
+@@ -599,7 +578,7 @@
+ 
+         <!-- copy the CPython license -->
+         <echo>copy CPython LICENSE from ${svn.checkout.dir}/python</echo>
+-        <copy file="${svn.checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
++	<copy file="${python.lib}/../LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
+ 
+         <!-- sources: todir has to correspond with installer/**/JarInstaller.java -->
+         <echo>copy sources from ${jython.base.dir}</echo>
diff --git a/dev-java/jython/files/jython-2.5.2-build.xml.patch b/dev-java/jython/files/jython-2.5.2-build.xml.patch
new file mode 100644
index 000000000000..fb5e46e569ff
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.2-build.xml.patch
@@ -0,0 +1,27 @@
+--- build.xml.orig	2012-07-13 14:06:40.965992853 +0200
++++ build.xml	2012-07-13 14:07:29.595035840 +0200
+@@ -512,6 +512,7 @@
+         </javac>
+ 
+         <!-- java files used by tests -->
++<!--
+         <javac srcdir="${test.source.dir}"
+                destdir="${compile.dir}"
+                target="${jdk.target.version}"
+@@ -535,6 +536,7 @@
+         <copy file="${source.dir}/org/python/modules/ucnhash.dat"
+               todir="${compile.dir}/org/python/modules"
+               preservelastmodified="true" />
++-->
+ 
+         <copy todir="${compile.dir}" preservelastmodified="true">
+             <fileset dir="${source.dir}">
+@@ -758,7 +762,7 @@
+         <jycompile srcdir="${dist.dir}/Lib" destdir="${dist.dir}/Lib" excludes="test/**"/>
+     </target>
+ 
+-    <target name="copy-lib" depends="init, copy-javalib, copy-cpythonlib">
++    <target name="copy-lib" depends="init">
+         <!-- XXX untested and most likely broken in 2.5
+         <copy todir="${dist.dir}" preservelastmodified="true">
+             <fileset dir="${jython.base.dir}" includes="Tools/**/*.py" />
diff --git a/dev-java/jython/files/jython-2.5.2-distutils_byte_compilation.patch b/dev-java/jython/files/jython-2.5.2-distutils_byte_compilation.patch
new file mode 100644
index 000000000000..db90e834f46c
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.2-distutils_byte_compilation.patch
@@ -0,0 +1,85 @@
+--- Lib/distutils/tests/test_build_py.py
++++ Lib/distutils/tests/test_build_py.py
+@@ -92,6 +92,25 @@
+             os.chdir(cwd)
+             sys.stdout = sys.__stdout__
+ 
++    def test_dont_write_bytecode(self):
++        # makes sure byte_compile is not used
++        pkg_dir, dist = self.create_dist()
++        cmd = build_py(dist)
++        cmd.compile = 1
++        cmd.optimize = 1
++
++        old_dont_write_bytecode = os.environ.get("PYTHONDONTWRITEBYTECODE")
++        os.environ["PYTHONDONTWRITEBYTECODE"] = "1"
++        try:
++            cmd.byte_compile([])
++        finally:
++            if old_dont_write_bytecode is None:
++                del os.environ["PYTHONDONTWRITEBYTECODE"]
++            else:
++                os.environ["PYTHONDONTWRITEBYTECODE"] = old_dont_write_bytecode
++
++        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
++
+ def test_suite():
+     return unittest.makeSuite(BuildPyTestCase)
+ 
+--- Lib/distutils/util.py
++++ Lib/distutils/util.py
+@@ -11,6 +11,7 @@
+ from distutils.dep_util import newer
+ from distutils.spawn import spawn
+ from distutils import log
++from distutils.errors import DistutilsByteCompileError
+ 
+ def get_platform ():
+     """Return a string that identifies the current platform.  This is used
+@@ -397,6 +398,9 @@
+     generated in indirect mode; unless you know what you're doing, leave
+     it set to None.
+     """
++    # nothing is done if PYTHONDONTWRITEBYTECODE environment variable is set
++    if os.environ.get("PYTHONDONTWRITEBYTECODE") is not None:
++        raise DistutilsByteCompileError('byte-compiling is disabled.')
+ 
+     # First, if the caller didn't force us into direct or indirect mode,
+     # figure out which mode we should be in.  We take a conservative
+--- Lib/distutils/command/build_py.py
++++ Lib/distutils/command/build_py.py
+@@ -418,6 +418,10 @@
+ 
+ 
+     def byte_compile (self, files):
++        if os.environ.get("PYTHONDONTWRITEBYTECODE") is not None:
++            self.warn('byte-compiling is disabled, skipping.')
++            return
++
+         from distutils.util import byte_compile
+         prefix = self.build_lib
+         if prefix[-1] != os.sep:
+--- Lib/distutils/command/install_lib.py
++++ Lib/distutils/command/install_lib.py
+@@ -121,6 +121,10 @@
+         return outfiles
+ 
+     def byte_compile (self, files):
++        if os.environ.get("PYTHONDONTWRITEBYTECODE") is not None:
++            self.warn('byte-compiling is disabled, skipping.')
++            return
++
+         from distutils.util import byte_compile
+ 
+         # Get the "--root" directory supplied to the "install" command,
+--- Lib/distutils/errors.py
++++ Lib/distutils/errors.py
+@@ -76,6 +76,8 @@
+ class DistutilsTemplateError (DistutilsError):
+     """Syntax error in a file list template."""
+ 
++class DistutilsByteCompileError(DistutilsError):
++    """Byte compile error."""
+ 
+ # Exception classes used by the CCompiler implementation classes
+ class CCompilerError (Exception):
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..150d463f1db1
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
@@ -0,0 +1,11 @@
+--- Lib/distutils/command/install.py
++++ 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..8d028d01b567
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
@@ -0,0 +1,15 @@
+--- src/org/python/core/PySystemState.java
++++ 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.5.2-sax-parser-class-not-found.patch b/dev-java/jython/files/jython-2.5.2-sax-parser-class-not-found.patch
new file mode 100644
index 000000000000..7e9273c68cb4
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.2-sax-parser-class-not-found.patch
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User Alan Kennedy <alan@xhaus.com>
+# Date 1333300584 -3600
+# Node ID a972112ac1b155ef41b3f8ce195251bc6cc3ebce
+# Parent  920a60f5d5b5fdf46f4f26c75cab42e2a671be2f
+#1537: Fix for classloading issues with MATLAB/OpenJDK
+
+diff --git a/Lib/xml/parsers/expat.py b/Lib/xml/parsers/expat.py
+--- a/Lib/xml/parsers/expat.py
++++ b/Lib/xml/parsers/expat.py
+@@ -47,12 +47,8 @@ from org.xml.sax.helpers import XMLReade
+ from org.xml.sax.ext import DefaultHandler2
+ 
+ # Xerces
+-try:
+-    # Name mangled by jarjar?
+-    import org.python.apache.xerces.parsers.SAXParser
+-    _xerces_parser = "org.python.apache.xerces.parsers.SAXParser"
+-except ImportError:
+-    _xerces_parser = "org.apache.xerces.parsers.SAXParser"
++_mangled_xerces_parser_name = "org.python.apache.xerces.parsers.SAXParser"
++_xerces_parser_name = "org.apache.xerces.parsers.SAXParser"
+ 
+ 
+ # @expat args registry
+@@ -88,7 +84,11 @@ class XMLParser(object):
+                      "not %s" % type(namespace_separator).__name__)
+             raise TypeError(error)
+ 
+-        self._reader = XMLReaderFactory.createXMLReader(_xerces_parser)
++        # See http://bugs.jython.org/issue1537
++        try:
++            self._reader = XMLReaderFactory.createXMLReader(_mangled_xerces_parser_name)
++        except:
++            self._reader = XMLReaderFactory.createXMLReader(_xerces_parser_name)
+ 
+         if self.namespace_separator is None:
+             try:
+
diff --git a/dev-java/jython/files/jython-2.5.2-sax-parser-fix.patch b/dev-java/jython/files/jython-2.5.2-sax-parser-fix.patch
new file mode 100644
index 000000000000..99abc2d7864b
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.2-sax-parser-fix.patch
@@ -0,0 +1,94 @@
+
+# HG changeset patch
+# User Alan Kennedy <jython-dev@xhaus.com>
+# Date 1319980040 0
+# Node ID 936bd1b132eb9c591cf915b060c6567ae8e16914
+# Parent  71b3f883f6c5f0f39f0ae8aff097a439d4970f46
+Fix for xml attribute namespaces issue
+http://bugs.jython.org/issue1768
+
+diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py
+--- a/Lib/test/test_sax.py
++++ b/Lib/test/test_sax.py
+@@ -390,22 +390,23 @@ def test_expat_nsattrs_wattr():
+     gather = AttrGatherer()
+     parser.setContentHandler(gather)
+ 
+-    parser.parse(StringIO("<doc xmlns:ns='%s' ns:attr='val'/>" % ns_uri))
++    a_name = "id" ; a_val = "val"
++    parser.parse(StringIO("<doc xmlns:ns='%s' ns:%s='%s'/>" % (ns_uri, a_name, a_val) ))
+ 
+     attrs = gather._attrs
+ 
+     return attrs.getLength() == 1 and \
+-           attrs.getNames() == [(ns_uri, "attr")] and \
+-           attrs.getQNames() == ["ns:attr"] and \
++           attrs.getNames() == [(ns_uri, a_name)] and \
++           attrs.getQNames() == ["ns:%s" % a_name] and \
+            len(attrs) == 1 and \
+-           attrs.has_key((ns_uri, "attr")) and \
+-           attrs.keys() == [(ns_uri, "attr")] and \
+-           attrs.get((ns_uri, "attr")) == "val" and \
+-           attrs.get((ns_uri, "attr"), 25) == "val" and \
+-           attrs.items() == [((ns_uri, "attr"), "val")] and \
+-           attrs.values() == ["val"] and \
+-           attrs.getValue((ns_uri, "attr")) == "val" and \
+-           attrs[(ns_uri, "attr")] == "val"
++           attrs.has_key((ns_uri, a_name)) and \
++           attrs.keys() == [(ns_uri, a_name)] and \
++           attrs.get((ns_uri, a_name)) == a_val and \
++           attrs.get((ns_uri, a_name), 25) == a_val and \
++           attrs.items() == [((ns_uri, a_name), a_val)] and \
++           attrs.values() == [a_val] and \
++           attrs.getValue((ns_uri, a_name)) == a_val and \
++           attrs[(ns_uri, a_name)] == a_val
+ 
+ def test_expat_nsattrs_no_namespace():
+     parser = make_parser()
+@@ -413,22 +414,23 @@ def test_expat_nsattrs_no_namespace():
+     gather = AttrGatherer()
+     parser.setContentHandler(gather)
+ 
+-    parser.parse(StringIO("<doc attr='val'/>"))
++    a_name = "id" ; a_val = "val"
++    parser.parse(StringIO("<doc %s='%s'/>" % (a_name, a_val) ))
+ 
+     attrs = gather._attrs
+ 
+     return attrs.getLength() == 1 and \
+-           attrs.getNames() == [(None, "attr")] and \
+-           attrs.getQNames() == ["attr"] and \
++           attrs.getNames() == [(None, a_name)] and \
++           attrs.getQNames() == [a_name] and \
+            len(attrs) == 1 and \
+-           attrs.has_key((None, "attr")) and \
+-           attrs.keys() == [(None, "attr")] and \
+-           attrs.get((None, "attr")) == "val" and \
+-           attrs.get((None, "attr"), 25) == "val" and \
+-           attrs.items() == [((None, "attr"), "val")] and \
+-           attrs.values() == ["val"] and \
+-           attrs.getValue((None, "attr")) == "val" and \
+-           attrs[(None, "attr")] == "val"
++           attrs.has_key((None, a_name)) and \
++           attrs.keys() == [(None, a_name)] and \
++           attrs.get((None, a_name)) == a_val and \
++           attrs.get((None, a_name), 25) == a_val and \
++           attrs.items() == [((None, a_name), a_val)] and \
++           attrs.values() == [a_val] and \
++           attrs.getValue((None, a_name)) == a_val and \
++           attrs[(None, a_name)] == a_val
+ 
+ # ===== InputSource support
+ 
+diff --git a/Lib/xml/sax/drivers2/drv_javasax.py b/Lib/xml/sax/drivers2/drv_javasax.py
+--- a/Lib/xml/sax/drivers2/drv_javasax.py
++++ b/Lib/xml/sax/drivers2/drv_javasax.py
+@@ -238,7 +238,7 @@ class JavaSAXParser(xmlreader.XMLReader,
+         pass # TODO
+ 
+ def _fixTuple(nsTuple, frm, to):
+-    if len(nsTuple) == 2:
++    if isinstance(nsTuple, tuple) and len(nsTuple) == 2:
+         nsUri, localName = nsTuple
+         if nsUri == frm:
+             nsUri = to
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..4e27af771eb4
--- /dev/null
+++ b/dev-java/jython/files/jython-2.7.0-build.xml.patch
@@ -0,0 +1,11 @@
+--- build.xml.orig	2015-06-27 16:12:08.442000000 +0000
++++ 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/files/python-2.5.5-distutils_byte_compilation.patch b/dev-java/jython/files/python-2.5.5-distutils_byte_compilation.patch
new file mode 100644
index 000000000000..d029247dd256
--- /dev/null
+++ b/dev-java/jython/files/python-2.5.5-distutils_byte_compilation.patch
@@ -0,0 +1,37 @@
+--- Lib/distutils/command/build_py.py
++++ Lib/distutils/command/build_py.py
+@@ -418,6 +418,10 @@
+ 
+ 
+     def byte_compile (self, files):
++        if os.environ.get("PYTHONDONTWRITEBYTECODE") is not None:
++            self.warn('byte-compiling is disabled, skipping.')
++            return
++
+         from distutils.util import byte_compile
+         prefix = self.build_lib
+         if prefix[-1] != os.sep:
+--- Lib/distutils/command/install_lib.py
++++ Lib/distutils/command/install_lib.py
+@@ -121,6 +121,10 @@
+         return outfiles
+ 
+     def byte_compile (self, files):
++        if os.environ.get("PYTHONDONTWRITEBYTECODE") is not None:
++            self.warn('byte-compiling is disabled, skipping.')
++            return
++
+         from distutils.util import byte_compile
+ 
+         # Get the "--root" directory supplied to the "install" command,
+--- Lib/distutils/errors.py
++++ Lib/distutils/errors.py
+@@ -76,6 +76,8 @@
+ class DistutilsTemplateError (DistutilsError):
+     """Syntax error in a file list template."""
+ 
++class DistutilsByteCompileError(DistutilsError):
++    """Byte compile error."""
+ 
+ # Exception classes used by the CCompiler implementation classes
+ class CCompilerError (Exception):
diff --git a/dev-java/jython/jython-2.1-r11.ebuild b/dev-java/jython/jython-2.1-r11.ebuild
new file mode 100644
index 000000000000..fa76eb16b7a2
--- /dev/null
+++ b/dev-java/jython/jython-2.1-r11.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit base java-pkg-2
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+MY_PV="21"
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.class"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE="readline source doc"
+# servlet
+
+CDEPEND="=dev-java/jakarta-oro-2.0*
+	readline? ( >=dev-java/libreadline-java-0.8.0 )"
+#	servlet? ( >=www-servers/tomcat-5.0 )
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	source? ( app-arch/zip )
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-assert.patch
+	epatch ${FILESDIR}/${PV}-assert-SimpleCompiler.py.patch
+
+	# bug #160861
+	rm -rf org/apache
+}
+
+src_compile() {
+	local cp="$(java-pkg_getjars jakarta-oro-2.0)"
+	local exclude=""
+
+	if use readline ; then
+		cp=${cp}:$(java-pkg_getjars libreadline-java)
+	else
+		exclude="${exclude} ! -name ReadlineConsole.java"
+	fi
+
+	#if use servlet; then
+	#	cp=${cp}:$(java-pkg_getjars servlet)
+	#else
+		exclude="${exclude} ! -name PyServlet.java"
+	#fi
+
+	ejavac -classpath ${cp} -nowarn $(find org -name "*.java" ${exclude})
+
+	find org -name "*.class" | xargs jar cf ${PN}.jar
+
+	# bug 115551
+	cd Lib/jxxload_help
+	ejavac -classpath ${S}/${PN}.jar -nowarn *.java
+	rm -f *.java Makefile
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	dodoc README.txt NEWS ACKNOWLEDGMENTS
+	use doc && java-pkg_dohtml -A .css .jpg .gif -r Doc/*
+
+	java-pkg_dolauncher jythonc \
+						--main "org.python.util.jython" \
+						--java_args "-Dpython.home=/usr/share/jython" \
+						--pkg_args "/usr/share/jython/tools/jythonc/jythonc.py"
+
+	java-pkg_dolauncher jython \
+						--main "org.python.util.jython" \
+						--java_args "-Dpython.home=/usr/share/jython"
+
+	dodir /usr/share/jython/cachedir
+	chmod a+rw ${D}/usr/share/jython/cachedir
+
+	rm Demo/jreload/example.jar
+	insinto /usr/share/${PN}
+	doins -r Lib Demo registry
+
+	insinto /usr/share/${PN}/tools
+	doins -r Tools/*
+
+	use source && java-pkg_dosrc com org
+}
+
+pkg_postinst() {
+	if use readline; then
+		elog "To use readline you need to add the following to your registry"
+		elog
+		elog "python.console=org.python.util.ReadlineConsole"
+		elog "python.console.readlinelib=GnuReadline"
+		elog
+		elog "The global registry can be found in /usr/share/${PN}/registry"
+		elog "User registry in \$HOME/.jython"
+		elog "See http://www.jython.org/docs/registry.html for more information"
+		elog ""
+	fi
+
+	elog "This revision renames org.python.core.Py.assert to assert_."
+	elog "This is the solution that upstream will use in the next release."
+	elog "Just note that this revision is not API compatible with vanilla 2.1."
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=142099"
+}
diff --git a/dev-java/jython/jython-2.2.1-r1.ebuild b/dev-java/jython/jython-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..e534548228b3
--- /dev/null
+++ b/dev-java/jython/jython-2.2.1-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+
+JAVA_PKG_IUSE="readline source doc servletapi mysql postgres examples oracle"
+#jdnc
+
+inherit base java-pkg-2 java-ant-2
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+
+MY_PV="installer-2.2.1"
+PYVER="2.2.3"
+
+SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
+mirror://sourceforge/${PN}/${PN}_${MY_PV}.jar"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+CDEPEND="=dev-java/jakarta-oro-2.0*
+	readline? ( >=dev-java/libreadline-java-0.8.0 )
+	mysql? ( >=dev-java/jdbc-mysql-3.1 )
+	postgres? ( dev-java/jdbc-postgresql )
+	oracle? ( dev-java/jdbc-oracle-bin:10.2 )
+	servletapi? ( java-virtuals/servlet-api:2.5 )
+	!<=dev-java/freemarker-2.3.10"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+		dev-java/javacc
+		${CDEPEND}"
+
+S="${WORKDIR}"
+
+#Tests currently very broken. Need to investigate whether that
+#is jython's or gentoo's doing.
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-build.patch"
+
+	rm -Rfv org || die "Unable to remove class files."
+	find . -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
+
+	echo javacc.jar="$(java-pkg_getjars --build-only javacc)" > ant.properties
+
+	if use readline; then
+		echo "readline.jar=$(java-pkg_getjars libreadline-java)" >> \
+		ant.properties
+	fi
+	if use servletapi; then
+		echo "servlet.jar=$(java-pkg_getjar --virtual servlet-api-2.5 servlet-api.jar)" \
+		>> ant.properties
+	fi
+	if use mysql; then
+		echo "mysql.jar=$(java-pkg_getjar jdbc-mysql jdbc-mysql.jar)" \
+		>> ant.properties
+	fi
+
+	if use postgres; then
+		echo \
+		"postgresql.jar=$(java-pkg_getjar jdbc-postgresql jdbc-postgresql.jar)"\
+		 >> ant.properties
+	fi
+
+	if use oracle; then
+		echo \
+		"oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \
+		>> ant.properties
+	fi
+}
+
+src_compile() {
+	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
+	local pylib="Python-${PYVER}/Lib"
+	antflags="${antflags} -Dpython.lib=${pylib} -Dsvn.checkout.dir=."
+	LC_ALL=C eant ${antflags} developer-build $(use_doc javadoc)
+}
+
+src_test() {
+	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
+	antflags="${antflags} -Dpython.home=dist"
+	local pylib="Python-${PYVER}/Lib"
+	antflags="${antflags} -Dpython.lib=${pylib}"
+	eant ${antflags} bugtest
+}
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+
+	dodoc README.txt NEWS ACKNOWLEDGMENTS
+	use doc && dohtml -A .css .jpg .gif -r Doc/*
+
+	local java_args="-Dpython.home=/usr/share/jython"
+	java_args="${java_args} -Dpython.cachedir=\${HOME}/.jythoncachedir"
+
+	java-pkg_dolauncher jythonc \
+						--main "org.python.util.jython" \
+						--java_args "${java_args}" \
+						--pkg_args "${java_args} /usr/share/jython/tools/jythonc/jythonc.py"
+
+	java-pkg_dolauncher jython \
+						--main "org.python.util.jython" \
+						--pkg_args "${java_args}"
+
+	insinto /usr/share/${PN}
+	doins -r dist/Lib registry
+
+	insinto /usr/share/${PN}/tools
+	doins -r dist/Tools/*
+
+	use doc && java-pkg_dojavadoc dist/Doc/javadoc
+	use source && java-pkg_dosrc src
+	use examples && java-pkg_doexamples dist/Demo/*
+}
+
+pkg_postinst() {
+	if use readline; then
+		elog "To use readline you need to add the following to your registry"
+		elog
+		elog "python.console=org.python.util.ReadlineConsole"
+		elog "python.console.readlinelib=GnuReadline"
+		elog
+		elog "The global registry can be found in /usr/share/${PN}/registry"
+		elog "User registry in \$HOME/.jython"
+		elog "See http://www.jython.org/docs/registry.html for more information"
+		elog ""
+	fi
+}
diff --git a/dev-java/jython/jython-2.2.1-r2.ebuild b/dev-java/jython/jython-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..91343e0ade6e
--- /dev/null
+++ b/dev-java/jython/jython-2.2.1-r2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="readline source doc servletapi mysql postgres examples oracle"
+#jdnc
+
+inherit base java-pkg-2 java-ant-2
+
+MY_PV="installer-2.2.1"
+PYVER="2.2.3"
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
+mirror://sourceforge/${PN}/${PN}_${MY_PV}.jar"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/jakarta-oro:2.0
+	readline? ( >=dev-java/libreadline-java-0.8.0:0 )
+	mysql? ( >=dev-java/jdbc-mysql-3.1:0 )
+	postgres? ( dev-java/jdbc-postgresql:0 )
+	oracle? ( dev-java/jdbc-oracle-bin:10.2 )
+	servletapi? ( java-virtuals/servlet-api:2.5 )
+	!<=dev-java/freemarker-2.3.10"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5
+	dev-java/javacc"
+
+S="${WORKDIR}"
+
+#Tests currently very broken. Need to investigate whether that
+#is jython's or gentoo's doing.
+RESTRICT="test"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	rm -Rfv org || die "Unable to remove class files."
+	find . -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
+
+	echo javacc.jar="$(java-pkg_getjars --build-only javacc)" > ant.properties
+
+	if use readline; then
+		echo "readline.jar=$(java-pkg_getjars libreadline-java)" >> \
+		ant.properties
+	fi
+	if use servletapi; then
+		echo "servlet.jar=$(java-pkg_getjar --virtual servlet-api-2.5 servlet-api.jar)" \
+		>> ant.properties
+	fi
+	if use mysql; then
+		echo "mysql.jar=$(java-pkg_getjar jdbc-mysql jdbc-mysql.jar)" \
+		>> ant.properties
+	fi
+
+	if use postgres; then
+		echo \
+		"postgresql.jar=$(java-pkg_getjar jdbc-postgresql jdbc-postgresql.jar)"\
+		 >> ant.properties
+	fi
+
+	if use oracle; then
+		echo \
+		"oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \
+		>> ant.properties
+	fi
+}
+
+src_compile() {
+	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
+	local pylib="Python-${PYVER}/Lib"
+	antflags="${antflags} -Dpython.lib=${pylib} -Dsvn.checkout.dir=."
+	LC_ALL=C eant ${antflags} developer-build $(use_doc javadoc)
+}
+
+src_test() {
+	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
+	antflags="${antflags} -Dpython.home=dist"
+	local pylib="Python-${PYVER}/Lib"
+	antflags="${antflags} -Dpython.lib=${pylib}"
+	eant ${antflags} bugtest
+}
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+
+	dodoc README.txt NEWS ACKNOWLEDGMENTS
+	use doc && dohtml -r Doc/*
+
+	local java_args="-Dpython.home=/usr/share/jython"
+	java_args="${java_args} -Dpython.cachedir=\${HOME}/.jythoncachedir"
+
+	java-pkg_dolauncher jythonc \
+						--main "org.python.util.jython" \
+						--java_args "${java_args}" \
+						--pkg_args "${java_args} /usr/share/jython/tools/jythonc/jythonc.py"
+
+	java-pkg_dolauncher jython \
+						--main "org.python.util.jython" \
+						--pkg_args "${java_args}"
+
+	insinto /usr/share/${PN}
+	doins -r dist/Lib registry
+
+	insinto /usr/share/${PN}/tools
+	doins -r dist/Tools/*
+
+	use doc && java-pkg_dojavadoc dist/Doc/javadoc
+	use source && java-pkg_dosrc src
+	use examples && java-pkg_doexamples dist/Demo/*
+}
+
+pkg_postinst() {
+	if use readline; then
+		elog "To use readline you need to add the following to your registry"
+		elog
+		elog "python.console=org.python.util.ReadlineConsole"
+		elog "python.console.readlinelib=GnuReadline"
+		elog
+		elog "The global registry can be found in /usr/share/${PN}/registry"
+		elog "User registry in \$HOME/.jython"
+		elog "See http://www.jython.org/docs/registry.html for more information"
+		elog ""
+	fi
+}
diff --git a/dev-java/jython/jython-2.5.3-r3.ebuild b/dev-java/jython/jython-2.5.3-r3.ebuild
new file mode 100644
index 000000000000..f35e893b7ead
--- /dev/null
+++ b/dev-java/jython/jython-2.5.3-r3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils java-pkg-2 java-ant-2 python-utils-r1
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+SRC_URI="http://central.maven.org/maven2/org/python/${PN}-installer/${PV}/${PN}-installer-${PV}.jar"
+
+LICENSE="PSF-2"
+SLOT="2.5"
+KEYWORDS="amd64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="readline"
+
+# Missing in installer jar.
+RESTRICT="test"
+
+COMMON_DEP="
+	!<=dev-java/freemarker-2.3.10
+	dev-java/antlr:3
+	dev-java/asm:3
+	dev-java/guava:0
+	>=dev-java/java-config-2.1.11-r3
+	dev-java/jffi:1.0
+	dev-java/jline:0
+	dev-java/jnr-constants:0.8.2
+	dev-java/jnr-posix:1.1
+	java-virtuals/script-api:0
+	java-virtuals/servlet-api:2.5
+	readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	# src/META-INF/services missing - taking from prebuilt jar
+	pushd src > /dev/null || die
+		jar -xf ../${PN}.jar META-INF/services || die
+	popd > /dev/null
+
+	find \( -name '*.jar' -o -name '*.class' \
+		-o -name '*.pyc' -o -name '*.exe' \) -delete
+
+	epatch "${FILESDIR}/${PN}-2.5.2-build.xml.patch"
+
+	epatch "${FILESDIR}/${PN}-2.5.2-distutils_byte_compilation.patch"
+	epatch "${FILESDIR}/${PN}-2.5.2-distutils_scripts_location.patch"
+	epatch "${FILESDIR}/${PN}-2.5.2-respect_PYTHONPATH.patch"
+
+	if ! use readline; then
+		rm -v src/org/python/util/ReadlineConsole.java || die
+	fi
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" java"
+
+EANT_BUILD_TARGET="developer-build"
+EANT_GENTOO_CLASSPATH="asm-3,guava,jffi-1.0,jline,jnr-constants-0.8.2,script-api,servlet-api-2.5"
+
+# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
+# Uncomment and add to COMMON_DEP 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"
+
+src_compile() {
+	use readline && EANT_GENTOO_CLASSPATH+=",libreadline-java"
+
+	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-1.1)"
+	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}\"" \
+		bin/jython || die
+
+	java-pkg-2_src_compile
+}
+
+EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar dist/${PN}-dev.jar
+
+	java-pkg_register-optional-dependency jdbc-mysql
+	java-pkg_register-optional-dependency jdbc-postgresql
+
+	insinto /usr/share/${PN}-${SLOT}
+	doins -r dist/{Lib,registry}
+
+	dodoc ACKNOWLEDGMENTS NEWS README.txt
+
+	use doc && java-pkg_dojavadoc 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 -i -e "/#python.console.readlinelib=JavaReadline/a \
+			python.console=org.python.util.ReadlineConsole\npython.console.readlinelib=GnuReadline" \
+			"${ED}"/usr/share/${PN}-${SLOT}/registry || die
+	fi
+
+	# the jvm opens classfiles rw ...
+	dodir /etc/sandbox.d
+	echo "SANDBOX_PREDICT=/usr/share/${PN}-${SLOT}" > "${ED}/etc/sandbox.d/20${P}-${SLOT}"
+
+	# we need a wrapper to help python_optimize
+	cat > "${T}"/jython <<_EOF_ || die
+exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
+	-Dpython.home="${ED}"/usr/share/${PN}-${SLOT} \
+	-Dpython.cachedir="${T}/.jythoncachedir" \
+	-Duser.home="${T}" \
+	org.python.util.jython "\${@}"
+_EOF_
+	chmod +x "${T}"/jython || die
+
+	python_export jython${SLOT} EPYTHON PYTHON_SITEDIR
+	local PYTHON="${T}"/jython
+
+	# 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}"/usr/share/jython-${SLOT}/Lib/test &>/dev/null
+
+	# for python-exec
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+}
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..f46891f5c2a4
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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
+
+	python_export jython${SLOT} EPYTHON PYTHON_SITEDIR
+	local PYTHON="${T}"/jython
+
+	# 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
+	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..ae0d80e6c20b
--- /dev/null
+++ b/dev-java/jython/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <use>
+    <flag name="readline">Use GNU readline instead of jline</flag>
+    <flag name="servletapi">Add optional support for servlet-api</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
new file mode 100644
index 000000000000..daac30946be4
--- /dev/null
+++ b/dev-java/jzlib/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/dev-java/jzlib/files/jzlib_build.xml b/dev-java/jzlib/files/jzlib_build.xml
new file mode 100644
index 000000000000..fb702df308e5
--- /dev/null
+++ b/dev-java/jzlib/files/jzlib_build.xml
@@ -0,0 +1,52 @@
+<project name="Jzlib" default="dist" basedir=".">
+    <description>
+JZlib is a re-implementation of zlib in pure Java.
+The first and final aim for hacking this stuff is
+to add the packet compression support to pure Java SSH systems.
+    </description>
+  <!-- set global properties for this build -->
+  <property name="version" value="1.0.5"/>
+  <property name="src" location="src"/>
+  <property name="build" location="build"/>
+  <property name="dist"  location="dist"/>
+  <property name="javadoc" location="javadoc"/>
+  <property name="javac.debug" value="false"/>
+  <path id="project.cp">
+    <pathelement location="${build}"/>
+  </path>
+  <target name="init">
+    <!-- Create the build directory structure used by compile -->
+    <mkdir dir="${build}"/>
+  </target>
+
+  <target name="compile" depends="init"
+        description="compile the source " >
+    <!-- Compile the java code from ${src} into ${build} -->
+    <javac srcdir="${src}" destdir="${build}" debug="${javac.debug}">
+    </javac>
+  </target>
+  <target name="dist" depends="compile"
+        description="generate the distribution" >
+    <!-- Create the distribution directory -->
+    <mkdir dir="${dist}/lib"/>
+
+    <!-- Put everything in ${build} into the jar file -->
+    <jar jarfile="${dist}/lib/jzlib-${version}.jar" basedir="${build}"/>
+  </target>
+
+  <target name="clean"
+        description="clean up" >
+    <!-- Delete the ${build} and ${dist} directory trees -->
+    <delete dir="${build}"/>
+    <delete dir="${dist}"/>
+    <delete dir="${javadoc}"/>
+  </target>
+
+  <target name="javadoc">
+  	<javadoc sourcepath="${src}"
+		destdir="${javadoc}"
+	>
+		<packageset dir="${src}"/>
+	</javadoc>
+  </target>
+</project>
diff --git a/dev-java/jzlib/jzlib-1.0.7-r1.ebuild b/dev-java/jzlib/jzlib-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..ca4fd0a92e66
--- /dev/null
+++ b/dev-java/jzlib/jzlib-1.0.7-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cp "${FILESDIR}/jzlib_build.xml" "${S}/build.xml" || die
+	mkdir "${S}/src" || die
+	mv "${S}/com/" "${S}/src/" || die
+}
+
+EANT_BUILD_TARGET="dist"
+
+src_install() {
+	java-pkg_newjar dist/lib/jzlib*.jar jzlib.jar
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src
+	dodoc README ChangeLog || die
+}
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..5151533e9593
--- /dev/null
+++ b/dev-java/jzlib/jzlib-1.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..8448a8c5f5e0
--- /dev/null
+++ b/dev-java/jzlib/jzlib-1.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..6648e4f650d6
--- /dev/null
+++ b/dev-java/jzlib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..1ef9e43bad0e
--- /dev/null
+++ b/dev-java/kryo/Manifest
@@ -0,0 +1,3 @@
+DIST kryo-1.05.zip 980393 SHA256 989c23c55fb5465cb4113f24fc728d17fa616bcf91bf4f8d9100c04c615b4a9e SHA512 b19aef102bf0e9a5980856ded3aaadd64616a0ed1d17488b5af1d349987c34603e641d2698712abba39a4fcaa2e9676ed11cc1902a8dfdaccba84a0a37161d40 WHIRLPOOL 4e007e5bb197e2269b9a970974937cbcb8c2905cb36885c2ea8a110f82524533c8e99875625d50155c8bb0b574fb4188404c1f0b9d7652ce4f101a4c2191be77
+DIST kryo-2.21.zip 1749241 SHA256 bab6232c7d07aa669fed19c15ecb4d319fb5072b3f7775d1d178d6c4fb8bd46e SHA512 e2bcf17b13e067b81951145981c091f3250c7c502fe30e9f41fcd0e62bb87bbf4373f5d367842e7b8966dad76f5580fa4e212edd1adf590a05b7e2f40e401c4a WHIRLPOOL 765875e8494de948a2cf594e5612b63504cddec9d91d7da6598cc69fb32b37925c4bfb4351650f9fe7a217535ae9882345d9194fb2dcef64dfec0b0b37371635
+DIST kryo-2.22.zip 2196334 SHA256 665c81ac37ff7912d3db94fcba766e9d9b14e920dea71be25f742b3c85202838 SHA512 4e2af99be7a251783886c717c2493f73c98faedc1bb5037d9a5344e539ed2a5eca1f1e02dec9adc68752d59ad07184bb4704f726f553261034a7287b83886b30 WHIRLPOOL 6fefa818d60fed4b4ea5672868e4a1f62e0bfcffafc5844943128db70195276b6b0074385abed1cc25ef583598b130a836ebf6d715851cf3eb73de8ba86d4ad2
diff --git a/dev-java/kryo/kryo-1.05.ebuild b/dev-java/kryo/kryo-1.05.ebuild
new file mode 100644
index 000000000000..d43141583b3b
--- /dev/null
+++ b/dev-java/kryo/kryo-1.05.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Fast, efficient Java serialization and cloning"
+HOMEPAGE="https://code.google.com/p/kryo/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+
+LICENSE="BSD-2"
+SLOT="1"
+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.5"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="objenesis,reflectasm,minlog"
+JAVA_SRC_DIR="${PN}/src"
+
+src_prepare() {
+	rm "${S}"/${PN}/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 ${PN}/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/kryo-2.21.ebuild b/dev-java/kryo/kryo-2.21.ebuild
new file mode 100644
index 000000000000..ad02e63465d2
--- /dev/null
+++ b/dev-java/kryo/kryo-2.21.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Fast, efficient Java serialization and cloning"
+HOMEPAGE="https://code.google.com/p/kryo/"
+SRC_URI="https://${PN}.googlecode.com/files/${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.5"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+S="${WORKDIR}/${P}/java"
+
+JAVA_GENTOO_CLASSPATH="objenesis,reflectasm,minlog"
+JAVA_SRC_DIR="src"
+
+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/kryo-2.22.ebuild b/dev-java/kryo/kryo-2.22.ebuild
new file mode 100644
index 000000000000..ad02e63465d2
--- /dev/null
+++ b/dev-java/kryo/kryo-2.22.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source doc test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Fast, efficient Java serialization and cloning"
+HOMEPAGE="https://code.google.com/p/kryo/"
+SRC_URI="https://${PN}.googlecode.com/files/${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.5"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+S="${WORKDIR}/${P}/java"
+
+JAVA_GENTOO_CLASSPATH="objenesis,reflectasm,minlog"
+JAVA_SRC_DIR="src"
+
+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..2d2ccc0795d8
--- /dev/null
+++ b/dev-java/kryo/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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->bytes->object.
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-java/kunststoff/Manifest b/dev-java/kunststoff/Manifest
new file mode 100644
index 000000000000..faf20add475a
--- /dev/null
+++ b/dev-java/kunststoff/Manifest
@@ -0,0 +1 @@
+DIST kunststoff-2_0_2.zip 77078 SHA256 cef7a76dfdb48460dbe805e0df560cdbfe73a427f3a16c479f9b88f6ce79a2fd SHA512 30e4d74ba28795152b7c740430ac8e5aa650bead2adcbe17442b6e2daefb36b0000d6f98653a161c6d504a6ac77b40fd1477d64143b77e73bec8c28f1c03c5d7 WHIRLPOOL 87839d5d8a69ec971de32421e3be25357069d7e17772bf371f4bebbd72209172f446db3ce8e10ed8f8aab3bc317263a62968d647a15fc811fb3477c39a54e482
diff --git a/dev-java/kunststoff/files/build.xml b/dev-java/kunststoff/files/build.xml
new file mode 100644
index 000000000000..ea3770e2cb34
--- /dev/null
+++ b/dev-java/kunststoff/files/build.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+
+<project name="kunststoff" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="src" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="docs" />
+	<property name="dist.dir" value="dist" />
+	<property name="jarfile" value="${dist.dir}/kunststoff.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}"
+			source="${target.jdk}"
+			target="${target.jdk}" />
+
+		<copy todir="${build.dir}">
+			<fileset dir="${src.dir}">
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
+	</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>
+</project>
diff --git a/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild b/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..b8f2a56fae1e
--- /dev/null
+++ b/dev-java/kunststoff/kunststoff-2.0.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Kunststoff Look&Feel"
+SRC_URI="http://www.incors.org/archive/${P//./_}.zip"
+HOMEPAGE="http://www.incors.org/archive"
+LICENSE="LGPL-2.1"
+SLOT="2.0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="doc source"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.4
+	>=app-arch/unzip-5.50-r1"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -f *.jar
+	cp "${FILESDIR}"/build.xml .
+}
+
+EANT_DOC_TARGET="docs"
+
+src_install() {
+	java-pkg_dojar dist/kunststoff.jar
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src/com
+}
diff --git a/dev-java/kunststoff/metadata.xml b/dev-java/kunststoff/metadata.xml
new file mode 100644
index 000000000000..fd86213ec01e
--- /dev/null
+++ b/dev-java/kunststoff/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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..95747f7ba86e
--- /dev/null
+++ b/dev-java/kxml/Manifest
@@ -0,0 +1 @@
+DIST kxml2-src-2.3.0.zip 354878 SHA256 f2441575236be69a460c6a54344b6ba8b8ba03fd0bab242b989f4f0976944cd8 SHA512 f4eeaa71fbe76b51cefb9a195d292c22c79c241920915fe8ddcf30dc11af39bbeb6b848a8c4dab9775fc8e327c5a29586ac53263a577de361312bbf45e25c1e5 WHIRLPOOL 0e8bca0f903477b8d83ca2558702ca17d8f15db2e4526758d6a78e29b070c8356840f140f2671e621ef29d052a26236073a6bdc1c585adbf8a5181932c44ffc2
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..a7235f392c16
--- /dev/null
+++ b/dev-java/kxml/kxml-2.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Small XML pull parser for constrained environments such as Applets, Personal Java or MIDP devices"
+HOMEPAGE="http://${PN}.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}2-src-${PV}.zip"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+
+CDEPEND="dev-java/xpp3:0"
+
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	find . -name '*.class' -print -delete || die
+	find . -name '*.jar' -print -delete || die
+}
+
+EANT_BUILD_TARGET="build_jar"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+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..43e3aa909990
--- /dev/null
+++ b/dev-java/kxml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..998ea7f5623d
--- /dev/null
+++ b/dev-java/l2fprod-common/Manifest
@@ -0,0 +1 @@
+DIST l2fprod-common-7.3.tar.bz2 475662 SHA256 d774fc617995b584a5d8a73a84f1f0feae45c54a462f8913a86c96846aafef0a SHA512 685dff4cd7a171fbc92d31c6ca25faa2feda2c5a10d5f646e8fa649f53c532d83bd97388518a2720a3b4b8b87c0fa54a63ced23aedbf500e19aa0f618b938a3a WHIRLPOOL c2dd0a4bbbc1b985b3627a1c9461ea5b0d004c5926c4b21e4aa7405299734c68e7fe774016093ad11ada4d832762a35b6a9f1f96ff09f6f782cc0929c826954a
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..c400db20dbc6
--- /dev/null
+++ b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7303cef96964
--- /dev/null
+++ b/dev-java/l2fprod-common/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/laf-plugin/Manifest b/dev-java/laf-plugin/Manifest
new file mode 100644
index 000000000000..102b809d13f5
--- /dev/null
+++ b/dev-java/laf-plugin/Manifest
@@ -0,0 +1 @@
+DIST laf-plugin-0.2-src.tar.bz2 13799 SHA256 e2252f74efbaa1f0c32a475c320283e614932e3af2d98a65462bf0e1f8cc00ba SHA512 91ac3f9f5ebfcd70e7cc76f2e028e9578c6113a848b0ccdc6b001fff006bf5aaa12af08b1752851693d218d4b2d7d053f62461481e49d5a0bde21e5a7d086331 WHIRLPOOL 6aaea36bbcc22eca1704185faf866fba1b723cd3d6ff02197f28287ded67fc43bb4c2f9cbe8a2dce9e82eaa88774b1fdb4c66e54cdc4f09ad946718641cb1334
diff --git a/dev-java/laf-plugin/files/laf-plugin-0.2-build.xml b/dev-java/laf-plugin/files/laf-plugin-0.2-build.xml
new file mode 100644
index 000000000000..fbcd199a4d9e
--- /dev/null
+++ b/dev-java/laf-plugin/files/laf-plugin-0.2-build.xml
@@ -0,0 +1,46 @@
+<project name="laf_plugin" default="dist" basedir=".">
+	<description>
+		Simple build file made by Alistair Bush for the kunststoff
+		project.
+	</description>
+
+	<property name="src" location="./src"/>
+	<property name="build" location="./build"/>
+	<property name="dist" location="./dist"/>
+	<property name="api" location="api"/>
+	
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${build}"/>
+		<mkdir dir="${api}"/>
+	</target>
+
+	<target name="javadoc" depends="init" description="Produce JavaDoc">
+		<javadoc sourcepath="${src}" destdir="${api}"/>
+	</target>
+
+	<target name="compile" depends="init" description="compile the source">
+		<javac srcdir="${src}" destdir="${build}" >
+		<include name="**/*.java" />
+		</javac>
+	</target>
+
+	<target name="dist" depends="compile"
+		description="generate the distribution" >
+	
+		<copy todir="build">
+			<fileset dir="src">
+				<exclude name="**/*.java"/>
+			</fileset>
+		</copy>
+		<mkdir dir="${dist}" />
+		<jar jarfile="${dist}/laf-plugin.jar" basedir="${build}"/>
+	</target>
+
+	<target name="clean" description="Clean up">
+		<delete dir="${build}" />
+		<delete dir="${dist}" />
+		<delete file="./*.jar" />
+	</target>
+
+</project>
diff --git a/dev-java/laf-plugin/laf-plugin-0.2.ebuild b/dev-java/laf-plugin/laf-plugin-0.2.ebuild
new file mode 100644
index 000000000000..51a034965a87
--- /dev/null
+++ b/dev-java/laf-plugin/laf-plugin-0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A generic plugin framework for look-and-feels"
+HOMEPAGE="http://laf-plugin.dev.java.net/"
+# repackaged from zip and renamed to contain PV
+SRC_URI="mirror://gentoo/${P}-src.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	cp "${FILESDIR}/${P}-build.xml" build.xml || die
+}
+
+EANT_BUILD_TARGET="dist"
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/laf-plugin/metadata.xml b/dev-java/laf-plugin/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/laf-plugin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/ldapsdk/Manifest b/dev-java/ldapsdk/Manifest
new file mode 100644
index 000000000000..b3c1f5fc2467
--- /dev/null
+++ b/dev-java/ldapsdk/Manifest
@@ -0,0 +1 @@
+DIST ldapsdk_java_20020819.tar.gz 1068301 SHA256 2f9599a2c5afcb0364c095728a909b73c59308a6ebf1849f6e8c3090be455df9 SHA512 e27be2a3c41db07589a0f4ee32f5b9dc2700f27aadf07c6c3db32041b3284ea8132d4aafad3cc0e132a68e1d438013df0068ea838c98cfed5ec9227f39d3c33d WHIRLPOOL 057fa56755aabedba5e74a5118e768d1653565d431f64c9f8a9033db86a4e67b7c7365ae203a2c2757591dbadec874543275e53e576fc39a82c35a2978746691
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..f559cbb2cab7
--- /dev/null
+++ b/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..9fa69c627aaf
--- /dev/null
+++ b/dev-java/ldapsdk/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<longdescription>
+
+The Mozilla Directory (LDAP) SDK Project
+
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest
new file mode 100644
index 000000000000..cad265698532
--- /dev/null
+++ b/dev-java/libg/Manifest
@@ -0,0 +1 @@
+DIST bndlib-2.1.0.tar.gz 123217291 SHA256 5e4c3c5d786acc1044103f57f4769acf54ea7d247f58f3c6a7b7769fb37df30f SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e WHIRLPOOL 3df261dec93655d2f4e483952b58d531fdf1936c505552f013f9447ac7fc8100e51f2412fd66224fe7871fa68fe1a6ec86c9c2787ffbfc65c8dc9863bac31fe5
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..38f2b0a1a317
--- /dev/null
+++ b/dev-java/libg/libg-2.1.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f74b561cfceb
--- /dev/null
+++ b/dev-java/libg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..602bf4dc7f50
--- /dev/null
+++ b/dev-java/libmatthew-java/Manifest
@@ -0,0 +1 @@
+DIST libmatthew-java-0.7.2.tar.gz 40601 SHA256 9f48a00caa8c9731d7056346ba72445ebca508e17715e32e310aee45ef36ed03 SHA512 d4a0024fb17221dff4d787b83fd5d9b4a189db0b3110291066f037dc33c009d479a3b94ec8d7c00ab5a39731ec8015dba212f367a858f4329e9d203325fec02a WHIRLPOOL 772118df8f11ddba8fd89ec1b29af63a3414a9e681b52bab591c1a57866b6cafa5efbfe248f1e3270b675bb07fdcb07a9ae05a748e45154d9fffbe2fb5887958
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..197dd4e2647b
--- /dev/null
+++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..250f2d1940ea
--- /dev/null
+++ b/dev-java/libmatthew-java/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/libmso/Manifest b/dev-java/libmso/Manifest
new file mode 100644
index 000000000000..c86dcacea9c6
--- /dev/null
+++ b/dev-java/libmso/Manifest
@@ -0,0 +1 @@
+DIST libmso-0.1.tar.bz2 2874 SHA256 4eedf17777b5724a3c7c9309dc88c36c05fb8f4ae24de35151bbe8d8d5f9b335 SHA512 b0f2bf5d7eeba6d1053bc895484142d3126b40ef40ea8a624ff2f83661151157bda194ba7a0aab3633ff66ca32768818c7dd8ca42cd5bde81454a807ec1f8e28 WHIRLPOOL 7a58f4ab136c31be27a01d3f04e44d508c7cab68768bb36b4086890804264ff3c18bfb77f47f30fb2b129d7a920ad619dd9e9b4fa42da4c1951da6b0bd26c622
diff --git a/dev-java/libmso/libmso-0.1.ebuild b/dev-java/libmso/libmso-0.1.ebuild
new file mode 100644
index 000000000000..237d18278b65
--- /dev/null
+++ b/dev-java/libmso/libmso-0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java library to detect printers"
+HOMEPAGE="http://mso.googlecode.com/"
+SRC_URI="http://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..6a298fd15827
--- /dev/null
+++ b/dev-java/libmso/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+		<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..07f5f348aac7
--- /dev/null
+++ b/dev-java/libreadline-java/Manifest
@@ -0,0 +1 @@
+DIST libreadline-java-0.8.0-src.tar.gz 77122 SHA256 cdcfd9910bfe2dca4cd08b2462ec05efee7395e9b9c3efcb51e85fa70548c890 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2 WHIRLPOOL e54b33173b26db1c7e81612f01159feb895ae47ffaeb2ba143a605a3c484179d993c04fc716cf1db2729225585ac6ab4a400f986cfd15bbcad0f1bf73c0e1d81
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-ldflags.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-ldflags.patch
new file mode 100644
index 000000000000..e0783bdab5a1
--- /dev/null
+++ b/dev-java/libreadline-java/files/libreadline-java-0.8.0-ldflags.patch
@@ -0,0 +1,12 @@
+diff -Nur libreadline-java-0.8.0/src/native/Makefile libreadline-java-0.8.0_patched/src/native/Makefile
+--- libreadline-java-0.8.0/src/native/Makefile	2003-01-07 12:14:35.000000000 +0200
++++ libreadline-java-0.8.0_patched/src/native/Makefile	2010-09-13 20:31:56.000000000 +0300
+@@ -97,7 +97,7 @@
+ 	$(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/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..ba626b1d124d
--- /dev/null
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..fae0e728371b
--- /dev/null
+++ b/dev-java/libreadline-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>
+	<herd>java</herd>
+	<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..7fc2d24a3833
--- /dev/null
+++ b/dev-java/log4j/Manifest
@@ -0,0 +1,2 @@
+DIST apache-log4j-1.2.16.tar.gz 2791979 SHA256 3a93ef38eb7ac9f851626d8b27cde7db1bfc78c1b587520fd740a0ab03e44c89 SHA512 d519c761579ce632a388164d9e492cf0327c4ed96522c92e3d9addfdb2c3a12b4a63a6ff7fc7455236bda61e265c1521ddf39cd8dfeac3e8c808ca982acaee97 WHIRLPOOL 07c67669d8670e7a624f14f3757b2be595a5f05b59e4c98b6ac0af12ead0a52b9608dc1068ef4737aee8cb653f3a81ca0a96fdcf7efb36f06e51a2b30f33d969
+DIST log4j-1.2.17.tar.gz 2864448 SHA256 a528e3771ee6234661b5eb0fa02e14faee89dfec38de94088c163ddf2a0a8663 SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8 WHIRLPOOL 1fc1b420e78bb56ca05282c81f12d5911f8966228194a8f5090a32cfa0403332b36589c7841b06c3bfd602f0f13cdf8342e678de01446e4260cffd8a57a6c175
diff --git a/dev-java/log4j/log4j-1.2.16.ebuild b/dev-java/log4j/log4j-1.2.16.ebuild
new file mode 100644
index 000000000000..88f4d8eaa094
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.16.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+JAVA_PKG_IUSE="doc javamail jms jmx source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="apache-${P}"
+DESCRIPTION="A low-overhead robust logging package for Java"
+SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
+HOMEPAGE="http://logging.apache.org/log4j/"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+# jikes support disabled: bug #108819
+IUSE="doc javamail jms jmx source"
+
+CDEPEND="javamail? ( java-virtuals/javamail java-virtuals/jaf )
+		jmx? ( dev-java/sun-jmx:0 )
+		jms? ( java-virtuals/jms )"
+
+RDEPEND=">=virtual/jre-1.4
+		${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+		${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	rm -rf dist/
+	java-pkg_filter-compiler jikes
+	rm -v *.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="log4j.jar"
+EANT_EXTRA_ARGS="-Djaxp-present=true"
+EANT_DOC_TARGET=""
+
+src_compile() {
+	if use javamail; then
+		EANT_GENTOO_CLASSPATH+="javamail,jaf"
+		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
+	fi
+	if use jmx; then
+		use javamail && EANT_GENTOO_CLASSPATH+=","
+		EANT_GENTOO_CLASSPATH+="sun-jmx"
+		EANT_EXTRA_ARGS+=" -Djmx-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() {
+	# the build still builds files with older version in name
+	java-pkg_newjar dist/lib/${PN}-1.2.15.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
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/log4j/log4j-1.2.17-r1.ebuild b/dev-java/log4j/log4j-1.2.17-r1.ebuild
new file mode 100644
index 000000000000..9b57f95a0b61
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.17-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc javamail jms jmx 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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc javamail jms jmx source"
+
+CDEPEND="javamail? (
+			dev-java/oracle-javamail:0
+			java-virtuals/jaf:0
+		)
+		jmx? (
+			dev-java/sun-jmx:0
+		)
+		jms? (
+			java-virtuals/jms:0
+		)"
+
+RDEPEND=">=virtual/jre-1.6
+		${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+		${CDEPEND}"
+
+MY_P="apache-${P}"
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	rm -rf dist || die
+	java-pkg_filter-compiler jikes
+	rm -v *.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="log4j.jar"
+EANT_EXTRA_ARGS="-Djaxp-present=true"
+EANT_DOC_TARGET=""
+
+src_compile() {
+	if use javamail; then
+		EANT_GENTOO_CLASSPATH+="javamail,jaf"
+		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
+	fi
+
+	if use jmx; then
+		if use javamail; then
+			EANT_GENTOO_CLASSPATH+=","
+		fi
+
+		EANT_GENTOO_CLASSPATH+="sun-jmx"
+		EANT_EXTRA_ARGS+=" -Djmx-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/log4j-1.2.17.ebuild b/dev-java/log4j/log4j-1.2.17.ebuild
new file mode 100644
index 000000000000..a16563b116f9
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.17.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc javamail jms jmx 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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc javamail jms jmx source"
+
+CDEPEND="javamail? (
+			java-virtuals/javamail
+			java-virtuals/jaf
+		)
+		jmx? ( dev-java/sun-jmx )
+		jms? ( java-virtuals/jms )"
+
+RDEPEND=">=virtual/jre-1.6
+		${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+		${CDEPEND}"
+
+MY_P="apache-${P}"
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	rm -rf dist || die
+	java-pkg_filter-compiler jikes
+	rm -v *.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="log4j.jar"
+EANT_EXTRA_ARGS="-Djaxp-present=true"
+EANT_DOC_TARGET=""
+
+src_compile() {
+	if use javamail; then
+		EANT_GENTOO_CLASSPATH+="javamail,jaf"
+		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
+	fi
+
+	if use jmx; then
+		if use javamail; then
+			EANT_GENTOO_CLASSPATH+=","
+		fi
+
+		EANT_GENTOO_CLASSPATH+="sun-jmx"
+		EANT_EXTRA_ARGS+=" -Djmx-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..1b3f29e1f2a7
--- /dev/null
+++ b/dev-java/log4j/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <use>
+    <flag name="javamail">Build the SMTPAppender</flag>
+    <flag name="jms">Build the JMSAppender</flag>
+    <flag name="jmx">Build org.apace.log4j.jmx</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/logback/Manifest b/dev-java/logback/Manifest
new file mode 100644
index 000000000000..485679ff5f02
--- /dev/null
+++ b/dev-java/logback/Manifest
@@ -0,0 +1,2 @@
+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
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..fd7d416ea102
--- /dev/null
+++ b/dev-java/logback/logback-1.0.13-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+		http://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/logback-1.0.13.ebuild b/dev-java/logback/logback-1.0.13.ebuild
new file mode 100644
index 000000000000..9e8f4cbb74ea
--- /dev/null
+++ b/dev-java/logback/logback-1.0.13.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+		http://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/janino:0
+	dev-java/jansi:0
+	java-virtuals/javamail:0
+	java-virtuals/servlet-api:2.5
+	dev-java/slf4j-api:0
+	tomcat? ( www-servers/tomcat:7 )
+"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="janino,jansi,javamail,servlet-api-2.5,slf4j-api"
+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..0934aa387517
--- /dev/null
+++ b/dev-java/logback/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..57c0560080ce
--- /dev/null
+++ b/dev-java/lucene-analyzers/Manifest
@@ -0,0 +1,2 @@
+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
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..bdea7daa5275
--- /dev/null
+++ b/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..9339292af664
--- /dev/null
+++ b/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86 ~x86-fbsd ~x86-linux ~amd64-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..63e203f20049
--- /dev/null
+++ b/dev-java/lucene-analyzers/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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..20b51b1a8ef5
--- /dev/null
+++ b/dev-java/lucene/Manifest
@@ -0,0 +1,16 @@
+DIST lucene-1.4.3-src.tar.gz 768320 SHA256 62051daecebbae50c4e9d1c4d840f32fc58d85b0a5b370095c98e346c9ba1049 SHA512 426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf844449532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911 WHIRLPOOL dea750d36a33689fa46926271a5c3be62b011e327ce9fa671a480a7ff9ce4d430d678fbf6f82befd81510d574e303f71b627d15b438492a8a34d5f60b5569b95
+DIST lucene-1.9.1-src.tar.gz 6135056 SHA256 a06bd64ce779f3d4e4b539c280f6a882efb2fd8cba4ebbed02a2b6f92658524f SHA512 fb9f29e0d38d6525d7f6f86d339867a08bfe77ba18a023885a3ecb093d217840c274c767b6e1451f7c58135919c6159122756ebde4640a47420526502395a994 WHIRLPOOL c9d83447742d2d0a2a30e73eb6ed2659db9be77d8bba0de716bdcf73af4bbbf0bf789251a8657c72aed217bf2b2deecb0ce044cf38d1b9a835cf66c338e9d548
+DIST lucene-2.1.0-src.tar.gz 8154476 SHA256 b18c6bff8d74ddd6baabf9288aec45c34e90d74f6688657a4af2cbd0847e6ad9 SHA512 9e9970c6f44b568867d0b714852d063758e8958eac76fa21ef7ab3f0e51f62bc2073d24faf8ad14bce560d6539287e65b82a5db0a35834dc0a0787729cf4a7aa WHIRLPOOL a38d6ce7015c5a2511d0a2d1d848d9762818c11ca9821cff47ded077f5934135a140e8b0ac1e4eea5085ff925535669fc56b10d18e86d73e124b7dd2fe1e0f71
+DIST lucene-2.2.0-src.tar.gz 6054069 SHA256 c40372fbe4b586cf715c84194cef83df26bb65cc026aca1c3be22a5e81bd1370 SHA512 afb40d3e71e2f5e45150b4e84635b9022bfe495de2fd6bc18e9792398a62258396f242266babd7209dfa1706e61c54c982d6ee70264b7807b60e6f25321c9cc7 WHIRLPOOL a0ccdf8823bc8eac432f1b0e5048f33b01249c01cc7da4033dbcefdd7b0259eb31020ec996adbafeb37284959f177f90e22131544d5ad9080da686fc4af7bd7e
+DIST lucene-2.3.0-src.tar.gz 4591950 SHA256 c020207987cb3bf415bf168b64245da3900de086312b82ce9b11d275146420b6 SHA512 ee3aa3388932f38a06a23d75bc1ad0043238155f3b474c651ed716dc0b8f4158f49cb79002c31197f28e6d2286b7dc22d00e801d63ec153605b7af2b70a0387e WHIRLPOOL 0f259265c152bca2356940085581e8ff46e98ab5415d68d0714683582aea2f7746f939d8e0e30bc0987d0970b6735cf6346eee2be784efad4be442a950a8a88f
+DIST lucene-2.3.1-src.tar.gz 4597493 SHA256 84ddee3a667242917c8117d9e273d9e81ef7f4015c69a7758f12b8018054e646 SHA512 95269c89485c4b23566459543365788c4c4c9c4b0bce6273dff63185e1dfabf643c37fd166227ffd89e4a6ea223aba19c79f3fdf7429a0cd69aadf34b863c8f2 WHIRLPOOL a6b211db97749187b3ee0036933fad3a2cf97208a5a9553cafc5c0bb33c3a3fc9a502203f4b855b6a8c4ffa3faa7b1041c879c44dccd48a5da407cf5fc458bfe
+DIST lucene-2.3.2-src.tar.gz 4602041 SHA256 d0cc4b8a40900bbb3243d2e9d9987e0ea0e7d359a2992222bc9acf296b208416 SHA512 42bf988b2eed45ea8d8a3523d9fcf4e384e0e9729a25a54e518a34faf960370a8f7d824f537df7155dc2b64ac11e1b30a8e1ea745a0e054c86722f6e8551360d WHIRLPOOL d8db8e2962624f11e35d69f49a4bf000ebec33a6b01d42e71b5e19cc160c0a29167f94d6b96bd9d45154aa7292469d31c502670bfd0c54e78d333c89e6f33c03
+DIST lucene-2.4.0-src.tar.gz 5053702 SHA256 01509848b8cf2e6675a38fc06124c7622cdd573e975ebcc893c36903b416b7c7 SHA512 d01893a92e979d229103c30c02b96a328bdb04984c7af8633cb4c8acc0a9008f999da240489408a8412fcb42eb19ff2ade3bfea823ae735d50baab3228b89af4 WHIRLPOOL 3adf147dfd80dc1c9643152eb16011ee6a9f02f528d95f2ba8911caccd505c8f4cd93e603c556db5a7ded85c2a32cb1dc333a438b713e6fe6132aeee84ba1b04
+DIST lucene-2.4.1-src.tar.gz 5057003 SHA256 47ecc5e105717d356e0468433d1a60f84f620d79ff9f48a78ca4be6c349b6a10 SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e WHIRLPOOL e452450c1981724b133af16098b29a1bcc6bfdd1ce2785929599278c674fbe9c2863d35fe93ae78a361d790eda29da62b25613a4ee57fe3b49290dfd11ebd3be
+DIST lucene-2.9.1-src.tar.gz 12459850 SHA256 7e1d06d3bbc2a71889c84f5f89c8af0b438184097a57e7070790c79a1aeb9102 SHA512 1dae3a33b50f7a8e8a2e578ddc19ff9d33b49bb3cb39d1d5e6706140c8e737a81b2cb587eb51e2dc4899cd3b1b9ce3f4795c4552a99e48e0960fbcbed872c9ed WHIRLPOOL 9357b78e794248032cb9f6097d3969e48dbfe0179afae69e779e58d1ebaae0230f7003a4bb26ec6df951fedc4091c779529582dbdd5496b27cba0613a67254d8
+DIST lucene-2.9.4-src.tar.gz 12494586 SHA256 2a8bd7c6f0632bc406bcec0091d286b3efd4743c2d45fd88b0d0d564281780cd SHA512 75c08520f41ec6ca603fac42471dfec5310c5de2c8b4b762719329acc22d5ac2fbc676d328a9c83966c39b88a4cc0ac5e97960a18ee8459575b4c823ba5fd3d6 WHIRLPOOL 21b02cc87d956d04248f017a8b1b6c37d719428e9431642c6a2bf064f04d6878ee075eb5d4c7c080b20700af71dd66c01359c4de1de4b6934399a4832967b83b
+DIST lucene-3.0.0-src.tar.gz 12421467 SHA256 661fc4eec33c2c509c1a53896da469304a51c5cc5ce51313d9f77f385c63346a SHA512 7ae59713e6c7f74487c62461f29dfed43700ee56ce6367a32370e8e47c7e8ab89d1ed01fd6bc09ff2c1fcd8136a7e1383be6c2f41ba5cbcb72101865dbd20a12 WHIRLPOOL 591e50311303307b0be75f98316c7bc39d35df1505d8ce9478c5a2ea5bf9a28c96aeea6bd02bef2865b79094e1a98a9b4ed5afa6b4706fa06cd21d6208aae78b
+DIST lucene-3.0.3-src.tar.gz 12446839 SHA256 91365fe5af0279b7b6300f17033580746c90272417665d9572db1c1a9d1ba37e SHA512 b9a09a3efc63450c8d4fab840185b21aab288a7fb02a7f8f63af08ac3f3ebee18a255d9ecfdd3d7301e8c9e93bee90abe2ae10e2b91ed6770c1d7075848b5869 WHIRLPOOL 72f2f5ad089b790dd0eefe7a1b6cf3d1e8a2aa85ea42bb0cfc754498feb00a2ec2a4ad80e1f2228d7a873048c1b8057e32d19d17bfffb044ae23180605a21fcb
+DIST lucene-3.4.0-src.tgz 39329123 SHA256 e0471a61085b4aac8db831b5c981262d972a611e4fea491c4e188a9ee730ff2a SHA512 c5cc4394af12e72c47c246f59bd2e352ff9d5b5749bed5b68c3a0925ae85fc595cb316f1a15e9074597e9c347b4193aa9d7c039a06c4bf9a603362ce4c3f0b39 WHIRLPOOL e217842d77c7875e85442551b1748ae18c89dfeb71d3c24809fc625890fe2c8ce57de242d9a61f95474b8d12d20b2405ff2692286957cf686bca292b2cae0aea
+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
diff --git a/dev-java/lucene/files/disable-contrib.patch b/dev-java/lucene/files/disable-contrib.patch
new file mode 100644
index 000000000000..550564fb40aa
--- /dev/null
+++ b/dev-java/lucene/files/disable-contrib.patch
@@ -0,0 +1,45 @@
+diff -u -r lucene-1.9.1-orig/build.xml lucene-1.9.1/build.xml
+--- lucene-1.9.1-orig/build.xml	2006-02-27 21:12:42.000000000 +0100
++++ lucene-1.9.1/build.xml	2008-01-16 13:28:50.000000000 +0100
+@@ -368,41 +368,10 @@
+         <packageset dir="src/java"/>
+ 
+ 	<packageset dir="src/demo"/>
+-	
+-        <packageset dir="contrib/analyzers/src/java"/>
+-        <packageset dir="contrib/ant/src/java"/>
+-        <packageset dir="contrib/highlighter/src/java"/>
+-        <packageset dir="contrib/lucli/src/java"/>
+-        <packageset dir="contrib/memory/src/java"/>
+-        <packageset dir="contrib/miscellaneous/src/java"/>
+-        <packageset dir="contrib/similarity/src/java"/>
+-        <packageset dir="contrib/regex/src/java"/>
+-        <packageset dir="contrib/snowball/src/java"/>
+-        <packageset dir="contrib/spellchecker/src/java"/>
+-        <packageset dir="contrib/surround/src/java"/>
+-        <packageset dir="contrib/swing/src/java"/>
+-        <packageset dir="contrib/wordnet/src/java"/>
+ 
+         <group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*"/>
+ 
+         <group title="Demo" packages="org.apache.lucene.demo*"/>
+-
+-        <group title="contrib: Analysis" packages="org.apache.lucene.analysis.*"/>
+-        <group title="contrib: Ant" packages="org.apache.lucene.ant*"/>
+-
+-        <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
+-        <group title="contrib: Lucli" packages="lucli*"/>
+-        <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
+-        <group title="contrib: Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
+-        <group title="contrib: MoreLikeThis" packages="org.apache.lucene.search.similar*"/>
+-        <group title="contrib: RegEx" packages="org.apache.lucene.search.regex*:org.apache.regexp*"/>
+-        <group title="contrib: Snowball" packages="org.apache.lucene.analysis.snowball*:net.sf.snowball*"/>
+-	<group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
+-	<group title="contrib: Surround Parser" packages="org.apache.lucene.queryParser.surround*"/>
+-        <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
+-        <group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
+-
+-	
+       </javadoc>
+     </sequential>
+   </macrodef>
diff --git a/dev-java/lucene/files/lucene-manifest b/dev-java/lucene/files/lucene-manifest
new file mode 100644
index 000000000000..3a742df6b264
--- /dev/null
+++ b/dev-java/lucene/files/lucene-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,org.apache.lucene.analysis,org.apache.lucene.analysis.de,org.apache.lucene.analysis.standard,
+ org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.queryParser, org.apache.lucene.search,org.apache.lucene.search.spans,
+ org.apache.lucene.store,org.apache.lucene.util
+Bundle-SymbolicName: org.apache.lucene
+Bundle-Version: 2.2.0
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..d55077424a4c
--- /dev/null
+++ b/dev-java/lucene/lucene-1.4.3-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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-1.9.1.ebuild b/dev-java/lucene/lucene-1.9.1.ebuild
new file mode 100644
index 000000000000..47b9e8ee59aa
--- /dev/null
+++ b/dev-java/lucene/lucene-1.9.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# This ebuild only builds the core of Lucene
+# It does not build any optional component (contributions)
+
+JAVA_PKG_IUSE="test source doc"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+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.9"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/junit dev-java/ant-junit )"
+
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -rf contrib # we remove entirely the contrib directory
+	epatch "${FILESDIR}/disable-contrib.patch"
+
+	if use test; then
+		mkdir lib
+		java-ant_rewrite-classpath "common-build.xml"
+	fi
+}
+
+src_compile() {
+	eant jar-core $(use_doc javadocs)
+}
+
+src_test() {
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt
+	# WTF is with the jar version below
+	java-osgi_newjar-fromfile "build/lucene-core-1.9.2-dev.jar" \
+		"${FILESDIR}/lucene-manifest" "Apache Lucene"
+
+	use doc && java-pkg_dojavadoc build/docs/api
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-2.1.0-r1.ebuild b/dev-java/lucene/lucene-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..e9991cc4335d
--- /dev/null
+++ b/dev-java/lucene/lucene-2.1.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-macos"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.4"
+
+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)
+}
+
+src_test() {
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt
+	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/*
+		java-pkg_dojavadoc build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-2.1.0-r2.ebuild b/dev-java/lucene/lucene-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..3f9d63cfb472
--- /dev/null
+++ b/dev-java/lucene/lucene-2.1.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+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_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)
+}
+
+src_test() {
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt
+	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/*
+		java-pkg_dojavadoc build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-2.2.0-r1.ebuild b/dev-java/lucene/lucene-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..fe5d6441b60d
--- /dev/null
+++ b/dev-java/lucene/lucene-2.2.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.2"
+KEYWORDS="amd64 ~ppc 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_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)
+}
+
+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
+	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/*
+		java-pkg_dojavadoc build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-2.2.0.ebuild b/dev-java/lucene/lucene-2.2.0.ebuild
new file mode 100644
index 000000000000..b6c685e1b7d9
--- /dev/null
+++ b/dev-java/lucene/lucene-2.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.4"
+
+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)
+}
+
+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
+	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/*
+		java-pkg_dojavadoc build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-2.3.0.ebuild b/dev-java/lucene/lucene-2.3.0.ebuild
new file mode 100644
index 000000000000..e7166069de34
--- /dev/null
+++ b/dev-java/lucene/lucene-2.3.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/archive/${P}-src.tar.gz
+		 mirror://apache/lucene/java/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.4"
+
+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=/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-2.3.1.ebuild b/dev-java/lucene/lucene-2.3.1.ebuild
new file mode 100644
index 000000000000..e7166069de34
--- /dev/null
+++ b/dev-java/lucene/lucene-2.3.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/archive/${P}-src.tar.gz
+		 mirror://apache/lucene/java/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.4"
+
+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=/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-2.3.2-r1.ebuild b/dev-java/lucene/lucene-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..1d907460792c
--- /dev/null
+++ b/dev-java/lucene/lucene-2.3.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/archive/${P}-src.tar.gz
+		 mirror://apache/lucene/java/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.4"
+
+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-2.3.2-r2.ebuild b/dev-java/lucene/lucene-2.3.2-r2.ebuild
new file mode 100644
index 000000000000..a4f9e49de799
--- /dev/null
+++ b/dev-java/lucene/lucene-2.3.2-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/archive/${P}-src.tar.gz
+		 mirror://apache/lucene/java/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+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_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-2.3.2.ebuild b/dev-java/lucene/lucene-2.3.2.ebuild
new file mode 100644
index 000000000000..c38ef874e8b5
--- /dev/null
+++ b/dev-java/lucene/lucene-2.3.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/archive/${P}-src.tar.gz
+		 mirror://apache/lucene/java/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.4"
+
+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=/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-2.4.0.ebuild b/dev-java/lucene/lucene-2.4.0.ebuild
new file mode 100644
index 000000000000..9cc27f745122
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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=/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-2.4.1-r1.ebuild b/dev-java/lucene/lucene-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..0346bed97c40
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc 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-2.4.1.ebuild b/dev-java/lucene/lucene-2.4.1.ebuild
new file mode 100644
index 000000000000..f84a0a4ec8f4
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.4"
+
+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-2.9.1-r1.ebuild b/dev-java/lucene/lucene-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..ac09a09721cb
--- /dev/null
+++ b/dev-java/lucene/lucene-2.9.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+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.9"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-nodeps:0
+	dev-java/javacc:0
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.4"
+
+java_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=/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-2.9.4.ebuild b/dev-java/lucene/lucene-2.9.4.ebuild
new file mode 100644
index 000000000000..3ed46b12cf49
--- /dev/null
+++ b/dev-java/lucene/lucene-2.9.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+		 mirror://apache/lucene/java/${PV}/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.9"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-nodeps:0
+	dev-java/javacc:0
+	dev-java/junit:0
+	test? ( dev-java/ant-junit )"
+# junit is needed for compilation because tests are compiled for javacc target even when not requested
+RDEPEND=">=virtual/jdk-1.5"
+
+java_prepare() {
+	sed -i -e '/-Xmax/ d' common-build.xml
+	find -name "*.jar" -type f | xargs rm -v
+	java-pkg_jar-from --build-only --into lib junit junit.jar junit-3.8.2.jar
+}
+
+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.0.0.ebuild b/dev-java/lucene/lucene-3.0.0.ebuild
new file mode 100644
index 000000000000..4e8a288ca530
--- /dev/null
+++ b/dev-java/lucene/lucene-3.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="3.0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-nodeps:0
+	dev-java/javacc:0
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.5"
+
+java_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.0.3.ebuild b/dev-java/lucene/lucene-3.0.3.ebuild
new file mode 100644
index 000000000000..a0dc5988dbd7
--- /dev/null
+++ b/dev-java/lucene/lucene-3.0.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+		 mirror://apache/lucene/java/${PV}/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="amd64 ppc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-nodeps:0
+	dev-java/javacc:0
+	dev-java/junit:0
+	test? ( dev-java/ant-junit )"
+# junit is needed for compilation because tests are compiled for javacc target even when not requested
+RDEPEND=">=virtual/jdk-1.5"
+
+java_prepare() {
+	find -name "*.jar" -type f | xargs rm -v
+	sed -i -e '/-Xmax/ d' common-build.xml
+	java-pkg_jar-from --build-only --into lib junit junit.jar junit-3.8.2.jar
+}
+
+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.4.0.ebuild b/dev-java/lucene/lucene-3.4.0.ebuild
new file mode 100644
index 000000000000..82c7bfdca96a
--- /dev/null
+++ b/dev-java/lucene/lucene-3.4.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 library
+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.4"
+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.5.0.ebuild b/dev-java/lucene/lucene-3.5.0.ebuild
new file mode 100644
index 000000000000..824a1ea259d6
--- /dev/null
+++ b/dev-java/lucene/lucene-3.5.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 library
+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..20f5c6fe1433
--- /dev/null
+++ b/dev-java/lucene/lucene-3.6.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 library
+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.10*: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..bd2c9d01b9b3
--- /dev/null
+++ b/dev-java/lucene/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+  <description>Maintainer for actual Lucene issues.</description>
+</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..f704963db390
--- /dev/null
+++ b/dev-java/lzma/Manifest
@@ -0,0 +1 @@
+DIST lzma463.tar.bz2 288057 SHA256 42396b90eedfef31951c1411902ed21ca9fb62d506c49dd1a2d4a7c56e53fbb3 SHA512 9e1fab5c54611c8ba9db2f4a0495d8a50d68a053d42e57a30f3a05021c68790d20578feac7c6ecc96777180633a552948e731e37dba0a07c9160e83e35e69fe8 WHIRLPOOL e1117a5867639b2569fbf4d5f2dc52c1bc0e5b2bbae4680aec20cc3482d1977c4304953955fbf29f33f371687dc4c9c62d155b6acb585bcbefe3e55cdcfb0c48
diff --git a/dev-java/lzma/files/build.xml b/dev-java/lzma/files/build.xml
new file mode 100644
index 000000000000..d51173759e6a
--- /dev/null
+++ b/dev-java/lzma/files/build.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="lzmajio" default="jar" basedir=".">
+	<target name="init">
+		<mkdir dir="build"/>
+		<mkdir dir="docs"/>
+	</target>
+	<target name="compile" depends="init">
+		<javac srcdir="SevenZip" destdir="build"/>
+	</target>
+
+	<target name="jar" depends="compile">
+		<jar jarfile="lzma.jar" basedir="build"/>
+	</target>
+
+	<target name="javadoc" depends="init">
+		<javadoc sourcepath="." destdir="docs"/>
+	</target>
+</project>
diff --git a/dev-java/lzma/lzma-4.63.ebuild b/dev-java/lzma/lzma-4.63.ebuild
new file mode 100644
index 000000000000..2622665e93b6
--- /dev/null
+++ b/dev-java/lzma/lzma-4.63.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+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.5"
+DEPEND=">=virtual/jdk-1.5"
+S=${WORKDIR}/Java
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	cp "${FILESDIR}"/build.xml . || die
+	#check for upstream adding build.xml, see Request ID 2464084 (on Feature
+	#Request Tracer at http://sourceforge.net/projects/sevenzip/
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc SevenZip
+}
diff --git a/dev-java/lzma/metadata.xml b/dev-java/lzma/metadata.xml
new file mode 100644
index 000000000000..5856244767dd
--- /dev/null
+++ b/dev-java/lzma/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>
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+	<herd>java</herd>
+	<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..13aec993e3ae
--- /dev/null
+++ b/dev-java/lzmajio/Manifest
@@ -0,0 +1 @@
+DIST lzmajio-0.95.tar.gz 20790 SHA256 d5856cad5909cfb2d808e64478904479905896df9b7433ee2276b527e4f8c04d SHA512 65736a66ec8f5eb63688edda912718f4e9b0518c68b0b1eed3df26e7b6bb15728024c637b4cf40f6ab52168c913cce91bd7cafefca7515e0f3e386738cedc6e5 WHIRLPOOL 13bef2b1eada5f02f6178af5ebb4634a328ceb5d5ac373d22d7b007aa4862c0525929878b9a24b01eb51889f906160493e7e7c51d9ec25f1ce6c83d23ee3097b
diff --git a/dev-java/lzmajio/lzmajio-0.95.ebuild b/dev-java/lzmajio/lzmajio-0.95.ebuild
new file mode 100644
index 000000000000..f7b6f1527423
--- /dev/null
+++ b/dev-java/lzmajio/lzmajio-0.95.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Implementations of 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=""
+
+COMMON_DEP=">=dev-java/lzma-4.61"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+EANT_GENTOO_CLASSPATH="lzma"
+
+src_prepare() {
+	java-pkg_jar-from lzma
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc net
+}
diff --git a/dev-java/lzmajio/metadata.xml b/dev-java/lzmajio/metadata.xml
new file mode 100644
index 000000000000..21237a6e3ed0
--- /dev/null
+++ b/dev-java/lzmajio/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>
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/matrix-toolkits-java/Manifest b/dev-java/matrix-toolkits-java/Manifest
new file mode 100644
index 000000000000..e36299ded79f
--- /dev/null
+++ b/dev-java/matrix-toolkits-java/Manifest
@@ -0,0 +1 @@
+DIST mtj-0.9.12.zip 2576775 SHA256 19bd4b710fd7a3ce798e7e0cc336cdc0f77b80e67d9cffff556bfe5275058bcf SHA512 526793d02d1a5ff7e8b9a2fb1c8fa570a88f96fcb4926623bae6cfdc31f206dc6103efa4e14a29f7b600ed2e1eba516f12c8da7e749983dd6f75a1a4c6676f4d WHIRLPOOL 4a32721aeca6466d46ec7030ecd927576d109c20a4d2ffdf2ff4b9e1e0ee0db643c6631dad88b81e66f403e467ada077b9be3351735f9f4b21aa9ac39d838b08
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..b01774553eb4
--- /dev/null
+++ b/dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://code.google.com/p/matrix-toolkits-java/"
+SRC_URI="http://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..1c59ceec112f
--- /dev/null
+++ b/dev-java/matrix-toolkits-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>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="google-code">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..5d11a8e2cb40
--- /dev/null
+++ b/dev-java/maven-bin/Manifest
@@ -0,0 +1,8 @@
+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.0-bin.tar.gz 5439122 SHA256 59088c62c14b996d597bbd55e720866b0e13e36daed8a46a81c01058ee74bd54 SHA512 8c6b13c680de2f9cddb1dffd15ae44a8866a29e56c92ccd905fba1a656d2cab26c40b10c4168ffe11dd3bd4e5161c6d9ea01f450e7c89aba532b2a20f9fd2b07 WHIRLPOOL 9b80b5e5d49a27784bd9760dd326677809fd5bcc8872bc2ee356bde92a6523d6cf1ad0ddcfc3aff96b07fb315af5f3c04b2278f5fd11964c76f179329dca8c8e
+DIST apache-maven-3.1.1-bin.tar.gz 5494427 SHA256 077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1 WHIRLPOOL 60aa84a2f6441deb005c41e00b4dbc790f8679d5387ffd6602d8008206718655784822816c9a9898cb9b09c75bb3b3d824c71150e4ac747bd0eb1dabe2bacdcd
+DIST apache-maven-3.2.3-bin.tar.gz 6956162 SHA256 bf3f04aadee3a67158aebdfb0b4cb022063329d459d10fd6b4b02223e10aa8ed SHA512 9c211b17a8109939a776a4ad0e833ce9b301941eb0cfd4e8978634589ea48227cb979b5819c4b151184cff46bb44139c09477e904daa00ac769b0c756859f6f0 WHIRLPOOL 6a254dc8beb6d1d42299dd563da1eaeccff11bbfd18a122cb015ee28e55f59ae0b4e512a48b697fa09004edd8bae7dbef32bce24dbc9f5913b7cdd311a6ec6b3
+DIST apache-maven-3.2.5-bin.tar.gz 7956528 SHA256 8c190264bdf591ff9f1268dc0ad940a2726f9e958e367716a09b8aaa7e74a755 SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5 WHIRLPOOL 79feb96c42dfd2235b0513ce50cf3d684224dcbccb290d2d80565648a6b30af8961b2e3d02d38818ca5c89386c5a25f2a8025e696279a339844535c2d2733f96
+DIST maven-1.1.tar.gz 7625074 SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0 WHIRLPOOL 2137afc57306d840d04a38a09f5b40d946d10f8216ebff4a3a0a385f475316266339f4b8d07b461a2004d487c6b74a68fc2db5f38cb831ed0947259f1cd08d48
diff --git a/dev-java/maven-bin/files/maven b/dev-java/maven-bin/files/maven
new file mode 100755
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-r1.ebuild b/dev-java/maven-bin/maven-bin-1.1-r1.ebuild
new file mode 100644
index 000000000000..264266860868
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-1.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86"
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jdk-1.5"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+MAVEN=${PN}-${SLOT}
+MAVEN_HOME="/usr/share/${MAVEN}"
+MAVEN_BIN="${MAVEN_HOME}/bin"
+
+src_compile() { :; }
+
+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/${MY_PN}-${SLOT} || die sym failed
+}
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..0579f16a7c07
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86"
+IUSE=""
+
+DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
+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..bde479968588
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86"
+IUSE=""
+
+DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
+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.0.11.ebuild b/dev-java/maven-bin/maven-bin-2.0.11.ebuild
new file mode 100644
index 000000000000..8cdfc4202464
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-2.0.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+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 ppc x86"
+
+RDEPEND=">=virtual/jdk-1.4
+	app-eselect/eselect-maven"
+
+IUSE=""
+
+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 "${D}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt || die
+
+	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}"
+}
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..4414b126b323
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86"
+IUSE=""
+
+DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
+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-2.2.1.ebuild b/dev-java/maven-bin/maven-bin-2.2.1.ebuild
new file mode 100644
index 000000000000..936a91af7e4d
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-2.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86"
+
+RDEPEND=">=virtual/jdk-1.5
+	app-eselect/eselect-maven"
+
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+src_unpack() {
+	unpack ${A}
+
+	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 "${D}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt || die
+
+	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}"
+}
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..88f6ee5b4d80
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86"
+IUSE=""
+
+DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
+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.0-r1.ebuild b/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..10157f672493
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 app-eselect/eselect-maven )
+	|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
+	dev-java/avalon-framework:4.1
+	dev-java/commons-io:1
+	dev-java/juel:0
+	dev-java/osgi-core-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 "${S}"/bin/*.bat || die
+
+	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
+
+	# Register jars.
+	java-pkg_getjars avalon-framework-4.1,commons-io-1,juel,osgi-core-api,servlet-api-2.4 > /dev/null
+	has_version dev-java/commons-logging:0 && java-pkg_getjars commons-logging > /dev/null
+	has_version dev-java/avalon-logkit:2.0 && java-pkg_getjars avalon-logkit-2.0 > /dev/null
+	has_version dev-java/log4j:0 && java-pkg_getjars log4j > /dev/null
+}
+
+# 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.txt 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.1.0.ebuild b/dev-java/maven-bin/maven-bin-3.1.0.ebuild
new file mode 100644
index 000000000000..35cef940a0d1
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.1.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
+	dev-java/avalon-framework:4.1
+	dev-java/avalon-logkit:2.0
+	dev-java/commons-io:1
+	dev-java/juel:0
+	dev-java/log4j:0
+	dev-java/osgi-core-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 "${S}"/bin/*.bat || die
+
+	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
+
+	java-pkg_getjars avalon-framework-4.1,avalon-logkit-2.0,commons-io-1,juel,log4j,osgi-core-api,servlet-api-2.4 > /dev/null
+}
+
+# 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.txt 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.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
new file mode 100644
index 000000000000..a2c003fd5f9a
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 app-eselect/eselect-maven )
+	|| ( 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.3.ebuild b/dev-java/maven-bin/maven-bin-3.2.3.ebuild
new file mode 100644
index 000000000000..40c967e8112c
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.2.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 app-eselect/eselect-maven )
+	|| ( 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/guava:14
+	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
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -fv \
+	bin/*.bat \
+	lib/{aopalliance,commons-cli,commons-io,guava,jsoup,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,guava-14,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..601fe9bf10e4
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 app-eselect/eselect-maven )
+|| ( 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/metadata.xml b/dev-java/maven-bin/metadata.xml
new file mode 100644
index 000000000000..a553df7d5aba
--- /dev/null
+++ b/dev-java/maven-bin/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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/mckoi/Manifest b/dev-java/mckoi/Manifest
new file mode 100644
index 000000000000..bdc237c0e57f
--- /dev/null
+++ b/dev-java/mckoi/Manifest
@@ -0,0 +1 @@
+DIST mckoi1.0.3.zip 2192577 SHA256 ffe54237dcdee9752489530347830a752a5606d7d5e97c2d395bf83355bee8df SHA512 37e654e5b801329e06d0d194f95298a78e8f8fde82c0e6b93bc3dc62476b0c34c4c370687948c6b631f2cc75287e144bf669b668ad3e0112e9ebf6a06c9e53d0 WHIRLPOOL 0cc7933fd106a97a22824c1386417fe1de4f0469d4b634b8239505916e921c1b043673d10d8814a4f263b16ce07f7226e82c712fb0dec0b9d30925fba0803583
diff --git a/dev-java/mckoi/files/build.xml b/dev-java/mckoi/files/build.xml
new file mode 100644
index 000000000000..48950ac58146
--- /dev/null
+++ b/dev-java/mckoi/files/build.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+
+<project name="mckoi" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="src" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="docs/api" />
+	<property name="dist.dir" value="dist" />
+	<property name="jarfile" value="${dist.dir}/mckoidb.jar" />
+	<property name="target.jdk" value="1.4" />
+	<property file="build.properties" />
+
+	<!-- 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}">
+			<classpath>
+				<pathelement path="${gnu-regexp.jar}" />
+			</classpath>
+		</javac>
+	</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>
+</project>
diff --git a/dev-java/mckoi/files/mckoi-1.0.3-jikes.patch b/dev-java/mckoi/files/mckoi-1.0.3-jikes.patch
new file mode 100644
index 000000000000..173340771041
--- /dev/null
+++ b/dev-java/mckoi/files/mckoi-1.0.3-jikes.patch
@@ -0,0 +1,48 @@
+diff -ur mckoi1.0.3.orig/src/com/mckoi/store/JournalledSystem.java mckoi1.0.3/src/com/mckoi/store/JournalledSystem.java
+--- mckoi1.0.3.orig/src/com/mckoi/store/JournalledSystem.java	2004-08-15 22:14:58.000000000 +0200
++++ mckoi1.0.3/src/com/mckoi/store/JournalledSystem.java	2004-12-20 13:19:07.808868672 +0100
+@@ -1047,7 +1047,7 @@
+     /**

+      * The journal file.

+      */

+-    private final JournalFile journal;

++    private final com.mckoi.store.JournalledSystem.JournalFile journal;

+ 

+     /**

+      * The position in the journal file.

+@@ -1069,7 +1069,7 @@
+     /**

+      * Constructs the entry.

+      */

+-    public JournalEntry(String resource_name, JournalFile journal,

++    public JournalEntry(String resource_name, com.mckoi.store.JournalledSystem.JournalFile journal,

+                         long position, long page_number) {

+       this.resource_name = resource_name;

+       this.journal = journal;

+@@ -1080,7 +1080,7 @@
+     /**

+      * Returns the journal file for this entry.

+      */

+-    public JournalFile getJournalFile() {

++    public com.mckoi.store.JournalledSystem.JournalFile getJournalFile() {

+       return journal;

+     }

+ 

+@@ -1716,7 +1716,7 @@
+     /**

+      * The JournalFile object that is a summary of.

+      */

+-    JournalFile journal_file;

++    com.mckoi.store.JournalledSystem.JournalFile journal_file;

+ 

+     /**

+      * True if the journal is recoverable (has one or more complete check

+@@ -1737,7 +1737,7 @@
+     /**

+      * Constructor.

+      */

+-    public JournalSummary(JournalFile journal_file) {

++    public JournalSummary(com.mckoi.store.JournalledSystem.JournalFile journal_file) {

+       this.journal_file = journal_file;

+     }

+     

diff --git a/dev-java/mckoi/mckoi-1.0.3-r2.ebuild b/dev-java/mckoi/mckoi-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..f49f11dc3d1b
--- /dev/null
+++ b/dev-java/mckoi/mckoi-1.0.3-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Mckoi Java SQL Database System"
+HOMEPAGE="http://mckoi.com/database/"
+SRC_URI="http://www.mckoi.com/database/ver/${P/-/}.zip"
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="amd64 x86"
+IUSE=""
+COMMON_DEP="=dev-java/gnu-regexp-1.1*"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${P/-/}"
+
+# uses enum as identifier
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-jikes.patch"
+
+	cp "${FILESDIR}/build.xml" . || die
+	java-ant_rewrite-classpath
+	java-ant_rewrite-bootclasspath 1.5
+
+	rm -v gnu-regexp-*
+	rm -v *.jar
+	find demo -name '*.class' -delete
+	# some contrib stuff depending on jboss
+	rm -rf src/net
+}
+
+EANT_DOC_TARGET="docs"
+EANT_GENTOO_CLASSPATH="gnu-regexp-1"
+
+src_install() {
+	java-pkg_dojar dist/mckoidb.jar
+
+	dodoc README.txt db.conf
+
+	# apidocs are in expected place
+	use doc && java-pkg_dohtml -r docs/*
+	use examples && java-pkg_doexamples demo
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/mckoi/metadata.xml b/dev-java/mckoi/metadata.xml
new file mode 100644
index 000000000000..0e55c8cf810a
--- /dev/null
+++ b/dev-java/mckoi/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<longdescription>
+Mckoi SQL Database is an SQL (Structured Query Language) Database
+management system written for the JavaTM platform. Mckoi SQL Database is
+optimized to run as a client/server database server for multiple
+clients, however it can also be embedded in an application as a
+stand-alone database. It is highly multi-threaded and features an
+extendable object-oriented engine.
+    
+Mckoi SQL Database started as an internal project and has since evolved
+from its inception in 1998. The main goals of the project are a code
+base that is simple to maintain and extend, ease of use and
+administration, robustness, multiple concurrent access, and performance.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/mersennetwister/Manifest b/dev-java/mersennetwister/Manifest
new file mode 100644
index 000000000000..513ef29262aa
--- /dev/null
+++ b/dev-java/mersennetwister/Manifest
@@ -0,0 +1 @@
+DIST mersennetwister-0_pre23765.tar.bz2 4974 SHA256 781fb0614aaae4e5d5f7c8cb23468248564714e44a7dae357b5a2d450027f9eb SHA512 3c3b970da3ddc3a0b7fda299916781551867b6ce3c8ecb1f89670783d4d51e2681b07c6b2dfc15e11a03c8b949f4880b0bf1511dde2cb4ad0600688809d38e46 WHIRLPOOL 082b6ffa9b8aeb02dc37393749632a65568296048f2cb7e572e2c8bac1d110d64f6d57b92c4928a46435d66436777ec57535c618302927218df6ef329957d3ae
diff --git a/dev-java/mersennetwister/mersennetwister-0_pre23765.ebuild b/dev-java/mersennetwister/mersennetwister-0_pre23765.ebuild
new file mode 100644
index 000000000000..641320cdbac3
--- /dev/null
+++ b/dev-java/mersennetwister/mersennetwister-0_pre23765.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S=${WORKDIR}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/mersennetwister/metadata.xml b/dev-java/mersennetwister/metadata.xml
new file mode 100644
index 000000000000..59b15e8a41aa
--- /dev/null
+++ b/dev-java/mersennetwister/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>
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/metadata-extractor/Manifest b/dev-java/metadata-extractor/Manifest
new file mode 100644
index 000000000000..6e18d8ce580c
--- /dev/null
+++ b/dev-java/metadata-extractor/Manifest
@@ -0,0 +1 @@
+DIST metadata-extractor-2.2.2-src.jar 3936358 SHA256 38f8b12418afde99286b9b7c86158eb4fd2c47a23ed4af025af77bae301e1783 SHA512 5004ecef28e9fc1f24a4b13b4596c801e9b20fcb9c20165e79b2543837187b8cb019aa32c301e2850939a95a23224444d6eb7e23c45d8bf54cf267899052b2f7 WHIRLPOOL ff35285df14741babe45b2b1906b0d5ceacbc76a12684d0e676cb7ad784eeafaa9bee4016489ce5643d5bcf85d1140d69667f8f9a646c9720ae4eb2602bbf031
diff --git a/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch b/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch
new file mode 100644
index 000000000000..fb455f4f0943
--- /dev/null
+++ b/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch
@@ -0,0 +1,46 @@
+--- metadata-extractor.build	2009-01-31 15:22:58.000000000 +0200
++++ metadata-extractor.build.fixed	2009-01-31 15:37:02.000000000 +0200
+@@ -24,25 +24,38 @@
+             srcdir="${src}"

+             destdir="${build}"

+             debug="${debug}"

+-            verbose="${verbose}"/>

++            verbose="${verbose}">
++            <exclude name="**/test/*.java"/>
++        </javac>

++    </target>
++    
++    <target name="compile-test" description="compile the source">

++        <javac classpath="${classpath}"

++            srcdir="${src}"

++            destdir="${build}"

++            debug="${debug}"

++            verbose="${verbose}">
++            <include name="**/test/*.java"/>
++        </javac>

+     </target>

+ 

+-    <target name="dist-binaries" depends="clean, compile, test" description="generate binary distribution">

++    <target name="dist-binaries" depends="clean, compile" description="generate binary distribution">

+         <jar destfile="${dist}/metadata-extractor-${version}.jar" update="false" basedir="${build}">

+             <manifest>

+                 <attribute name="Main-Class" value="com.drew.imaging.jpeg.JpegMetadataReader"/>

+-            </manifest>

++            </manifest>
++            <exclude name="**/test/*.class"/>

+         </jar>

+     </target>

+ 

+-    <target name="dist-source" depends="clean, compile, test" description="generate source distribution">

++    <target name="dist-source" depends="clean, compile" description="generate source distribution">

+         <jar destfile="${dist}/metadata-extractor-${version}-src.jar" update="false">

+             <fileset dir="."

+                 includes="${src}/**/*.java, ${src}/**/*.jpg, ${lib}/junit.jar, metadata-extractor.build, ReleaseNotes.txt"/>

+         </jar>

+     </target>

+ 

+-    <target name="test" depends="compile" description="run all junit tests">

++    <target name="test" depends="compile-test" description="run all junit tests">

+         <junit printsummary="yes" fork="yes" haltonfailure="yes">

+             <classpath>

+                 <pathelement location="${build}"/>

diff --git a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild
new file mode 100644
index 000000000000..7f9981b5da45
--- /dev/null
+++ b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Metadata extraction framework for Exif and IPTC metadata segments, extraction support for JPEG files"
+HOMEPAGE="http://www.drewnoakes.com/code/exif/"
+SRC_URI="http://www.drewnoakes.com/code/exif/metadata-extractor-${PV}-src.jar"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc amd64"
+IUSE="test"
+
+DEPEND="
+	|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
+	=dev-java/junit-3.8*
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+S=${WORKDIR}/
+
+src_unpack() {
+	jar xf "${DISTDIR}/${A}"
+	sed -e "s:clean, compile, test:clean, compile:" -i metadata-extractor.build || die "sed failed"
+	mv metadata-extractor.build build.xml
+
+	java-pkg_jar-from --build-only --into lib/ junit junit.jar
+}
+
+EANT_DOC_TARGET=""
+EANT_BUILD_TARGET="dist-binaries"
+
+src_install() {
+	dodoc ReleaseNotes.txt
+	java-pkg_newjar dist/*.jar "${PN}.jar"
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
+}
diff --git a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild
new file mode 100644
index 000000000000..d8fd51fbdb73
--- /dev/null
+++ b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Metadata extraction framework for Exif and IPTC metadata segments, extraction support for JPEG files"
+HOMEPAGE="http://www.drewnoakes.com/code/exif/"
+SRC_URI="http://www.drewnoakes.com/code/exif/metadata-extractor-${PV}-src.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="test"
+
+DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
+	test? ( dev-java/junit:0 )
+	app-arch/unzip:0"
+
+RDEPEND=">=virtual/jre-1.4"
+S=${WORKDIR}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-buildfix.patch
+
+	mv metadata-extractor.build build.xml || die
+
+	use test && java-pkg_jar-from --build-only --into lib/ junit junit.jar
+}
+
+EANT_DOC_TARGET=""
+EANT_BUILD_TARGET="dist-binaries"
+
+src_install() {
+	java-pkg_newjar dist/*.jar ${PN}.jar
+
+	dodoc ReleaseNotes.txt
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
+}
diff --git a/dev-java/metadata-extractor/metadata.xml b/dev-java/metadata-extractor/metadata.xml
new file mode 100644
index 000000000000..d8e75a94dca2
--- /dev/null
+++ b/dev-java/metadata-extractor/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+		A general metadata extraction framework. Support currently exists for
+		Exif and Iptc metadata segments. Extraction of these segments is
+		provided for Jpeg files.
+	</longdescription>
+</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..4d463cd97846
--- /dev/null
+++ b/dev-java/metainf-services/Manifest
@@ -0,0 +1 @@
+DIST metainf-services-1.5.tar.gz 5294 SHA256 b507d193377dc04a3ca8136fcd6afb37b2d4f058e89108ac571470ffb089224b SHA512 baa7977dabc7b0d36c977cf48ddd3a4f890c66d0f439d0792cb3c826e35b5b3abfd3839f66db0d90ba5c22b26a32310f639bbc88a39f8aa6d864577b752d1da3 WHIRLPOOL 1e4abdca07e7e44051b6ec116deaab2e13d89cd9e70808fa5237d16a37b63af8868eb15c05de4933070124cab5d52db8caf43baf4fd8b231423892c083c8a6e3
diff --git a/dev-java/metainf-services/files/metainf-services-1.5-build.xml b/dev-java/metainf-services/files/metainf-services-1.5-build.xml
new file mode 100644
index 000000000000..6694623abff2
--- /dev/null
+++ b/dev-java/metainf-services/files/metainf-services-1.5-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.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 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..f70091621a3d
--- /dev/null
+++ b/dev-java/metainf-services/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="github">kohsuke/metainf-services</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/metainf-services/metainf-services-1.5.ebuild b/dev-java/metainf-services/metainf-services-1.5.ebuild
new file mode 100644
index 000000000000..dd0e1a4e4d68
--- /dev/null
+++ b/dev-java/metainf-services/metainf-services-1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5"
+DEPEND=">=virtual/jdk-1.5"
+
+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/mg4j/Manifest b/dev-java/mg4j/Manifest
new file mode 100644
index 000000000000..dc337235c28f
--- /dev/null
+++ b/dev-java/mg4j/Manifest
@@ -0,0 +1 @@
+DIST mg4j-0.9.1-src.tar.gz 169529 SHA256 8ca5c99facd9be71af57f0e71f746e83af98018774afe37d2a7a83aa356dc828 SHA512 b9831ed28360836a1828011bd9bf6474303f2125e1643fcb600a14aa8851468785d60739f85c1cfd9762e1744765a17827b334f194169786f54419d6b1f711c3 WHIRLPOOL 43fb4f7b8b786f66aa84b86cdcdcb758e9da727a5c88c0fb6f755c71a450f671be80901c1b5bde4486dab4a8621f0aa8f75c59bacf59b5c1a54b68b81c624759
diff --git a/dev-java/mg4j/files/mg4j-build.patch b/dev-java/mg4j/files/mg4j-build.patch
new file mode 100644
index 000000000000..eef1c4878cbb
--- /dev/null
+++ b/dev-java/mg4j/files/mg4j-build.patch
@@ -0,0 +1,56 @@
+diff -uprN mg4j-0.9.orig/build.xml mg4j-0.9/build.xml
+--- mg4j-0.9.orig/build.xml	2004-09-01 12:04:18.000000000 +0200
++++ mg4j-0.9/build.xml	2004-11-17 00:30:41.879119728 +0100
+@@ -39,25 +39,34 @@
+ 	   includes="it/unimi/dsi/mg4j/query/parser/**"
+ 	   nowarn="on"
+ 	   debug="on"
+-		   optimize="on"
++	   optimize="on"
+            destdir="${build}"
+-		   source="1.4"
+-		   />
++	   source="1.4"
++	   target="1.4">
++
++	<classpath>
++		<pathelement path="lib/jal.jar;lib/fastutil.jar;lib/gnu.getopt.jar;lib/libreadline-java.jar;lib/colt.jar" />
++	</classpath>
++   </javac>
+   </target>
+ 
+   <target name="compile" depends="init,compile-parser">
+     <javac srcdir="${src}" 
+ 	   debug="on"
+-		   optimize="on"
++	   optimize="on"
+            destdir="${build}"
+-		   source="1.4"
+-		   />
++	   source="1.4"
++	   target="1.4">
++
++	<classpath>
++		<pathelement path="lib/jal.jar;lib/fastutil.jar;lib/gnu.getopt.jar;lib/libreadline-java.jar;lib/colt.jar" />
++	</classpath>
++   </javac>
+   </target>
+ 
+   <target name="jar" depends="compile">
+     <jar jarfile="mg4j-${version}.jar" 
+-         basedir="${build}"
+-		 />
++         basedir="${build}" />
+   </target>
+ 
+ 
+@@ -69,8 +78,7 @@
+ 			 sourcepath="${src}" 
+ 			 private="off"
+ 			 source="1.4"
+-			 windowtitle="MG4J ${version}"
+-			 >
++			 windowtitle="MG4J ${version}">
+ 	<link href="${j2se.apiurl}"/>
+ 	<link href="${fastutil.apiurl}"/>
+ 	<link href="${colt.apiurl}"/>
diff --git a/dev-java/mg4j/metadata.xml b/dev-java/mg4j/metadata.xml
new file mode 100644
index 000000000000..0aca2297599c
--- /dev/null
+++ b/dev-java/mg4j/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<longdescription>
+
+MG4J (Managing Gigabytes for Java) is a collaborative effort aimed at providing
+a free Java implementation of inverted-index compression techniques; as a
+by-product, it offers several general-purpose optimised classes, including fast
+&amp; compact mutable strings, bit-level I/O, fast unsychronised buffered
+streams, (possibly signed) minimal perfect hashing for very large strings
+collections, etc.
+
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/mg4j/mg4j-0.9.1-r2.ebuild b/dev-java/mg4j/mg4j-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..9c00faf44f3b
--- /dev/null
+++ b/dev-java/mg4j/mg4j-0.9.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A free Java implementation of inverted-index compression technique"
+SRC_URI="http://mg4j.dsi.unimi.it/${P}-src.tar.gz"
+HOMEPAGE="http://mg4j.dsi.unimi.it"
+
+LICENSE="LGPL-2.1"
+SLOT="0.9"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/colt:0
+	dev-java/fastutil:4.3
+	dev-java/jal:0
+	dev-java/java-getopt:1
+	dev-java/libreadline-java:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	dev-java/javacc:0"
+
+java_prepare() {
+	epatch "${FILESDIR}/mg4j-build.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="colt,fastutil-4.3,jal,java-getopt-1,libreadline-java"
+
+src_install() {
+	java-pkg_newjar ${P}.jar
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc java/it
+}
diff --git a/dev-java/microba/Manifest b/dev-java/microba/Manifest
new file mode 100644
index 000000000000..19ee8babbba1
--- /dev/null
+++ b/dev-java/microba/Manifest
@@ -0,0 +1 @@
+DIST microba-0.4.4-full.zip 631831 SHA256 33c3779dd243d7415b137dff5d15d292589390b08f398f77fef581099aa1b5c8 SHA512 80103b33ebb50e0dafa82b713218bbedbf59424922424515a453a49d1be416960a78c6c4d987eede5ab168f806cf0bb7ffcc900a6a19827e51e9bf612d08e742 WHIRLPOOL c2bd6033dc3e18597e6d0219bde742d09dde70e72a82012a14d27966c0d12ea9ca725d3dc2d8732bc557979cea8e6808a7ed5ba9b3a3be04b33dd1071bdb9dbe
diff --git a/dev-java/microba/metadata.xml b/dev-java/microba/metadata.xml
new file mode 100644
index 000000000000..ff6f3454ea40
--- /dev/null
+++ b/dev-java/microba/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">microba</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/microba/microba-0.4.4.ebuild b/dev-java/microba/microba-0.4.4.ebuild
new file mode 100644
index 000000000000..ca18fec627ee
--- /dev/null
+++ b/dev-java/microba/microba-0.4.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Swing components for date operations and palettes"
+HOMEPAGE="http://microba.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-full.zip"
+LICENSE="BSD"
+KEYWORDS="amd64 ppc x86"
+SLOT="0"
+
+COMMON_DEPEND=">=dev-java/jgraph-5.9.2"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+
+IUSE=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	unpack ./${P}-sources.jar
+	rm *.jar || die
+
+	# do not delete stuff after it's zipped
+	sed -i -e "s/<delete/<mkdir/" build.xml
+
+	cd lib-compiletime
+	rm *.jar || die
+	java-pkg_jar-from jgraph jgraph.jar
+}
+
+EANT_BUILD_TARGET="bin_release"
+EANT_DOC_TARGET="doc_release"
+
+src_install() {
+	java-pkg_newjar redist/${P}.jar
+	dodoc *.txt || die
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/com
+}
diff --git a/dev-java/miglayout/Manifest b/dev-java/miglayout/Manifest
new file mode 100644
index 000000000000..1aa38a0d1d68
--- /dev/null
+++ b/dev-java/miglayout/Manifest
@@ -0,0 +1 @@
+DIST miglayout-4.0-sources.jar 194675 SHA256 3b8e14f727a14f3179b46d6e754804a93e184c657491d44ec76179e6f619cfd7 SHA512 27284ceac254707428351fb2451ffd5f2ebd580374df59624bb6af06011f70d87b27849900c2573aff782ebe6d84e1806c18a59741213948f0b238ee5a51ec2f WHIRLPOOL a9ab25becba5ed9426239c19865cb01a6d8c7d0ba2da1c878d06dc75bf111b9c76f36c27012d740f935619e9ec92f15fb9470a7de63ccce3f7dfab698b70e319
diff --git a/dev-java/miglayout/metadata.xml b/dev-java/miglayout/metadata.xml
new file mode 100644
index 000000000000..94b0e5548075
--- /dev/null
+++ b/dev-java/miglayout/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..15cb91034811
--- /dev/null
+++ b/dev-java/miglayout/miglayout-4.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..535318af0b4f
--- /dev/null
+++ b/dev-java/milton-api/Manifest
@@ -0,0 +1,2 @@
+DIST milton-api-2.5.1.5-sources.jar 210148 SHA256 e55d3919b6852206137121f0bf240607b82011bc4a21f1ac4f58be247ba0d221 SHA512 2cfc5cf5b81e36055871351cabced0b83e0c24aff3adb222cbb9a22d13bb19619e315606ccfbd4d0b14d3951deeb51442fa86fb587ecedd7cfbbc5ee54b76803 WHIRLPOOL 0c74aabff88f7b5d586d369cdc074bc227b3b0b1303268f90e52ea1b2bf42f3c53323ffdd8d8f31d626b18aeb5e2d2b0d7ee3426c409b62b6b3f07939961dc5e
+DIST milton-api-2.6.5.5-sources.jar 227823 SHA256 bfd1fd7cd0560024cb64630e3660873d13033cc18d783a6f3deda2dfa7784e59 SHA512 66730e025399039537b31f635546375939e98c27e4250283342d8dec350a682368f5991d969dfecce9ab45f541d2da448f9786c8265ae55caa742f887a97899f WHIRLPOOL ed9578e52c477675f55209e5223b744a967f616f3d2b17aea87145ceac32cc69516535261a599814ca7a0e86d01adaa30ec2c96b3be0a280b9199b8fb09345a2
diff --git a/dev-java/milton-api/metadata.xml b/dev-java/milton-api/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/milton-api/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/milton-api/milton-api-2.5.1.5.ebuild b/dev-java/milton-api/milton-api-2.5.1.5.ebuild
new file mode 100644
index 000000000000..d44d58f3dd5a
--- /dev/null
+++ b/dev-java/milton-api/milton-api-2.5.1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="2.5"
+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.5"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+JAVA_GENTOO_CLASSPATH="commons-codec,commons-io-1,slf4j-api"
diff --git a/dev-java/milton-api/milton-api-2.6.5.5.ebuild b/dev-java/milton-api/milton-api-2.6.5.5.ebuild
new file mode 100644
index 000000000000..4e2f26b160cc
--- /dev/null
+++ b/dev-java/milton-api/milton-api-2.6.5.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="2.6"
+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.5"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+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..37c7d48ee1fc
--- /dev/null
+++ b/dev-java/milton-mail-api/Manifest
@@ -0,0 +1 @@
+DIST milton-mail-api-2.5.1.5-sources.jar 34106 SHA256 537fd8b99b29574705be8c82ffd5d447bbcc009f4d94fd9b2b53540177dab868 SHA512 c2f244f7fb500828ed26cdc254de428324f560a9f9809373b8aca0fb1a71a70bc748e0155f4c68448307bc272dd7b671a1003522b6eacf8c41cdea116f5ebd5d WHIRLPOOL 9a29b4ffbd6fd457b2bf59b4f71d8a42c0037ff566dd8f95bbc400f3a8a873b28daa20e8757dc323855812c73087490bfb6c9226c6b26699e526aebb19d03911
diff --git a/dev-java/milton-mail-api/metadata.xml b/dev-java/milton-mail-api/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/milton-mail-api/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/milton-mail-api/milton-mail-api-2.5.1.5.ebuild b/dev-java/milton-mail-api/milton-mail-api-2.5.1.5.ebuild
new file mode 100644
index 000000000000..5b3a21cf393a
--- /dev/null
+++ b/dev-java/milton-mail-api/milton-mail-api-2.5.1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="2.5"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="
+	dev-java/milton-api:${SLOT}
+	dev-java/slf4j-api:0
+	java-virtuals/javamail:0
+"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+JAVA_GENTOO_CLASSPATH="milton-api-${SLOT},javamail,slf4j-api"
diff --git a/dev-java/mimepull/Manifest b/dev-java/mimepull/Manifest
new file mode 100644
index 000000000000..283e95831b12
--- /dev/null
+++ b/dev-java/mimepull/Manifest
@@ -0,0 +1 @@
+DIST mimepull-1.8.tar.bz2 48841 SHA256 357f3c2b558a755c4f3d7b71056d8973d723cd2b8529ed54014fa8d164378702 SHA512 60de5b888ccdf89ffdeba0a5ccd98e77f7497e57c6b3c71049446dab0293836f8f2b84a39354602e9073fb6fef880dbc11c80323413f8ed15f0a3af68086ae07 WHIRLPOOL a7a9f58210b47eb37f5994233339773672f1ff12f6e0aa2fcc04873b6e29aecd3181a28131ca45d5e275bb111d1a990ef6d8545d3eab8919a7db73d91c903b09
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..ebb97bf0ef01
--- /dev/null
+++ b/dev-java/mimepull/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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..67767faa069a
--- /dev/null
+++ b/dev-java/mimepull/mimepull-1.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/mina-core/Manifest b/dev-java/mina-core/Manifest
new file mode 100644
index 000000000000..64e68b6c7265
--- /dev/null
+++ b/dev-java/mina-core/Manifest
@@ -0,0 +1 @@
+DIST mina-core-1.1.7-sources.jar 272148 SHA256 53890e14b238eab91f70459f01656a6afb520364b6238c8fa9c3855b02cf8573 SHA512 44f2f94aa356ce1b4ac0379ecec7b76b15210e54314c911bd8ba6d48910415363c9a34dc50e29b8e04ad08a371398ad9e2a00065a44b71c25caa3ef14a72b832 WHIRLPOOL 82f97287027e3c32ff489345ce385bd31325e0755ef9744f1a81a9cf295f8cde1bf0ba44b1afe506a3b08f37e601e55a88d4dd0936abe7c4eccf716962bd8943
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..250f2d1940ea
--- /dev/null
+++ b/dev-java/mina-core/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
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..a15d2288cdad
--- /dev/null
+++ b/dev-java/mina-core/mina-core-1.1.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/minlog/Manifest b/dev-java/minlog/Manifest
new file mode 100644
index 000000000000..fadab1b8857a
--- /dev/null
+++ b/dev-java/minlog/Manifest
@@ -0,0 +1 @@
+DIST minlog-1.2.zip 19766 SHA256 cd4d58a97085acc4c3cb4d455584eb4463483d7df822d517f9b3af005e13ca22 SHA512 79c341288fc4c18ceb307011b3591e239d00a356fc78379449bbcc4d93b0355665a4425dd31a23d83c79eeebf19a591b9d3fb34d6107a4a503125dc683b4519c WHIRLPOOL e42c5c61eba879857189855f9e1ee1d3326588d701d67c7c41453e2dda2083adc192f3e6bfdb8a1be45cbd1a53438dc44e4f2356aac0b7f2c3bc178dfb1717bd
diff --git a/dev-java/minlog/metadata.xml b/dev-java/minlog/metadata.xml
new file mode 100644
index 000000000000..417123168c0a
--- /dev/null
+++ b/dev-java/minlog/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..06033d13402c
--- /dev/null
+++ b/dev-java/minlog/minlog-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..67cd16ef5514
--- /dev/null
+++ b/dev-java/mockito/Manifest
@@ -0,0 +1 @@
+DIST mockito-1.9.5.zip 6453870 SHA256 aaef6647ebded1deffa74e8b9cd5a3449eb385dbc127e1d56f0bdb59cde5c00e SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51 WHIRLPOOL 2746b67745fbeff7752137e6afae8871fd20ccfe72a3b769df4e29d051bdc9da5de90cced3418641247cd8e8e0ff8c37b84483b91bfd6625b2fad25750aeead1
diff --git a/dev-java/mockito/metadata.xml b/dev-java/mockito/metadata.xml
new file mode 100644
index 000000000000..25f5acc3ae1b
--- /dev/null
+++ b/dev-java/mockito/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..562d37bc8e87
--- /dev/null
+++ b/dev-java/mockito/mockito-1.9.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A mocking framework for Java"
+HOMEPAGE="https://code.google.com/p/mockito/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ppc ppc64"
+
+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/mockobjects/Manifest b/dev-java/mockobjects/Manifest
new file mode 100644
index 000000000000..9b4ad07295db
--- /dev/null
+++ b/dev-java/mockobjects/Manifest
@@ -0,0 +1 @@
+DIST mockobjects-java-0.09-gentoo.tar.bz2 98965 SHA256 e869b4cb103e07d041f06f5fa5dfaa5e6eaad2d709ab2cf5446c9fff3b4f5d16 SHA512 212616dc1ebe6a1e21cea932d1eb9b7fd7d391f45f70f7d532a2a65cb71d3dcc69c6eb11d01875a6dfda4874a319cae1b45bb53e6291811a1f11c5a7dee02523 WHIRLPOOL 11d56f40b21de1609a3dd668b279a23e01e53c26b2b29bca36acf0e21b78f2a279adda20bd74fbc4381ffdd6707985974ca3a33794976ca7a9c009233fcd20c3
diff --git a/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch b/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch
new file mode 100644
index 000000000000..22ac56cf5c08
--- /dev/null
+++ b/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch
@@ -0,0 +1,110 @@
+--- build.xml.orig	2007-01-07 15:54:42.000000000 +0100
++++ build.xml	2007-01-07 16:40:45.000000000 +0100
+@@ -70,7 +70,8 @@
+     <available property="jdk.version" value="1.2" classname="java.lang.ThreadLocal" />
+     <available property="jdk.version" value="1.3" classname="java.lang.StrictMath" />
+     <available property="jdk.version" value="1.4" classname="java.lang.CharSequence" />
+-    <available property="j2ee.version" value="1.2"
++    <!--
++	<available property="j2ee.version" value="1.2"
+                classpathref="lib.classpath"
+                classname="javax.servlet.Servlet" />
+     <available property="j2ee.version" value="1.3"
+@@ -79,6 +80,7 @@
+     <available property="httpclient" value="true"
+                classpathref="lib.classpath"
+                classname="org.apache.commons.httpclient.HttpClient" />
++	-->
+ 
+     <property name="jar.j2ee.name" value="" />
+ 
+@@ -118,7 +120,6 @@
+            srcdir="${src.core.dir}">
+       <classpath>
+         <path refid="lib.classpath" />
+-        <pathelement path="${java.class.path}" />
+       </classpath>
+     </javac>
+ 
+@@ -134,7 +135,6 @@
+       <src path="${src.jdk.dir}/common" />
+       <classpath>
+         <path refid="lib.classpath" />
+-        <pathelement path="${java.class.path}" />
+         <pathelement path="${core.classes}" />
+       </classpath>
+     </javac>
+@@ -158,7 +158,6 @@
+ 
+       <classpath>
+         <path refid="lib.classpath" />
+-        <pathelement path="${java.class.path}" />
+         <pathelement path="${core.classes}" />
+         <pathelement path="${jdk.classes}" />
+       </classpath>
+@@ -179,7 +178,6 @@
+         <pathelement location="${j2ee.classes}" />
+         <pathelement location="${jdk.classes}" />
+         <pathelement location="${core.classes}" />
+-        <pathelement path="${java.class.path}" />
+       </classpath>
+ 
+       <formatter type="plain" usefile="false" />
+@@ -222,7 +220,6 @@
+ 
+         <classpath>
+           <path refid="lib.classpath" />
+-          <pathelement path="${java.class.path}" />
+           <pathelement path="${core.classes}" />
+           <pathelement path="${jdk.classes}" />
+         </classpath>
+@@ -234,7 +231,7 @@
+   </target>
+ 
+   <target name="jar"
+-          depends="junit, jar-core, jar-jdk, jar-j2ee"/>
++          depends="compile-j2ee, jar-core, jar-jdk, jar-j2ee"/>
+ 
+   <target name="jar-core"
+           depends="compile-core, deliverable-names"
+@@ -292,7 +289,7 @@
+   </target>
+ 
+   <target name="jar-ext-httpclient"
+-          depends="junit, compile-ext-httpclient"
++          depends="compile-ext-httpclient"
+ 	  description="Generate extension mockobjects jar">
+     <jar jarfile="${out.dir}/${ant.project.name}-httpclient.jar"
+       manifest="${conf.dir}/manifest">
+@@ -322,7 +319,6 @@
+ 
+       <classpath>
+         <path refid="lib.classpath" />
+-        <pathelement path="${java.class.path}" />
+       </classpath>
+       <sourcepath>
+         <pathelement path="${src.dir}/core"/>
+@@ -401,8 +397,8 @@
+        ========================================================================
+     -->
+   <target name="all"
+-          depends="clean, junit, jar, javadoc, dist"
+-          description="do it all (clean, jar, javadoc, junit, dist)">
++          depends="clean, jar, javadoc, dist"
++          description="do it all (clean, jar, javadoc, dist)">
+   </target>
+ 
+   <target name="src" depends="clean,prepare-dist">
+@@ -423,5 +419,12 @@
+     <delete file="${dist.name}-src.tar" />
+   </target>
+ 
++   <!-- zip the sources -->
++   <target name="sourcezip">
++         <zip destfile="${out.dir}/${ant.project.name}-src.zip">
++                <zipfileset dir="src" />
++         </zip>
++        </target>
++
+ </project>
+ 
diff --git a/dev-java/mockobjects/files/mockobjects-0.09-java15.patch b/dev-java/mockobjects/files/mockobjects-0.09-java15.patch
new file mode 100644
index 000000000000..6fc419a1b7ec
--- /dev/null
+++ b/dev-java/mockobjects/files/mockobjects-0.09-java15.patch
@@ -0,0 +1,11 @@
+--- src/jdk/common/alt/java/io/FileImpl.java	2006-01-15 13:49:06.000000000 +0100
++++ src/jdk/common/alt/java/io/FileImpl.java	2006-01-15 13:47:59.000000000 +0100
+@@ -171,7 +171,7 @@
+     }
+ 
+     public int compareTo(Object o) {
+-        return file.compareTo(o);
++        return file.compareTo((java.io.File) o);
+     }
+ 
+     public java.io.File getRealFile() {
diff --git a/dev-java/mockobjects/files/mockobjects-0.09-junit.patch b/dev-java/mockobjects/files/mockobjects-0.09-junit.patch
new file mode 100644
index 000000000000..fe80135a8bee
--- /dev/null
+++ b/dev-java/mockobjects/files/mockobjects-0.09-junit.patch
@@ -0,0 +1,11 @@
+--- src/core/com/mockobjects/util/AssertMo.java	2003-05-18 22:59:40.000000000 +0200
++++ src/core/com/mockobjects/util/AssertMo.java	2007-01-07 14:46:34.000000000 +0100
+@@ -77,7 +77,7 @@
+         assertTrue("Should not have verified", threwException);
+     }
+ 
+-    static protected void failNotEquals(
++    static public void failNotEquals(
+         String message,
+         Object expected,
+         Object actual) {
diff --git a/dev-java/mockobjects/metadata.xml b/dev-java/mockobjects/metadata.xml
new file mode 100644
index 000000000000..4cc3c6920946
--- /dev/null
+++ b/dev-java/mockobjects/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<longdescription>
+Mock Objects is a test-first development process for building
+object-oriented software and a generic unit testing framework that
+supports that process. Mock objects give you:
+
+* A methodology for developing and using mock objects. 
+
+* A core mock objects framework. This is a library of code that supports
+  the implementation of mock objects. It is based around a set of
+  expectation classes for values and collections. There are also various
+  other classes to make mock objects easier to write or to use.
+
+* A default set of mock implementations for the standard Java platform
+  APIs. We have made a start on packages such as servlets, sql, and io.
+
+* Mock implementations for more specialised libraries, particularly
+  third party products. So far, we have started on ATG Dynamo and IBM's
+  VisualAge for Java tools API.
+
+* A community for exchanging ideas on anything related to unit testing,
+  with a bias towards Mock Objects. 
+
+Our larger aim is to make www.mockobjects.com the point of reference for
+ideas and tools for unit testing particularly based on Mock Objects. Our
+first implementation is in Java, largely because that's what we've been
+working in, but also because it has a stable set of APIs that are
+suitable for writing Mock Objects. We have applied these techniques to
+other environments and intend to publish the results here. 
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/mockobjects/mockobjects-0.09-r4.ebuild b/dev-java/mockobjects/mockobjects-0.09-r4.ebuild
new file mode 100644
index 000000000000..2dfa6f036c3e
--- /dev/null
+++ b/dev-java/mockobjects/mockobjects-0.09-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source test"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Test-first development process for building object-oriented software"
+HOMEPAGE="http://mockobjects.sf.net"
+SRC_URI="http://dev.gentoo.org/~karltk/java/distfiles/mockobjects-java-${PV}-gentoo.tar.bz2"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+CDEPEND="=dev-java/junit-3.8*"
+# limiting to 1.4 jdk because there's some jdk-specific tests in build.xml that end with 1.4
+# also there's bug #119080
+# feel free to fix that and investigate workingness with 1.5+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5
+	test? ( dev-java/ant-junit )"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+S="${WORKDIR}/mockobjects-java-${PV}"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-junit.patch"
+	epatch "${FILESDIR}/${P}-java15.patch"
+
+	java-ant_rewrite-bootclasspath 1.5
+
+	mkdir -p out/jdk/classes || die
+
+	cd lib || die
+	java-pkg_jar-from junit
+}
+
+src_compile() {
+	# ecj doesn't like subclassing PrintWriter in 1.5
+	java-pkg_force-compiler javac
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	# doesn't seem any tests get actually run, why?
+	ANT_TASKS="ant-junit" eant junit
+}
+
+src_install() {
+	java-pkg_newjar out/${PN}-alt-jdk1.4-${PV}.jar ${PN}-alt-jdk1.4.jar
+	java-pkg_newjar out/${PN}-jdk1.4-${PV}.jar ${PN}-jdk1.4.jar
+	java-pkg_newjar out/${PN}-core-${PV}.jar ${PN}-core.jar
+	dodoc doc/README || die
+
+	use doc && java-pkg_dojavadoc out/doc/javadoc
+	use examples && java-pkg_doexamples src/examples
+	use source && java-pkg_dosrc src/core/com src/extensions/com \
+		src/jdk/common/com src/jdk/1.4/com
+}
diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
new file mode 100644
index 000000000000..9332e5af68bf
--- /dev/null
+++ b/dev-java/mojarra/Manifest
@@ -0,0 +1,3 @@
+DIST javax.faces-2.2.9-sources.jar 3098257 SHA256 f3ba4bcafcdac5e92bd784574e3f0b35ff4b7c56d07dda628a8e0246d1a40b27 SHA512 a398c7edd483af59e59c52896dfd6fbf67948cb9778940bb5045c6c4ee2e0549e24ee321dcf7a8bdadbbec82c7e533840bc42669e79664fa864627744b6cc0e3 WHIRLPOOL 040768e9aba1575137e4a1ef7bbf587fea71ff46119066a0fe5b72a9c0a1da647fbef1a712952efa0d59d51ca346366eefc0f79b7912cc7d071d695a39edf48c
+DIST mojarra-1.2_15-b01-FCS-patch.bz2 4369 SHA256 c8495b51225201bf23033a01bb853abf1cc0a40214aa6a68c7dd1c30812e6cd1 SHA512 125e511b052d4c70314a069c47ce72b51e4dd9d1c6826def6c1a8c0bf72f6c711a9fb9f05065a5f1f46dce8462b701198f67d257b1f0aa683b494b31d90205ac WHIRLPOOL 62efb9f165d40be7ba94be04046867b342d2ba39f340443bceb3f8b421c9be2c8c312ea9e04d7c743e6440fe124bd8566fa383013a9654b7758f180f659234c4
+DIST mojarra-1.2_15-b01-FCS-source.zip 5091287 SHA256 8678db1e93a2f605b696ae3a04e145bc14dd46409301ae230dc6ee4477ccb343 SHA512 6e8d8278aac36d3971bef523f8ec90a4959c0d6ec69642d5edd10379c2cdbe13242ad197475abda887b886f166b8c7ea762be5560a746f2426cec9c6a25c0144 WHIRLPOOL c5b2ab6a568468c2570d61d5cf8bc5f7147b403c9f7718c2ea32eda783605f48aa41c9f8a96cf48e13c10e5859061a527f40c003d7ff48a66571be6a69472559
diff --git a/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch b/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch
new file mode 100644
index 000000000000..d73ee9ce0596
--- /dev/null
+++ b/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch
@@ -0,0 +1,26 @@
+--- src/com/sun/faces/util/Util.java.orig	2015-06-08 21:08:39.770000000 +0000
++++ src/com/sun/faces/util/Util.java	2015-06-08 21:10:12.719000000 +0000
+@@ -315,13 +315,16 @@
+         // 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 stuff for the time being 

++        // since groovy 2.4 hasn't hit the tree... yet.

++        // 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..250f2d1940ea
--- /dev/null
+++ b/dev-java/mojarra/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/mojarra/mojarra-1.2.15-r2.ebuild b/dev-java/mojarra/mojarra-1.2.15-r2.ebuild
new file mode 100644
index 000000000000..300ac12a0646
--- /dev/null
+++ b/dev-java/mojarra/mojarra-1.2.15-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+WANT_ANT_TASKS="ant-trax"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="$(get_version_component_range 1-2)_$(get_version_component_range 3)-b01-FCS"
+
+DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
+HOMEPAGE="https://javaserverfaces.dev.java.net/"
+SRC_URI="https://javaserverfaces.dev.java.net/files/documents/1866/151669/${PN}-${MY_PV}-source.zip
+	mirror://gentoo/${PN}-${MY_PV}-patch.bz2"
+
+LICENSE="CDDL"
+SLOT="1.2"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+COMMON_DEP="
+	dev-java/glassfish-servlet-api:2.5
+	dev-java/groovy:0
+	dev-java/jakarta-jstl:0
+	dev-java/portletapi:1
+	"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	dev-java/ant-contrib
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/commons-digester:0
+	dev-java/commons-logging:0
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}-${MY_PV}-sources"
+
+src_prepare() {
+	epatch "${DISTDIR}/${PN}-${MY_PV}-patch.bz2"
+
+	mkdir -p "${S}/dependencies/jars" || die
+
+	# Should we remove those files? I don't see a reason to pull in three
+	# different web app server for this package.
+	rm -f \
+		"${S}/jsf-ri/src/com/sun/faces/vendor/GlassFishInjectionProvider.java" \
+		"${S}/jsf-ri/src/com/sun/faces/vendor/Jetty6InjectionProvider.java" \
+		"${S}/jsf-ri/src/com/sun/faces/vendor/Tomcat6InjectionProvider.java"
+
+	find -name '*.jar' -exec rm -f {} \;
+
+	cd "${S}/common/lib/"
+	java-pkg_jarfrom --build-only ant-contrib
+
+	cd "${S}/dependencies/jars"
+	java-pkg_jarfrom --build-only commons-beanutils-1.7
+	java-pkg_jarfrom --build-only commons-collections
+	java-pkg_jarfrom --build-only commons-digester
+	java-pkg_jarfrom --build-only commons-logging
+	java-pkg_jarfrom glassfish-servlet-api-2.5
+	java-pkg_jarfrom groovy
+	java-pkg_jarfrom jakarta-jstl
+	java-pkg_jarfrom portletapi-1
+}
+
+src_compile() {
+	cd "${S}/jsf-api"
+	eant -Djsf.build.home="${S}" -Dcontainer.name=glassfish jars
+
+	cd "${S}/jsf-ri"
+	eant -Djsf.build.home="${S}" -Dcontainer.name=glassfish jars
+}
+
+src_install() {
+	java-pkg_dojar "${S}/jsf-api/build/lib/jsf-api.jar"
+	java-pkg_dojar "${S}/jsf-ri/build/lib/jsf-impl.jar"
+	use source && java-pkg_dosrc "${S}"/jsf-api/src/* "${S}"/jsf-ri/src/*
+}
diff --git a/dev-java/mojarra/mojarra-2.2.9.ebuild b/dev-java/mojarra/mojarra-2.2.9.ebuild
new file mode 100644
index 000000000000..8a94ed405b29
--- /dev/null
+++ b/dev-java/mojarra/mojarra-2.2.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils 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:1.2.5
+	dev-java/tomcat-jstl-impl:1.2.5
+	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-1.2.5,tomcat-jstl-impl-1.2.5,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/msv/Manifest b/dev-java/msv/Manifest
new file mode 100644
index 000000000000..f79db9d7cd61
--- /dev/null
+++ b/dev-java/msv/Manifest
@@ -0,0 +1,2 @@
+DIST msv-core-2013.6.1-sources.jar 1011944 SHA256 5a76e0712cb97987b900eb7a7437ff0231abd8db94d3d4edd0d724c11372cffd SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a WHIRLPOOL e134144ee1daebb84749b8f6bbfb6646e3415c0de5a2e504e6d1c5257127df7ace79597c2bb216f9cd8dbaa80f394b3b02a872e7f15790932b3950cb591e3c26
+DIST msv.20050627.zip 3791703 SHA256 664759fd048d35ed1eea9dbad15cc04475e3c2c5509050cc85c9cbaf778e7278 SHA512 689d18f8091e7a1a213fb0ea49c89fd04020f4e152964ab6813fefee6b034aac591b3837d162366d9a1f6dc7e0a7d452d400bb7757b1e9488de9d019a212a16b WHIRLPOOL dfa8f07688f116c804c5aaf1b0d54bbeff9f9c4e7f20312a12b2b695c5cd71bc3f13b245825ac62a83146e4ed01776d053f747861cb2e0141bab8ba38397d00f
diff --git a/dev-java/msv/files/build-20050627-r2.xml b/dev-java/msv/files/build-20050627-r2.xml
new file mode 100644
index 000000000000..9d6908ce4bd7
--- /dev/null
+++ b/dev-java/msv/files/build-20050627-r2.xml
@@ -0,0 +1,62 @@
+<?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="dist.docs" value="${dist}/doc/api"/>
+
+   <property name="libdir" value="lib"/>
+
+   <property name="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+    <path id="lib.classpath">
+		<fileset dir="${libdir}">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <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}" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+		  <fileset dir="${build}"/>
+		  <fileset dir="${src}" includes="**/*.properties" />
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+	   <javadoc sourcepath="${src}" destdir="${dist.docs}" packagenames="*" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/msv/files/build-20050627-r3.xml b/dev-java/msv/files/build-20050627-r3.xml
new file mode 100644
index 000000000000..9d6908ce4bd7
--- /dev/null
+++ b/dev-java/msv/files/build-20050627-r3.xml
@@ -0,0 +1,62 @@
+<?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="dist.docs" value="${dist}/doc/api"/>
+
+   <property name="libdir" value="lib"/>
+
+   <property name="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+    <path id="lib.classpath">
+		<fileset dir="${libdir}">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <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}" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+		  <fileset dir="${build}"/>
+		  <fileset dir="${src}" includes="**/*.properties" />
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+	   <javadoc sourcepath="${src}" destdir="${dist.docs}" packagenames="*" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/msv/metadata.xml b/dev-java/msv/metadata.xml
new file mode 100644
index 000000000000..aec296600961
--- /dev/null
+++ b/dev-java/msv/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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-20050627-r2.ebuild b/dev-java/msv/msv-20050627-r2.ebuild
new file mode 100644
index 000000000000..24d24816f600
--- /dev/null
+++ b/dev-java/msv/msv-20050627-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Multi-Schema XML Validator, a Java tool for validating XML documents"
+HOMEPAGE="http://www.sun.com/software/xml/developers/multischema/ https://msv.dev.java.net/"
+SRC_URI="mirror://gentoo/${PN}.${PV}.zip"
+
+LICENSE="BSD Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0
+	dev-java/xml-commons-resolver:0
+	dev-java/xerces:2
+	dev-java/xsdlib:0"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${RDEPEND}"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp -i "${FILESDIR}/build-${PVR}.xml" build.xml || die
+	rm -v *.jar || die
+
+	mkdir lib && cd lib
+	java-pkg_jar-from iso-relax,relaxng-datatype,xerces-2,xml-commons-resolver,xsdlib
+}
+
+EANT_EXTRA_ARGS="-Dproject.name=${PN}"
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	dodoc README.txt ChangeLog.txt || die
+
+	use doc && java-pkg_dojavadoc dist/doc/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/msv/msv-20050627-r3.ebuild b/dev-java/msv/msv-20050627-r3.ebuild
new file mode 100644
index 000000000000..5a338e610a1a
--- /dev/null
+++ b/dev-java/msv/msv-20050627-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Multi-Schema XML Validator, a Java tool for validating XML documents"
+HOMEPAGE="http://www.sun.com/software/xml/developers/multischema/ https://msv.dev.java.net/"
+SRC_URI="mirror://gentoo/${PN}.${PV}.zip"
+
+LICENSE="BSD Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0
+	dev-java/xml-commons-resolver:0
+	dev-java/xerces:2
+	dev-java/xsdlib:0"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${RDEPEND}"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp -i "${FILESDIR}/build-${PVR}.xml" build.xml || die
+	rm -v *.jar || die
+
+	mkdir lib && cd lib
+	java-pkg_jar-from iso-relax,relaxng-datatype,xerces-2,xml-commons-resolver,xsdlib
+}
+
+EANT_EXTRA_ARGS="-Dproject.name=${PN}"
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dolauncher msv --main com.sun.msv.driver.textui.Driver
+
+	dodoc README.txt ChangeLog.txt || die
+
+	use doc && java-pkg_dojavadoc dist/doc/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
new file mode 100644
index 000000000000..d3ceef8970a7
--- /dev/null
+++ b/dev-java/msv/msv-20130601.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~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/mx4j-core/Manifest b/dev-java/mx4j-core/Manifest
new file mode 100644
index 000000000000..9caec33bdf50
--- /dev/null
+++ b/dev-java/mx4j-core/Manifest
@@ -0,0 +1,2 @@
+DIST mx4j-3.0.1-src.tar.gz 622504 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1bd0d92f48c9bea958e8cb5dcba SHA512 7e37b49f7b25475a8926caa74b3f2d252f106374db26063d4f9c72f2e7a32e9c90256ee763e8791ce6a1981cacf8d1848cf616c7771c734c3e05494681663465 WHIRLPOOL 333cadbdc1d166202960d9da1978ccb2c6620d86e3b5aec40101139295160615bd32a5ada4c9346513361b41b026913b5d328aad15dc2bdc858587e920521c47
+DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05
diff --git a/dev-java/mx4j-core/files/mx4j-core-3.0.1-split-javadoc-build.patch b/dev-java/mx4j-core/files/mx4j-core-3.0.1-split-javadoc-build.patch
new file mode 100644
index 000000000000..35c20fe9a8a6
--- /dev/null
+++ b/dev-java/mx4j-core/files/mx4j-core-3.0.1-split-javadoc-build.patch
@@ -0,0 +1,44 @@
+--- mx4j-3.0.1.orig/build/build.xml	2006-10-27 22:11:53.000000000 -0500
++++ mx4j-3.0.1/build/build.xml	2006-10-27 22:14:39.000000000 -0500
+@@ -417,7 +417,7 @@
+       </jar>

+    </target>

+ 

+-   <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools">

++   <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx">

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

+       <javadoc destdir="${dist.docs.api.dir}"

+          author="true"

+@@ -431,6 +431,23 @@
+          <group title="MX4J classes" packages="mx4j:mx4j.*"/>

+          <sourcepath>

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

++         </sourcepath>

++      </javadoc>

++   </target>

++

++   <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">

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

++      <javadoc destdir="${dist.docs.api.dir}"

++         author="true"

++         version="true"

++         use="true"

++         windowtitle="MX4J API"

++         classpathref="classpath">

++         <package name="mx4j.*"/>

++

++         <bottom><![CDATA[<center><small>Copyright &#169; 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>

++         <group title="MX4J classes" packages="mx4j:mx4j.*"/>

++         <sourcepath>

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

+          </sourcepath>

+       </javadoc>

+@@ -478,7 +495,7 @@
+ 

+    <target name="main" depends="tests, compile.examples"/>

+ 

+-   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs">

++   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core">

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

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

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

diff --git a/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch b/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch
new file mode 100644
index 000000000000..9fba649e1f45
--- /dev/null
+++ b/dev-java/mx4j-core/files/mx4j-core-3.0.2-split-javadoc-build.patch
@@ -0,0 +1,45 @@
+diff -Nru mx4j-3.0.2.vanilla/build/build.xml mx4j-3.0.2/build/build.xml
+--- mx4j-3.0.2.vanilla/build/build.xml	2008-06-17 15:32:02.000000000 +0200
++++ mx4j-3.0.2/build/build.xml	2008-06-17 15:34:06.000000000 +0200
+@@ -407,7 +407,7 @@
+       </jar>
+    </target>
+ 
+-   <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools">
++   <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx">
+       <mkdir dir="${dist.docs.api.dir}"/>
+       <javadoc destdir="${dist.docs.api.dir}"
+          author="true"
+@@ -421,6 +421,23 @@
+          <group title="MX4J classes" packages="mx4j:mx4j.*"/>
+          <sourcepath>
+             <pathelement path="${core.src.dir}"/>
++          </sourcepath>

++       </javadoc>

++    </target>

++ 

++    <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">

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

++       <javadoc destdir="${dist.docs.api.dir}"

++          author="true"

++          version="true"

++          use="true"

++          windowtitle="MX4J API"

++          classpathref="classpath">

++          <package name="mx4j.*"/>

++ 

++          <bottom><![CDATA[<center><small>Copyright &#169; 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>

++          <group title="MX4J classes" packages="mx4j:mx4j.*"/>

++          <sourcepath>

+             <pathelement path="${tools.src.dir}"/>
+          </sourcepath>
+       </javadoc>
+@@ -468,7 +485,7 @@
+ 
+    <target name="main" depends="tests, compile.examples"/>
+ 
+-   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs">
++   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core">
+       <mkdir dir="${release.dist.dir}"/>
+       <mkdir dir="${binary.release.dist.dir}"/>
+       <mkdir dir="${source.release.dist.dir}"/>
diff --git a/dev-java/mx4j-core/metadata.xml b/dev-java/mx4j-core/metadata.xml
new file mode 100644
index 000000000000..5d6507f94ff6
--- /dev/null
+++ b/dev-java/mx4j-core/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.
+
+JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems.
+
+This package has the jmx core. To get everything that upstream binary has emerge
+dev-java/mx4j with the appropriate use flags.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">mx4j</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/mx4j-core/mx4j-core-3.0.1.ebuild b/dev-java/mx4j-core/mx4j-core-3.0.1.ebuild
new file mode 100644
index 000000000000..955ea421a831
--- /dev/null
+++ b/dev-java/mx4j-core/mx4j-core-3.0.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${P/-core/}"
+DESCRIPTION="Open Source implementation of the JMX and JMX Remote API (JSR 160) specifications"
+HOMEPAGE="http://mx4j.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
+
+# The ${S}/BUILD-HOWTO is a good source for dependencies
+# This package could also be built with jdk-1.3; see special
+# handling instructions in ${S}/BUILD-HOWTO.
+
+RDEPEND="dev-java/bcel
+	dev-java/commons-logging
+	dev-java/log4j"
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.4
+	>=dev-java/ant-core-1.6
+	source? ( app-arch/zip )"
+RDEPEND="${RDEPEND}
+	>=virtual/jre-1.4"
+
+LICENSE="Apache-1.1"
+SLOT="3.0"
+KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
+IUSE="doc source"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-split-javadoc-build.patch"
+
+	cd "${S}/lib"
+	java-pkg_jar-from bcel bcel.jar
+	java-pkg_jar-from commons-logging commons-logging.jar
+	java-pkg_jar-from log4j
+}
+
+src_compile() {
+	eant -f build/build.xml compile.jmx compile.rjmx $(use_doc javadocs.core)
+}
+
+src_install() {
+	java-pkg_dojar dist/lib/*.jar
+	dodoc README.txt
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc "${S}/src/core/*"
+}
+
+pkg_postinst() {
+	elog "This is a a new split ebuild for just the core jmx to reduce"
+	elog "dependencies for packages that only require the core. You can"
+	elog "find the examples in dev-java/mx4j and the tools in dev-java/mx4j-tools"
+}
diff --git a/dev-java/mx4j-core/mx4j-core-3.0.2-r1.ebuild b/dev-java/mx4j-core/mx4j-core-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..145b245df1e4
--- /dev/null
+++ b/dev-java/mx4j-core/mx4j-core-3.0.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="${PN/-core/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Open Source implementation of the JMX and JMX Remote API (JSR 160) specifications"
+HOMEPAGE="http://mx4j.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz"
+
+CDEPEND="dev-java/bcel:0
+	dev-java/commons-logging:0
+	dev-java/log4j:0"
+DEPEND=">=virtual/jdk-1.6
+	>=dev-java/ant-core-1.6
+	source? ( app-arch/zip )
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+LICENSE="Apache-1.1"
+SLOT="3.0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc source"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="bcel,commons-logging,log4j"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-split-javadoc-build.patch"
+}
+
+src_compile() {
+	eant -f build/build.xml \
+		compile.jmx \
+		compile.rjmx \
+		$(use_doc javadocs.core)
+}
+
+src_install() {
+	java-pkg_dojar dist/lib/*.jar
+	dodoc README.txt
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc "${S}/src/core/*"
+}
+
+pkg_postinst() {
+	elog "This is a a new split ebuild for just the core jmx to reduce"
+	elog "dependencies for packages that only require the core. You can"
+	elog "find the examples in dev-java/mx4j and the tools in dev-java/mx4j-tools"
+}
diff --git a/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild b/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild
new file mode 100644
index 000000000000..108b89f919a0
--- /dev/null
+++ b/dev-java/mx4j-core/mx4j-core-3.0.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="${PN/-core/}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Open Source implementation of the JMX and JMX Remote API (JSR 160) specifications"
+HOMEPAGE="http://mx4j.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz"
+
+# The ${S}/BUILD-HOWTO is a good source for dependencies
+# This package could also be built with jdk-1.3; see special
+# handling instructions in ${S}/BUILD-HOWTO.
+
+RDEPEND="dev-java/bcel
+	dev-java/commons-logging
+	dev-java/log4j"
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.5
+	>=dev-java/ant-core-1.6
+	source? ( app-arch/zip )"
+RDEPEND="${RDEPEND}
+	>=virtual/jre-1.5"
+
+LICENSE="Apache-1.1"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc source"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-split-javadoc-build.patch"
+
+	cd "${S}/lib"
+	java-pkg_jar-from bcel bcel.jar
+	java-pkg_jar-from commons-logging commons-logging.jar
+	java-pkg_jar-from log4j
+}
+
+src_compile() {
+	eant -f build/build.xml compile.jmx compile.rjmx $(use_doc javadocs.core)
+}
+
+src_install() {
+	java-pkg_dojar dist/lib/*.jar
+	dodoc README.txt
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc "${S}/src/core/*"
+}
+
+pkg_postinst() {
+	elog "This is a a new split ebuild for just the core jmx to reduce"
+	elog "dependencies for packages that only require the core. You can"
+	elog "find the examples in dev-java/mx4j and the tools in dev-java/mx4j-tools"
+}
diff --git a/dev-java/mx4j-tools/Manifest b/dev-java/mx4j-tools/Manifest
new file mode 100644
index 000000000000..4d4079a16d29
--- /dev/null
+++ b/dev-java/mx4j-tools/Manifest
@@ -0,0 +1 @@
+DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05
diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.1-split-javadoc-build.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.1-split-javadoc-build.patch
new file mode 100644
index 000000000000..35c20fe9a8a6
--- /dev/null
+++ b/dev-java/mx4j-tools/files/mx4j-tools-3.0.1-split-javadoc-build.patch
@@ -0,0 +1,44 @@
+--- mx4j-3.0.1.orig/build/build.xml	2006-10-27 22:11:53.000000000 -0500
++++ mx4j-3.0.1/build/build.xml	2006-10-27 22:14:39.000000000 -0500
+@@ -417,7 +417,7 @@
+       </jar>

+    </target>

+ 

+-   <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools">

++   <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx">

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

+       <javadoc destdir="${dist.docs.api.dir}"

+          author="true"

+@@ -431,6 +431,23 @@
+          <group title="MX4J classes" packages="mx4j:mx4j.*"/>

+          <sourcepath>

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

++         </sourcepath>

++      </javadoc>

++   </target>

++

++   <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">

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

++      <javadoc destdir="${dist.docs.api.dir}"

++         author="true"

++         version="true"

++         use="true"

++         windowtitle="MX4J API"

++         classpathref="classpath">

++         <package name="mx4j.*"/>

++

++         <bottom><![CDATA[<center><small>Copyright &#169; 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>

++         <group title="MX4J classes" packages="mx4j:mx4j.*"/>

++         <sourcepath>

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

+          </sourcepath>

+       </javadoc>

+@@ -478,7 +495,7 @@
+ 

+    <target name="main" depends="tests, compile.examples"/>

+ 

+-   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs">

++   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core">

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

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

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

diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch
new file mode 100644
index 000000000000..25de4b50b8f5
--- /dev/null
+++ b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch
@@ -0,0 +1,37 @@
+diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java
+--- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2010-04-03 13:09:19.815790652 +0100
++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2010-04-03 13:09:29.096398617 +0100
+@@ -12,13 +12,13 @@
+ import java.io.IOException;
+ import java.io.ObjectInputStream;
+ 
++import com.caucho.hessian.io.AbstractDeserializer;
+ import com.caucho.hessian.io.AbstractHessianInput;
+-import com.caucho.hessian.io.Deserializer;
+ 
+ /**
+  * @version $
+  */
+-class JMXDeserializer extends Deserializer
++class JMXDeserializer extends AbstractDeserializer
+ {
+    private Class type;
+ 
+diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java
+--- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2010-04-03 13:09:19.815790652 +0100
++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2010-04-03 13:11:41.543862447 +0100
+@@ -13,12 +13,12 @@
+ import java.io.ObjectOutputStream;
+ 
+ import com.caucho.hessian.io.AbstractHessianOutput;
+-import com.caucho.hessian.io.Serializer;
++import com.caucho.hessian.io.AbstractSerializer;
+ 
+ /**
+  * @version $Revision: 1.3 $
+  */
+-class JMXSerializer extends Serializer
++class JMXSerializer extends AbstractSerializer
+ {
+    public void writeObject(Object obj, AbstractHessianOutput out) throws IOException
+    {
diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch
new file mode 100644
index 000000000000..9fba649e1f45
--- /dev/null
+++ b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch
@@ -0,0 +1,45 @@
+diff -Nru mx4j-3.0.2.vanilla/build/build.xml mx4j-3.0.2/build/build.xml
+--- mx4j-3.0.2.vanilla/build/build.xml	2008-06-17 15:32:02.000000000 +0200
++++ mx4j-3.0.2/build/build.xml	2008-06-17 15:34:06.000000000 +0200
+@@ -407,7 +407,7 @@
+       </jar>
+    </target>
+ 
+-   <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools">
++   <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx">
+       <mkdir dir="${dist.docs.api.dir}"/>
+       <javadoc destdir="${dist.docs.api.dir}"
+          author="true"
+@@ -421,6 +421,23 @@
+          <group title="MX4J classes" packages="mx4j:mx4j.*"/>
+          <sourcepath>
+             <pathelement path="${core.src.dir}"/>
++          </sourcepath>

++       </javadoc>

++    </target>

++ 

++    <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">

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

++       <javadoc destdir="${dist.docs.api.dir}"

++          author="true"

++          version="true"

++          use="true"

++          windowtitle="MX4J API"

++          classpathref="classpath">

++          <package name="mx4j.*"/>

++ 

++          <bottom><![CDATA[<center><small>Copyright &#169; 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>

++          <group title="MX4J classes" packages="mx4j:mx4j.*"/>

++          <sourcepath>

+             <pathelement path="${tools.src.dir}"/>
+          </sourcepath>
+       </javadoc>
+@@ -468,7 +485,7 @@
+ 
+    <target name="main" depends="tests, compile.examples"/>
+ 
+-   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs">
++   <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core">
+       <mkdir dir="${release.dist.dir}"/>
+       <mkdir dir="${binary.release.dist.dir}"/>
+       <mkdir dir="${source.release.dist.dir}"/>
diff --git a/dev-java/mx4j-tools/metadata.xml b/dev-java/mx4j-tools/metadata.xml
new file mode 100644
index 000000000000..b59408fa4e72
--- /dev/null
+++ b/dev-java/mx4j-tools/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.
+
+JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems.
+
+This package has the mx4j tools. To get everything that the upstream binary has emerge
+dev-java/mx4j with the appropriate use flags.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">mx4j</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/mx4j-tools/mx4j-tools-3.0.2-r1.ebuild b/dev-java/mx4j-tools/mx4j-tools-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..6d7f5a08a538
--- /dev/null
+++ b/dev-java/mx4j-tools/mx4j-tools-3.0.2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-ant-2
+
+MY_P=${P/-tools/}
+MY_PN=${PN/-tools/}
+
+DESCRIPTION="Optional tool classes and utilities for MX4J"
+HOMEPAGE="http://mx4j.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz"
+
+# The ${S}/BUILD-HOWTO is a good source for dependencies
+# This package could also be built with jdk-1.3; see special
+# handling instructions in ${S}/BUILD-HOWTO.
+
+# javamail and jython support is optional but because ant-core puts it in the classpath
+# if it is installed we can't force disable it without modifying the build.xml
+# and jikes refuses to compile mx4j with javamail support disabled
+
+# Optional jetty support can be enabled after jetty uses java-pkg_dojar to install jars
+
+CDEPEND="dev-java/bcel:0
+	dev-java/ant-core:0
+	dev-java/commons-logging:0
+	dev-java/log4j:0
+	www-servers/axis:1
+	dev-java/hessian:4.0
+	dev-java/jython:2.7
+	java-virtuals/servlet-api:3.0
+	java-virtuals/jaf:0
+	java-virtuals/javamail:0"
+DEPEND=">=virtual/jdk-1.6
+	source? ( app-arch/zip )
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+LICENSE="Apache-1.1"
+SLOT="3.0"
+KEYWORDS="amd64 x86"
+IUSE="doc source"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="bcel,commons-logging,log4j,axis-1,servlet-api-3.0,hessian-4.0,jython-2.7,jaf,javamail"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-split-javadoc-build.patch"
+	epatch "${FILESDIR}/${P}-new-hessian.patch"
+}
+
+src_compile() {
+	eant -f build/build.xml compile.tools $(use_doc javadocs.tools)
+}
+
+src_install() {
+	java-pkg_dojar dist/lib/mx4j-tools.jar
+	java-pkg_dowar dist/lib/mx4j-soap.war
+
+	dodoc README.txt
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc "${S}/src/tools/*"
+}
diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
new file mode 100644
index 000000000000..b19c903085c4
--- /dev/null
+++ b/dev-java/mx4j/Manifest
@@ -0,0 +1,2 @@
+DIST mx4j-3.0.2-src.tar.gz 618163 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266 SHA512 24014ff723b0880ca5f94b28d3c698659aa04258853e259b7b4025decbf27f0022cbe9da1101b8e2d4e5fb950bfabd9556a402a9b99e6122d0fca324e479ebf8 WHIRLPOOL 31c45b785fef2596bcdd39f0c8507db8ea315de97cd78e34ae3e473b71e644d91554c6601ddcc283a325c36a2215680b8138ab89f3bd817961119edf2c935f05
+DIST mx4j-3.0.2.tar.gz 4555894 SHA256 282bd68e517aba3d0f5bbf76f90c3c09e446c529e7796467ab7de65398bb1115 SHA512 a4b8b62530ce41a0e3170a0c31dbaf5251096b98e50f73eeebd725f29e5b7e920d8c7f03d486d72c7643e9ce069a86a048c080f019fd0053dce5e6774809a26f WHIRLPOOL 775f2b51664e3d05687b1e3fbb7b538e45e2918b8a079d2048a75a1f5aca1c323a2d0c1e8847ca94649973fc7e6f9bb324d44f76acb551fe1270138ae126ebbb
diff --git a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch b/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch
new file mode 100644
index 000000000000..25de4b50b8f5
--- /dev/null
+++ b/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch
@@ -0,0 +1,37 @@
+diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java
+--- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2010-04-03 13:09:19.815790652 +0100
++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2010-04-03 13:09:29.096398617 +0100
+@@ -12,13 +12,13 @@
+ import java.io.IOException;
+ import java.io.ObjectInputStream;
+ 
++import com.caucho.hessian.io.AbstractDeserializer;
+ import com.caucho.hessian.io.AbstractHessianInput;
+-import com.caucho.hessian.io.Deserializer;
+ 
+ /**
+  * @version $
+  */
+-class JMXDeserializer extends Deserializer
++class JMXDeserializer extends AbstractDeserializer
+ {
+    private Class type;
+ 
+diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java
+--- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2010-04-03 13:09:19.815790652 +0100
++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2010-04-03 13:11:41.543862447 +0100
+@@ -13,12 +13,12 @@
+ import java.io.ObjectOutputStream;
+ 
+ import com.caucho.hessian.io.AbstractHessianOutput;
+-import com.caucho.hessian.io.Serializer;
++import com.caucho.hessian.io.AbstractSerializer;
+ 
+ /**
+  * @version $Revision: 1.3 $
+  */
+-class JMXSerializer extends Serializer
++class JMXSerializer extends AbstractSerializer
+ {
+    public void writeObject(Object obj, AbstractHessianOutput out) throws IOException
+    {
diff --git a/dev-java/mx4j/metadata.xml b/dev-java/mx4j/metadata.xml
new file mode 100644
index 000000000000..ef5247c538ae
--- /dev/null
+++ b/dev-java/mx4j/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.
+
+JMX is an optional package for J2SE that provides a standard way to manage applications. It can also be used to wrap legacy systems and provide a standard interface to the outside world, enabling the development of web services. JMX allows developers to write more modular and loosely coupled system components and reduce the complexity of large, interoperating systems.
+
+Beginning with 3.0.1-r2 mx4j was split into three packages dev-java/mxj4-core,
+dev-java/mxj4-tools and dev-java/mx4j. This was done in order to reduce
+dependencies in packages that only require the core.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">mx4j</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/mx4j/mx4j-3.0.2-r1.ebuild b/dev-java/mx4j/mx4j-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..776bb7c6c1b3
--- /dev/null
+++ b/dev-java/mx4j/mx4j-3.0.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="examples source doc"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Metapackage for mx4j"
+HOMEPAGE="http://mx4j.sourceforge.net/"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz
+	doc? ( mirror://sourceforge/${PN}/${P}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="3.0"
+
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+CDEPEND="examples? (
+		dev-java/bcel:0
+		dev-java/log4j:0
+		dev-java/commons-logging:0
+		www-servers/axis:1
+		java-virtuals/servlet-api:3.0
+		dev-java/hessian:4.0
+		dev-java/jython:2.7
+		dev-java/gnu-jaf:1
+		java-virtuals/javamail:0
+	)
+	dev-java/mx4j-core:3.0
+	dev-java/mx4j-tools:3.0
+	!<dev-java/mx4j-tools-3.0.1-r1
+	"
+
+RDEPEND="
+	${CDEPEND}
+	examples? ( >=virtual/jre-1.6 )"
+
+# We always depend on a jdk to get the package.env created
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-new-hessian.patch"
+
+	if use doc; then
+		mkdir binary && cd binary
+		unpack "${P}.tar.gz"
+	fi
+
+	if use examples; then
+		cd "${S}/lib"
+		java-pkg_jar-from bcel bcel.jar
+		java-pkg_jar-from log4j
+		java-pkg_jar-from commons-logging commons-logging.jar
+		java-pkg_jar-from axis-1
+		java-pkg_jar-from hessian-4.0
+		java-pkg_jar-from jython-2.7 jython.jar
+		java-pkg_jar-from gnu-jaf-1 activation.jar
+		java-pkg_jar-from --virtual javamail mail.jar
+		java-pkg_jar-from --virtual servlet-api-3.0 servlet-api.jar
+	fi
+}
+
+src_compile() {
+	cd build
+	if use examples; then
+		eant compile.examples
+	fi
+}
+
+src_install() {
+	dodoc README.txt RELEASE-NOTES-* || die
+
+	if use examples; then
+		java-pkg_dojar dist/examples/mx4j-examples.jar
+		dodir /usr/share/doc/${PF}/examples
+		cp -r src/examples/mx4j/examples/* "${D}usr/share/doc/${PF}/examples"
+	fi
+
+	use source && java-pkg_dosrc src/examples/mx4j
+
+	if use doc; then
+		local docdir="${WORKDIR}/${P}/binary/${P}/docs"
+		java-pkg_dojavadoc "${docdir}/api"
+		dohtml -r "${docdir}/images"
+		dohtml "${docdir}"/{*.html,*.css}
+	fi
+
+	# Recording jars to get the same behaviour as before
+	local jars="$(java-pkg_getjars mx4j-core-3.0,mx4j-tools-3.0)"
+	for jar in ${jars//:/ }; do
+		java-pkg_regjar "${jar}"
+	done
+}
+
+pkg_postinst() {
+	elog "Although this package can be used directly with java-config,"
+	elog "ebuild developers should use mx4j-core and mx4j-tools directly."
+}
diff --git a/dev-java/nachocalendar/Manifest b/dev-java/nachocalendar/Manifest
new file mode 100644
index 000000000000..a050faa22d25
--- /dev/null
+++ b/dev-java/nachocalendar/Manifest
@@ -0,0 +1 @@
+DIST nachocalendar-src-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe
diff --git a/dev-java/nachocalendar/metadata.xml b/dev-java/nachocalendar/metadata.xml
new file mode 100644
index 000000000000..71dbb743752c
--- /dev/null
+++ b/dev-java/nachocalendar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+		<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.ebuild b/dev-java/nachocalendar/nachocalendar-0.23.ebuild
new file mode 100644
index 000000000000..7086110beb22
--- /dev/null
+++ b/dev-java/nachocalendar/nachocalendar-0.23.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Flexible Calendar component to the Java Platform"
+HOMEPAGE="http://nachocalendar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/junit )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -r doc || die
+	rm -v lib/* || die
+}
+
+src_install() {
+	java-pkg_newjar lib/${P}.jar ${PN}.jar
+	java-pkg_newjar lib/${P}-demo.jar ${PN}-demo.jar
+	java-pkg_dolauncher nachocalendar-demo --main net.sf.nachocalendar.demo.CalendarDemo
+	dodoc {CHANGELOG,README,TODO}.txt || die
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc src/java/net
+}
+
+src_test() {
+	cd src/test || die
+	ejavac -cp \
+		"${S}/lib/${P}.jar:$(java-pkg_getjars --build-only junit)" \
+		./net/sf/nachocalendar/model/DefaultDataModelTest.java
+	ejavac -cp \
+		"${S}/lib/${P}.jar:$(java-pkg_getjars --build-only junit)" \
+		./net/sf/nachocalendar/model/DefaultDateSelectionModelTest.java
+	ejunit -cp ".:${S}/lib/${P}.jar" \
+		net.sf.nachocalendar.model.DefaultDataModelTest \
+		net.sf.nachocalendar.model.DefaultDateSelectionModelTest
+}
diff --git a/dev-java/nailgun/Manifest b/dev-java/nailgun/Manifest
new file mode 100644
index 000000000000..0a2a84d95ca1
--- /dev/null
+++ b/dev-java/nailgun/Manifest
@@ -0,0 +1 @@
+DIST nailgun-src-0.7.1.zip 1489813 SHA256 2942760e68fabab1afc3bc447545cb532ae7bd6e779ca4af8b3163d629076e72 SHA512 51867248179487b042f3fe93585390b972d1d95928f92fc6b342c3ae663696b251fcd074c8042c6ae129947105e2203cb256a987b46dd8499bb3964302f1ccae WHIRLPOOL 7c24f82a260eaef397fc694f5e15abfe86c2463d644366bf4d59904cf632e301ec5c9f26d0a63aff4491c196bbf3b8dfa612862e59d488eaf3af6076abacd1d8
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..b25a04437581
--- /dev/null
+++ b/dev-java/nailgun/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..bc61ac38f0e6
--- /dev/null
+++ b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="a client, protocol, and server for running Java apps without incurring the 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 ~ppc 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..60f31ee38b7d
--- /dev/null
+++ b/dev-java/nanoxml/Manifest
@@ -0,0 +1 @@
+DIST NanoXML-2.2.3.tar.gz 426111 SHA256 df3bd3663b766851caffba963853383cff813695dca3e827ce6e00a920d544fa SHA512 6800b86039cb555efc05644db65c516fb242d4d081ea612969d6cc52a12ffd7571e012a7afe7962cd61c28b0ebb3b9d94af76f20013f3b4dd7d2aacdc552c6fc WHIRLPOOL 3164e5c09b2e42058da1c2c3df55512dfc75245dca7857fb46085f1a6b0a8a4360397026825a6e0f3ce66fab9c55774ad65ee9d6daf072ee9f0bae42d6509882
diff --git a/dev-java/nanoxml/metadata.xml b/dev-java/nanoxml/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/nanoxml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild b/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild
new file mode 100644
index 000000000000..2f5f1882abd1
--- /dev/null
+++ b/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="NanoXML is a small non-validating parser for Java. "
+
+HOMEPAGE="http://nanoxml.sourceforge.net/"
+MY_P=NanoXML-${PV}
+SRC_URI="http://nanoxml.cyberelf.be/downloads/${MY_P}.tar.gz"
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+COMMON_DEP="dev-java/sax"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/ThirdParty/SAX
+	java-pkg_jar-from sax
+	cd ${S}
+
+	local docsed
+	if use doc; then
+		docsed="javadoc -source $(java-pkg_get-source)"
+	else
+		docsed="true"
+	fi
+
+	# Use the right arguments for javac/javadoc
+	sed -e "s:/tmp/:${T}/:g" \
+		-e "s/javac/javac $(java-pkg_javac-args)/" \
+		-e "s/-target 1.1//" \
+		-e "s/javadoc/${docsed}/" \
+		-i build.sh || die "failed to sed"
+}
+
+src_compile() {
+	./build.sh || die "failed to build"
+}
+
+src_install() {
+	java-pkg_dojar Output/*.jar
+
+	dohtml -r Documentation/NanoXML-*
+	use doc && java-pkg_dojavadoc Documentation/JavaDoc
+}
diff --git a/dev-java/nekohtml/Manifest b/dev-java/nekohtml/Manifest
new file mode 100644
index 000000000000..047e9408e595
--- /dev/null
+++ b/dev-java/nekohtml/Manifest
@@ -0,0 +1 @@
+DIST nekohtml-1.9.18.tar.gz 10471968 SHA256 fbb0dc6bdc07a1b4c4cc7ab32197f1aa431a506e33caf6cfb8130766c22475c0 SHA512 f7321ad853eb63e327ef8bada52892caf58372f11136df72f46d8a7cd6918492cc66243002955525ac05fd669b3c4389e9067421f749f99f928629cc7f88e0eb WHIRLPOOL 8b7208ba84bdce1da6fdca17548f5c8b98a85a6d39f2695ddf776508c5b0dc3a724fbe994f64c37b62a718a36e41b8dfe28c73bbb7da7c0347485ebf8b811336
diff --git a/dev-java/nekohtml/files/nekohtml-0.9.5-xerces.patch b/dev-java/nekohtml/files/nekohtml-0.9.5-xerces.patch
new file mode 100644
index 000000000000..c3fa2cc0ba0a
--- /dev/null
+++ b/dev-java/nekohtml/files/nekohtml-0.9.5-xerces.patch
@@ -0,0 +1,16 @@
+Only in nekohtml-0.9.5-patched/: .build-html.xml.swp
+diff -ru nekohtml-0.9.5/src/html/org/cyberneko/html/HTMLScanner.java nekohtml-0.9.5-patched/src/html/org/cyberneko/html/HTMLScanner.java
+--- nekohtml-0.9.5/src/html/org/cyberneko/html/HTMLScanner.java	2005-06-19 00:04:02.000000000 -0400
++++ nekohtml-0.9.5-patched/src/html/org/cyberneko/html/HTMLScanner.java	2006-10-12 00:42:08.000000000 -0400
+@@ -3274,4 +3274,11 @@
+ 

+     } // class LocationItem

+ 

++	public String getXMLVersion() {

++		throw new UnsupportedOperationException("Not implemented yet.");

++	}

++	public int getCharacterOffset() {

++		throw new UnsupportedOperationException("Not implemented yet.");

++	}

++

+ } // class HTMLScanner

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..6ecee9585b31
--- /dev/null
+++ b/dev-java/nekohtml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..706355871547
--- /dev/null
+++ b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..76d67fea6065
--- /dev/null
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/netbeans-apisupport/metadata.xml b/dev-java/netbeans-apisupport/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-apisupport/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..69ee7cfdb591
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.0.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-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-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
new file mode 100644
index 000000000000..8f9799522bc7
--- /dev/null
+++ b/dev-java/netbeans-cnd/Manifest
@@ -0,0 +1,7 @@
+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 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 C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
+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
diff --git a/dev-java/netbeans-cnd/metadata.xml b/dev-java/netbeans-cnd/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-cnd/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..8f7714902880
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.0.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-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="~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-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
new file mode 100644
index 000000000000..dfed2dabb576
--- /dev/null
+++ b/dev-java/netbeans-dlight/Manifest
@@ -0,0 +1,3 @@
+DIST 457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip 283369 SHA256 2da5ca58d9960bb19f3b573709c0f73a408cbd94a19e89abfcc261b85decf9d2 SHA512 60a742dad5967c2eb5350d62cfc39925a4413fc4dc904ebdf1e6a04849a4f659dc75ff6166189957854d1241badc0bc0925aa868509d96495f41f4d91565a545 WHIRLPOOL 27e8e1219ee65f87b4cf0a24ac9955bbf65e33d4cd2315bfc9c157b170b6b9eba1d703a72a4a1a2ae05462b6c8c99b82b1e908362d65bfc36685e2c1ccb75b5f
+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
diff --git a/dev-java/netbeans-dlight/metadata.xml b/dev-java/netbeans-dlight/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-dlight/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..fec6ed7f54d9
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.0.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
new file mode 100644
index 000000000000..f2c210918241
--- /dev/null
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -0,0 +1,34 @@
+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
diff --git a/dev-java/netbeans-enterprise/metadata.xml b/dev-java/netbeans-enterprise/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-enterprise/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2.ebuild
new file mode 100644
index 000000000000..f18b01ae1d5e
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
new file mode 100644
index 000000000000..76d67fea6065
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/netbeans-ergonomics/metadata.xml b/dev-java/netbeans-ergonomics/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..64a7ad63edb2
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.0.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-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-extide/Manifest b/dev-java/netbeans-extide/Manifest
new file mode 100644
index 000000000000..4ce901333a92
--- /dev/null
+++ b/dev-java/netbeans-extide/Manifest
@@ -0,0 +1,4 @@
+DIST 22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip 2318445 SHA256 9d251f217f0f39c098d4fa576d77c720f8039b43becb15d88912d9c3fdcd2c3e SHA512 c696b7984a663257210b03bb9a7d4a8da8a53d7e727de068558380b14c0f17aefe8cfe310c0b96f277010756b277f500629db3c9d9a1fcf38f5113708d8dbd34 WHIRLPOOL a8e55e84ee661eb951dec065cf0f2ac6f19720a30bbe8432c95a56d531fdd2bb48a8359946fc8a1bc8d789a568bfed87bcdee04efdc86be58a518434616d6641
+DIST 95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip 95179 SHA256 040359927e4e0e77f28649de1618a5170200c31b00b5f4ac53fb5a06dfeee886 SHA512 977c9cd7c91c3ccce4d8bd9bafe6302c99bae2bc8e53ab1776602ba1e61770ac1a68c1109aeb6d609126a1916b3f4d961d2574a7d6b8a280262878e022c5edb5 WHIRLPOOL e1671f868a0da75d31408e1a91ebeaaa4ed03f40bc2a8040ba8e5d4b1ffe0dc71e2874d96240df0d0c9170bd0f12fca25a565504ba91462422f9f4de65a51208
+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
diff --git a/dev-java/netbeans-extide/metadata.xml b/dev-java/netbeans-extide/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-extide/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..96bc08a7c50e
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-8.0.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
new file mode 100644
index 000000000000..413f178401f0
--- /dev/null
+++ b/dev-java/netbeans-groovy/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/dev-java/netbeans-groovy/metadata.xml b/dev-java/netbeans-groovy/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-groovy/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..469896db255b
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.0.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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-harness/Manifest b/dev-java/netbeans-harness/Manifest
new file mode 100644
index 000000000000..425313432b20
--- /dev/null
+++ b/dev-java/netbeans-harness/Manifest
@@ -0,0 +1,7 @@
+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
diff --git a/dev-java/netbeans-harness/metadata.xml b/dev-java/netbeans-harness/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-harness/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..5f244b02b6b1
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-8.0.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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-ide/Manifest b/dev-java/netbeans-ide/Manifest
new file mode 100644
index 000000000000..f924f80b67a1
--- /dev/null
+++ b/dev-java/netbeans-ide/Manifest
@@ -0,0 +1,77 @@
+DIST 010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar 161749 SHA256 c2796b7d2b374f82ae6e4b89cab5b27fcd075c01829e10efe184a2fe5e8749a4 SHA512 4a3c60974562aa45b11341b610abdaa22de6af183c19c1c01df63afa107b53e6d0079f19ae36bf1acb2e4428996aa2c349acc2442a0a25124929da53b07739e5 WHIRLPOOL 51dc17ad690383ed1211fbaddebc654c6393e20451f4a4eadbb55d93d31987eb4f5bd0d479a690aec447e89f83c0c40a075104163cfe68141dda18eab910ddd5
+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 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 136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar 46335 SHA256 695258f8e819d274fba3356c035ddfe12a39464a770e7b0a9bee30ad45233d01 SHA512 bd51d73f0afe58a6ce61566427b46dfdfe877aff401233fb5c58f9bce4b0e7fe8c30bffb16595bca1af6bf36cf9c2f4f1f3c841419c506b1484f5566658a818f WHIRLPOOL 7475afda3af8e12113ee19d87ba6f3098dc2a737661fcb6d095c4067c5efc83e0219daf5991b5ce52db9232365b54165e4273bcc68b0d7a3c825f0e44fbf89f1
+DIST 19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar 121404 SHA256 51d2484ea7077a10df7b932f8eafe503b5f299b5c6b186d78ebdb12905828e5f SHA512 9e6c2ec92f4e2ae48f73ed8a83ed0e7b5097f4e4afc22a9f30bda56d06e272570f6dc77ed8c62f1ef254e7d94b1463e9735fea11325490da7cca4981cadefa48 WHIRLPOOL 8d43115a28b3e644967a238afb1a85b0cf7aa34d7c660d571c53dddcbfaad5259dc9153efbbdbc09a62bd2e45aa0ebedcc8492bc9047dbdef36dbabeaf72f4bd
+DIST 1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar 376801 SHA256 9eef4f5c8a3fd617e718b8fb90354d6e5a0871d7ed3b246f0db01311cb0f7c7a SHA512 e21f9f0c5ebe342ec2effa9a3a99404cfbef5e6fe99ff761274dce16af95a0d6ca3c2ea9af928d2538b11ab3aa17ffbc360a1d69f787d2ffea4e7b3544188bf9 WHIRLPOOL 1347011b54f33d03dc699be266bc5b1dbbb6917db541d596bb927d1287794637ebc415c49ce44727a4fc3a6ce89f705f73380c272b3034e2e8e232d0a9d4e03c
+DIST 23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip 401328 SHA256 c0b63e8b5f246574ce5571e1fbc6b716b68a9e64bf9433800a61777e5ccaf3e2 SHA512 e76ae7f1cb6679bc69534ca9d24dc72f545f8e8fd849f57f746cbc73762729bd872f79c524e2dfd3f481d9d9cbe60a08bd85f383e843ccd39bcbf777db786e9f WHIRLPOOL a53f65f3017cc8619b570e563fbac4185fdc0d52c451386c35dabfa7f23f02544c8493e3d0b9bb4de332cc60858a3b87fe95bba76c5e3149ed9e91e61631da49
+DIST 24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar 192528 SHA256 14a00bf150c00853ad66bcdca91e446410df1014b2843727eb8249b609ba6d01 SHA512 eee56bdcc0cdfb94914a0e5e075c45a768b7e449f894363e15c5f106bb0038b57be0d3ba802a36038a70a848a09271d90aac118fd6e9c6f422391afed21ebf86 WHIRLPOOL a8ad7690c8615ffef9dee07a2ee63bba2f52119122ddfdd4e90111fcd95988985a069d226556f0378a895d0ede2160b575cd8e66005430d34647ef04f4ba9a68
+DIST 27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip 428971 SHA256 e8a264a9f8951347bd133033e29790964773b74ecac2e924acfdac332aaa89e1 SHA512 02b724efadfa66260780e641396f2cf96347769b328b291cbf914ae1363e26324a1a887a583f5ed6b3f23f1d704283e5142e3fa46987b6978af06ccd6880a265 WHIRLPOOL 2376a650fee7737e4f6e8698449ecf756639c4e6edd4a95261846cb93cb4e8f7de4bb1272651b8e956a6a95806e733b7db56634f19b86bf72b9013e9a22e079c
+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 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 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 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
+DIST 4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar 3778995 SHA256 db07fac55e4d689ab4e4107c67679aff116788f488caf35980bfcf7792641651 SHA512 3d9f273fbf1187c69f88a8d5741841f9b6ac0edeb8dd9df0610390bc4f7bbafc63d872621e26c5093dcb792986657ae2d0f691caedd249f7b861d0a552134d58 WHIRLPOOL 7704b47754260e085a1fcfc2a03389e25e7896d4c64babc7b663b510c7eb4dd3289b7e0e8a8f65fc5093eeb8a6e5517ace9d1111083fcc937501555395baced7
+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 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 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 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 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 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 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 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 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 A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip 10071 SHA256 d4803bf165603f9aa566c19e70fd27f89dc5e5626546b881d4f741a19f7cb969 SHA512 49d2f3b0ec16b5dc1c3b461c1154636698211880376facb1165afc13816f88f625d76055008b9c88e603d5dc55246c52b4ec8cb26667d41a7a27372ccd917d42 WHIRLPOOL 25eae3982cabc6d9774a26d803b60a07a21a2908829aac807609f88645f1d3e93a0b02567f82189c295a6437bf53a91b83938ba5cf4a1e8311b48a4a7bd7bf72
+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 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 C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar 1487304 SHA256 5bc8bb080fdf3ef968485ae90f7877fbcfc05b2cfe4753824acb5a36a1ee2036 SHA512 7c1bec8fc317a13a0353ae95320bf57afb81997e4bcf484b365ad12940c4eeed2e414ec01ded4d9b6bcb4239d59baaf78e2b51829fbd28dd034d768193d87a7d WHIRLPOOL d93252d0c59913213cedd26adefcf9834ab45be5fbcde2a3406c7af74fab31d73ff422a49695911cfcee3e2247e9dfea872eba66b4901c35315f644983c40f7f
+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 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 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 D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar 434027 SHA256 0f27e304afffa14dae2932fb16588846f1f8b78b11e9bc5562ebb40c6c33c237 SHA512 f0758b9bce6ddef27f8bd60cce8ed9b4874b45307a64d9b9ff6a62519fde5b19733c3c236686bde4a1d87a94e7a2dfc08cc8d03bd3bb28a6b297bd40a8272fd4 WHIRLPOOL ef9c2a9751ceec4108a9523f29d7401bcdc6cb79f6cfb9d2a55b2b2d3236764da3606fc128a469ee03a6800f1d03aaec59934910a112813d6101686238e135b8
+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 E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar 69180 SHA256 d01eb1dfeb6806c34f957035252855e76da791d1e2f273db24a40a511e87c7d9 SHA512 3a2ee75681c54ad11048fcd9c06678c4088c32f29896a4851e037beb5ec70977898d1d3935cc731479b881765de80cb1cb77098dafccce948bb623e723534320 WHIRLPOOL d6daa7e39cfdb9c86d16a8f5c39e548b700f7ee03fbd656506a4788b19ee1ee6247b745ec40dfa526662859befd2412ffb682ba0df80bae8d0c111e7f91537ef
+DIST EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar 761996 SHA256 df7463424e3560f5e8c8003e1816c0a6ea6e84673921ca5af05b90b0892b3c97 SHA512 4923bbfcd0531d6807debc9ac0d8a1e10576eb2ed8a224ccb3bbba7e4f172d97b1d41f708398943b1298db15335fdd8919f1c8d9ba0ceb2170f7bf935cb7e470 WHIRLPOOL 755ff43f93d09733c6c4e41938e777d86273b5be8a475e4b32e1766bb0ee01c523ccd24197af9e133401cd15a4be08b72b34eae54c2645f434ca8065f51bbc05
+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 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
diff --git a/dev-java/netbeans-ide/metadata.xml b/dev-java/netbeans-ide/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-ide/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.0.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.0.2.ebuild
new file mode 100644
index 000000000000..c0f840eaaea2
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.0.2.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+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}
+	http://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-linking-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:4.4
+	dev-java/iso-relax: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: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-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.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-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.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-java/Manifest b/dev-java/netbeans-java/Manifest
new file mode 100644
index 000000000000..65434b7295c5
--- /dev/null
+++ b/dev-java/netbeans-java/Manifest
@@ -0,0 +1,23 @@
+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 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 SHA256 18a77f915276751b01ed8e7feaf344e78f5ea62bf53b7bb6a821a22865165044 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727 WHIRLPOOL 7aeb90a8661d8eaa2ee2a5953932e3b829187554bf605bb5e55abb42edb82ff13a6e4b4acb8f3615a74961f044ebaf19343e3d403a476a019890cadeead73dd5
+DIST 562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar 23838 SHA256 0c05ac203cfc63f1a6d59dea84d915220e18e8e37a57cfbb317e769f992f3e8f SHA512 a39da963b1e0c0111870bc3989e10c70dd136c0276099b48cadc70706f76b0b2ba1ece6df67c05bf8e26a4638b19b28b454df6c23ed5a9d4936d3cc5506ec4b1 WHIRLPOOL 88043adc7057b68647d9205782e46a2d7824533b9a46366e7949459e88fd2ac7be6dcd1bc1c7371e071c7efc5fcf6d3956c211f97932cee0e0a4f47c58db6983
+DIST 5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar 162126 SHA256 227c4888011550cad0aed4c07e187b9f8e873c01558a08f014d288987415a9a9 SHA512 de26d1e19a625adb040b6aa870762ecf8f1ffdfb2c82f58cc7a82f1a029249862dcfd39b6a995f63f04d9b36ef23a8ba8518c9cff1b5e2242e6ad5268790b5ba WHIRLPOOL 20dff7b96369cda98dace4dc38f7e013de9ccf7119047183f936bd58e1d8c6154fa913f906dd1996d8e989d16a4e92502aacf937f730a8b63728208b96455a7f
+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 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 BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar 56032 SHA256 817762baeabb24daf8a41a9716e31f85a7659147d09264a499f4d35b0fe04115 SHA512 c84d4066b9519cf2c00d5d4f054865693cd1665e5db3b30f6e77b44a7c0d3055cc40a1641b805ea38d2294e2cab1a27fab85035950ff0d94960a4de185bcc76b WHIRLPOOL aae6bc05d3b441443b9f0d80e65fde81614b0206eee5714f4e51ceaa0adb778758a5d65efb3a4963111f3b258753e0154447914a5586251883d22b0c1e09f9f3
+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 F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 SHA256 5f41fe1ef8a7607bafbc04baa7814aecaf72b90a6fa796adec0846f50f8ac7f0 SHA512 0a65813cf76e997b362a0ce48ec55ac180907a7af6062c6f86f96448775164c2bf67c147920f2bfa6a8eb24c14046acf66d0ee9a5481bd7b9b251774a86a7db6 WHIRLPOOL edd56a338e08e788a307849794387069a60b1873a3a8fa29e1e7045fbf8a2f1ff175e68579df3789fdf6af8f7f94de2430560a89de48d64c22e76b1fe95b6505
+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
diff --git a/dev-java/netbeans-java/metadata.xml b/dev-java/netbeans-java/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-java/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/netbeans-java/netbeans-java-8.0.2-r2.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.2-r2.ebuild
new file mode 100644
index 000000000000..4f91ea2088f3
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-8.0.2-r2.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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:1.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: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-1.0 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
+	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 && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	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-1.0/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-r3.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.2-r3.ebuild
new file mode 100644
index 000000000000..f075fddec61b
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-8.0.2-r3.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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: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
+	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 && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	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-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
new file mode 100644
index 000000000000..de6ecb2e79ff
--- /dev/null
+++ b/dev-java/netbeans-javacard/Manifest
@@ -0,0 +1,5 @@
+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
diff --git a/dev-java/netbeans-javacard/metadata.xml b/dev-java/netbeans-javacard/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-javacard/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..11abb4f599c1
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.0.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
new file mode 100644
index 000000000000..dce6fb0e75bb
--- /dev/null
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -0,0 +1,3 @@
+DIST 22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip 2318445 SHA256 9d251f217f0f39c098d4fa576d77c720f8039b43becb15d88912d9c3fdcd2c3e SHA512 c696b7984a663257210b03bb9a7d4a8da8a53d7e727de068558380b14c0f17aefe8cfe310c0b96f277010756b277f500629db3c9d9a1fcf38f5113708d8dbd34 WHIRLPOOL a8e55e84ee661eb951dec065cf0f2ac6f19720a30bbe8432c95a56d531fdd2bb48a8359946fc8a1bc8d789a568bfed87bcdee04efdc86be58a518434616d6641
+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
diff --git a/dev-java/netbeans-javadoc/metadata.xml b/dev-java/netbeans-javadoc/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-javadoc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..dae6fd676be8
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.0.2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
new file mode 100644
index 000000000000..8d3ee443e25b
--- /dev/null
+++ b/dev-java/netbeans-javafx/Manifest
@@ -0,0 +1,8 @@
+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 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
diff --git a/dev-java/netbeans-javafx/metadata.xml b/dev-java/netbeans-javafx/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-javafx/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..c734656db311
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.0.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
new file mode 100644
index 000000000000..76d67fea6065
--- /dev/null
+++ b/dev-java/netbeans-mobility/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/netbeans-mobility/metadata.xml b/dev-java/netbeans-mobility/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-mobility/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..d6f96b01b5ac
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.0.2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-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-nb/Manifest b/dev-java/netbeans-nb/Manifest
new file mode 100644
index 000000000000..ab8e33f41a90
--- /dev/null
+++ b/dev-java/netbeans-nb/Manifest
@@ -0,0 +1,3 @@
+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
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..8598dae6395c
--- /dev/null
+++ b/dev-java/netbeans-nb/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..9ac92d276c8c
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-8.0.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-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-php/Manifest b/dev-java/netbeans-php/Manifest
new file mode 100644
index 000000000000..b0865e76508e
--- /dev/null
+++ b/dev-java/netbeans-php/Manifest
@@ -0,0 +1,5 @@
+DIST 0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip 38814 SHA256 b49d6683562098839b7303da877242d0c017ae217db5c442cce33cf1559e733f SHA512 75773b7067a0ec98263bdd2e9fdda77ae05e415b19b12e828ca92085266380f19980ffcdfdfac5a7f284fd2292b3af47ee93938b034f77397d8ade129fec6076 WHIRLPOOL 9a6080379a2c30d6add51c141b8126abc786c2e060a32ed0e377503002a6a1087b99605fae0dfe30bcf60f43fcef65fff4fc30858e15488f932c9b7caef224e9
+DIST 3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip 4593 SHA256 156a35bf95b0353f05e91f1f8f591b5f8124d99cbdf380e32d03f07f889f2146 SHA512 66efd8c6f586c501e19d0b1f04ab212c955ffbd67bf489a9c60b37e0f93733c75b86b01462cf78ba8877b4baff723659d9753458aeb8a0150fbddd4d81ab1b01 WHIRLPOOL 70e28e715335b3119c2c18f3b8736869d7aba4c08555ef5b20a5151eeaf79a8d4c4d94a20a283fa219a7d336c91fed84c86a7424b7a571d152e1fa2e59b37a86
+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
diff --git a/dev-java/netbeans-php/metadata.xml b/dev-java/netbeans-php/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-php/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..f2b3792bc983
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-8.0.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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-platform/Manifest b/dev-java/netbeans-platform/Manifest
new file mode 100644
index 000000000000..dcd592140a9a
--- /dev/null
+++ b/dev-java/netbeans-platform/Manifest
@@ -0,0 +1,8 @@
+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 972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar 234898 SHA256 d80c97da091ccc495479980aca82bb9ade3c3239fbc60b5f3840440ed3fe785d SHA512 889ebf198602afd574774ea3f41898f497d7f9af8e9a6397f6555d6fa7ac690e6e7e2e869e181636528f7a5b32204866e53250f6ce790d05763fcea4c8649d16 WHIRLPOOL 47cd43dd5732fe6a773ed50047af2786dd3d4ba712ae5f70c1f80571e835fbbdef68ee90ef3dde9d8e10a0e983f213656acbe287d7d6262c8a0bd0925799d35b
+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 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
diff --git a/dev-java/netbeans-platform/metadata.xml b/dev-java/netbeans-platform/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-platform/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..52e1b72e6093
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-8.0.2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
new file mode 100644
index 000000000000..76d67fea6065
--- /dev/null
+++ b/dev-java/netbeans-profiler/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/netbeans-profiler/metadata.xml b/dev-java/netbeans-profiler/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-profiler/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..6e57047e9a5b
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.0.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.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="~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-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
new file mode 100644
index 000000000000..c97cd6a0f228
--- /dev/null
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -0,0 +1,10 @@
+DIST 08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar 15474 SHA256 e084148590cdacdd2fc9db9bb0e8a86f46df56b3213121534e42829c5a1f917f SHA512 91ecd525f39d4e664269cb6886b1e5545561203da9631dce9efdc77a46cb9d442f88e90030c7ac9c1c9e3561b8a4ffc1d949239a50a689963a4370de8832090c WHIRLPOOL f3db920768f72ce0e5cfc8601dfdc32dc1171c6036b36c6fd4d47bedcf9602cdc51bcba5b56aec9881c9ff035c8f76f42aba714e4c607201dfd75a969e511ddb
+DIST 20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip 5225948 SHA256 a3b1ff2204bdd30a269ef4ff073c3ea8600367efe9c975b5eed9b4448d6a3957 SHA512 414dd6a37125d591974dd673e3a7f7d5d315ee5eb910fd354b08212b6341b48eb9962b24d6cff984e15ad0837904babe4032eb6b3c903bc16567e6b0dba54785 WHIRLPOOL 93d618a19c84ec6bad12cb799ca45bcffdf498d5cff892b8e6453a1762d817a0554c03700bf5b355dd1139d4bb148b9f99b06eafecf9022aa3e131c0bfd256ff
+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 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 D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib 29404 SHA256 692d95da66fbbe01d59ff23b20ad576aea4901017dca125b3f3cf67c49a8bdac SHA512 cf3df4552032065ee4dcfa5b2ef95e8fba27bee353211f3c05bb152c2e0c160b482911d5bf2acf668cf501825e184eb015bea3030edc89d2380dfd69282e310d WHIRLPOOL 970c9ea93e62aa9ef51fe1defee95d6da7a014b04725a113dfebea3abea9affb4fcea40661195e8994ff0783d9ef57131b3dfdfaf97dc8bb450da08fbc583e26
+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
diff --git a/dev-java/netbeans-webcommon/metadata.xml b/dev-java/netbeans-webcommon/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-webcommon/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..80a3f7802448
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.0.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://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-linking-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-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
new file mode 100644
index 000000000000..76d67fea6065
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/netbeans-websvccommon/metadata.xml b/dev-java/netbeans-websvccommon/metadata.xml
new file mode 100644
index 000000000000..a735655e737f
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</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..d011bb1d64c1
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-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/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
new file mode 100644
index 000000000000..2665155da82f
--- /dev/null
+++ b/dev-java/netty-buffer/Manifest
@@ -0,0 +1,2 @@
+DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-buffer/files/netty-buffer-4.0.19-build.xml b/dev-java/netty-buffer/files/netty-buffer-4.0.19-build.xml
new file mode 100644
index 000000000000..44fef2151062
--- /dev/null
+++ b/dev-java/netty-buffer/files/netty-buffer-4.0.19-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/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.19.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" 
+           memoryMaximumSize="256m" 
+           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" 
+           memoryMaximumSize="256m" 
+           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/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..9af12552d298
--- /dev/null
+++ b/dev-java/netty-buffer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="github">netty/netty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.19.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.19.ebuild
new file mode 100644
index 000000000000..37449f68d875
--- /dev/null
+++ b/dev-java/netty-buffer/netty-buffer-4.0.19.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 rapid development of 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"
+
+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
+
+	# Remove the odd memory restriction in the generated build files.
+	sed -i 's/memoryMaximumSize="256m"//' 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.21.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
new file mode 100644
index 000000000000..d84a549761f7
--- /dev/null
+++ b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 rapid development of 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-codec/Manifest b/dev-java/netty-codec/Manifest
new file mode 100644
index 000000000000..2665155da82f
--- /dev/null
+++ b/dev-java/netty-codec/Manifest
@@ -0,0 +1,2 @@
+DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-codec/files/netty-codec-4.0.19-build.xml b/dev-java/netty-codec/files/netty-codec-4.0.19-build.xml
new file mode 100644
index 000000000000..d8a2553d2aab
--- /dev/null
+++ b/dev-java/netty-codec/files/netty-codec-4.0.19-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 5/15/14 7:12 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="netty-codec-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-codec-4.0.19.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">
+    <pathelement location="${maven.repo.local}/io/netty/netty-transport/4.0.19.Final/netty-transport-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-buffer/4.0.19.Final/netty-buffer-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-common/4.0.19.Final/netty-common-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling/1.3.18.GA/jboss-marshalling-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/com/jcraft/jzlib/1.1.2/jzlib-1.1.2.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/io/netty/netty-transport/4.0.19.Final/netty-transport-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-buffer/4.0.19.Final/netty-buffer-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-common/4.0.19.Final/netty-common-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling/1.3.18.GA/jboss-marshalling-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/com/jcraft/jzlib/1.1.2/jzlib-1.1.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling-serial/1.3.18.GA/jboss-marshalling-serial-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling-river/1.3.18.GA/jboss-marshalling-river-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/org/javassist/javassist/3.18.0-GA/javassist-3.18.0-GA.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/easymock/easymock/3.2/easymock-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.3/objenesis-1.3.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/jmock/jmock-junit4/2.6.0/jmock-junit4-2.6.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/jmock/jmock/2.6.0/jmock-2.6.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit-dep/4.4/junit-dep-4.4.jar"/>
+    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.13/logback-classic-1.0.13.jar"/>
+    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-core/1.0.13/logback-core-1.0.13.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.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}" 
+           nowarn="true" 
+           debug="true" 
+           optimize="true" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="true" 
+           memoryMaximumSize="256m" 
+           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" 
+           memoryMaximumSize="256m" 
+           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-codec/files/netty-codec-4.0.21-build.xml b/dev-java/netty-codec/files/netty-codec-4.0.21-build.xml
new file mode 100644
index 000000000000..cf611db90336
--- /dev/null
+++ b/dev-java/netty-codec/files/netty-codec-4.0.21-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 5/15/14 7:12 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="netty-codec-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-codec-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">
+    <pathelement location="${maven.repo.local}/io/netty/netty-transport/4.0.19.Final/netty-transport-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-buffer/4.0.19.Final/netty-buffer-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-common/4.0.19.Final/netty-common-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling/1.3.18.GA/jboss-marshalling-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/com/jcraft/jzlib/1.1.2/jzlib-1.1.2.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/io/netty/netty-transport/4.0.19.Final/netty-transport-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-buffer/4.0.19.Final/netty-buffer-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/io/netty/netty-common/4.0.19.Final/netty-common-4.0.19.Final.jar"/>
+    <pathelement location="${maven.repo.local}/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling/1.3.18.GA/jboss-marshalling-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/com/jcraft/jzlib/1.1.2/jzlib-1.1.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling-serial/1.3.18.GA/jboss-marshalling-serial-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/org/jboss/marshalling/jboss-marshalling-river/1.3.18.GA/jboss-marshalling-river-1.3.18.GA.jar"/>
+    <pathelement location="${maven.repo.local}/org/javassist/javassist/3.18.0-GA/javassist-3.18.0-GA.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/easymock/easymock/3.2/easymock-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/cglib/cglib-nodep/2.2.2/cglib-nodep-2.2.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.3/objenesis-1.3.jar"/>
+    <pathelement location="${maven.repo.local}/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/org/jmock/jmock-junit4/2.6.0/jmock-junit4-2.6.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/jmock/jmock/2.6.0/jmock-2.6.0.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit-dep/4.4/junit-dep-4.4.jar"/>
+    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-classic/1.0.13/logback-classic-1.0.13.jar"/>
+    <pathelement location="${maven.repo.local}/ch/qos/logback/logback-core/1.0.13/logback-core-1.0.13.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.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}" 
+           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-codec/metadata.xml b/dev-java/netty-codec/metadata.xml
new file mode 100644
index 000000000000..9af12552d298
--- /dev/null
+++ b/dev-java/netty-codec/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="github">netty/netty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-codec/netty-codec-4.0.19.ebuild b/dev-java/netty-codec/netty-codec-4.0.19.ebuild
new file mode 100644
index 000000000000..3c506e5fa226
--- /dev/null
+++ b/dev-java/netty-codec/netty-codec-4.0.19.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 rapid development of 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"
+
+CDEPEND="dev-java/${MY_PN}-buffer:0
+	dev-java/${MY_PN}-common:0
+	dev-java/${MY_PN}-transport:0
+	dev-java/jboss-marshalling:0
+	dev-java/jzlib:1.1.3
+	dev-libs/protobuf[java]"
+
+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}-buffer,${MY_PN}-common,jboss-marshalling,${MY_PN}-transport,jzlib-1.1.3,protobuf"
+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
+
+	# Remove the odd memory restriction in the generated build files.
+	sed -i 's/memoryMaximumSize="256m"//' build.xml || die
+}
+
+#    [junit] Testcase: testZLIB_OR_NONE2 took 0.008 sec
+#    [junit] 	Caused an ERROR
+#    [junit] null
+#    [junit] java.lang.InstantiationException
+#    [junit] 	at java.lang.reflect.Constructor.newInstance(Constructor.java:408)
+RESTRICT="test"
+
+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-codec/netty-codec-4.0.21.ebuild b/dev-java/netty-codec/netty-codec-4.0.21.ebuild
new file mode 100644
index 000000000000..876c6672fe7f
--- /dev/null
+++ b/dev-java/netty-codec/netty-codec-4.0.21.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 rapid development of 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"
+
+CDEPEND="dev-java/${MY_PN}-buffer:0
+	dev-java/${MY_PN}-common:0
+	dev-java/${MY_PN}-transport:0
+	dev-java/jboss-marshalling:0
+	dev-java/jzlib:1.1.3
+	dev-libs/protobuf[java]"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common,jboss-marshalling,${MY_PN}-transport,jzlib-1.1.3,protobuf"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+#    [junit] Testcase: testZLIB_OR_NONE2 took 0.008 sec
+#    [junit] 	Caused an ERROR
+#    [junit] null
+#    [junit] java.lang.InstantiationException
+#    [junit] 	at java.lang.reflect.Constructor.newInstance(Constructor.java:408)
+RESTRICT="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-common/Manifest b/dev-java/netty-common/Manifest
new file mode 100644
index 000000000000..2665155da82f
--- /dev/null
+++ b/dev-java/netty-common/Manifest
@@ -0,0 +1,2 @@
+DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-common/files/netty-common-4.0.19-build.xml b/dev-java/netty-common/files/netty-common-4.0.19-build.xml
new file mode 100644
index 000000000000..29e56ede46a2
--- /dev/null
+++ b/dev-java/netty-common/files/netty-common-4.0.19-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:11 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="netty-common-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-common-4.0.19.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-common/files/netty-common-4.0.21-build.xml b/dev-java/netty-common/files/netty-common-4.0.21-build.xml
new file mode 100644
index 000000000000..b83a8bda55b8
--- /dev/null
+++ b/dev-java/netty-common/files/netty-common-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:11 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="netty-common-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-common-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-common/metadata.xml b/dev-java/netty-common/metadata.xml
new file mode 100644
index 000000000000..9af12552d298
--- /dev/null
+++ b/dev-java/netty-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>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="github">netty/netty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-common/netty-common-4.0.19.ebuild b/dev-java/netty-common/netty-common-4.0.19.ebuild
new file mode 100644
index 000000000000..39dba0eb213b
--- /dev/null
+++ b/dev-java/netty-common/netty-common-4.0.19.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 rapid development of 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-api:0"
+RDEPEND=">=virtual/jre-1.6
+		${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+		${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+EANT_BUILD_TARGET="package"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-logging,log4j,javassist-3,slf4j-api"
+
+# 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"
+
+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-common/netty-common-4.0.21.ebuild b/dev-java/netty-common/netty-common-4.0.21.ebuild
new file mode 100644
index 000000000000..2b47294b1b6a
--- /dev/null
+++ b/dev-java/netty-common/netty-common-4.0.21.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 rapid development of 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-api: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"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-logging,log4j,javassist-3,slf4j-api"
+
+# 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"
+
+java_prepare() {
+	#EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars --build-only commons-logging,log4j,javassist-3,slf4j-api)"
+	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-handler/Manifest b/dev-java/netty-handler/Manifest
new file mode 100644
index 000000000000..dffa89f71e28
--- /dev/null
+++ b/dev-java/netty-handler/Manifest
@@ -0,0 +1 @@
+DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
diff --git a/dev-java/netty-handler/files/netty-handler-4.0.19-build.xml b/dev-java/netty-handler/files/netty-handler-4.0.19-build.xml
new file mode 100644
index 000000000000..eadfef9f7dc9
--- /dev/null
+++ b/dev-java/netty-handler/files/netty-handler-4.0.19-build.xml
@@ -0,0 +1,232 @@
+<?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-handler-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-handler-4.0.19.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" 
+           memoryMaximumSize="256m" 
+           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" 
+           memoryMaximumSize="256m" 
+           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-handler/metadata.xml b/dev-java/netty-handler/metadata.xml
new file mode 100644
index 000000000000..9af12552d298
--- /dev/null
+++ b/dev-java/netty-handler/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="github">netty/netty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-handler/netty-handler-4.0.19.ebuild b/dev-java/netty-handler/netty-handler-4.0.19.ebuild
new file mode 100644
index 000000000000..fdcac9964ba7
--- /dev/null
+++ b/dev-java/netty-handler/netty-handler-4.0.19.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 rapid development of 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"
+
+CDEPEND="dev-java/${MY_PN}-buffer:0
+	dev-java/${MY_PN}-codec:0
+	dev-java/${MY_PN}-common:0
+	dev-java/${MY_PN}-transport:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	test? (
+		dev-java/ant-core:0
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-codec,${MY_PN}-common,${MY_PN}-transport"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-core,junit-4"
+EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	# Remove the odd memory restriction in the generated build files.
+	sed -i 's/memoryMaximumSize="256m"//' 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-transport/Manifest b/dev-java/netty-transport/Manifest
new file mode 100644
index 000000000000..2665155da82f
--- /dev/null
+++ b/dev-java/netty-transport/Manifest
@@ -0,0 +1,2 @@
+DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-transport/files/netty-transport-4.0.19-build.xml b/dev-java/netty-transport/files/netty-transport-4.0.19-build.xml
new file mode 100644
index 000000000000..c39d54c8ae3c
--- /dev/null
+++ b/dev-java/netty-transport/files/netty-transport-4.0.19-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/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.19.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" 
+           memoryMaximumSize="256m" 
+           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" 
+           memoryMaximumSize="256m" 
+           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/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..9af12552d298
--- /dev/null
+++ b/dev-java/netty-transport/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="github">netty/netty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/netty-transport/netty-transport-4.0.19.ebuild b/dev-java/netty-transport/netty-transport-4.0.19.ebuild
new file mode 100644
index 000000000000..81341925b9a4
--- /dev/null
+++ b/dev-java/netty-transport/netty-transport-4.0.19.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 rapid development of 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"
+
+CDEPEND="dev-java/${MY_PN}-buffer:0
+	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/logback:0
+		dev-java/junit:4
+	)"
+
+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"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-core,easymock-3.2,junit-4,logback"
+EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
+
+# error: package ch.qos.logback.classic does not exist
+RESTRICT="test"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	# Remove the odd memory restriction in the generated build files.
+	sed -i 's/memoryMaximumSize="256m"//' 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-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..457d27258657
--- /dev/null
+++ b/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 rapid development of 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.21.ebuild b/dev-java/netty-transport/netty-transport-4.0.21.ebuild
new file mode 100644
index 000000000000..f44c11543f4d
--- /dev/null
+++ b/dev-java/netty-transport/netty-transport-4.0.21.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 rapid development of 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.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${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"
+
+# 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/neuroph/Manifest b/dev-java/neuroph/Manifest
new file mode 100644
index 000000000000..e52042139391
--- /dev/null
+++ b/dev-java/neuroph/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/dev-java/neuroph/metadata.xml b/dev-java/neuroph/metadata.xml
new file mode 100644
index 000000000000..b88f3d4a8c7c
--- /dev/null
+++ b/dev-java/neuroph/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..eda6eb081be6
--- /dev/null
+++ b/dev-java/neuroph/neuroph-2.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..eda6eb081be6
--- /dev/null
+++ b/dev-java/neuroph/neuroph-2.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..96302c394fb5
--- /dev/null
+++ b/dev-java/neuroph/neuroph-2.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b56b71744497
--- /dev/null
+++ b/dev-java/objenesis/Manifest
@@ -0,0 +1 @@
+DIST objenesis-1.3-bin.zip 287452 SHA256 42599550f4f222522e90ff7677c506c5c85590bc5f5e07b6e3b075a171c1eb91 SHA512 48f838e00cfe0d12c6c73fb3d1d8482ccd8de71742a86c3afbba832c6b73e1f7b1604f8c209386e00f7751cd568e9ef4d61b543db66c927f3d61f9e6ee0a4193 WHIRLPOOL ab452111d5865a52164e26de9bc6a7669b879b1538ac5dc9884ee73853da10d152594c8c4c7fc367de6916608d8e5984ae8a3b5ee06db82377d394adafd0223c
diff --git a/dev-java/objenesis/metadata.xml b/dev-java/objenesis/metadata.xml
new file mode 100644
index 000000000000..9594fec975a6
--- /dev/null
+++ b/dev-java/objenesis/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..6a28e36a6b6d
--- /dev/null
+++ b/dev-java/objenesis/objenesis-1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://${PN}.googlecode.com/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}-bin.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ppc ppc64"
+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..3c1dd7a01671
--- /dev/null
+++ b/dev-java/odfdom/Manifest
@@ -0,0 +1 @@
+DIST odfdom-0.8.6-sources.zip 33171275 SHA256 fcb5ecefd07081073b50c023e2b49090400e8d152d5f06ea93c87f5db012bfd2 SHA512 7b71d55da01d604d89c5e0c7b9efcfd67e926db6807c885cb34cb9bd2e1fb1dc4a38d8e75967e08913b7ab1dcd85e7165d561fd3585a3d0c63df35a1a12c44e0 WHIRLPOOL b14ec321387b96b0df96d78a204e999548e671b023750efbdbbaae633babbee54a924dd9a20bb6c1e1888aa9c397cd9d0ea8946c8109767ab0918ef0e085ff7d
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..604e0a4238bb
--- /dev/null
+++ b/dev-java/odfdom/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..201aea7f09e0
--- /dev/null
+++ b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~hppa-hpux ~ia64-hpux ~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..07c0ef95e269
--- /dev/null
+++ b/dev-java/offo-hyphenation/Manifest
@@ -0,0 +1 @@
+DIST offo-hyphenation_v1.2.zip 378809 SHA256 026c3605416e921cdc5b24ba486fef306d1a4863ba95295f689b7190885e5c5a SHA512 ef0cb0aa7020bedd6c59f6d4cec95274f18fc5a7d19d24d1a05014c7c20b70c8e515aa7b7db4852a0c1bb87f594f638a906b5b61c0443804902cc9876d35d934 WHIRLPOOL 1a644a55a1769a866fa47e654310b942ef176396c3c2070c7b69f3e5e82e69156f42535363a127733753488bcddfee5b41b505ba512b4a0126f37fec96b6c98a
diff --git a/dev-java/offo-hyphenation/metadata.xml b/dev-java/offo-hyphenation/metadata.xml
new file mode 100644
index 000000000000..12697493b88a
--- /dev/null
+++ b/dev-java/offo-hyphenation/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">offo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/offo-hyphenation/offo-hyphenation-1.2.ebuild b/dev-java/offo-hyphenation/offo-hyphenation-1.2.ebuild
new file mode 100644
index 000000000000..e9fd44928849
--- /dev/null
+++ b/dev-java/offo-hyphenation/offo-hyphenation-1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Hyphenation patterns for Apache Fop"
+HOMEPAGE="http://offo.sourceforge.net"
+# upstream will hopefully version future release...
+SRC_URI="mirror://sourceforge/offo/${PN}_v${PV}.zip"
+# review this upon update!
+LICENSE="GPL-2 Apache-2.0 LPPL-1.3b TeX"
+SLOT="0"
+KEYWORDS=" amd64 ppc 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
+
+	dohtml licenses.html || die
+	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..bb3b4760cb13
--- /dev/null
+++ b/dev-java/ognl/Manifest
@@ -0,0 +1,3 @@
+DIST OGNL_3_0_8.tar.gz 3564389 SHA256 e32d78c88985fc8f2c9ab5fb208d7dc22593dea32ed959b46b1d9101b99127d3 SHA512 79ca457077f344da16677e56f8e0ae809d2af85015e1c4bc17a3eef4dd25c01738fdbcac8a9397b83251b48164404df161d60e20d43868e1ff32e9bb388ef4b6 WHIRLPOOL a5e21dcccc4bfc424412abf94c48a3f45ba541a9e25bd0c7c4dc11869cac7051f586e5883011d03c75187fcd432195b526cfb53e3a300fbe2f84f5b4cd67e12a
+DIST ognl-2.6.9-dist.zip 2338429 SHA256 2fcb108c332b388c0ca282e8dfea9a079ab6af3caa08cfe3ccb307dffd57e290 SHA512 7883f4e2c3c4b1fab5966481c661cdb3fdd7489717333e985dc7a517fbf14f82e3c218f81e8ad94008f7fcd6e66d166bd03227ff5f1df6a203e1cbc2985bd44c WHIRLPOOL 821d93653b6217b69d575abcfaad9639d8f4e46699124b2ffc0d1ae8ba1fc763ec89b0bf6991b2a929b9e5d31e1b1fcbaf1fd1f6931952ed5f1c4df4d82c372c
+DIST osbuild.xml 5939 SHA256 b56534bfdceabe54f4c446d7ee3718dc373523aa368d83206723300fa6931726 SHA512 6b66b7b27073fd6b707b71fb2da7017602edd85de52e767ecb8d8931fdd96811b04d9ec0ac9ec1cb32daf03d43610f760471959cf7211b1921a92d5f5a070416 WHIRLPOOL d8b355472c773a4e180d8efa2c0ecbf55a1233432f8af6c21f9fc8e02012db9780f923af6c3383a343126f4753ce7a62316fdda6a393b5aceb822fe52b64f233
diff --git a/dev-java/ognl/metadata.xml b/dev-java/ognl/metadata.xml
new file mode 100644
index 000000000000..686a81439b85
--- /dev/null
+++ b/dev-java/ognl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="github">jkuhnert/ognl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/ognl/ognl-2.6.9-r2.ebuild b/dev-java/ognl/ognl-2.6.9-r2.ebuild
new file mode 100644
index 000000000000..dfcf5a24a17b
--- /dev/null
+++ b/dev-java/ognl/ognl-2.6.9-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Object-Graph Navigation Language; an expression language for getting/setting properties of objects"
+HOMEPAGE="http://www.ognl.org/"
+SRC_URI="http://www.ognl.org/${PV}/${P}-dist.zip
+	https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
+
+LICENSE="Apache-1.1"
+SLOT="2.6"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	default
+	cp "${DISTDIR}/osbuild.xml" "${S}/" || die
+}
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+}
+
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	use doc && java-pkg_dohtml -r dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
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..b2bcdbd53812
--- /dev/null
+++ b/dev-java/ognl/ognl-3.0.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Object-Graph Navigation Language; an expression language for getting/setting 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=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}-OGNL_${PV//./_}"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	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
+	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/opencsv/Manifest b/dev-java/opencsv/Manifest
new file mode 100644
index 000000000000..ea2f0500b8c5
--- /dev/null
+++ b/dev-java/opencsv/Manifest
@@ -0,0 +1 @@
+DIST opencsv-2.3-src-with-libs.tar.gz 280510 SHA256 04ebc52af08b20e18c193f194ea9d169a7737403b2376f1707d858dbd4e7950d SHA512 3831cb9c5aaf8b19ed6895406e7358ddb6b30cba1876b42daeab41230d83bd532b9db53c073960413a385222ca889f1aae14404fd46143aa28ee05b3d1019106 WHIRLPOOL 069c1bf477c04f0ad6db927e7179c0dc29104c48e179f0fcf8e4c42b0de2e83e3e3ab5fd80ebbd8e13e12cacfbe231097b675e99ecb0ef1610277dbc9a9c927a
diff --git a/dev-java/opencsv/metadata.xml b/dev-java/opencsv/metadata.xml
new file mode 100644
index 000000000000..6eab0f966490
--- /dev/null
+++ b/dev-java/opencsv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..0a9ca9fa5eeb
--- /dev/null
+++ b/dev-java/opencsv/opencsv-2.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+S="${WORKDIR}/${P}"
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+RESTRICT="test"
+
+java_prepare() {
+	rm lib/* || die
+}
+
+src_install() {
+	java-pkg_newjar deploy/${P}.jar ${PN}.jar
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc src/au
+}
diff --git a/dev-java/openspml/Manifest b/dev-java/openspml/Manifest
new file mode 100644
index 000000000000..044a6e5fc03d
--- /dev/null
+++ b/dev-java/openspml/Manifest
@@ -0,0 +1 @@
+DIST openspml_v0.5.zip 6155674 SHA256 ab437e5cffb3ad22c6525ecafa142c99cf36c21aa30d974c9c9b3bb0ad9d5c4e SHA512 31302b72f79620c94dcb7299bee8f8fc481fd40e0b71ee9497be8a202b855469ca2f0a3a2959c67f269f426854b3d61c4e8c1188b33b9d8d6df5cc376049f38c WHIRLPOOL 08b927636d9dec19a4f07100ff61781c75e4a0346110bd3323dcf17d1e9f3214c8b176775441293ecf1b01799034775b4bc698ada6680983cd8cdc3634e93feb
diff --git a/dev-java/openspml/files/build.xml-0.5 b/dev-java/openspml/files/build.xml-0.5
new file mode 100644
index 000000000000..4d8866254bf8
--- /dev/null
+++ b/dev-java/openspml/files/build.xml-0.5
@@ -0,0 +1,19 @@
+<?xml version="1.0" standalone="yes"?>
+<project basedir="." default="jar">
+  <target name="compile">
+    <mkdir dir="bin"/>
+    <javac srcdir="src" destdir="bin">
+      <include name="**/*.java"/>
+      <classpath>
+        <fileset dir="lib">
+          <include name="**/*.jar"/>
+        </fileset>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="openspml.jar">
+      <zipfileset dir="bin"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/openspml/metadata.xml b/dev-java/openspml/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/openspml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/openspml/openspml-0.5-r1.ebuild b/dev-java/openspml/openspml-0.5-r1.ebuild
new file mode 100644
index 000000000000..a2448cb5901f
--- /dev/null
+++ b/dev-java/openspml/openspml-0.5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Open source implementation of Service Provisioning Markup Language (SPML)"
+HOMEPAGE="http://www.openspml.org/"
+SRC_URI="http://www.openspml.org/Files/${PN}_v${PV}.zip"
+
+LICENSE="openspml"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-java/soap-2.3.1-r4:0
+		java-virtuals/javamail:0"
+
+RDEPEND="${CDEPEND}
+		>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="soap,javamail"
+JAVAC_ARGS="-source 1.4"
+
+java_prepare() {
+	rm -r "${S}"/src/org/openspml/test/ || die
+	rm "${S}"/lib/*.jar || die
+}
diff --git a/dev-java/openspml/openspml-0.5.ebuild b/dev-java/openspml/openspml-0.5.ebuild
new file mode 100644
index 000000000000..3d1fbd96c9c3
--- /dev/null
+++ b/dev-java/openspml/openspml-0.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Open source implementation of Service Provisioning Markup Language (SPML)"
+HOMEPAGE="http://www.openspml.org/"
+SRC_URI="http://www.openspml.org/Files/${PN}_v${PV}.zip"
+
+LICENSE="openspml"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.4"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+
+	unpack "${A}"
+
+	# Argh...
+	cd "${S}"
+	find . -type f -exec chmod 644 {} \;
+	find . -type d -exec chmod 755 {} \;
+
+	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml"
+
+}
+
+src_compile() {
+
+	cd "${S}/lib"
+
+	cd "${S}"
+	eant jar
+
+}
+
+src_install() {
+
+	java-pkg_dojar "${S}/lib/openspml.jar"
+
+	use source && java-pkg_dosrc "${S}/src/*"
+	dodoc README history.txt
+	use doc && java-pkg_dojavadoc doc
+
+}
diff --git a/dev-java/openspml2/Manifest b/dev-java/openspml2/Manifest
new file mode 100644
index 000000000000..7c4413efd1e9
--- /dev/null
+++ b/dev-java/openspml2/Manifest
@@ -0,0 +1 @@
+DIST openspml_v2-1.0rc2.tgz 2068049 SHA256 52bdd3a783a151b05bb285f6682fc91edfa0edeb93acc1370f37be0d0ec46b85 SHA512 8ec9f9831e7d5aedeb1ffc6deaba5f81ba96450902fad37fcaa1ee657fa73445383dcb9ed047a737e248b13ebaa67bab9216e52d22b7479f93fe62828f3215ac WHIRLPOOL 6c1c3cbe51710bc74fdd5f94f3efcabecb230e6e01c0966afe9d6d7ec8e8be91bcaa315e8bdf455cc2b3e444ac22b50c1f6deca6bf9d096b6af15492dad1435e
diff --git a/dev-java/openspml2/files/build.xml-1.0_rc2 b/dev-java/openspml2/files/build.xml-1.0_rc2
new file mode 100644
index 000000000000..c6dbb958f6fd
--- /dev/null
+++ b/dev-java/openspml2/files/build.xml-1.0_rc2
@@ -0,0 +1,19 @@
+<?xml version="1.0" standalone="yes"?>
+<project basedir="." default="jar">
+  <target name="compile">
+    <mkdir dir="bin"/>
+    <javac srcdir="src/java/" destdir="bin">
+      <include name="**/*.java"/>
+      <classpath>
+        <fileset dir="lib">
+          <include name="**/*.jar"/>
+        </fileset>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="openspml2.jar">
+      <zipfileset dir="bin"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/openspml2/metadata.xml b/dev-java/openspml2/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/openspml2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/openspml2/openspml2-1.0_rc2.ebuild b/dev-java/openspml2/openspml2-1.0_rc2.ebuild
new file mode 100644
index 000000000000..f91f5c253483
--- /dev/null
+++ b/dev-java/openspml2/openspml2-1.0_rc2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Open source implementation of Service Provisioning Markup Language (SPML)"
+HOMEPAGE="http://www.openspml.org/"
+SRC_URI="http://www.openspml.org/Files/openspml_v2-${MY_PV}.tgz"
+
+LICENSE="CDDL-Schily"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc source"
+
+COMMON_DEP="
+	=dev-java/servletapi-2.4*
+	dev-java/openspml"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4"
+
+S="${WORKDIR}"
+
+src_unpack() {
+
+	unpack "${A}"
+	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die "cp failed"
+
+	rm -f "${S}/lib/*"
+
+}
+
+src_compile() {
+
+	cd "${S}/lib"
+	rm -f *.jar
+	java-pkg_jar-from servletapi-2.4
+	java-pkg_jar-from openspml
+
+	cd "${S}"
+	eant jar
+
+}
+
+src_install() {
+
+	java-pkg_dojar "${S}/openspml2.jar"
+
+	use source && java-pkg_dosrc "${S}/src/java/*"
+	use doc && {
+		java-pkg_dohtml -r docs/api
+		dodoc docs/ToolkitOverview.html
+		dodoc docs/DSML_2.0_Profile_Overview.txt
+	}
+
+}
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
new file mode 100644
index 000000000000..958338365cf0
--- /dev/null
+++ b/dev-java/oracle-javamail/Manifest
@@ -0,0 +1 @@
+DIST javamail-1.5.2-src.zip 1573447 SHA256 76efde22a38a021baa99087be1878787bf5e72ceb684b1bc33eb260a8ddcbdd5 SHA512 9d2ae8c38a8e7464023219dac13df95a34cab52a5ff9f19015ea0dde73a838f49ae006c9dc1538eeb978844af7ac962ce3b22d89f0f9ccda684141f7b52840bc WHIRLPOOL 6c438c6569cbd689eeaa8398301b5481956443ccb9f2112891bce5e97d1a792e0176e8fb395cbadd4175e87c253db833760aff96ea61654dad3d478d386fbf7b
diff --git a/dev-java/oracle-javamail/metadata.xml b/dev-java/oracle-javamail/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/oracle-javamail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..3106b63a1b36
--- /dev/null
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..4fdc177c8ebb
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -0,0 +1,29 @@
+DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
+DIST javafx_samples-2_2_80-linux.zip 21218149 SHA256 bd632d2c0f36be8bfc798ee6b78b328ff12d9b6ccea5e077dffc7a06f7933819 SHA512 00ec77bfbc7c9a9b1a61acb360b8278febd07bd16fc407a0b52ca0b694d35c79c0fb92d11caf131a8ee16238275962f6bc2e1f8471740ee0045b96bd14e957ba WHIRLPOOL b3f5032b1496b1bb8776e79566ed6a3da1dec3ab2b6d66d3cf67901bbaab5e746a1f3967af271c7b5a90b4522b6763ad7a5f172dfcf588184c5392a1a8a5a785
+DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
+DIST jdk-7u80-linux-i586-demos.tar.gz 20827120 SHA256 27b7c4955d989c9c34a6eed9e08f1955e01546146ed6fb1223f04ef33d143900 SHA512 25fc9ff9ee993ccf8d4caf0701b1e8e5ffdc78c68b0e94a93eb49f3cbc54f739a1699090e675439df9b63338974f5b9a04f6e33df59f6193b42a87a9a437ff47 WHIRLPOOL 25d8ef0b3205ede51eb2ba306d98d7eac91e06d0ca13b771593f343ac27df1d085cfd65a98346c63e76498eb19c106302407615218a907c8f6ea2e743eae09bc
+DIST jdk-7u80-linux-i586.tar.gz 154850445 SHA256 9ded1318a7223cf6e09ac4b6ee4db1f4c5d1aef1d3d291f6db8491a32eaa57ba SHA512 69e2ee7964b18e9e8b57db917b303eb9ea629c432300fe4749177118d2f5c365e72b976649e21354643fe4957120a2b23de025bab4dc45977837d4847a61ffb6 WHIRLPOOL 2d549c7971935f79e536de8bb0a5fc2547a8bdf039d1617a73fbc0ae222a80422fb336105c3362521efb376aa2ea6fa8c3a0521044785bfc9dc061ebe694628c
+DIST jdk-7u80-linux-x64-demos.tar.gz 20882163 SHA256 09c55d37508ff6c4b9ebac34e8d5fb65d7ace5cf45d5074726b413e8aa30dfa1 SHA512 2c24799ca0f14d74053e504cee0a9160472fd7e26e1d86d4eb72b190ec934b041bd72b5ce77f44bdca4b7fe8d8104515572491145f2f14e6d295be0bb010b2ef WHIRLPOOL e9f0312261049a5610ffbc64417f41025f36fc0ffec0f40dbcdfd391a3152f1c05ef80d584671d46fe26f86846825ea66e91090159e79a5192f11c695396e8ef
+DIST jdk-7u80-linux-x64.tar.gz 153530841 SHA256 bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623 SHA512 a772878f740e87835bafc82841e8f4c1dfbe8bc79e072d3f6c5c74d3a206eb9001a53b474d91a22819c7c0d6407ed88993635c39738779c2b08c22c7a1c2e9e9 WHIRLPOOL fac71585db57851245891919daca1f043c1a8c002c193426ea7e30b482129e65adee336c2421e4aa1241b8fd7cc69b8a1918cd0c44315bf4aec715e86d116384
+DIST jdk-7u80-macosx-x64.dmg 206510745 SHA256 2b9deef240a7f07d08541da01bbd60cbf93bf713efd5997e586ba23ec4f5089e SHA512 99150dd7bcc0ceddb12c7690b341323bb49fd0a8b98680176ba964ebbd37fe3e2fd1febad64b376a9fbbb19d883f5800613a8dc6c644de5f36cd7aeacb4d6e3a WHIRLPOOL 41ccabd45b6b8bdd43ca308fdbe3b1c3e89b58aa80336b2810c5bc4b57adc14cd98914467dac582eccd69e03bb911dd5f7d6c30d4ee5a8be2d7eb05607e12035
+DIST jdk-7u80-macosx-x86_64-demos.tar.gz 19394289 SHA256 27b3f9f12e8e6b56b6f42cbe2ba0e04cb3521c487162ef4de366ba6bb6c60735 SHA512 1dea5c171ffa93a1f111c59b2138f983307bdc4ec0e98ab848dfc040af5a39d8a1ff85fdc3997eeb190499a28565da18284610605a346977c173267a98edbc54 WHIRLPOOL 79f2410802cf476dd5fa6817bfa0538fdf1bc4158d32c1ccd9748b81c7640ff0d6ea92e3bb25e8d29fc7687ef6163b1cf386f852fb2e5960a3f77fa6e392bc73
+DIST jdk-7u80-solaris-i586-demos.tar.gz 16855430 SHA256 27b4aa795a9e57436d4b3aa11ea00bcf34442a95921e50a086ebdce94cb5f19a SHA512 9af21b132609cdb237bc63e4e739e81589f90445f116434ae7cad744fadefb38790d78fde7ff4d13689d275fe5a814c283f280d0485f0ec85147376672040de6 WHIRLPOOL e7ee65da144034781c84f07073ff23ee57561f838c85c7e7b24cb3b1b8d0e6f0393666383ac4473cd7d05d75e98406ec6484b447a17192c8a65eb6281622839f
+DIST jdk-7u80-solaris-i586.tar.gz 101088226 SHA256 c29d5f70359201c85ff23a103d71b768100ab23d1417433867ab418bdd46cc39 SHA512 16219609a356339a8575880f44b9eefe4459681202ff0925740f921a7239ebf5fe718c2607cbbebe790d8afc0ace25583c9b3ad67257d0a48cb32032072b2b3f WHIRLPOOL 50e09a1318d3e4a2262fbccd54946f86549314878f019d46efed350d31e9fc35df549b5ed6a305c63e61eace0f360e88bcaa21795abd6a93518be72e70f42bf6
+DIST jdk-7u80-solaris-sparc-demos.tar.gz 16881622 SHA256 e71933842bbc3ebb36b0b529c583bbff175a4ba88118d4460acb49cd6d615852 SHA512 843b139e793744b8e6d3370a7a036e7c16604a7d8310da363594460ebf72f912373392a9046b3d2ef51b5e275affda6b7f87e3b9e1e9ef096763b0b2e59b6f48 WHIRLPOOL 84bb9d1f3fc410fa15b5c1d6e8e179cd80cfa35d73c118d33c5d477cfa12cf29906a36499b8dc8f1a6b221cf4df9144c0dfb878acd1902ab7b63efa340214985
+DIST jdk-7u80-solaris-sparc.tar.gz 104306569 SHA256 1bbab4305af963dc6d964fbc3083aa132f71a30ba285f50f0c2b6894f7403d25 SHA512 1c19cc5cb90cd8b64adab70707a6c47f78fdbdc4a8e33b9523f94e7a0cee66746cc061a6c640da4dd9751adbfaa14f09fc2e7ca950317bb3b17c2829a4102342 WHIRLPOOL 4bd0ccd7d284e17a3517318ef803cf69e1555186bc65d3d7c6a2ee79d173fdd6a7fb16568fefed5841f10cecb83c85c9f3d0c3cee1448d838641294de7005713
+DIST jdk-7u80-solaris-sparcv9-demos.tar.gz 904770 SHA256 fa3a92e70e52b0bffdee8d2e640587d308cacb0390a5c9dd33c80f1f5a039df1 SHA512 2c7754f9a8fc0440e3174c90c4eb79f94827b6337331e55da6fd19dddee8d70cfa979e65df0459ad9c21e858b4bbcb7d3906d18b6153785ce0128837ffd0d161 WHIRLPOOL 76ef02524bcb4c90b51f78413c366ea37f99bcde88e049402f5fb05303911c473b7acb4c18ccc667b9c61584e8af3b6dbb193fd8ff2f80858720446d3474248b
+DIST jdk-7u80-solaris-sparcv9.tar.gz 19301205 SHA256 1a2bce541efe7b81cafe683626b3edea56918a8ca897ff36a2deaed00a7fce05 SHA512 93ea0e8f5ae611dd1a620dffd72e315ecb6ce8375bd902a793fab128ac7e95d2cb338df1c273a2c29af6194e7cbdb810d79193b413b4b101538c08ebeef1eb41 WHIRLPOOL c9ae1f1b561c4ec1d3c1a7f5008e80642b49a9fd1c6459f8ada65c01accc338280bdd683712d54a9b7741eeccf856b4f2ee82e898fbe1f39260d58efab217185
+DIST jdk-7u80-solaris-x64-demos.tar.gz 865205 SHA256 a08dd0665d35986675beeba0f80d5db54a91fb276d8641ce1ba16ba873a18682 SHA512 c53f026bfdfed8d83d42e3fce497baffeb370adf0423be2f891f6d200510088ac8227ae4f261ece059dbf29eb33cacafb20a0c328e7d8723387eba38def389d0 WHIRLPOOL 0539e964e194527055186b120df11e74ab3d9568fc2a5ff002ef405396f521a7c35013420067d37874b9602fe29d104dce63f22bfd687c45722689d62a8c552d
+DIST jdk-7u80-solaris-x64.tar.gz 17176587 SHA256 ccc156363e3080e92382cd675d96889460a4421464b4567333394c8405eeb709 SHA512 83ce229c3a38e454d9acafa189b3b6f247a4723ddb3c3fa08993323590949295b0f3740ab235c7c539f90a684b8cefad7839f82f566b7a141019b94af6cbad89 WHIRLPOOL 07412c6de5886c729b43726fb228783606b2a53c2a286b1af2dd5359975d1c75964a895d7da543f98c461adf0ab4b82fc32ebeb49e1835448effd93886f1b206
+DIST jdk-8u51-linux-arm-vfp-hflt-demos.tar.gz 10401432 SHA256 3260a78ac9bfa216443087d516998270716a6167612ba57759c7e8616aaba945 SHA512 b3177c31efbb4fa5171fb89bc1488cf7cb954919e129b70afbb7f374479f3cace69e9968767353a89002581493460e44c251df12174d3f3e20aa3ebc807dddf0 WHIRLPOOL 47fe7a61be0d85661cb9d8418ca5d20542acb9563fdf6837e0a25132824ed8c891ad0a7beb4061acd671217768a9223518874fbe599581bca0a0e6bf1f6dcbf1
+DIST jdk-8u51-linux-arm-vfp-hflt.tar.gz 81593057 SHA256 2a6644a4540c8f47784daf8afcbb405a03e686720e4c9eac6584253a55def0c7 SHA512 9fd811ab3af7144436fbbc14e914f9313933e0dd1aae2eb35369ae5b291e12a1b9d9236bd6921e7e8e59f8a24bc65ebea4624079bbaf179ea821ba0908a5a975 WHIRLPOOL dbb4674237da39f0d86ea261bb48d78faa9ad4e0a3b1a8cd8a1ffd493202cb28c54294d7a82343b88727640cbbc31f123b67eb4926a094191dcc3653a575baf6
+DIST jdk-8u51-linux-i586-demos.tar.gz 54797997 SHA256 08014bd53b4519890e7b82cb3d1b69c959e8bef08cd43cfd80b3043e6263d136 SHA512 3aebe35501937658ecc78b4d4e4268de8dda8e37b817f4f22e2b0ff3667da3dd29aa95bec241ad9b300e4db61d2329b4ae5c498f34a00efaf1d62164a6b92785 WHIRLPOOL dfded6fd17f18560cae1ea6d08d08ff8508c0ac8f07740b96d6747cca0f60a6db04dce934dce3d0cb3650c2d34069569805c892d41da4a95b7d5f3b8b7875c31
+DIST jdk-8u51-linux-i586.tar.gz 175056840 SHA256 3fd43a5d88ea759bf12502980aa956c683d9df058ad25a94914c5890807e9f2b SHA512 79e405d07dd8a0556f336807fae951608665a33d4a461ea0c103831cac2914b7654db6c6dee479542155c379e9fcaaafa763dfe469dcf5ae48a1dd5544b9a1e9 WHIRLPOOL f1a03c11f694cc29199ee1ee9a72d7e617195b8e0f6500841023a447e8fb4e1df3321099dbae2b51df9fd2e72924758499d6bc7b1c9fe40a05ddd11ff6329e67
+DIST jdk-8u51-linux-x64-demos.tar.gz 54852711 SHA256 7de5f948bca36967a85fb8831bbe3a389634064c7f3cfdd476cd62dd268b3591 SHA512 33adc18b239f9a7973efa892e7d61d54ced1dc271a2dd27f6ab7e1e89626f061040639d953523b10070137a66bcc85ea48289be15f9e82ef6500416cb2f2dec1 WHIRLPOOL e3fd9e12a9ef832f4a2595bacb578821b56878b93bb50790c28c4c9d78e35ec00b1a9e95a32af3e1e2338b0839564749cd1c4d89e8ae1c4457ab22c9118db094
+DIST jdk-8u51-linux-x64.tar.gz 173281904 SHA256 d7149012cc51c2cdb8d3a1767825e0dfc36ca0419c3dae56d993cb2732cbeff1 SHA512 ab4559fdfe7150a2e3e06128b2e8c2621c078e8a13290cf015bc0dce3514e8881feb178672d9bf46ec9e0f6ca0ab23f712278db39796515ed55594af552a1f9b WHIRLPOOL 49920b8a9b04ab6c1e9d40f332e4079e3df5868dfacbcb575ff9844897a48f836693ff928a56119fbb249c0e09e9aa3e81c1d8c998d3c18ebe2de26464931449
+DIST jdk-8u51-macosx-x64.dmg 232874868 SHA256 85ee66d1fdce5244afcbfbfce8dc90582b8c7e3ec8ab4c21e0f4eb390af97832 SHA512 15fba10d1fe0eede89eae3a5e184ff9c1048fe48538046b527f4e78bd0a6285bdbf858edeb4613707d9ccbb7ffde5c197a9e80920cabac149488646965890199 WHIRLPOOL 86ad3c0ea8ab9a16c17084070dde8e66dc348a17997e6ce31d25a65dbce7c1dd935ecd91ffad6e57780be9cebda128427b413594c8f58e61a5bf2f4e57529cb4
+DIST jdk-8u51-macosx-x86_64-demos.zip 55361655 SHA256 e4c6ffe2c188b25e615fe5abc953ea3bd7cf7dc9cb53c5b7c636f509bf84d429 SHA512 f72e84f1cf14a3cc2f817599d5984385dca928e1384a7eab9d9d55900d6fcfcc6d77752def13bf0a3c9033955672f9ec82d632cf4aea6e64329fc2399ca3b101 WHIRLPOOL 75bdeac4264aa404b6c27353893bcd5112ba2cc96abec64bc97e80f55a0c5e2b919ef25f2571f8b87879d0a1e6ea0ae6d64e51d5a54fca06394059d2fd42693f
+DIST jdk-8u51-solaris-sparcv9-demos.tar.gz 9787771 SHA256 5c4d765478be6b9ede7932b25f734ce41d4dfaae76cd3b71604c7bb047a56ad8 SHA512 8d8785b118cac13448b7832a556a081f0aca7fc19122e702c721b2a3be57c6b2b27e52c1d2270910bb853de9d53262bdb91fba43a40a6a8481bfe5c26099240e WHIRLPOOL 82a72e0ef11aff33d75fcf54d9fae3a7e417b16077f9fb104ef23b45a4018b2edd3c7d77fb8888e3e4c7d787db14db29354886dd209aa9b7427e899413bec71e
+DIST jdk-8u51-solaris-sparcv9.tar.gz 103599046 SHA256 4bdfdae59ec62248ed893feff2fb4be8a8639330599f53f5b03208349ae91513 SHA512 68a95f498aabff65489bd6f6756af7737f408cc0b7253ad9bcd9f57ab5f7a130b35c251426f7dc256e1797a70f5152ceea86a4ea46749375fb8acd51e4309601 WHIRLPOOL 2a690757a673ab5958057631fef7efd748c2c456ed978922220322a5e390aa6e7016a2d2438053f12bc6054c45288ff4722955fb9a1722798409085152d004c7
+DIST jdk-8u51-solaris-x64-demos.tar.gz 9759566 SHA256 3376f1083841bd376da78fd6f3eb4127da4e9493d6af8f7c32e1eabfd8cab67e SHA512 a3c5efa70f75aff606ddcd1f52260e71828ba5ad8848fbf6f1c5d3cbd44f4f0a0a9e3e5576a1d68735a4339ad6e43124049a06ac62c6718c5a2a8dd56a1af766 WHIRLPOOL ae710e2cf1e328647124b385d7b96ffcc5d9bfaf159976163c1ab5075637eccbdfff8b9cecff322ac40d5c717403f4f3508b3574d91a761b2122674bb2cd0cbd
+DIST jdk-8u51-solaris-x64.tar.gz 101131923 SHA256 7afdda5f4310fce88e68f9c383bcc57451416471bb3af00cd1dfe323f2440932 SHA512 d08b8f4499f448f4e495b226bd88f44d9a4fcff69788e893a40d1de5e7e16970a655955c6b52d94e1604027d7fc025b8b99ef7687bd3de1419937b00813f023c WHIRLPOOL 21bb40348963034a59ca25004ecfaa4daeed4a96c45f1060314062cbccdfa48c2615c54677c8a28cec492e7ad2b7b8e91c9e1e212ff239cd3d995c7d84596e35
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-1.7.env b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env
new file mode 100644
index 000000000000..cc6305ddbde3
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.7.env
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Oracle JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_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/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.7"
+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/files/oracle-jdk-bin-1.8.env b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.8.env
new file mode 100644
index 000000000000..b0bad330a4c8
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-1.8.env
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Oracle JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_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/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.8"
+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..d95caa103826
--- /dev/null
+++ b/dev-java/oracle-jdk-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>
+  <herd>java</herd>
+  <longdescription>Oracle Java SE Development Kit, Official Binary Distribution</longdescription>
+  <use>
+    <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
+    <flag name="derby">Install bundled Derby (Java database)</flag>
+    <flag name="javafx">Install JavaFX libraries</flag>
+    <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
+    <flag name="pax_kernel">Use paxctl to mark the JVM binaries</flag>
+    <flag name="source">Install JVM (and optionally JavaFX) sources</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.80.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.80.ebuild
new file mode 100644
index 000000000000..1862e5d31194
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.80.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-vm-2 prefix versionator
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html#jdk-${MY_PV}-oth-JPR"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos 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 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos )
+FX_VERSION="2_2_$(get_version_component_range 4)"
+
+AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+AT_arm="jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz"
+AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz"
+AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz"
+AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg"
+AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
+
+FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
+
+DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz"
+DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
+DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz"
+DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
+DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
+DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
+DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.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}? ("
+	SRC_URI+=" $(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.7"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+COMMON_DEP=""
+RDEPEND="${COMMON_DEP}
+	X? ( !aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	) )
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-java/java-sdk-docs:1.7 )
+	fontconfig? ( media-libs/fontconfig )
+	!prefix? ( sys-libs/glibc )
+	selinux? ( sec-policy/selinux-java )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="${COMMON_DEP}
+	jce? ( app-arch/unzip )
+	examples? ( kernel_linux? ( app-arch/unzip ) )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}"/jdk${S_PV}
+
+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-downloads-javase7-521261.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() {
+	# Special case for ARM soft VS hard float.
+	if use arm ; then
+		if [[ ${CHOST} == *-hardfloat-* ]] ; then
+			unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
+			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
+		else
+			unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
+			use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
+		fi
+		use examples && unpack javafx_samples-${FX_VERSION}-linux.zip
+		use jce && unpack ${JCE_FILE}
+	elif use x86-macos || use x64-macos ; then
+		pushd "${T}" > /dev/null
+		mkdir dmgmount
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount
+		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg
+		hdiutil detach "${T}"/dmgmount
+		zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv
+		mv Contents/Home "${S}"
+		popd > /dev/null
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	if use jce; then
+		mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
+	fi
+}
+
+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
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
+			{,jre/}lib/i386/libjavaplugin_nscp*.so
+		rm -vrf jre/plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
+			{,jre/}lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	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
+		if use kernel_linux; then
+			cp -pPR	"${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
+				"${ddest}"/javafx-samples || die
+		fi
+	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
+		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
+	fi
+
+	if use source; then
+		cp -p src.zip "${ddest}" || die
+	fi
+
+	if use !arm && use !x86-macos && use !x64-macos ; 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/7/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.*
+	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 x86-macos || use x64-macos ; then
+		# fix misc install_name issues
+		pushd "${ddest}"/jre/lib > /dev/null || die
+		local lib needed nlib npath
+		for lib in \
+				libJObjC libdecora-sse libglass libjavafx-{font,iio} \
+				libjfxmedia libjfxwebkit libprism-es2 ;
+		do
+			lib=${lib}.dylib
+			einfo "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
+				"${lib}"
+		done
+		popd > /dev/null
+		for nlib in jdk1{5,6} ; do
+			install_name_tool -change \
+				/usr/lib/libgcc_s_ppc64.1.dylib \
+				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+			install_name_tool -id \
+				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+		done
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.51.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.51.ebuild
new file mode 100644
index 000000000000..996f80315eb0
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.51.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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 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 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-arm-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-arm-vfp-hflt-demos.tar.gz"
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-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 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source"
+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? (
+		awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+		)
+		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 )"
+
+# A PaX header isn't created by scanelf so depend on paxctl to avoid
+# fallback marking. See bug #427642.
+DEPEND="jce? ( app-arch/unzip )
+	examples? ( x64-macos? ( app-arch/unzip ) )
+	pax_kernel? ( sys-apps/paxctl )"
+
+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
+		mkdir dmgmount
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount
+		local update=$(get_version_component_range 4)
+		[[ ${#update} == 1 ]] && update="0${update}"
+		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
+		hdiutil detach "${T}"/dmgmount
+		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
+		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
+		popd > /dev/null
+	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
+}
+
+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 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* || 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
+
+	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
+		install_mozilla_plugin "${dest}/${nsplugin}"
+	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.*
+	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.
+		pushd "${ddest}"/jre/lib > /dev/null || die
+		local lib needed nlib npath
+		for lib in \
+			decora_sse glass jfx{media,webkit} \
+			javafx_{font,font_t2k,iio} prism_{common,es2,sw} \
+		; do
+			lib=lib${lib}.dylib
+			einfo "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
+				"${lib}"
+		done
+		popd > /dev/null
+
+		# This is still jdk1{5,6}, even on Java 8, so don't change it
+		# until you know different.
+		for nlib in jdk1{5,6} ; do
+			install_name_tool -change \
+				/usr/lib/libgcc_s_ppc64.1.dylib \
+				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+			install_name_tool -id \
+				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+		done
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
new file mode 100644
index 000000000000..0fc4983594bc
--- /dev/null
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -0,0 +1,6 @@
+DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
+DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
+DIST jre-7u80-linux-i586.tar.gz 48558751 SHA256 b773aef1458a4adde03af62f8163c7e4614b485e1f01699ff8f5f60919251575 SHA512 d85b8700248a4ad0a0873d0c84b2175fb0a66773c43899ab47ac531be089794c17eb0e8b7503d46efd78833da17c9fa8a83ad1cb9c062e191acfb77155639474 WHIRLPOOL 766c88748bc758a1b35bd6008750cc8f2678801b1cc5629bcb7a756e4a32973a5f5ad927348b3ce3ad9ecb3e7aca5d1af2b613fba35d4f53f9601b1ff42312b2
+DIST jre-7u80-linux-x64.tar.gz 47110223 SHA256 4c01efd0d8e80bb6e2f324ec3408ce64f066d4506c7ec93a491f615a4523f4f3 SHA512 e61e78ab1be0313690e8ab8d6cbae7366dd78aa4716f47c8908178196b658b94ee318dd04043965a72c34d8ef5c1cb4902afaa2188e76eb944256f090339107d WHIRLPOOL 1af7417b327402abaf4074445f051924de8b19810668890e089b66a488dddfc7f50cdd96a012130a591940338177164f66c83caf54c5d6d370be27d119a907fe
+DIST jre-8u51-linux-i586.tar.gz 65731094 SHA256 e59a6fc88e1fc62167be684ffd5de90f5d31f1c7b7e6361dde24b45afeaa8d3a SHA512 6b459f70c1bc4007a0e10e89682c5c33601b795f6693eda0836e49b9e248229e109947232aef7b9d15b38f92931a134bc96833408e44572bf3f3b2da301ad275 WHIRLPOOL dca9c6d3f68917561d1bc84fb9d33ba01907d57eee1487c7e080989a6b89332a4f8e198717b8c4fe992c71d6715aa0e058bb02bd9b90ed8a7055cbc1747e4311
+DIST jre-8u51-linux-x64.tar.gz 63861111 SHA256 25c2146b4ff1a12a9449589f8372f7f67cb63d6f6ad2b7f9ec92181cd3a31cee SHA512 7b3c8be7ba4014041e86b2dd597d027285185f9e8a484110bea589d73e4e35a9d709d57198610f466ea05ef8ea4b7e696f1fc844a60511d0ba111f666de5cf44 WHIRLPOOL 1472b32649afbed578eaf1b31006a2020bd217a3f75b9b7d7bc2fd8c32bcd422dfd46e7d11e2e5e34904a1f5cc0bd03885cb0c1515ccd63985ca974a6d61eddb
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-1.7.env b/dev-java/oracle-jre-bin/files/oracle-jre-bin-1.7.env
new file mode 100644
index 000000000000..a56c89844b12
--- /dev/null
+++ b/dev-java/oracle-jre-bin/files/oracle-jre-bin-1.7.env
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Oracle JRE @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/bin"
+LDPATH="@GENTOO_PORTAGE_EPREFIX@/usr/java/packages/lib/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib64:@GENTOO_PORTAGE_EPREFIX@/lib64:@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.7"
+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/files/oracle-jre-bin-1.8.env b/dev-java/oracle-jre-bin/files/oracle-jre-bin-1.8.env
new file mode 100644
index 000000000000..8350b2ddd8bd
--- /dev/null
+++ b/dev-java/oracle-jre-bin/files/oracle-jre-bin-1.8.env
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Oracle JRE @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/bin"
+LDPATH="@GENTOO_PORTAGE_EPREFIX@/usr/java/packages/lib/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib64:@GENTOO_PORTAGE_EPREFIX@/lib64:@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.8"
+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..e93f517764a3
--- /dev/null
+++ b/dev-java/oracle-jre-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <longdescription>Oracle Java SE Runtime Environment, Official Binary Distribution</longdescription>
+  <use>
+    <flag name="awt">Install non-headless AWT libraries, 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="pax_kernel">Use paxctl to mark the JVM binaries</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.80.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.80.ebuild
new file mode 100644
index 000000000000..a71aa23236cb
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.80.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 eutils prefix versionator
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
+AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
+
+# This URIs need updating when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html#jre-${MY_PV}-oth-JPR"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.zip"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	x86? ( ${X86_AT} )
+	amd64? ( ${AMD64_AT} )
+	jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.7"
+KEYWORDS="amd64 x86"
+IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+COMMON_DEP=""
+RDEPEND="${COMMON_DEP}
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)
+	alsa? ( media-libs/alsa-lib )
+	fontconfig? ( media-libs/fontconfig )
+	!prefix? ( sys-libs/glibc )
+	selinux? ( sec-policy/selinux-java )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="${COMMON_DEP}
+	jce? ( app-arch/unzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jre${S_PV}"
+
+pkg_nofetch() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	fi
+
+	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-downloads-javase7-521261.html#jre-${MY_PV}-oth-JPR"
+	einfo
+}
+
+src_prepare() {
+	if use jce; then
+		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf lib/i386/libjavaplugin_oji.so \
+			lib/i386/libjavaplugin_nscp*.so
+		rm -vrf plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf lib/${arch}/libnpjp2.so \
+			lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir "${dest}"
+	cp -pPR bin lib man "${ddest}" || die
+
+	# 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
+
+	dodoc COPYRIGHT README
+
+	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
+		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
+	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/7/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
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.51.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.51.ebuild
new file mode 100644
index 000000000000..65d152aac0a4
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.51.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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 +awt cups +fontconfig javafx jce nsplugin pax_kernel 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? (
+		awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+		)
+		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 )"
+
+# A PaX header isn't created by scanelf so depend on paxctl to avoid
+# fallback marking. See bug #427642.
+DEPEND="jce? ( app-arch/unzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+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
+}
+
+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 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
+		install_mozilla_plugin "${dest}/${nsplugin}"
+	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
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/oscache/Manifest b/dev-java/oscache/Manifest
new file mode 100644
index 000000000000..def73131079c
--- /dev/null
+++ b/dev-java/oscache/Manifest
@@ -0,0 +1 @@
+DIST oscache-2.0.2-full.zip 2533146 SHA256 d909d10aec024d9f53475030843afbb3c3bd18ee1a77b3e9e486a6f0fb336d52 SHA512 18799280bd81506a610659d8e8fb4a1405ff32d1275a227c6306d5197cf3ba8d907227cbbfec4bb570ab7e9fe6342828fd42702644cf19a51e1c66bba8d11cd3 WHIRLPOOL d35959a4c996d000c28d2f5f28f8c527f3a08283912a2a949d1577768d074e1e2517b6ef7b122aee0366e9d723187dc9572acd6b800cb7f13633a1824b4b4b51
diff --git a/dev-java/oscache/metadata.xml b/dev-java/oscache/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/oscache/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/oscache/oscache-2.0.2-r3.ebuild b/dev-java/oscache/oscache-2.0.2-r3.ebuild
new file mode 100644
index 000000000000..f2d852cf605a
--- /dev/null
+++ b/dev-java/oscache/oscache-2.0.2-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2
+
+DESCRIPTION="OSCache is a widely used, high performance J2EE caching framework"
+SRC_URI="https://oscache.dev.java.net/files/documents/629/2653/${P}-full.zip"
+HOMEPAGE="http://www.opensymphony.com/oscache/"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+COMMON_DEP="
+		dev-java/commons-collections
+		dev-java/commons-logging
+		java-virtuals/servlet-api:2.3
+		java-virtuals/jms
+		dev-java/jgroups"
+RDEPEND=">=virtual/jre-1.3
+		${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.3
+		${COMMON_DEP}
+		app-arch/unzip"
+IUSE=""
+
+S=${WORKDIR}
+
+java_prepare() {
+	find . -name "*.jar" -print -delete || die
+}
+
+src_compile() {
+	local build_dir="${S}"/build
+	local classpath="-classpath $(java-pkg_getjars commons-logging,commons-collections,servlet-api-2.3,jms,jgroups):${build_dir}:."
+	mkdir ${build_dir}
+
+	echo "Building core..."
+	cd "${S}"/src/core/java
+	ejavac ${classpath} -nowarn -d ${build_dir} $(find . -name "*.java") || die
+
+	echo "Building cluster support plugin..."
+	cd "${S}"/src/plugins/clustersupport/java
+	find . -name "*.java" -exec sed -i -e "s/org.javagroups/org.jgroups/g" {} \;
+	ejavac ${classpath} -nowarn -d ${build_dir} $(find . -name "*.java") || die
+
+	echo "Building disk persistence plugin..."
+	cd "${S}"/src/plugins/diskpersistence/java
+	ejavac ${classpath} -nowarn -d ${build_dir} `find . -name "*.java"` || die "compile failed"
+
+	if use doc ; then
+		echo "Building documentation..."
+		mkdir "${S}"/javadoc
+		cd ${build_dir}
+		local sourcepath="${S}/src/core/java:${S}/src/plugins/diskpersistence/java:${S}/src/plugins/clustersupport/java"
+		javadoc ${classpath} -sourcepath ${sourcepath} -d "${S}"/javadoc \
+			$(find com/opensymphony/oscache -type d | tr '/' '.') \
+			|| die "failed to create javadoc"
+	fi
+
+	cd "${S}"
+	jar cf ${PN}.jar -C build . || die "jar failed"
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+	dodoc readme.txt
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest
new file mode 100644
index 000000000000..3f7817aeb7d4
--- /dev/null
+++ b/dev-java/osgi-compendium/Manifest
@@ -0,0 +1 @@
+DIST osgi.cmpn-4.3.1.jar 741615 SHA256 d73af7676eb25236057598907ae40c7542b6a8dcdd5b9a0001552fb4b2134bbe SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9 WHIRLPOOL d24c488ed334bd634b1b5349e433274af5534a442c7a934b1f891279f4e9269459d84aed2bcdc96f268ae4ea8d25b49dcaf70e12d6c344899dbe0279c6148ab9
diff --git a/dev-java/osgi-compendium/metadata.xml b/dev-java/osgi-compendium/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/osgi-compendium/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..96cb62778379
--- /dev/null
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Service Platform Compendium API (Companion Code)"
+HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
+SRC_URI="http://www.osgi.org/download/r4v43/osgi.cmpn-${PV}.jar"
+
+LICENSE="Apache-2.0 OSGi-Specification-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RESTRICT="bindist fetch"
+
+COMMON_DEPEND="dev-java/glassfish-persistence:0
+	dev-java/osgi-core-api:0
+	dev-java/osgi-foundation:0
+	dev-java/tomcat-servlet-api:3.0"
+
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.5"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+JAVA_GENTOO_CLASSPATH="glassfish-persistence,osgi-core-api,osgi-foundation,tomcat-servlet-api-3.0"
+
+pkg_nofetch() {
+	einfo "Please download osgi.cmpn-${PV}.jar from"
+	einfo "  http://www.osgi.org/Download/Release4V43"
+	einfo "which you can find listed as"
+	einfo "  OSGi Service Platform Release 4 Version 4.3 Compendium Companion Code"
+	einfo "after accepting the license."
+}
+
+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..d5c0c843e5a7
--- /dev/null
+++ b/dev-java/osgi-core-api/Manifest
@@ -0,0 +1,2 @@
+DIST osgi-core-api-4.3-all.zip 337463 SHA256 e03188926e6dfbc87ef7a097226c6cd01e399747d75e03a233961de661b13fbc SHA512 4620e96e0a24661a0d3f3a570598d51ba9068b7204f3dd34179bdca76ad9f2edf2e20c1656f0dc355be647a2b5befc064ff50b8f75167639580fb5ef661292c1 WHIRLPOOL 97634762b8c2042301d78312baff5bc575314d5ded28d673d69f354c1e5b23d3845bd4d90421f6d2fe20574386ae5d88e126da90d1fde8aabe71530cc2b8f65f
+DIST osgi.core-5.0.0.jar 418232 SHA256 22fe6c64753a0479fb450bcb740ea5e51747cca2e1aabb8a582d50c02c3eec94 SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3 WHIRLPOOL 9164e08ccd6f079898d0dedd33df1ea1f76f3ed4e65fe9205d17e72e6d8f6e5820fbab7a0bbe9633efa85f9ff4a9045813ea9d193dc110f5b6bd7d67a98b621c
diff --git a/dev-java/osgi-core-api/metadata.xml b/dev-java/osgi-core-api/metadata.xml
new file mode 100644
index 000000000000..95a67909c7b5
--- /dev/null
+++ b/dev-java/osgi-core-api/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild b/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild
new file mode 100644
index 000000000000..40fa4291c0af
--- /dev/null
+++ b/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/r4v${PV//./}/osgi.core-${PV}.0.jar -> ${P}-all.zip"
+
+LICENSE="Apache-2.0 OSGi-Specification-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-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..f0528eaa5133
--- /dev/null
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 OSGi-Specification-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..91fafed7763a
--- /dev/null
+++ b/dev-java/osgi-enterprise-api/Manifest
@@ -0,0 +1 @@
+DIST osgi.enterprise-5.0.0.jar 479506 SHA256 2ad77a87fbd53e6e719bccfe4bb71bf9e409c104e7c2b500a9a59859faf85e4f SHA512 0404c05afd8cb3ef8b826b0f08deeb03b0027ca99e091953d39ef69674809c5b899e0f2c8efb685df5fce070c2aafcf813e470fbb538d4ec3b480a8060351144 WHIRLPOOL cfc9117632bcb7cdef03bc484beee374429ea665a049f079d7a649d16a56369e976a9d80469a7db2124d02e00ea2ffe11faecf52623abe66cf0241a9bd12028e
diff --git a/dev-java/osgi-enterprise-api/metadata.xml b/dev-java/osgi-enterprise-api/metadata.xml
new file mode 100644
index 000000000000..82a57ccd5243
--- /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>
+<herd>java</herd>
+<longdescription lang="en">
+</longdescription>
+</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..f4049e618f61
--- /dev/null
+++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ec87324e7fa5
--- /dev/null
+++ b/dev-java/osgi-foundation/Manifest
@@ -0,0 +1 @@
+DIST osgi-foundation-1.2.0.tar.xz 45176 SHA256 0f460df58caa1335b6eaa238068c725ff8ef823de83bd2ee65534d2757ad058c SHA512 6523dd6b4cd8205aa3359fae4640ff6b17a1944aec6bf23acf0d6e4eb33839a9b9049e8df0c55a4f35013b40b1df2391a53ed68df682a317c35dca504e9b996b WHIRLPOOL c43abe51b4f8ec743e8dc0c073c519c08a1499f1538bd3804c29eafe916385379f66dceb6202e7f061061bdbe082df93502dd051106cfb9896040125acad71b5
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..7303cef96964
--- /dev/null
+++ b/dev-java/osgi-foundation/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..bd24d7222c20
--- /dev/null
+++ b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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..d16abad5e163
--- /dev/null
+++ b/dev-java/osgi-obr/Manifest
@@ -0,0 +1 @@
+DIST org.osgi.service.obr-1.0.2-project.tar.gz 7939 SHA256 2be4c016dd95d5411e13472b5e50ab75039de4384b26ae0d28308511e702c510 SHA512 2af278c6309f8e2fd64c86c5e28a32935ee88e43489b2ca89be94bd2b996acbfcbf93a439f4e3c5f61d5d98df8d0897485982cd749f57d80574a3eb1fbb8ad21 WHIRLPOOL 51d1cc62662eacca789987414258d54909491f853ae84fb95d8bf71ee77f0e50aef4ae19e5004bd0a15a62dc2dbeba34c4caa96f3c7e8ceb8e52e00f5b9b142b
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..838c00a4a448
--- /dev/null
+++ b/dev-java/osgi-obr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</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..338c630e8bac
--- /dev/null
+++ b/dev-java/osgi-obr/osgi-obr-1.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5
+	${CDEPEND}
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.5
+	${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..fe92b6d9a764
--- /dev/null
+++ b/dev-java/pat/Manifest
@@ -0,0 +1,2 @@
+DIST patdocs15.jar 246030 SHA256 19805bd985e473099b573d10e0809849c95affa288dd32dffde783ec6cd0b0d2 SHA512 09bc354352c1c29727a37a81bda167bc5755c270028c85b030f1e775df1f96a5777d864c6dbb78351425f1706d97645320ba2b08634f924b2cc5aef91980138a WHIRLPOOL 5f85b9676b79b8af46696b5bb5698b2b3bbac69ed79a5f57f5101cae91b42bd511336f03feb346f9679a76a2732ad649a54fbd3e4dcf5cd67047cdbc3bb8f7b0
+DIST patsrcfree153.jar 135452 SHA256 6a64747899e0fc82f607e4da7d330d74d3f527c01cd8f2d605bb87c9be3f0367 SHA512 4c62906a9f236351f8de457198e746229c48dc983275a95546815fe5af0083a54e204226abaf71ef01cf407c8be34f8e5594f65b126d45ff3e4ba75630ccdabe WHIRLPOOL c3c7d6f159ff670847e634bc58b808dc41bb66a7e9fa33cd204771c109d3f0972d37c7cbfac468efb55915b747238486adaac7cd4dc3ac51ddaa0a1feb7f4b46
diff --git a/dev-java/pat/metadata.xml b/dev-java/pat/metadata.xml
new file mode 100644
index 000000000000..44346b6e6c3d
--- /dev/null
+++ b/dev-java/pat/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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.ebuild b/dev-java/pat/pat-1.5.3.ebuild
new file mode 100644
index 000000000000..0ad1099da574
--- /dev/null
+++ b/dev-java/pat/pat-1.5.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2
+
+DESCRIPTION="Regular Expressions in Java"
+HOMEPAGE="http://www.javaregex.com"
+
+MY_PV=$(delete_all_version_separators)
+MAJORMINOR=$(get_version_component_range 1-2)
+DOC_VER=$(delete_all_version_separators ${MAJORMINOR})
+MY_P=${PN}-${PV}
+
+SRC_URI="http://www.javaregex.com/binaries/${PN}srcfree${MY_PV}.jar
+	doc? ( http://www.javaregex.com/binaries/patdocs${DOC_VER}.jar )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip"
+
+S=${WORKDIR}
+
+src_compile() {
+	ejavac $(find . -name "*.java")
+	jar cf ${PN}.jar $(find . -name "*.class")
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+
+	if use doc; then
+		dohtml docs/*.{html,jpg}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	use source && java-pkg_dosrc com
+}
diff --git a/dev-java/pdf-renderer/Manifest b/dev-java/pdf-renderer/Manifest
new file mode 100644
index 000000000000..e40375ea9177
--- /dev/null
+++ b/dev-java/pdf-renderer/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/pdf-renderer/metadata.xml b/dev-java/pdf-renderer/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/pdf-renderer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..66cec761d265
--- /dev/null
+++ b/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..65de3b980d0e
--- /dev/null
+++ b/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..37b1a6392408
--- /dev/null
+++ b/dev-java/pdfbox/Manifest
@@ -0,0 +1,3 @@
+DIST PDFBox-0.7.3.zip 22769102 SHA256 5c6f6c87cdbf247ff29d0ce691ab977c2e869070d54cf1bd6305e0fd84e7373d SHA512 1d76d5e96be26f89fdb53f68d60320dbfd5ff9c575b8ef076c8dadd3ffac6aa42f69248f9df3532c171de6093e7b5ffc097f40461a33077256f57cf75e41a6b1 WHIRLPOOL 7d0eda7449e3e6bd8d7426ed884b9d6cdeebf03104d4b3dde2bf499595d3a15906d4f26b38dd84434faca7d6d9b150353b6e2e2bb1592d2b4af716a8633d7b1e
+DIST pcfi-2010.08.09.jar 6731455 SHA256 a787fb2a842de7bd5ee4fa13c4808aa6793380dde0219560b50054f6ca25c77c SHA512 067394ddac4a48ba8ac94b03f907d0faf98a91be658689a34eb85fdce49515582426f6a1fa433bfa87ca417ce3a6fa3aa89d89126a36176d8e04f3359c36d10b WHIRLPOOL fa9e9b6b2cc45f749101726c8fb7a4c7719d78448122c465b60696cd5be1a2a27bc65f549429d5a74c79bc74aaed39b3c0a8dfe02ec569303b96faa818410e73
+DIST pdfbox-1.8.8-src.zip 11339989 SHA256 90d6b9a33682586e29bbce4ffeadf38c12fe0373bfe82441c1a63610a9c4ea8a SHA512 254361d0dcbfdc52bc78a2ed7e121065a2d173d1362a219d6644c3cc8a83a37904744e03f1725e2db67494d5f54f822b6e5a16dd8e791906efb9c348d564552f WHIRLPOOL cd9e71be60ee6d92c34f4affe7d6b074896920491a731a65f2b74e9e09754e836288c632e5d4a24b2d8aba64505dc58d2c3f8d0dd103c33773fce6dcd187e5a3
diff --git a/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch b/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch
new file mode 100644
index 000000000000..cb8c8cd62a42
--- /dev/null
+++ b/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch
@@ -0,0 +1,134 @@
+--- build.xml.orig	2015-05-12 16:41:01.813664913 +0000
++++ build.xml	2015-05-12 16:44:10.434652444 +0000
+@@ -28,7 +28,7 @@
+     <property name="tool.dir" value="tools" />
+     <property name="bin.dir" value="bin" />
+ 
+-    <property name="project.version" value="1.8.7" />
++    <property name="project.version" value="1.8.8" />
+ 
+     <!-- pdfbox -->
+     <property name="pdfbox.project.name" value="pdfbox"/>
+@@ -95,9 +95,6 @@
+     <property name="testoutput-ext.dir" value="${pdfbox.target.dir}/test-output-ext"/>
+     <property name="testinput-ext.dir" value="${pdfbox.target.dir}/test-input-ext"/>
+ 
+-    <property name="adobefiles.url" value="${maven.repo2}/com/adobe/pdf/pcfi/2010.08.09/pcfi-2010.08.09.jar"/>
+-    <property name="adobefiles.jar" value="${download.dir}/pcfi-2010.08.09.jar"/>
+-
+     <property name="file" value=""/>
+ 
+     <!--.NET properties -->
+@@ -171,7 +168,7 @@
+         <mkdir dir="${jempbox.dest.dir}"/>
+     </target>
+ 
+-    <target name="pdfbox.compile" depends="fontbox.package,jempbox.package,pdfbox.init,get.adobefiles"
++    <target name="pdfbox.compile" depends="fontbox.package,jempbox.package,pdfbox.init"
+             description="Compile Java source files">
+         <!-- required encoding flag to be able to build using ibm-jdk on redhat ES-->
+         <javac srcdir="${pdfbox.src.dir}" destdir="${pdfbox.dest.dir}"
+@@ -206,31 +203,6 @@
+ 
+     <target name="test" depends="testextract,test-junit,testimage" description="Run all the junit tests"/>
+ 
+-    <target name="find.adobefiles">
+-        <available property="adobefiles.found" file="${dest.dir}/org/apache/pdfbox/resources/cmap"/>
+-    </target>
+-
+-    <target name="get.adobefiles"
+-            unless="adobefiles.found" depends="find.adobefiles"
+-            description="Download and unpack afm and cmap files from Adobe">
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${adobefiles.url}"/>
+-            <param name="destfile" value="${adobefiles.jar}"/>
+-        </antcall>
+-        <unjar src="${adobefiles.jar}" dest="${pdfbox.dest.dir}/org/apache/pdfbox/resources/afm">
+-            <patternset>
+-                <include name="com/adobe/pdf/pcfi/afm/*.afm"/>
+-            </patternset>
+-            <mapper type="flatten"/>
+-        </unjar>
+-        <unjar src="${adobefiles.jar}" dest="${pdfbox.dest.dir}/org/apache/pdfbox/resources">
+-            <patternset>
+-                <include name="com/adobe/pdf/pcfi/glyphlist.txt"/>
+-            </patternset>
+-            <mapper type="flatten"/>
+-        </unjar>
+-    </target>
+-
+     <target name="testextract" depends="clean,pdfbox.compile" description="Test text extraction">
+         <junit printsummary="off" fork="on" dir=".">
+             <jvmarg value="-Xmx1024M"/>
+@@ -341,52 +313,7 @@
+         </checkstyle>
+     </target>
+ 
+-    <target name="get.externallibs.pdfbox">
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${bcmail.url}"/>
+-            <param name="destfile" value="${bcmail.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${bcprov.url}"/>
+-            <param name="destfile" value="${bcprov.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${junit.url}"/>
+-            <param name="destfile" value="${junit.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${logging.url}"/>
+-            <param name="destfile" value="${logging.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${icu4j.url}"/>
+-            <param name="destfile" value="${icu4j.jar}"/>
+-        </antcall>
+-    </target>
+-
+-    <target name="get.externallibs.fontbox">
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${junit.url}"/>
+-            <param name="destfile" value="${junit.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${logging.url}"/>
+-            <param name="destfile" value="${logging.jar}"/>
+-        </antcall>
+-    </target>
+-
+-    <target name="get.externallibs.jempbox">
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${junit.url}"/>
+-            <param name="destfile" value="${junit.jar}"/>
+-        </antcall>
+-        <antcall target="downloadfile">
+-            <param name="sourcefile" value="${logging.url}"/>
+-            <param name="destfile" value="${logging.jar}"/>
+-        </antcall>
+-    </target>
+-
+-    <target name="pdfbox.package" depends="get.externallibs.pdfbox,pdfbox.compile" description="Package pdfbox into a jar file">
++    <target name="pdfbox.package" depends="pdfbox.compile" description="Package pdfbox into a jar file">
+         <propertyfile file="${pdfbox.resources.dir}/org/apache/pdfbox/resources/pdfbox.version">
+             <entry  key="pdfbox.version" value="${pdfbox.release.name}"/>
+         </propertyfile>
+@@ -405,7 +332,7 @@
+         </jar>
+     </target>
+ 
+-    <target name="fontbox.package" depends="get.externallibs.fontbox,fontbox.compile" description="Package fontbox into a jar file">
++    <target name="fontbox.package" depends="fontbox.compile" description="Package fontbox into a jar file">
+         <jar jarfile="${fontbox.jar}">
+             <fileset dir="${fontbox.dest.dir}"/>
+             <metainf dir="." includes="*.txt"/>
+@@ -419,7 +346,7 @@
+         </jar>
+     </target>
+ 
+-    <target name="jempbox.package" depends="get.externallibs.jempbox,jempbox.compile" description="Package jempbox into a jar file">
++    <target name="jempbox.package" depends="jempbox.compile" description="Package jempbox into a jar file">
+         <jar jarfile="${jempbox.jar}">
+             <fileset dir="${jempbox.dest.dir}"/>
+             <metainf dir="." includes="*.txt"/>
diff --git a/dev-java/pdfbox/metadata.xml b/dev-java/pdfbox/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/pdfbox/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/pdfbox/pdfbox-0.7.3-r3.ebuild b/dev-java/pdfbox/pdfbox-0.7.3-r3.ebuild
new file mode 100644
index 000000000000..28f90f16be3e
--- /dev/null
+++ b/dev-java/pdfbox/pdfbox-0.7.3-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+inherit java-pkg-2 java-ant-2
+
+MY_PN="PDFBox"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Java library and utilities for working with PDF documents"
+HOMEPAGE="http://www.pdfbox.apache.org"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE=""
+
+CDEPEND="dev-java/fontbox:0
+	dev-java/bcprov:1.38
+	dev-java/bcmail:1.38
+	dev-java/lucene:2.1
+	dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${CDEPEND}"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+S="${WORKDIR}/${MY_P}"
+
+# missing needed files
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v external/*.jar lib/*.jar || die
+	rm -rf docs/javadoc
+
+	# the pdf files used in test cases are not included
+	rm -rf src/test
+
+	cd external
+	java-pkg_jar-from fontbox
+	java-pkg_jar-from bcprov-1.38
+	java-pkg_jar-from bcmail-1.38
+	java-pkg_jar-from lucene-2.1
+	java-pkg_jar-from ant-core ant.jar
+}
+
+EANT_BUILD_TARGET="package"
+
+my_launcher() {
+	java-pkg_dolauncher ${1} --main org.pdfbox.${2}
+	echo "${2} -> ${1}" >> "${T}"/launcher.list
+}
+
+src_install() {
+	java-pkg_newjar lib/${MY_P}-dev.jar
+
+	my_launcher pdfconvertcolorspace ConvertColorspace
+	my_launcher pdfdecrypt Decrypt
+	my_launcher pdfencrypt Encrypt
+	my_launcher pdfexportfdf ExportFDF
+	my_launcher pdfexportxfdf ExportXFDF
+	my_launcher pdfextractimages ExtractImages
+	my_launcher pdfextracttext ExtractText
+	my_launcher pdfimportfdf ImportFDF
+	my_launcher pdfimportxfdf ImportXFDF
+	my_launcher pdfoverlay Overlay
+	my_launcher pdfdebugger PDFDebugger
+	my_launcher pdfmerger PDFMerger
+	my_launcher pdfreader PDFReader
+	my_launcher pdfsplit PDFSplit
+	my_launcher pdftoimage PDFToImage
+	my_launcher printpdf PrintPDF
+	my_launcher texttopdf TextToPDF
+
+	if use doc; then
+		dohtml -r docs/*
+		java-pkg_dojavadoc website/build/site/javadoc
+	fi
+
+	use source && java-pkg_dosrc src/org
+}
+
+pkg_postinst() {
+	elog "This package installs several command line tools for manipulating"
+	elog "PDF files. Some of their names were changed from upstream to"
+	elog "be less ambigous, and not collide with other packages. For"
+	elog "detailed information refer to the html documentation installed with"
+	elog "USE=doc, or ${HOMEPAGE}"
+
+	while read line
+	do
+		elog ${line}
+	done < "${T}"/launcher.list
+}
diff --git a/dev-java/pdfbox/pdfbox-1.8.8.ebuild b/dev-java/pdfbox/pdfbox-1.8.8.ebuild
new file mode 100644
index 000000000000..8cb72f896251
--- /dev/null
+++ b/dev-java/pdfbox/pdfbox-1.8.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java library and utilities for working with PDF documents"
+HOMEPAGE="http://pdfbox.apache.org/"
+ADOBE_FILES="pcfi-2010.08.09.jar"
+SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
+	http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/${ADOBE_FILES}"
+LICENSE="BSD"
+SLOT="1.8"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+CDEPEND="dev-java/icu4j:4
+	dev-java/junit:4
+	dev-java/bcprov:1.45
+	dev-java/bcmail:1.45
+	>=dev-java/commons-logging-1.1.1:0"
+RDEPEND=">=virtual/jre-1.7
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit:0 )
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="bcprov-1.45,bcmail-1.45,commons-logging,junit-4,icu4j-4"
+EANT_BUILD_TARGET="pdfbox.package"
+WANT_ANT_TASKS="ant-nodeps"
+
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+}
+
+java_prepare() {
+	# This patch:
+	# - turns off downloads
+	# - increments version number (silly mistake from upstream)
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	mv target/${P}.jar ${P}.jar
+}
+
+src_install() {
+	java-pkg_newjar ${P}.jar ${PN}.jar
+
+	if use source; then
+		java-pkg_dosrc src/main/java/org
+	fi
+}
diff --git a/dev-java/piccolo/Manifest b/dev-java/piccolo/Manifest
new file mode 100644
index 000000000000..5db7f230bf1c
--- /dev/null
+++ b/dev-java/piccolo/Manifest
@@ -0,0 +1 @@
+DIST piccolo-1.04-src.zip 252316 SHA256 75a8f729c98e3b8015fdd044776cf5c4555ddcee6577a72c1ffa63cc17111ade SHA512 fa0809e8d9eb43713144bdf193975c62344269bc1b24d12159c98c98776de4633c95234bbbb023d445e00786903fcd9b49d37053f03d8d6a1e2c84b93668f947 WHIRLPOOL 2568255ab0f69d7852a435444213bc1867c255478ba7eedc6373f2e4ce6625d16dd116693b1027726a3823be716d552221b1f1c4191c0d907b2db92be58dcd79
diff --git a/dev-java/piccolo/metadata.xml b/dev-java/piccolo/metadata.xml
new file mode 100644
index 000000000000..ac174a7752db
--- /dev/null
+++ b/dev-java/piccolo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..99d28d4c130c
--- /dev/null
+++ b/dev-java/piccolo/piccolo-1.04.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	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..352799936b9b
--- /dev/null
+++ b/dev-java/piccolo2d/Manifest
@@ -0,0 +1 @@
+DIST Piccolo2D.Java-1.2.1.zip 1886765 SHA256 3ba041d458226f8f54170cd82b76d2868a943f3b6d18c602ffacb8887598a621 SHA512 00e8119148abfe2b399ca252eda97c0199bdc03584e08b34438b16cf3c27bb103eb04c6afe9bf4c07832fe2a95147f53a4a536abe81a2f3116c332678f2dd919 WHIRLPOOL d4da92c931c65a26b5f5925c9557aa4a7af4c0cc009a9a49b01853b74e3a63bbde110e30d2464a2bb39fbce6058a73a0a76d1d7778370abe122ef06baaeb98ac
diff --git a/dev-java/piccolo2d/files/1.2.1-font-api.patch b/dev-java/piccolo2d/files/1.2.1-font-api.patch
new file mode 100644
index 000000000000..ba77b3515585
--- /dev/null
+++ b/dev-java/piccolo2d/files/1.2.1-font-api.patch
@@ -0,0 +1,12 @@
+diff -ur piccolo-1.2.1.old/extras/edu/umd/cs/piccolox/swt/SWTGraphics2D.java piccolo-1.2.1/extras/edu/umd/cs/piccolox/swt/SWTGraphics2D.java
+--- piccolo-1.2.1.old/extras/edu/umd/cs/piccolox/swt/SWTGraphics2D.java	2008-07-27 23:35:16.000000000 +0300
++++ piccolo-1.2.1/extras/edu/umd/cs/piccolox/swt/SWTGraphics2D.java	2008-07-27 23:36:09.000000000 +0300
+@@ -238,7 +238,7 @@
+ 					style = style | SWT.ITALIC;	
+ 				}
+ 				
+-				return new Font(fd[0].getName(),style,fd[0].height);
++				return new Font(fd[0].getName(),style,fd[0].getHeight());
+ 			}
+ 			return null;			
+ 		}
diff --git a/dev-java/piccolo2d/metadata.xml b/dev-java/piccolo2d/metadata.xml
new file mode 100644
index 000000000000..06017385f9db
--- /dev/null
+++ b/dev-java/piccolo2d/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="google-code">piccolo2d</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/piccolo2d/piccolo2d-1.2.1-r2.ebuild b/dev-java/piccolo2d/piccolo2d-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..bb194c8fc6af
--- /dev/null
+++ b/dev-java/piccolo2d/piccolo2d-1.2.1-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="piccolo"
+DESCRIPTION="A Structured 2D Graphics Framework"
+HOMEPAGE="http://code.google.com/p/piccolo2d/"
+SRC_URI="http://piccolo2d.googlecode.com/files/Piccolo2D.Java-${PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPS="
+	dev-java/swt:3.5
+	java-virtuals/jdk-with-com-sun
+	"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPS}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEPS}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Needs X11
+RESTRICT="test"
+
+java_prepare() {
+	find -name '*.jar' -print -delete
+	epatch "${FILESDIR}/1.2.1-font-api.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="swt-3.5,jdk-with-com-sun"
+EANT_BUILD_TARGET="${MY_PN} extras"
+EANT_GENTOO_CLASSPATH_EXTRA="build/${MY_PN}.jar:build/${MY_PN}x.jar"
+EANT_DOC_TARGET="api"
+EANT_TEST_TARGET="runtests"
+
+src_install() {
+	java-pkg_dojar build/*.jar
+	dodoc Readme.txt ReleaseNotes.txt || die
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc extras/edu src/edu
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/picocontainer/Manifest b/dev-java/picocontainer/Manifest
new file mode 100644
index 000000000000..2e521d1549e7
--- /dev/null
+++ b/dev-java/picocontainer/Manifest
@@ -0,0 +1 @@
+DIST picocontainer-1.1-src.tar.gz 83564 SHA256 c1463cbaceaa1eae718d271035653a61a19232f3a20e831bd5d016963ef6091e SHA512 adee3e5f46cc8f9a57db1c3e08b4730430daf92c090413ce061576c272b0a1a8bad94281a7a0bd4bdfa8fec8ca051bd15560d0a0fb0ca65cee39ea5ff1b15777 WHIRLPOOL 1ac06f7845c47b7fb238fb83702ccd80f35d5ade3d465e9928e60731d3488df96604f5756d9ea0c61c08b1ec35e3d3e9341ead9aeb50f46f825447d911370244
diff --git a/dev-java/picocontainer/metadata.xml b/dev-java/picocontainer/metadata.xml
new file mode 100644
index 000000000000..896e47a05b0c
--- /dev/null
+++ b/dev-java/picocontainer/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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..abb2c9c1c70d
--- /dev/null
+++ b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..6c52690ee9b3
--- /dev/null
+++ b/dev-java/plexus-classworlds/Manifest
@@ -0,0 +1 @@
+DIST plexus-classworlds-2.2.3.tar.bz2 41744 SHA256 fda8ce2db126e3d21f09103818810795924c7c023132b1a6c59179927242013a SHA512 d5f3d3dac4df569b91ddea9265b14a2459b0ecd4ac3e4547cbac341f50d18238071a7a560d9771a9f8724c59225ea7fa8645ed72c5a00a684519a46a024c3c61 WHIRLPOOL ccd9b9e8f94d39635338169a258b4abb5fff798f32da7166b3d4123ff3aa3ad5ed986618bd6c122b456736cdd207df79a965e258330a2820142208b9e54c490f
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..604e0a4238bb
--- /dev/null
+++ b/dev-java/plexus-classworlds/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..1e2693d512de
--- /dev/null
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://plexus.codehaus.org/"
+SRC_URI="http://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/poi/Manifest b/dev-java/poi/Manifest
new file mode 100644
index 000000000000..0ade9233f9e7
--- /dev/null
+++ b/dev-java/poi/Manifest
@@ -0,0 +1,2 @@
+DIST poi-src-3.0.2-FINAL-20080204.tar.gz 19034308 SHA256 38a3d599fb75eaaa7c70fec230a9a88c192080b4c07fc9e7c7a31f8b26c8e4eb SHA512 30aa49e7694b6ae904b1362e967b2f0df9990db0c7f51499d60a78285135eef218436419502725083a4cbbc1ae89fc48976ac29cc214b0266b05400c758c6b7a WHIRLPOOL 189dce9e7a399f4a8b0a3cc29e178ac9b190db6d85e528245c54c9789ea895269f493318bfb4f37f51a0c8cdc92a97635c15c9c2ecdde4bfa37a7444667ab47e
+DIST poi-src-3.2-FINAL-20081019.tar.gz 25909967 SHA256 7f39291c4ea12420676680c7e21923e4579b73122710873448dba1673ad03804 SHA512 e6d77f2ae595a7f97f27169cbf67bcde6f21fc05b673e86818b6da6602e7388f9fb6de78837e33067ea2c483c705e48dd08932635c8457f67c79678eb354e1f3 WHIRLPOOL 2d1b64eef8619c913d9b7874f547e072f0acfdc048cae18f8cdbb14a87b3698c597c0163cd0e77fa9043404800576a36b580915a0441b665f26724d564608e84
diff --git a/dev-java/poi/files/poi-3.0.2-isADateFormat.patch b/dev-java/poi/files/poi-3.0.2-isADateFormat.patch
new file mode 100644
index 000000000000..d4743148ef04
--- /dev/null
+++ b/dev-java/poi/files/poi-3.0.2-isADateFormat.patch
@@ -0,0 +1,11 @@
+--- ./src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java.orig	2008-02-07 12:02:57.000000000 +0100
++++ ./src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java	2008-02-07 12:29:17.000000000 +0100
+@@ -210,7 +210,7 @@
+     	
+     	// Otherwise, check it's only made up of:
+     	//  y m d - / ,
+-    	if(fs.matches("^[ymd\\-/, ]+$")) {
++    	if(fs.matches("^[yYmMdDhHsS\\-/,. :]+$")) {
+     		return true;
+     	}
+     	
diff --git a/dev-java/poi/files/poi-3.0.2-isADateFormatTest.patch b/dev-java/poi/files/poi-3.0.2-isADateFormatTest.patch
new file mode 100644
index 000000000000..b21c1d64316b
--- /dev/null
+++ b/dev-java/poi/files/poi-3.0.2-isADateFormatTest.patch
@@ -0,0 +1,45 @@
+--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java	2007/12/04 17:06:57	601004
++++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java	2008/02/07 12:39:12	619382
+@@ -228,6 +228,7 @@
+     			"yyyy-mm-dd", "yyyy/mm/dd", "yy/mm/dd", "yy/mmm/dd",
+     			"dd/mm/yy", "dd/mm/yyyy", "dd/mmm/yy",
+     			"dd-mm-yy", "dd-mm-yyyy",
++    			"DD-MM-YY", "DD-mm-YYYY",
+     			"dd\\-mm\\-yy", // Sometimes escaped
+     			
+     			// These crazy ones are valid
+@@ -242,15 +243,33 @@
+     		assertTrue( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
+     	}
+     	
++    	// Then time based ones too
++    	formats = new String[] {
++    			"yyyy-mm-dd hh:mm:ss", "yyyy/mm/dd HH:MM:SS", 
++    			"mm/dd HH:MM", "yy/mmm/dd SS",
++    	};
++    	for(int i=0; i<formats.length; i++) {
++    		assertTrue( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
++    	}
++    	
+     	// Then invalid ones
+     	formats = new String[] {
+-    			"yyyy:mm:dd", 
++    			"yyyy*mm*dd", 
+     			"0.0", "0.000",
+     			"0%", "0.0%",
+     			"", null
+     	};
+     	for(int i=0; i<formats.length; i++) {
+     		assertFalse( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
++    	}
++    	
++    	// And these are ones we probably shouldn't allow,
++    	//  but would need a better regexp
++    	formats = new String[] {
++    			"yyyy:mm:dd", 
++    	};
++    	for(int i=0; i<formats.length; i++) {
++    	//	assertFalse( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
+     	}
+     }
+
diff --git a/dev-java/poi/metadata.xml b/dev-java/poi/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/poi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/poi/poi-3.0.2-r1.ebuild b/dev-java/poi/poi-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..245ce50e7301
--- /dev/null
+++ b/dev-java/poi/poi-3.0.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+JAVA_PKG_IUSE="doc examples source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API To Access Microsoft Format Files"
+HOMEPAGE="http://poi.apache.org/"
+RELEASE_DATE="20080204"
+SRC_URI="mirror://apache/poi/release/src/${PN}-src-${PV}-FINAL-${RELEASE_DATE}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="test"
+
+COMMON_DEPEND="
+	>=dev-java/commons-beanutils-1.7:1.7
+	>=dev-java/commons-lang-2.1:2.1
+	>=dev-java/commons-logging-1.1"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}
+	test? ( dev-java/ant-junit )"
+
+S=${WORKDIR}/${P}-FINAL
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	# Patch that adds official fix for detection of custom date/time formats
+	# See bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=44373
+	epatch "${FILESDIR}/${P}-isADateFormat.patch"
+	use test && epatch "${FILESDIR}/${P}-isADateFormatTest.patch"
+
+	find -name "*.jar" | xargs rm -v
+
+	cd "${S}/lib"
+	java-pkg_jar-from commons-logging commons-logging.jar commons-logging-1.1.jar
+	use test && java-pkg_jar-from --build-only junit junit.jar junit-3.8.1.jar
+
+	cd "${S}/src/contrib/lib"
+	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+	java-pkg_jar-from commons-lang-2.1 commons-lang.jar commons-lang-2.1.jar
+
+	java-pkg_filter-compiler jikes
+}
+
+src_compile() {
+	# the same target compiles the source and the test so we just mess with
+	# the source directory
+	eant jar $(use_doc javadocs) -Ddisconnected=true \
+		$(use !test && echo -Dmain.src.test=legal -Dscratchpad.src.test=legal)
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test -Ddisconnected=true
+}
+
+src_install() {
+	use doc && java-pkg_dojavadoc build/tmp/site/build/site/*
+	use examples && java-pkg_doexamples src/examples/* src/scratchpad/examples/*
+	use source && java-pkg_dosrc src/contrib/src/org src/java/org src/scratchpad/src/org
+
+	cd build/dist
+	local VERSION=$(get_version_component_range 1-2)
+	java-pkg_newjar poi-scratchpad-${VERSION}* ${PN}-scratchpad.jar
+	java-pkg_newjar poi-contrib-${VERSION}* ${PN}-contrib.jar
+	java-pkg_newjar poi-${VERSION}* ${PN}.jar
+}
diff --git a/dev-java/poi/poi-3.2.ebuild b/dev-java/poi/poi-3.2.ebuild
new file mode 100644
index 000000000000..782886cbc9d4
--- /dev/null
+++ b/dev-java/poi/poi-3.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+JAVA_PKG_IUSE="doc examples source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API To Access Microsoft Format Files"
+HOMEPAGE="http://poi.apache.org/"
+RELEASE_DATE="20081019"
+SRC_URI="mirror://apache/poi/release/src/${PN}-src-${PV}-FINAL-${RELEASE_DATE}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="test"
+
+COMMON_DEPEND="
+	>=dev-java/commons-logging-1.1"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}
+	test? ( dev-java/ant-junit )"
+
+S=${WORKDIR}/${P}-FINAL
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	find -name "*.jar" | xargs rm -v
+
+	cd "${S}/lib"
+	java-pkg_jar-from commons-logging commons-logging.jar commons-logging-1.1.jar
+	use test && java-pkg_jar-from --build-only junit junit.jar junit-3.8.1.jar
+
+	java-pkg_filter-compiler jikes
+}
+
+src_compile() {
+	# the same target compiles the source and the test so we just mess with
+	# the source directory
+	eant jar $(use_doc javadocs) -Ddisconnected=true \
+		$(use !test && echo -Dmain.src.test=legal -Dscratchpad.src.test=legal)
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test -Ddisconnected=true
+}
+
+src_install() {
+	use doc && java-pkg_dojavadoc build/tmp/site/build/site/apidocs
+	use examples && java-pkg_doexamples src/examples/* src/scratchpad/examples/*
+	use source && java-pkg_dosrc src/contrib/src/org src/java/org src/scratchpad/src/org
+
+	cd build/dist || die "Cannot change to dist directory"
+	java-pkg_newjar poi-scratchpad-${PV}* ${PN}-scratchpad.jar
+	java-pkg_newjar poi-contrib-${PV}* ${PN}-contrib.jar
+	java-pkg_newjar poi-${PV}* ${PN}.jar
+}
diff --git a/dev-java/portletapi/Manifest b/dev-java/portletapi/Manifest
new file mode 100644
index 000000000000..0f45cff4d294
--- /dev/null
+++ b/dev-java/portletapi/Manifest
@@ -0,0 +1,2 @@
+DIST jetspeed-2.0-src.tar.gz 31317896 SHA256 c32a336810d934e4a627210e13e751bcd9b4257aaea78410ee1fba0c4a71cac0 SHA512 26dc10670663f9cd1faf25a9a7ad03942acc69e7b3acebf0608a84f055d9dde5e38e6ee6bce917b3efe53fd2242d04286829fd5f793caba4ebf598d899b599e4 WHIRLPOOL 0ae444ae4174ed3a0dea90ff1574c9ccb4b5b0f1389946f06d817c3225c4aa6f4d85c4030b4ac305bfaced7d3b08857b756a3e7d4ccdbf95d604edfd23bf3b27
+DIST portlet-api-2.0-sources.jar 124636 SHA256 bdba11e796e1370317e2587523925836edfb59cde438759210718fbe1d72694a SHA512 cf02030850d746b19b85bb3aa204fa7602af47fdda70d5be4c317dea01939abce96915d08186ac876b3081cd8023687e9c4bcef6f4f9a28e8a3456eaa56c8d8f WHIRLPOOL e5892a6dc6407cf1583d6b43c26d7e6a97531ed9cb42e30306638c8acd725e7df09bea744688fa2a3f8a74bd0b189a388cfd1be387fa354184565063f167c457
diff --git a/dev-java/portletapi/files/portletapi-1.0-build.xml b/dev-java/portletapi/files/portletapi-1.0-build.xml
new file mode 100644
index 000000000000..9d0b88fe1826
--- /dev/null
+++ b/dev-java/portletapi/files/portletapi-1.0-build.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--build.xml generated by maven from project.xml version 1.0
+  on date September 19 2006, time 1721-->
+
+<project default="jar" name="portlet-api" basedir=".">
+  <property name="defaulttargetdir" value="target">
+  </property>
+  <property name="libdir" value="target/lib">
+  </property>
+  <property name="classesdir" value="target/classes">
+  </property>
+  <property name="testclassesdir" value="target/test-classes">
+  </property>
+  <property name="distdir" value="dist">
+  </property>
+  <property name="javadocdir" value="dist/docs/api">
+  </property>
+  <property name="final.name" value="portletapi">
+  </property>
+  <path id="build.classpath">
+    <fileset dir="${libdir}">
+      <include name="**/*.jar">
+      </include>
+    </fileset>
+  </path>
+  <target name="init" description="o Initializes some properties">
+    <mkdir dir="${libdir}">
+    </mkdir>
+    <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>
+  </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="src/java">
+        </pathelement>
+      </src>
+      <classpath refid="build.classpath">
+      </classpath>
+    </javac>
+    <copy todir="${classesdir}">
+      <fileset dir="src/java">
+        <exclude name="**/*.java">
+        </exclude>
+      </fileset>
+    </copy>
+  </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">
+  </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">
+  </target>
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+    <mkdir dir="${javadocdir}">
+    </mkdir>
+    <tstamp>
+      <format pattern="1999-yyyy" property="year">
+      </format>
+    </tstamp>
+    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
+    </property>
+    <property name="title" value="Java Portlet API 1.0 API">
+    </property>
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="javax.portlet.*">
+      <classpath>
+        <path refid="build.classpath">
+        </path>
+      </classpath>
+    </javadoc>
+  </target>
+  <target name="get-deps" unless="noget" depends="init">
+    <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+    <setproxy>
+    </setproxy>
+  </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/portletapi/metadata.xml b/dev-java/portletapi/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/portletapi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/portletapi/portletapi-1.0.ebuild b/dev-java/portletapi/portletapi-1.0.ebuild
new file mode 100644
index 000000000000..56d6184b7fb5
--- /dev/null
+++ b/dev-java/portletapi/portletapi-1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+JETSPEED_P="jetspeed-2.0-src"
+DESCRIPTION="Jetspeed 2 Portlet API implementation of JSR 168"
+HOMEPAGE="http://portals.apache.org/jetspeed-2/"
+SRC_URI="mirror://apache/portals/jetspeed-2/sources/${JETSPEED_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${JETSPEED_P}/portlet-api"
+
+src_unpack() {
+	unpack ${A}
+	cp "${FILESDIR}/${P}-build.xml" "${S}/build.xml" || die
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/javax
+}
diff --git a/dev-java/portletapi/portletapi-2.0.ebuild b/dev-java/portletapi/portletapi-2.0.ebuild
new file mode 100644
index 000000000000..e5546ac9eef8
--- /dev/null
+++ b/dev-java/portletapi/portletapi-2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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="http://mirrors.ibiblio.org/maven2/javax/portlet/${MY_PN}/${PV}/${MY_P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+CDEPEND="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_ENCODING="ISO-8859-1"
+JAVA_GENTOO_CLASSPATH="tomcat-servlet-api-3.0"
+
+java_prepare() {
+	mkdir src || die
+	mv * src
+}
diff --git a/dev-java/prefuse/Manifest b/dev-java/prefuse/Manifest
new file mode 100644
index 000000000000..24c6e4df3807
--- /dev/null
+++ b/dev-java/prefuse/Manifest
@@ -0,0 +1 @@
+DIST prefuse-beta-20071021.zip 4334966 SHA256 c816d4182c31e23ecb63470ea009a70dfedc76dc8e3a0af8f240867047526b2d SHA512 289386d4614d5f04ac3dbe0bb0be41186540e278b36089a8dfd8f1accd813b229d85a1a36fb05f15d204b77c22e6e41eefa259cff42d8f26680574c6dec7e983 WHIRLPOOL b41d4688bac272756f0860e90e7d66ee72cc078562417698c2c51b1233d10c7b15070f26c38d60648fd4ba796e8530f54a166a89a74271f5e24d59e307efdfe0
diff --git a/dev-java/prefuse/metadata.xml b/dev-java/prefuse/metadata.xml
new file mode 100644
index 000000000000..aa580f769c29
--- /dev/null
+++ b/dev-java/prefuse/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..12f6c9d91384
--- /dev/null
+++ b/dev-java/prefuse/prefuse-20071021_beta.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 structured and unstructured data"
+SRC_URI="mirror://sourceforge/prefuse/${MY_P}.zip"
+HOMEPAGE="http://prefuse.org"
+LICENSE="BSD"
+SLOT="2006"
+KEYWORDS="amd64 ~ppc 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..ce24f9dd42ee
--- /dev/null
+++ b/dev-java/proguard/Manifest
@@ -0,0 +1,4 @@
+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
diff --git a/dev-java/proguard/metadata.xml b/dev-java/proguard/metadata.xml
new file mode 100644
index 000000000000..e53d61d2885e
--- /dev/null
+++ b/dev-java/proguard/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..96e8d253d14f
--- /dev/null
+++ b/dev-java/proguard/proguard-4.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..309240aeacf2
--- /dev/null
+++ b/dev-java/proguard/proguard-4.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..eae5da79aaf7
--- /dev/null
+++ b/dev-java/proguard/proguard-4.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ae87f1fe55ad
--- /dev/null
+++ b/dev-java/proguard/proguard-5.2.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/proxool/Manifest b/dev-java/proxool/Manifest
new file mode 100644
index 000000000000..f9cdc0369927
--- /dev/null
+++ b/dev-java/proxool/Manifest
@@ -0,0 +1 @@
+DIST proxool-0.8.3-source.tar.gz 5782824 SHA256 2de39f0b45b71ba05f5639943a8f59a8bc49a4cc025efd7d1b16b39dfbd0ad11 SHA512 ff81c18a6c55aad245092c221f61df963b9574771218fa52c027f11ad73379429e160b481bdb2f5a335f7e4da97b7bcdff41f4c3fbec182668437fc965d6b94e WHIRLPOOL 69604c3afc3530a3ac35b250b3124cf474346cfb65c4888a8b611d66b24659869231bbb6820d450715672fb6e8777aa15d049c9ca5a6c1a78bb6bea9026ade8e
diff --git a/dev-java/proxool/metadata.xml b/dev-java/proxool/metadata.xml
new file mode 100644
index 000000000000..b0ed1ba5ec6c
--- /dev/null
+++ b/dev-java/proxool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">proxool</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/proxool/proxool-0.8.3-r2.ebuild b/dev-java/proxool/proxool-0.8.3-r2.ebuild
new file mode 100644
index 000000000000..f5d23680f902
--- /dev/null
+++ b/dev-java/proxool/proxool-0.8.3-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Proxool is a Java connection pool"
+HOMEPAGE="http://proxool.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+# Tests disabled because they would need hibernate
+# and as such creating a circular dependency
+RESTRICT="test"
+
+COMMON_DEP="
+	dev-java/avalon-framework:4.2
+	dev-java/avalon-logkit:2.0
+	dev-java/log4j:0
+	dev-java/mx4j-core:3.0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+# Require jdk6 for building. #402487
+DEPEND="${COMMON_DEP}
+	virtual/jdk:1.6
+	dev-util/checkstyle:0"
+
+java_prepare() {
+	find -name '*.jar' -exec rm {} + || die
+
+	java-pkg_jar-from --into lib --build-only checkstyle
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="build-jar"
+EANT_GENTOO_CLASSPATH="log4j,servlet-api-3.0,avalon-framework-4.2,avalon-logkit-2.0,mx4j-core-3.0"
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+
+	dodoc README.txt || die
+	# dohtml valid as there are other docs too
+	use doc && java-pkg_dohtml -r doc/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
new file mode 100644
index 000000000000..763c940c4ad5
--- /dev/null
+++ b/dev-java/qdox/Manifest
@@ -0,0 +1,3 @@
+DIST qdox-1.12-20100531.205010-5-project.tar.gz 519732 SHA256 7ec2a48498f996e35c6bfdbff1dbbb061e51ff16862c4f3c3f12235d30857cca SHA512 b549704c941ac6333f4d96a880c4c05af6793043ad5f3d8adf6352c285507f7748905c57c91261c4171b1e6c3b11bb8e2ecad68a413a5297eebd92ac2d671809 WHIRLPOOL bd560572d5d41f39918237519e7d201bfde30e27e6d4d5d55f543681d833380553df8b062ca3392f9b9b3d185e48ac689dd7492796e9211ef9b21797129d3017
+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
diff --git a/dev-java/qdox/metadata.xml b/dev-java/qdox/metadata.xml
new file mode 100644
index 000000000000..24b0b903912b
--- /dev/null
+++ b/dev-java/qdox/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<herd>proxy-maintainers</herd>
+	<longdescription>
+		High speed, small footprint parser for extracting class/interface/method
+		definitions from source files complete with JavaDoc @tags.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/qdox/qdox-1.12-r1.ebuild b/dev-java/qdox/qdox-1.12-r1.ebuild
new file mode 100644
index 000000000000..42326d9171bb
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="https://github.com/codehaus/qdox"
+SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz  "
+
+LICENSE="Apache-2.0"
+SLOT="1.12"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${PV}-SNAPSHOT"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip:0
+	dev-java/byaccj:0
+	>=dev-java/jflex-1.4.3:0
+	dev-java/jmock:1.0
+	test? ( dev-java/junit:0 )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+java_prepare() {
+	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.12.1.ebuild b/dev-java/qdox/qdox-1.12.1.ebuild
new file mode 100644
index 000000000000..7f99e232abf6
--- /dev/null
+++ b/dev-java/qdox/qdox-1.12.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit 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 ~ppc ~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.4.3:0
+	dev-java/jmock:1.0
+	test? ( dev-java/junit:0 )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+java_prepare() {
+	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..6c85ec48792a
--- /dev/null
+++ b/dev-java/qdox/qdox-1.6.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..bf4e17b6ced0
--- /dev/null
+++ b/dev-java/radeox/Manifest
@@ -0,0 +1 @@
+DIST radeox-1.0-BETA-2-src.tgz 1720998 SHA256 3a0a38cfd82d84dde518f4347bfd8ad487e4993f7f99dfe5eefe4df7c3497045 SHA512 57e746e2cb3f6a39ab0e7e7171c4c47325712a61235a9622205d5f069cb4f82492ebec8482eb674619c9d58699a501461c863a97119ca674a337af5a331389d2 WHIRLPOOL 08e366dea85f64f36a7628dbf5abc5b62eaea1cfd4a01cdef2ee9258cbc19949051b2dc34c620adbe72dccae74bb352762256aefe08ffbf49692e7acddea0386
diff --git a/dev-java/radeox/metadata.xml b/dev-java/radeox/metadata.xml
new file mode 100644
index 000000000000..0eaa5d13942c
--- /dev/null
+++ b/dev-java/radeox/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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..03db899f7a86
--- /dev/null
+++ b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/reflectasm/Manifest b/dev-java/reflectasm/Manifest
new file mode 100644
index 000000000000..aa9000ffe24b
--- /dev/null
+++ b/dev-java/reflectasm/Manifest
@@ -0,0 +1 @@
+DIST reflectasm-1.09.tar.gz 252335 SHA256 622246d7a686cd8ba7ff3ab2037063f5f32329efa13758c2c3681988a428eab6 SHA512 ca4347a67ad408c8bd273eda2557e1686ddf3780439682d5ce9072b72a7e1b8ad35374b8600d5665a6c473c6ee16870a6ab27bb103fe41a27d00b2f222d75f61 WHIRLPOOL c58594400270911b009874e9253e59d0a71393458106e52a5d925a6d128366eaf18035dd59f8cb2c5549b8c8a4539b76bff6686de775f3621629452ab3fdef10
diff --git a/dev-java/reflectasm/files/reflectasm-1.09-maven-build.xml b/dev-java/reflectasm/files/reflectasm-1.09-maven-build.xml
new file mode 100644
index 000000000000..41984daee5d1
--- /dev/null
+++ b/dev-java/reflectasm/files/reflectasm-1.09-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 2/4/14 12:38 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="reflectasm-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="reflectasm-1.09"/>
+  <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">
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
+    <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.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" 
+         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/ow2/asm/asm/4.0"/>
+    <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}/junit/junit/4.8.2"/>
+    <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"/>
+  </target>
+
+</project>
diff --git a/dev-java/reflectasm/files/reflectasm-1.09-parallel-tests.patch b/dev-java/reflectasm/files/reflectasm-1.09-parallel-tests.patch
new file mode 100644
index 000000000000..aa6a53ca4040
--- /dev/null
+++ b/dev-java/reflectasm/files/reflectasm-1.09-parallel-tests.patch
@@ -0,0 +1,16 @@
+Remove test that unloads the current class loader. If this is enabled, the
+testAutoUnloadClassloaders testcase will fail if it's run after
+testRemoveClassloaders. Since junit generally runs tests in an arbitrary order
+this causes random testsuite failures.
+
+--- reflectasm-1.09/test/com/esotericsoftware/reflectasm/ClassLoaderTest.java
++++ reflectasm-1.09/test/com/esotericsoftware/reflectasm/ClassLoaderTest.java
+@@ -104,8 +104,6 @@
+ 		assertEquals(initialCount+1, AccessClassLoader.activeAccessClassLoaders());

+ 		AccessClassLoader.remove(testObject2.getClass().getClassLoader());

+ 		assertEquals(initialCount+0, AccessClassLoader.activeAccessClassLoaders());

+-		AccessClassLoader.remove(this.getClass().getClassLoader());

+-		assertEquals(initialCount-1, AccessClassLoader.activeAccessClassLoaders());

+ 	}

+ 

+ 	static public class Test {

diff --git a/dev-java/reflectasm/metadata.xml b/dev-java/reflectasm/metadata.xml
new file mode 100644
index 000000000000..3388b15fec74
--- /dev/null
+++ b/dev-java/reflectasm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="github">EsotericSoftware/reflectasm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/reflectasm/reflectasm-1.09.ebuild b/dev-java/reflectasm/reflectasm-1.09.ebuild
new file mode 100644
index 000000000000..5b1c82ce6b46
--- /dev/null
+++ b/dev-java/reflectasm/reflectasm-1.09.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="High performance Java reflection"
+HOMEPAGE="https://github.com/EsotericSoftware/reflectasm/"
+SRC_URI="https://github.com/EsotericSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+COMMON_DEPEND="dev-java/asm:4"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit4:0
+	)"
+
+EANT_GENTOO_CLASSPATH="asm-4"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},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 . -name '*.jar' -delete
+
+	epatch "${FILESDIR}"/${P}-parallel-tests.patch
+}
+
+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/reflections/Manifest b/dev-java/reflections/Manifest
new file mode 100644
index 000000000000..7aeb7096fa20
--- /dev/null
+++ b/dev-java/reflections/Manifest
@@ -0,0 +1 @@
+DIST reflections-0.9.9-sources.jar 56725 SHA256 432803a991d57b551cbd8b2dfc118b6ff2d0263d02a5a02299c017023e81440b SHA512 7a0c65b91444e01364254fa2d2d43b385f7c2cd5254b24fa63d03dfe4ea3d8955094115e2363317ce375e7e602d0e3554d1faf860e4a454a17fe4cac7a24bb13 WHIRLPOOL 5cde67f6a9e6c322c389ae7f37431957b1a7f4311fb1ff008c671fe924e589becc673eacb812a082a1a81ba2dbc6453a42f879f8a65d921a3867d3eeaf6d2ef3
diff --git a/dev-java/reflections/metadata.xml b/dev-java/reflections/metadata.xml
new file mode 100644
index 000000000000..909a9b33f6fd
--- /dev/null
+++ b/dev-java/reflections/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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>
+</pkgmetadata>
diff --git a/dev-java/reflections/reflections-0.9.9.ebuild b/dev-java/reflections/reflections-0.9.9.ebuild
new file mode 100644
index 000000000000..2e5e4a6e47d8
--- /dev/null
+++ b/dev-java/reflections/reflections-0.9.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java runtime metadata analysis"
+HOMEPAGE="http://code.google.com/p/reflections/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=org/${PN}/${PN}/${PV}/${P}-sources.jar"
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+CDEPEND="dev-java/commons-vfs:2
+	dev-java/dom4j:1
+	dev-java/gson:2.2.2
+	dev-java/guava:18
+	dev-java/javassist:3
+	dev-java/jsr305:0
+	dev-java/slf4j-api:0
+	dev-java/tomcat-servlet-api:3.1"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="commons-vfs-2,dom4j-1,gson-2.2.2,guava-18,javassist-3,jsr305,slf4j-api,tomcat-servlet-api-3.1"
diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
new file mode 100644
index 000000000000..8e2ce65e5112
--- /dev/null
+++ b/dev-java/relaxng-datatype/Manifest
@@ -0,0 +1 @@
+DIST relaxngDatatype-1.0.zip 74033 SHA256 7be15d1beb7faf895d5a7abff793ba324c4753d319236f40941ee63949f65eb2 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79 WHIRLPOOL 27ddc5d44c7a6f0c792fdfc4db4cd2c38751c4ace170422bd9cb9a528725c07f4ba896b75d165c5a8c6c1e2517403468f6d1425441adee0982ecaf934e15cab1
diff --git a/dev-java/relaxng-datatype/files/relaxng-datatype-1.0-build_xml.patch b/dev-java/relaxng-datatype/files/relaxng-datatype-1.0-build_xml.patch
new file mode 100644
index 000000000000..c77438f5581f
--- /dev/null
+++ b/dev-java/relaxng-datatype/files/relaxng-datatype-1.0-build_xml.patch
@@ -0,0 +1,71 @@
+diff -ru relaxngDatatype-1.0/build.xml relaxngDatatype-1.0-patched/build.xml
+--- relaxngDatatype-1.0/build.xml	2001-11-27 19:20:34.000000000 -0500
++++ relaxngDatatype-1.0-patched/build.xml	2005-06-25 23:05:35.000000000 -0400
+@@ -1,12 +1,10 @@
+ <?xml version="1.0"?>

+ 

+-<project name="relaxng" basedir="." default="release">

++<project name="relaxng" basedir="." default="dist">

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

+ 	

+-	<target name="release">

+-		<tstamp/>

+-		

+ 		<!-- compile Java source files -->

++	<target name="compile">

+ 		<mkdir dir="bin"/>

+ 		<javac

+ 			srcdir="src"

+@@ -14,7 +12,9 @@
+ 			debug="off"

+ 			optimize="on"

+ 			/>

++	</target>

+ 		

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

+ 		<!-- create manifest file -->

+ 		<echo file="MANIFEST.MF">Manifest-Version: 1.0

+ 

+@@ -24,25 +24,28 @@
+ Implementation-Vendor: relaxng.sourceforge.net</echo>

+ 		

+ 		<!-- standard archive -->

+-		<delete file="relaxngDatatype.jar"/>

+ 		<jar	jarfile="relaxngDatatype.jar"

+ 				compress="false"

+ 				manifest="MANIFEST.MF">

+ 			<fileset dir="bin" includes="**/*.class" />

+ 		</jar>

++	</target>

+ 		

+ 		<!-- generate javadoc documentation -->

++	<target name="javadoc">

+ 		<mkdir dir="doc"/>

+ 		<javadoc	locale="en_US"

+ 					packagenames="org.relaxng.datatype.*"

+ 					sourcepath="src"

+-					destdir="doc"

++					destdir="doc/api"

+ 					windowtitle="RELAX NG Datatype Interface"

+ 					public="yes"

+ 					author="yes"

+ 					>

+ 		</javadoc>

++	</target>

+ 		

++	<target name="dist" depends="jar,javadoc">

+ 		<!-- creates distribution package -->

+ 		<zip	zipfile="relaxngDatatype-${version}.zip">

+ 			<zipfileset dir="." prefix="relaxngDatatype-${version}"

+@@ -59,4 +62,11 @@
+ 				includes="relaxngDatatype.jar" />

+ 		</zip>

+ 	</target>

++

++	<target name="clean">

++		<delete file="relaxngDatatype-${version}.zip"/>

++		<delete dir="doc/api"/>

++		<delete dir="bin"/>

++		<delete file="relaxngDatatype.jar"/>

++	</target>

+ </project>

diff --git a/dev-java/relaxng-datatype/metadata.xml b/dev-java/relaxng-datatype/metadata.xml
new file mode 100644
index 000000000000..de9b803e551e
--- /dev/null
+++ b/dev-java/relaxng-datatype/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">relaxng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild
new file mode 100644
index 000000000000..201e0108be13
--- /dev/null
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="relaxngDatatype"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
+HOMEPAGE="http://relaxng.org/"
+SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v *.jar || die
+	epatch "${FILESDIR}/${P}-build_xml.patch"
+}
+
+src_install() {
+	java-pkg_dojar ${MY_PN}.jar
+	dodoc README.txt || die
+
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/relaxngcc/Manifest b/dev-java/relaxngcc/Manifest
new file mode 100644
index 000000000000..96e0760bad57
--- /dev/null
+++ b/dev-java/relaxngcc/Manifest
@@ -0,0 +1 @@
+DIST relaxngcc-20031218.zip 2162036 SHA256 b6a3e797e8a4d6389ecfca5d7c0218ca22966b893e8fcf5a9b6cd7a417d27f30 SHA512 df797243c095e79e9018d8f17deb3963631128718428ff325af6910e285e649f27c270b63101f2b5833ddde23814c54a662397000f433f8a32cea30917760d4b WHIRLPOOL e476fec6c65775e2552a60856ee0e32ada9df0301580f1f8e9deb604532dbbe9ca7c165c72d69226930d84f0b5529ac9a6c6f790d7dcc35400686a31848eed92
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/MANIFEST.MF-1.12 b/dev-java/relaxngcc/files/MANIFEST.MF-1.12
new file mode 100644
index 000000000000..df03d7e51798
--- /dev/null
+++ b/dev-java/relaxngcc/files/MANIFEST.MF-1.12
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0

+Main-Class: relaxngcc.RelaxNGCC

diff --git a/dev-java/relaxngcc/files/build.xml-1.12 b/dev-java/relaxngcc/files/build.xml-1.12
new file mode 100644
index 000000000000..df36ef68bd80
--- /dev/null
+++ b/dev-java/relaxngcc/files/build.xml-1.12
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<project name="relaxngcc" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+	<javac debug="false" srcdir="src" destdir="build">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="relaxngcc.jar" manifest="MANIFEST.MF">
+      <fileset dir="build" includes="**/*.class"/>
+    </jar>
+  </target>
+</project>
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/metadata.xml b/dev-java/relaxngcc/metadata.xml
new file mode 100644
index 000000000000..cee33cced394
--- /dev/null
+++ b/dev-java/relaxngcc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">relaxngcc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild
new file mode 100644
index 000000000000..74bb5ca87b61
--- /dev/null
+++ b/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/relaxng-datatype:0
+	dev-java/msv:0
+	dev-java/ant-core:0
+	dev-java/xsdlib:0"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${RDEPEND}"
+
+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 relaxng-datatype
+	java-pkg_jarfrom msv
+	java-pkg_jarfrom xsdlib
+	java-pkg_jarfrom ant-core
+	cd "${S}" || die
+
+	cp "${FILESDIR}/build.xml-1.12-r1" build.xml || die "cp failed"
+	epatch "${FILESDIR}"/${PV}-*.patch
+	rm -rf "src/relaxngcc/maven"
+	java-pkg_filter-compiler jikes
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar relaxngcc.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..c26d82662ff0
--- /dev/null
+++ b/dev-java/resin-servlet-api/Manifest
@@ -0,0 +1,15 @@
+DIST resin-3.0.25-src.zip 10690692 SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc SHA512 f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057 WHIRLPOOL a05b431e3fc5c0cf2309681689e4a228b6234254898aec0927e7fd2ecb46ff149166b8097d3878877e08b2937f70e82d1aabc70143d2b4c45f2abc640a47a4ba
+DIST resin-3.1.10-src.zip 13518055 SHA256 44113af9b9063459f6edf6892e57a35110f42b324dada24bac3c7d1b4a6dec0f SHA512 2f4df6778f58b48fd366005425e9e67b4d2ff915a97c0ba58e00670bc630fe35ccdd219c740e4d6b25bedec1e9b9121d2eb71c459a8111238dd87965e3c11971 WHIRLPOOL eb09b198d7e71894badf2d23d3be04b349271e82c25b560058e5240a1bffb13ceba3bf84c3f2d6513a9e5b4df0f44f026c744370c2b4e8f65d4ba09b256b99c3
+DIST resin-3.1.11-src.zip 13518605 SHA256 e7a31468675e424016aa24efb5b80dc5be1d88129fae2390ac424c2ebd789515 SHA512 ee7668a39f6caeaab0851a440289a97b69cbaba5f873a6fe837b869368455067d2cc36d6dc01c1fddfb31dca714cbef6800049e498a8479808df14b34003491f WHIRLPOOL 6053a03ae3b0f33f46e8b98a5d15cc82924feaaa77c929520fd847d14d6418771239dae8e62dc6c09d72447013059d250a4b34d27d2f1c0556e201b5ba0fbc7e
+DIST resin-3.1.12-src.zip 13579367 SHA256 b2e5b3573a369944c243ebc1b6c6439a681d52efb9416af1177a263234fbea95 SHA512 5d348482175962e4e0401437fa69ce3c7569e514ab7b02ef236937686cfb5185b5cef2deef831d510cf458a41d786457041f579d551c9f1f1aab49829015ff6f WHIRLPOOL e8210528c025bfe7a75279cea4e346a3b948c121d763fe6ef0e6c5cd90b2b476957abe2616bb79687987c0afa4016178d3bcf5e2e910ffab4736399288fda13c
+DIST resin-4.0.13-src.zip 17439983 SHA256 2dd13eab5a23383e180ff018aa7c6318c094369359ea313fcf698ba1fa412b6e SHA512 011751ac332b5ef9bfd398d5c72f04978d6d1e97cdddcdad9b16dc664b98f5d8b68811edd1a6cd81cc432d040ddbf8415cd1290b7c9808f924305a1a4c31d797 WHIRLPOOL 0d0b7d7e94d0645e0303064858932cf747e77be19c94388332b135f419dcb99bc8b1184445ab182ce4979fec55e8b5be1072fda04dc1fb47cd0ca2c3d7410463
+DIST resin-4.0.14-src.zip 17542066 SHA256 6a0b1bed5240609672041529a1b6b926f45356f47114ce4db0df1262a0b98fa5 SHA512 a5eea8bcce202b137f8388e00953910e6de8c261106bbce298f7c9fe132f7854e0a01132dfa29e3ab5e2a0ee920471eaaecb7a456f9d9adf83aea4e883d1472b WHIRLPOOL 3b36720e85d781c45530169778325f8f28c8c988226890138b341f969987f7f5ec1f59cbf25463eebf5ed910959e4753f4eb84a4ca7811efb09b82f802c77e9f
+DIST resin-4.0.15-src.zip 17560013 SHA256 e9dcedcc4de44d738571d0bbb2cce747aaeff517ae571ab6e46f74fa969d4f39 SHA512 9e44cda4d8192b38a6364d4e3e013b9de66947eff590d19ed9182b50efebc75222bf71aaec7d15bcc1efaaa6166161ca5a1101414845abf86862a28af7d019a0 WHIRLPOOL 6d578627d748e104a35e57666064652a21025d1059ea3f62891487b193be24315c7c57729ea850503fcf32de159199c48fa4f7d559d6169d00691f3d9d5c40b8
+DIST resin-4.0.22-src.zip 17540820 SHA256 5b79a28e82849f97fc6bbf670306e29c19159b061b370f7eabc483f56a54053a SHA512 f9ddffa0ab0151041881464edfe9579ed9391da87cf79b18122a28d2dc656d05aa6140430bc3c9a0d79e562ce7b324011d9c933541cc1430a291ec72e55ee799 WHIRLPOOL 458df4fb3463d291940b1282eb23141eb46b465009d9e3fa42b8af43a7c846552ddc3ff75b4ab99557e0c53a4937508f7f37f20f837d7f5684796776ad686d9d
+DIST resin-4.0.25-src.zip 17971688 SHA256 e30ace9c2c9ececb1769402ea7a6cd2fe8ea73f9f38009da1b4d2ba23ab6972a SHA512 c978148674e00101f24702f2ffe4b3220bfd82cad35b0263296efda0b001cdceaa5f18ae170a589aec763627d6cf39ff2ccdd5e195b65c90d04416939bb442d9 WHIRLPOOL 843dc74888f63f96b9ea8526afc88846d55c58a54b4233140984cfe7a0ba365a04b230ef8047caef7e27a413d8e775a15f6fa649c3d8e3a19cc0058abb50f58a
+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-gentoo-patches-3.0.25.tar.bz2 4781 SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035 WHIRLPOOL ea9eb10d1359d898021a781bdf947811d3500092a3489759202251713b776b5c2c20bfde112be5a108358cb470f0c3aa4cc2a4d54695c406fc2b3c3d18ad7a54
+DIST resin-gentoo-patches-3.1.10.tar.bz2 1626 SHA256 c1cd5b5631e534d670173c465436822980e9df6b9bcfd15f7a25efa09b8faedf SHA512 edd1a115169c7fb2a1cf39a8c5f5dc2325a401ae8ac5a1788813b9ba13aff5e974d296120818310e23e5c0dc205ac2785050dd9c5d7961279b6ffc146342b6bf WHIRLPOOL ee321a16df5fdfc4eb5e4fe1afac660734da77796d6ea13f0d84a00171ca3579436d4f5aa84a6c6b9c242d4c245552b3ffd212cedeb264f518f575dcb517ae6d
+DIST resin-gentoo-patches-3.1.11.tar.bz2 1625 SHA256 a071d2d1af5e9eae56c80035c4efef02d546e0d007c3a2d7cd6a529152df9484 SHA512 5b7b4e1e4ff25bbda2a968d808cd868d8ec19f0d12344039d21a85c4e9b76538b22e998e1390cd83660e878b2e5a7bac8b879a9a540a8f4dc29a49b83ed8987b WHIRLPOOL 728512044037d11ac5a7e3e3b86409fa61ca44c6936272df66de45ca4961ac475d8f97f4b4410c7318597f50748fac820961d9b5b29c3e19ffe6f5755f9a53bc
+DIST resin-gentoo-patches-3.1.12.tar.bz2 1618 SHA256 de44915936848374adb975ca3f0dca3560d75c64b385b451e95e6813a3405ffd SHA512 12dfd508765c46a9c9ca782e1b63def2989a3d2e025b3e8a7b15e5b389976aeba898e1659044a737156d953c0eaca9a4a461a9c71dc601aaaeddac8cd5da03ea WHIRLPOOL 43785f6d225f74626c6a769e4eedf0873aa794f02780defbe0815d77771934646d6f849302ab829a81cf4babad0acad2f7fc4458f1d80ba0c3fbdd9292a0f90b
diff --git a/dev-java/resin-servlet-api/metadata.xml b/dev-java/resin-servlet-api/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/resin-servlet-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</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..fc16ee83e2ad
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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.10.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.10.ebuild
new file mode 100644
index 000000000000..11c89a50e85d
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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-3.1.11.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.11.ebuild
new file mode 100644
index 000000000000..73882697fa46
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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-3.1.12.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
new file mode 100644
index 000000000000..bd9efb6e29ce
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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.13.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.13.ebuild
new file mode 100644
index 000000000000..a3f12af3f0db
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.13.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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
+	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.14.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.14.ebuild
new file mode 100644
index 000000000000..162b8745559a
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.14.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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
+	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.15.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.15.ebuild
new file mode 100644
index 000000000000..162b8745559a
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.15.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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
+	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.22.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.22.ebuild
new file mode 100644
index 000000000000..5680f67eca41
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.22.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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.25.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.25.ebuild
new file mode 100644
index 000000000000..f994bfdafae2
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.25.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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.26.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
new file mode 100644
index 000000000000..ef402f6e71ee
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..3d99fe25c5bb
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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..69f4fab0e245
--- /dev/null
+++ b/dev-java/rhino/Manifest
@@ -0,0 +1,4 @@
+DIST Rhino1_7_7_RELEASE.zip 6059127 SHA256 0ef505aee093c690025c4484ce108b6e735e05baa3181bb56fdec4cb6b8b0107 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e WHIRLPOOL 0f54840077e46a6ac31e23784b3c13881a774356df14274fc9ffdf93eb3d7b92e8666630d8e51494931819a609a971bb6744cf961c2c168bb94b4e42d3eb0896
+DIST rhino-swing-ex-1.0.zip 19708 SHA256 062837ddb18951ace41ba0050aec95a690c00190a6218e5c9591c381035dfa7d SHA512 f2c1f970595cb08ac301d2fc21e0a2f1090b2007c849d993094ef3215a39456a5865bcaaf9424da93a09d6f0d151be6ec77f844bde2540d725c85c4b54a5f248 WHIRLPOOL 4dd40c1c80a70cd08584ac44abd3b42a790080f93449da8e241ed568ff5b3a5ac6cef12951632eba91547845be49401102d072b05a83a3ed78705acd768b1ced
+DIST rhino1_6R5.zip 1822832 SHA256 02a4f17121f148c94ac65fb6d9eb4a817ce86c378c96cc94e9fc1b087b34526f SHA512 bd10b2e687925e06a5a4da5bc0e29a65cff08fc26792e3183f2ab28efb71efcdbc2fb08142be2fd2622c0b94dfa2691ce898ba847935def780e8686a879720f0 WHIRLPOOL 5fda95c5a99a6e99322a81fda513135cece56df0c7d17efcaea0b5f9f8f63b3adccd47bf30f26521b36e33f34e642e05107d7e0f202b8d532356884954d01049
+DIST rhino1_7R2.zip 2996867 SHA256 677f7dc1b67a1587bc03974d5f0720474a56b8f29835e1d860739908df8462dc SHA512 e4472e11377e93b64df3a2a9f266956d86ba78c85ceba57ff05c983d577143351fcbbbc0b63f7034718fd74c13a9e50bac6e8813f320b86fcd09b571e919b858 WHIRLPOOL 546f9a0e565881dd6128e000ca8c8e017cf7432e40df885268c4827e2dbd28f86cde37dbc7284bd1b08b062060eca1465716f850dbd54f176ead475b4b55351d
diff --git a/dev-java/rhino/files/00_dont-fetch-swing-ex.patch b/dev-java/rhino/files/00_dont-fetch-swing-ex.patch
new file mode 100644
index 000000000000..994975149dd0
--- /dev/null
+++ b/dev-java/rhino/files/00_dont-fetch-swing-ex.patch
@@ -0,0 +1,10 @@
+--- toolsrc/build.xml	2004-03-25 15:54:34.000000000 +0100
++++ toolsrc/build-patch.xml	2004-06-19 23:48:07.225123288 +0200
+@@ -20,7 +20,6 @@
+     <!-- Download source from Sun's site, unzip it, remove

+          the files we don't need, and change the package

+     -->

+-    <get src="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip" dest="${nest}/${build.dir}/swingExSrc.zip"/>

+     <unzip src="${nest}/${build.dir}/swingExSrc.zip" dest="${src.debugger}"/>

+     <delete file="${src.debugger}/FileSystemModel2.java" />

+     <delete file="${src.debugger}/MergeSort.java" />

diff --git a/dev-java/rhino/files/1.5.5_jdk15.patch b/dev-java/rhino/files/1.5.5_jdk15.patch
new file mode 100644
index 000000000000..0948921b4770
--- /dev/null
+++ b/dev-java/rhino/files/1.5.5_jdk15.patch
@@ -0,0 +1,23 @@
+diff -urpN rhino1_5R5.old/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
+--- rhino1_5R5.old/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	2004-03-25 15:54:34.000000000 +0100
++++ rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	2005-02-01 13:58:26.521223264 +0100
+@@ -124,7 +124,7 @@ public class JavaPolicySecurity extends 
+ 

+     public JavaPolicySecurity() {

+         // To trigger error on jdk-1.1 with lazy load

+-        new CodeSource(null, null);

++        new CodeSource(null, (java.security.cert.Certificate[])null);

+     }

+ 

+     protected void callProcessFileSecure(final Context cx,

+@@ -167,8 +167,8 @@ public class JavaPolicySecurity extends 
+     }

+ 

+     private ProtectionDomain getUrlDomain(URL url) {

+-        CodeSource cs = new CodeSource(url, null);

+-        PermissionCollection pc = Policy.getPolicy().getPermissions(cs);

++        CodeSource cs = new CodeSource(url, (java.security.cert.Certificate[])null);

++	PermissionCollection pc = Policy.getPolicy().getPermissions(cs);

+         return new ProtectionDomain(cs, pc);

+     }

+ 

diff --git a/dev-java/rhino/files/public-NativeScript.patch b/dev-java/rhino/files/public-NativeScript.patch
new file mode 100644
index 000000000000..026bcedb0e55
--- /dev/null
+++ b/dev-java/rhino/files/public-NativeScript.patch
@@ -0,0 +1,11 @@
+--- rhino1_5R5/src/org/mozilla/javascript/NativeScript.java.orig	2006-05-31 14:01:06.000000000 +0200
++++ rhino1_5R5/src/org/mozilla/javascript/NativeScript.java	2006-05-31 14:03:37.000000000 +0200
+@@ -55,7 +55,7 @@
+  * @author Norris Boyd

+  */

+ 

+-class NativeScript extends NativeFunction implements Script

++public class NativeScript extends NativeFunction implements Script

+ {

+ 

+     static void init(Context cx, Scriptable scope, boolean sealed)

diff --git a/dev-java/rhino/files/rhino-1.6-noget.patch b/dev-java/rhino/files/rhino-1.6-noget.patch
new file mode 100644
index 000000000000..235091428392
--- /dev/null
+++ b/dev-java/rhino/files/rhino-1.6-noget.patch
@@ -0,0 +1,12 @@
+diff --git a/toolsrc/org/mozilla/javascript/tools/debugger/build.xml b/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
+index 7ed0236..5f7db6e 100644
+--- a/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
++++ b/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
+@@ -47,7 +47,6 @@
+          the files we don't need, and change the package
+     -->
+     <mkdir dir="downloaded"/>
+-    <get src="${swing-ex-url}" dest="downloaded/swingExSrc.zip"/>
+     <unzip src="downloaded/swingExSrc.zip" dest="downloaded/">
+       <patternset>
+           <include name="AbstractCellEditor.java"/>
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..edd54749e161
--- /dev/null
+++ b/dev-java/rhino/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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>
+</pkgmetadata>
diff --git a/dev-java/rhino/rhino-1.6.5.ebuild b/dev-java/rhino/rhino-1.6.5.ebuild
new file mode 100644
index 000000000000..4c59f2556129
--- /dev/null
+++ b/dev-java/rhino/rhino-1.6.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source"
+inherit java-pkg-2 java-ant-2 eutils versionator
+
+MY_P="${PN}$(replace_version_separator 1 _ $(replace_version_separator 2 R))"
+
+DESCRIPTION="An open-source implementation of JavaScript written in Java"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip
+	mirror://gentoo/rhino-swing-ex-1.0.zip"
+HOMEPAGE="http://www.mozilla.org/rhino/"
+# dual license for rhino and BSD-2 for the swing-ex from Sun's tutorial
+LICENSE="|| ( MPL-1.1 GPL-2 ) BSD-2"
+SLOT="1.6"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+CDEPEND="=dev-java/xml-xmlbeans-1*"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${MY_P}.zip
+	cd "${S}"
+
+	# don't download src.zip from Sun
+	epatch "${FILESDIR}/rhino-1.6-noget.patch"
+
+	rm -v *.jar || die
+	rm -rf docs/apidocs || die
+
+	local dir="toolsrc/org/mozilla/javascript/tools/debugger/downloaded"
+	mkdir ${dir} || die
+	cp "${DISTDIR}/rhino-swing-ex-1.0.zip" ${dir}/swingExSrc.zip || die
+
+	mkdir lib/ && cd lib/ || die
+	java-pkg_jar-from xml-xmlbeans-1 xbean.jar
+}
+
+src_install() {
+	java-pkg_dojar build/${MY_P}/js.jar
+
+	java-pkg_dolauncher jsscript-${SLOT} \
+		--main org.mozilla.javascript.tools.shell.Main
+
+	if use doc; then
+		local dir="build/${MY_P}/docs"
+		mv "${dir}"/{apidocs,api} || die
+		java-pkg_dohtml -r "${dir}"/*
+		dosym /usr/share/doc/${PF}/html/{api,apidocs} || die
+	fi
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
+}
diff --git a/dev-java/rhino/rhino-1.7.2-r2.ebuild b/dev-java/rhino/rhino-1.7.2-r2.ebuild
new file mode 100644
index 000000000000..b6e779c10b4f
--- /dev/null
+++ b/dev-java/rhino/rhino-1.7.2-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="1"
+JAVA_PKG_IUSE="doc examples source"
+inherit java-pkg-2 java-ant-2 eutils versionator
+
+MY_P="${PN}$(replace_version_separator 1 _ $(replace_version_separator 2 R))"
+
+DESCRIPTION="An open-source implementation of JavaScript written in Java"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip
+	mirror://gentoo/rhino-swing-ex-1.0.zip"
+HOMEPAGE="http://www.mozilla.org/rhino/"
+# dual license for rhino and BSD-2 for the swing-ex from Sun's tutorial
+LICENSE="|| ( MPL-1.1 GPL-2 ) BSD-2"
+SLOT="1.6"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+CDEPEND="=dev-java/xml-xmlbeans-1*"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${MY_P}.zip
+	cd "${S}"
+
+	# don't download src.zip from Sun
+	epatch "${FILESDIR}/rhino-1.6-noget.patch"
+
+	rm -v *.jar || die
+	rm -rf docs/apidocs || die
+
+	local dir="toolsrc/org/mozilla/javascript/tools/debugger/downloaded"
+	mkdir ${dir} || die
+	cp "${DISTDIR}/rhino-swing-ex-1.0.zip" ${dir}/swingExSrc.zip || die
+
+	mkdir lib/ && cd lib/ || die
+	java-pkg_jar-from xml-xmlbeans-1 xbean.jar
+
+	# Stop downloading of deps
+	cd "${S}"
+	mkdir -p build/tmp-xbean
+	touch build/tmp-xbean/xbean.zip
+	touch lib/jsr173_1.0_api.jar
+}
+
+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/rhino/rhino-1.7.7.ebuild b/dev-java/rhino/rhino-1.7.7.ebuild
new file mode 100644
index 000000000000..9a61bd72825e
--- /dev/null
+++ b/dev-java/rhino/rhino-1.7.7.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.7"
+KEYWORDS="~amd64 ~ppc ~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() {
+	find . \
+		-type f \
+		-name \*.jar \
+		-print \
+		-exec rm -v {} \; || die "Couldn't delete bundled jar files."
+
+	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..0581488334a9
--- /dev/null
+++ b/dev-java/rngom/Manifest
@@ -0,0 +1 @@
+DIST rngom-20051226.zip 1370492 SHA256 aafaeb2e7e1a712affcd89605a1df99c1deb77eb2424291b47556a597225542e SHA512 487fa97db3ac5d3ab2c9c64b8b406de789393dbe06e38d2b180ab4deb59813b2aeaa46b1ad7d5b55e67dd0558be98d300d7d91e66c922206b35822fdf931d0ef WHIRLPOOL 254d7fd0feba46b4fbf230fd9dd1cbfe6536f6cc06c403fa2b1092fe50464146125cab3a2e5bb6e006f4c3878d3cef4b624ba44ffb1c00b601e20e2474d6041e
diff --git a/dev-java/rngom/files/build.xml-20051226 b/dev-java/rngom/files/build.xml-20051226
new file mode 100644
index 000000000000..cc3cf5bb8738
--- /dev/null
+++ b/dev-java/rngom/files/build.xml-20051226
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<project name="rngom" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac debug="false" srcdir="src" destdir="build">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="rngom.jar">
+      <fileset dir="build" includes="**/*.class"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/rngom/metadata.xml b/dev-java/rngom/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/rngom/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/rngom/rngom-20051226.ebuild b/dev-java/rngom/rngom-20051226.ebuild
new file mode 100644
index 000000000000..43892c9ef639
--- /dev/null
+++ b/dev-java/rngom/rngom-20051226.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="RNGOM is an open-source Java library for parsing RELAX NG grammars"
+HOMEPAGE="https://rngom.dev.java.net/"
+SRC_URI="https://rngom.dev.java.net/files/documents/1647/26424/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="dev-java/relaxng-datatype
+	dev-java/xsdlib"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd "${S}"
+	rm -v *.jar || die
+	mkdir lib || die
+
+	cd lib/
+	java-pkg_jarfrom relaxng-datatype
+	java-pkg_jarfrom xsdlib
+
+	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die "cp failed"
+
+}
+
+src_compile() {
+	eant jar
+}
+
+src_install() {
+
+	java-pkg_dojar "${PN}.jar"
+
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc javadoc
+
+}
diff --git a/dev-java/rome/Manifest b/dev-java/rome/Manifest
new file mode 100644
index 000000000000..8bd7f75a692a
--- /dev/null
+++ b/dev-java/rome/Manifest
@@ -0,0 +1 @@
+DIST rome-0.9-src.zip 248755 SHA256 c8e8674de5b204d02ce8b5e33fa5f848f23ee4e4746c60ebc7ccf52a1ac97a4f SHA512 d4bc9945e2b77bdc38eca609ec353379c279cd700d8d85220a1723d1b019da2c18bd93ff98b062e519e7d87f2d2b6853f373fc7178cec0f83b34af45fce5f3ff WHIRLPOOL 69554087947fec155478d5d8cd820976a878d1055dfbeebcb567893c2e943ae89f247dd578ad94d6c88cba2ee8d3faa7fac05556790157f7e2e95ed1cd752404
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..407583277d87
--- /dev/null
+++ b/dev-java/rome/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>java@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/rome/rome-0.9.ebuild b/dev-java/rome/rome-0.9.ebuild
new file mode 100644
index 000000000000..20a33a6296b7
--- /dev/null
+++ b/dev-java/rome/rome-0.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Open source Atom/RSS Java utilities that make it easy to work in Java with most syndication formats"
+HOMEPAGE="https://java.net/projects/rome"
+SRC_URI="https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEPEND=">=dev-java/jdom-1.0"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	test? ( dev-java/ant-junit )
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Patch build.xml so the tests pass
+	epatch "${FILESDIR}/${P}-build.xml-test-upstream.patch"
+
+	# Symlink jars
+	mkdir -p target/lib
+	cd target/lib
+	java-pkg_jar-from jdom-1.0
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
+
+src_test() {
+	java-pkg_jar-from --into target/lib junit
+	ANT_TASKS="ant-junit" eant test
+}
diff --git a/dev-java/rundoc/Manifest b/dev-java/rundoc/Manifest
new file mode 100644
index 000000000000..2b1daada14cb
--- /dev/null
+++ b/dev-java/rundoc/Manifest
@@ -0,0 +1 @@
+DIST rundoc-0.11-src.tar.gz 26109 SHA256 e123a38260df24f7641c3c0b5164be810ba6770d14d546d60b09a55e86333bc1 SHA512 e27f4f6ecbb4a78bc8ed245829e0ab7d727166890bfd4f55d544d4073f20691681bcb223e5cd353f786e79fc446bee24f10d955ed9844a44dd610b7eb7b773d4 WHIRLPOOL 5edd6a1b8b2865b60e82b3bd41640591919079f85283581343c1069c934edc0236a5e9a73683401618e6862abd892aaf9c0094711a04e7c8d8e2ac552ca2acb7
diff --git a/dev-java/rundoc/metadata.xml b/dev-java/rundoc/metadata.xml
new file mode 100644
index 000000000000..1eee4a6024e9
--- /dev/null
+++ b/dev-java/rundoc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+
+	<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.ebuild b/dev-java/rundoc/rundoc-0.11.ebuild
new file mode 100644
index 000000000000..4c5cc4de1976
--- /dev/null
+++ b/dev-java/rundoc/rundoc-0.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Ant helper task for keeping documentation in source files"
+HOMEPAGE="http://www.martiansoftware.com/lab/index.html"
+SRC_URI="http://www.martiansoftware.com/lab/${PN}/${P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEP=">=dev-java/ant-core-1.5.4"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v *.jar
+	java-ant_rewrite-classpath
+}
+
+EANT_GENTOO_CLASSPATH="ant-core"
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/java/com
+}
diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest
new file mode 100644
index 000000000000..fa8218ab9652
--- /dev/null
+++ b/dev-java/rxtx/Manifest
@@ -0,0 +1,2 @@
+DIST rxtx-2.1-7r2.zip 1345757 SHA256 31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9 SHA512 977f098da9e9618a2bc1d2265f1a59c8bdeb00a228378af0176e2f7fa408fb0dcb309a8168de0febc13fa0e04d9d54c76c267a61b815037b5881100c4025a1ce WHIRLPOOL adafe3f944ed95cf28cefe1efc50f2402bbb475515f8085b6a19283a86df6ffd769387baf422dd89cbd5d5696674c0130cd07c48c72a9b4e2737026d56832fa5
+DIST rxtx-2.2pre2.zip 1491209 SHA256 3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03 SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514 WHIRLPOOL 0c2893c016ae99f918ca3605c83d18ec2b9ea0022628562a36859eaa20001ce6cfa15d7e77b80ee32e259f162ee1512b026a9965ec1402ae35ebed4b473796fc
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-add-ttyACM.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff
new file mode 100644
index 000000000000..857c8342c371
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff
@@ -0,0 +1,23 @@
+support /dev/ttyACMx devices natively
+upstream bug report pending: http://bugzilla.qbang.org/show_bug.cgi?id=139
+http://bugs.gentoo.org/show_bug.cgi?id=301126
+Signed-off: Thilo Bangert <bangert@gentoo.org>
+
+--- src/RXTXCommDriver.java.orig	2010-01-15 17:30:46.000000000 +0100
++++ src/RXTXCommDriver.java	2010-01-15 17:31:56.000000000 +0100
+@@ -519,6 +519,7 @@
+ 					if(osName.equals("Linux"))
+ 					{
+ 						String[] Temp = {
++						"ttyACM",       // linux USB Modems
+ 						"ttyS", // linux Serial Ports
+ 						"ttySA", // for the IPAQs
+ 						"ttyUSB" // for USB frobs
+@@ -535,6 +536,7 @@
+ 						"holter",    // custom card for heart monitoring
+ 						"modem",     // linux symbolic link to modem.
+ 						"rfcomm",       // bluetooth serial device
++						"ttyACM",       // linux USB Modems
+ 						"ttyircomm", // linux IrCommdevices (IrDA serial emu)
+ 						"ttycosa0c", // linux COSA/SRP synchronous serial card
+ 						"ttycosa1c", // linux COSA/SRP synchronous serial card
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff
new file mode 100644
index 000000000000..3d32f360d188
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff
@@ -0,0 +1,12 @@
+diff --git a/src/lfd/lockdaemon.c b/src/lfd/lockdaemon.c
+index bdb8553..d13c5eb 100644
+--- a/src/lfd/lockdaemon.c
++++ b/src/lfd/lockdaemon.c
+@@ -30,6 +30,7 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <pwd.h>
++#include <limits.h>
+ 
+ #define FHS
+ #define LOCKFILEPREFIX "LCK.."
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/metadata.xml b/dev-java/rxtx/metadata.xml
new file mode 100644
index 000000000000..67dbcd454952
--- /dev/null
+++ b/dev-java/rxtx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <use>
+    <flag name="lfd">Installs and uses LockFileServer daemon (lfd)</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild b/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild
new file mode 100644
index 000000000000..149fb25528cb
--- /dev/null
+++ b/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit flag-o-matic toolchain-funcs versionator autotools java-pkg-2
+
+MY_PV="$(replace_version_separator 2 -)"
+MY_PV="$(replace_version_separator 3 r ${MY_PV})"
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# some minor fixes
+	sed -i -e "s:UTS_RELEASE::g" configure.in
+	sed -i -e "s:|1.5\*:|1.5*|1.6*|1.7*:g" configure.in
+	sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am
+
+	# some patches
+	epatch "${FILESDIR}/${MY_P}-lfd.diff" \
+		"${FILESDIR}/${MY_P}-nouts.diff" \
+		"${FILESDIR}/${MY_P}-add-ttyACM.diff" \
+		"${FILESDIR}/${MY_P}-lfd-include-limits.diff"
+
+	# update autotools stuff
+	rm acinclude.m4
+	eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	econf $(use_enable lfd lockfile_server) || die "econf failed"
+	emake || die "emake failed"
+
+	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 || die "failed to 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/rxtx/rxtx-2.2_pre2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
new file mode 100644
index 000000000000..3bd68bb98de8
--- /dev/null
+++ b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f1874c349aa8
--- /dev/null
+++ b/dev-java/saaj/Manifest
@@ -0,0 +1 @@
+DIST saaj-1.3.19.tar.bz2 2266558 SHA256 d498d621a9798e503dae9728cf39d50a585e7704ffab2feb61ed769534f05f43 SHA512 12a439e296117abeac5de4694f2efec74c7f2b15cd86cb8759bfba6867f68dfe6c2f5b86ac2f8884eb86dddb3221e19f6c47c976cbcedcebe28570b51280ef71 WHIRLPOOL 746f1cc0ec5a3840165c94cab406ef72089b952276370c3e82aced4b21d482f89edcbe88f6feca44fe9854267930d11429e83d650b3f8ba7b94e58e88aae4ce6
diff --git a/dev-java/saaj/files/build.xml-1.3 b/dev-java/saaj/files/build.xml-1.3
new file mode 100644
index 000000000000..596bff615b1d
--- /dev/null
+++ b/dev-java/saaj/files/build.xml-1.3
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<project name="saaj" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac debug="false" srcdir="src" destdir="build">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="saaj.jar">
+      <fileset dir="build" includes="**/*.class"/>
+    </jar>
+  </target>
+</project>
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..250f2d1940ea
--- /dev/null
+++ b/dev-java/saaj/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/saaj/saaj-1.3.19-r1.ebuild b/dev-java/saaj/saaj-1.3.19-r1.ebuild
new file mode 100644
index 000000000000..05c7152ebcab
--- /dev/null
+++ b/dev-java/saaj/saaj-1.3.19-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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 ppc x86 ~x86-fbsd"
+IUSE=""
+
+# jaf and saaj-api only for java 5
+COMMON_DEP="
+	dev-java/mimepull:0
+	dev-java/xerces:2
+	dev-java/xml-commons-external:1.4
+	java-virtuals/jaf:0
+	java-virtuals/saaj-api:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+# servlet-api 2.5 for java 5. 3.0 is java 6.
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		dev-java/xalan:0
+		java-virtuals/servlet-api:2.5
+	)"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	epatch "${FILESDIR}"/${P}-java-5-bootclasspath.patch
+
+	# 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,jaf,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
+	dohtml -r docs/*
+
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/sablecc-anttask/Manifest b/dev-java/sablecc-anttask/Manifest
new file mode 100644
index 000000000000..99943cb6e464
--- /dev/null
+++ b/dev-java/sablecc-anttask/Manifest
@@ -0,0 +1 @@
+DIST sablecc-anttask-1.1.0-src.tar.gz 14045 SHA256 1225ad44f093c6ad73132e599f9294abd20cbfb51c7cf53eadcf96cb14945235 SHA512 23e8f3e911660549fd5bd6bcec4c97c58138fbc478bb958695b9b5327cf3da6985830d1c7a8db45516e2f708f7a9405921342b2a05bdce31c39c71569d62059d WHIRLPOOL cda4247e9ae789e742d4a084b8ac7d6e51bdab3b9f7dbacfc8799fd75b2318f3e544f490630016343782ec1139b41a4c5f124da651c6356d9b1f1422f4a1a7f7
diff --git a/dev-java/sablecc-anttask/metadata.xml b/dev-java/sablecc-anttask/metadata.xml
new file mode 100644
index 000000000000..6c817e87bfb4
--- /dev/null
+++ b/dev-java/sablecc-anttask/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">sablecc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r1.ebuild b/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..e98fb557c501
--- /dev/null
+++ b/dev-java/sablecc-anttask/sablecc-anttask-1.1.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Ant task for sablecc"
+HOMEPAGE="http://sablecc.org/"
+SRC_URI="mirror://sourceforge/sablecc/${P}-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/sablecc
+	>=dev-java/ant-core-1.7"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+	java-pkg_register-ant-task
+	dohtml doc/*
+	dodoc AUTHORS ChangeLog README || die
+}
diff --git a/dev-java/sablecc/Manifest b/dev-java/sablecc/Manifest
new file mode 100644
index 000000000000..c02d8b78422b
--- /dev/null
+++ b/dev-java/sablecc/Manifest
@@ -0,0 +1,2 @@
+DIST sablecc-3.2.tar.gz 440484 SHA256 f6a9e9ff5d2f57fa2c99f08653bb8c034fbd2de9e34aaf31b412c1b656fef80c SHA512 d8682a1cfd8bbb77543733008a12c4581c6b75c4e20a320d4dfc26b179e03076adfe735d70cc0ed92435ee23f6f74717524c800724f16804dc4d0078606918bd WHIRLPOOL db8aafe6134176091c7e173ed513d1acd61bd82767eadab788ada43de09645d975d213dd10626ee482b02c44372095470975854e52b23f23800aee9459aba251
+DIST sablecc-3.7.tar.gz 556985 SHA256 665e25207832246449dcd3e5d1fff4dec77b0db27378a3de528bca2ecbd680f0 SHA512 c53212ae10afc546796a46b8f1d731d3337c1fe184f12a285686b1f876b207a6cddcd789876d5c9d6b378583065bbb8ca7b5c3797d88b4eea3609ffe9a9c8f71 WHIRLPOOL bae77590d9a9afe017d0a797edfd1fe67b4fc099b4cc9bf654d57d3101d97f601cf4df849c28fbf0047ff888df2b285421fbc4556c942cb77da56ea07e7ab2ce
diff --git a/dev-java/sablecc/files/sablecc b/dev-java/sablecc/files/sablecc
new file mode 100644
index 000000000000..ec449013fa84
--- /dev/null
+++ b/dev-java/sablecc/files/sablecc
@@ -0,0 +1,2 @@
+#!/bin/sh
+${JAVA_HOME}/bin/java -jar /usr/share/sablecc/lib/sablecc.jar $*
diff --git a/dev-java/sablecc/metadata.xml b/dev-java/sablecc/metadata.xml
new file mode 100644
index 000000000000..6c817e87bfb4
--- /dev/null
+++ b/dev-java/sablecc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">sablecc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/sablecc/sablecc-3.2.ebuild b/dev-java/sablecc/sablecc-3.2.ebuild
new file mode 100644
index 000000000000..653f65d38d1c
--- /dev/null
+++ b/dev-java/sablecc/sablecc-3.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4"
+
+src_unpack() {
+	unpack ${A}
+	rm -v "${S}"/lib/*.jar || die
+}
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+src_install() {
+	java-pkg_dojar lib/*
+
+	dobin "${FILESDIR}"/${PN}
+
+	dodoc AUTHORS THANKS || die
+	dohtml README.html || die
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/sablecc/sablecc-3.7.ebuild b/dev-java/sablecc/sablecc-3.7.ebuild
new file mode 100644
index 000000000000..5b1b39afba07
--- /dev/null
+++ b/dev-java/sablecc/sablecc-3.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~x86"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+java_prepare() {
+	rm -v "${S}"/lib/*.jar || die
+}
+
+src_install() {
+	java-pkg_dojar lib/*
+
+	dobin "${FILESDIR}"/${PN}
+
+	dodoc AUTHORS THANKS
+	dohtml README.html
+
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/sac/Manifest b/dev-java/sac/Manifest
new file mode 100644
index 000000000000..861f268edd73
--- /dev/null
+++ b/dev-java/sac/Manifest
@@ -0,0 +1 @@
+DIST sacjava-1.3.zip 163617 SHA256 a228cae0e4c0cbefc7087cd1e17c0e8f91ee648949c6f0b9854c22f7ad1557b6 SHA512 e179d2e672f1e9e134c4bec92742410bcf2c5d423e5d236856bb53e849d7fcdb2bb09518796d30862685a9ab2344bfeea9b4c7f3c3dd4a1007c8056e120c87b9 WHIRLPOOL 306315955e0fd94e11d601e8de04c6acee104b3a8662b4d10fe3c336aff940af6ef10037c6117c218ece03cd042abf02c061daed40568087009db15bfa352086
diff --git a/dev-java/sac/files/build.xml b/dev-java/sac/files/build.xml
new file mode 100644
index 000000000000..af8a31794e84
--- /dev/null
+++ b/dev-java/sac/files/build.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<project name="sac" default="jar">
+	<!-- some properties -->
+	<property name="src" value="src" />
+	<property name="build" value="build" />
+	<property name="dist" value="dist"/>
+
+	<property name="jarfile" value="${ant.project.name}.jar"/>
+
+	<!-- init -->
+   <target name="init">
+      <tstamp/>
+	   <mkdir dir="${dist}"/>
+	   <mkdir dir="${build}"/>
+   </target>	
+
+	<!-- compile everything -->
+   <target name="compile" depends="init">
+      <javac srcdir="${src}" destdir="${build}"/>
+   </target>
+
+	<!-- build the jar file -->
+   <target name="jar" depends="compile">
+      <jar jarfile="${dist}/${jarfile}" basedir="${build}"/>
+   </target>
+	
+	<!-- clean up -->
+   <target name="clean">
+	   <delete dir="${build}"/>
+	   <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/sac/metadata.xml b/dev-java/sac/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/sac/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/sac/sac-1.3-r1.ebuild b/dev-java/sac/sac-1.3-r1.ebuild
new file mode 100644
index 000000000000..39aaeae281fa
--- /dev/null
+++ b/dev-java/sac/sac-1.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+
+	cp "${FILESDIR}/build.xml" "${S}"
+
+	cd "${S}"
+	rm -rv sac.jar META-INF/ || die
+
+	mkdir src
+	mv org src
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar dist/sac.jar
+
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/sat4j-core/Manifest b/dev-java/sat4j-core/Manifest
new file mode 100644
index 000000000000..624ededcc6f8
--- /dev/null
+++ b/dev-java/sat4j-core/Manifest
@@ -0,0 +1,4 @@
+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
diff --git a/dev-java/sat4j-core/metadata.xml b/dev-java/sat4j-core/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/sat4j-core/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..e33a75a141db
--- /dev/null
+++ b/dev-java/sat4j-core/sat4j-core-2.2.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0eef81467296
--- /dev/null
+++ b/dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..289cef790ea6
--- /dev/null
+++ b/dev-java/sat4j-pseudo/Manifest
@@ -0,0 +1,4 @@
+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
diff --git a/dev-java/sat4j-pseudo/metadata.xml b/dev-java/sat4j-pseudo/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/sat4j-pseudo/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..204de24c6f85
--- /dev/null
+++ b/dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7b32cf2f9773
--- /dev/null
+++ b/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..571265f2af09
--- /dev/null
+++ b/dev-java/sax/Manifest
@@ -0,0 +1 @@
+DIST sax2r3.zip 372488 SHA256 f9221ba55b3b753cf900ef64dc588a1d6b2716f63440b0f1ab55fe9deb418272 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648 WHIRLPOOL 5822d3aba16ccb8bde702f3817090d931c01b6bbb83fc4abf521d3a369599bc4a88707e37db6ef9abb074ddd0119b4b845d7d8c12e6eacd93f382f0acc01d9f2
diff --git a/dev-java/sax/metadata.xml b/dev-java/sax/metadata.xml
new file mode 100644
index 000000000000..2cfbf2b5202b
--- /dev/null
+++ b/dev-java/sax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">sax</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/sax/sax-2.2.1-r2.ebuild b/dev-java/sax/sax-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..1e4cbe80cdb2
--- /dev/null
+++ b/dev-java/sax/sax-2.2.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple API for XML, originally a Java-only API. It was the first widely adopted API for XML in Java"
+
+HOMEPAGE="http://sax.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sax/sax2r3.zip"
+LICENSE="public-domain"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/sax2r3"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -rf classes *.jar
+}
+
+src_install() {
+	java-pkg_newjar sax2.jar
+	dodoc ChangeLog CHANGES README || die
+
+	use doc && java-pkg_dojavadoc docs/javadoc
+	use source && java-pkg_dosrc "${S}"/src/*
+}
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
new file mode 100644
index 000000000000..19b2be1f9156
--- /dev/null
+++ b/dev-java/saxon/Manifest
@@ -0,0 +1,3 @@
+DIST saxon6-5-5.zip 3346162 SHA256 a76806dda554edc844601d0ec0fb3d2a10a2f397eabf3569dfb44b628363afc4 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a WHIRLPOOL 11bd5242e2c82ac7467561946a0b3b35e53af48962906739136ce97561ca38fd950011a1f4a65cd597d2279af244c7b474707017108296c8deaee8fcecde7652
+DIST saxonb8-4.zip 7266831 SHA256 c47f0f88c765d246a3e6666228db050fba5089bc8eff426d1b23ef807d1c7ff0 SHA512 cca8681dff8c851e1be513a5d3334a6395291f1773ea452d759445100c4e97e8fafee3e2fd7a1974d234ed6404e2292e231d00830bd90740e2dab1c671fec1b5 WHIRLPOOL 0d8ec91f77d632416eb4362264081a340addece41de11dc7203de63309e6c07a92c40f087724eb161671043f90790abf97ce520e2095414bc01ab42596a4ab39
+DIST saxonhe9-2-0-6source.zip 2942625 SHA256 4f15659cf8bb537b4b20f63cf060bf56f39453ab520fa912b2e9fe87e90a972e SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e WHIRLPOOL ca1b5b8f2f70eb72259b8128606830adebc6f6eed8c5c6ff9f222a672556ff8f73219960758480366004b656100e017bfdebad7f4dc60afc9cb3ab6793fa9364
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/files/saxon-8.4b-jikes.patch b/dev-java/saxon/files/saxon-8.4b-jikes.patch
new file mode 100644
index 000000000000..e3d3f2c38043
--- /dev/null
+++ b/dev-java/saxon/files/saxon-8.4b-jikes.patch
@@ -0,0 +1,14 @@
+diff -ru saxon/src/net/sf/saxon/expr/UserFunctionCall.java saxon-patched/src/net/sf/saxon/expr/UserFunctionCall.java
+--- saxon/src/net/sf/saxon/expr/UserFunctionCall.java	2005-03-21 13:46:38.000000000 -0500
++++ saxon-patched/src/net/sf/saxon/expr/UserFunctionCall.java	2005-06-29 20:13:47.000000000 -0400
+@@ -401,8 +401,8 @@
+          */
+ 
+         public Object map(Item item, XPathContext context) throws XPathException {
+-            if (item instanceof FunctionCallPackage) {
+-                return (((FunctionCallPackage)item).iterateResults(context));
++            if (item instanceof UserFunctionCall.FunctionCallPackage) {
++                return (((UserFunctionCall.FunctionCallPackage)item).iterateResults(context));
+             } else {
+                 return item;
+             }
diff --git a/dev-java/saxon/metadata.xml b/dev-java/saxon/metadata.xml
new file mode 100644
index 000000000000..9f1123bb2bec
--- /dev/null
+++ b/dev-java/saxon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">saxon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/saxon/saxon-6.5.5.ebuild b/dev-java/saxon/saxon-6.5.5.ebuild
new file mode 100644
index 000000000000..f9c7640612ff
--- /dev/null
+++ b/dev-java/saxon/saxon-6.5.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source"
+inherit java-pkg-2 java-ant-2 eutils versionator
+
+MY_P="${PN}$(replace_all_version_separators -)"
+DESCRIPTION="A collection of tools for processing XML documents: XSLT processor, XSL library, parser"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+HOMEPAGE="http://saxon.sourceforge.net/"
+
+LICENSE="MPL-1.1"
+SLOT="6.5"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+COMMON_DEP="~dev-java/jdom-1.0"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+
+	unzip -qq source.zip -d src || die "failed to unpack"
+
+	cp "${FILESDIR}/build-${PV}.xml" build.xml || die
+
+	rm -v *.jar || die
+	rm -rf doc/api || die
+	rm samples/java/*.class || die
+	mkdir lib && cd lib
+	java-pkg_jar-from jdom-1.0
+}
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+
+	eant -Dproject.name=${PN} jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	if use doc; then
+		java-pkg_dojavadoc dist/doc/api
+		dohtml -r doc/*
+	fi
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/saxon/saxon-8.4b-r3.ebuild b/dev-java/saxon/saxon-8.4b-r3.ebuild
new file mode 100644
index 000000000000..9dff433ad379
--- /dev/null
+++ b/dev-java/saxon/saxon-8.4b-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="A collection of tools for processing XML documents: XSLT processor, XSL library, parser"
+MyPV=${PV%b}
+SRC_URI="mirror://sourceforge/saxon/saxonb${MyPV/./-}.zip"
+HOMEPAGE="http://saxon.sourceforge.net/"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/xom
+	~dev-java/jdom-1.0
+	=dev-java/xml-commons-external-1.3*"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	unpack ./source.zip
+	mkdir src
+	mv net src
+
+	epatch "${FILESDIR}/${P}-jikes.patch"
+
+	cp -i "${FILESDIR}/build-${PV}.xml" build.xml || die
+
+	rm -v *.jar || die
+	rm samples/java/*.class || die
+
+	mkdir lib && cd lib
+	java-pkg_jar-from jdom-1.0
+	java-pkg_jar-from xom
+	# Is not needed with 1.5 but gets pulled in by deps any way
+	# without this emerging with sun-jdk-1.4 fails with
+	# JAVA_PKG_STRICT
+	java-pkg_jar-from xml-commons-external-1.3
+}
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+
+	# the jar is named saxon8 and and helps if new slots come along
+	java-pkg_dolauncher ${PN}8 --main net.sf.saxon.Transform
+	if use doc; then
+		java-pkg_dojavadoc dist/doc/api doc/*
+		java-pkg_dohtml doc/*
+	fi
+	use examples && java-pkg_doexamples samples
+	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..f7bb106d8d08
--- /dev/null
+++ b/dev-java/saxon/saxon-9.2.0.6.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..7eaca1d500c6
--- /dev/null
+++ b/dev-java/saxpath/Manifest
@@ -0,0 +1 @@
+DIST saxpath-1.0.tar.gz 2166023 SHA256 90c07abb3e3f09c398c02d84b44b651aa59d724aa6fabf45aa44a2365a6725c1 SHA512 aafd5e3d6d135f0916ebe3e4804bbbeb9c255b23210a46474716485ce2da0ee81fad4313a38951865104d2eaf1fadb81efd00677431b0294b1d01b7a729cee9e WHIRLPOOL 18b2150261a2a1bcbb34ecf07b38c9276d5610be1f1dd16b3de7c8c5de9c712dee44a896d5c9cfcb5dc9152342b5a7c2b11f70243ef74c2531ba3aaf6706a35b
diff --git a/dev-java/saxpath/files/MANIFEST.MF b/dev-java/saxpath/files/MANIFEST.MF
new file mode 100644
index 000000000000..77fcc25b3bad
--- /dev/null
+++ b/dev-java/saxpath/files/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0

+Extension-Name: org.saxpath

+Specification-Title: saxpth

+Specification-Version: 1.0 FCS

+Specification-Vendor: werken digital.

+Created-By: Ant 1.4.1

+Implementation-Vendor:  werken digital.

+Implementation-Version: 1.0

+Implementation-Title: saxpath

diff --git a/dev-java/saxpath/metadata.xml b/dev-java/saxpath/metadata.xml
new file mode 100644
index 000000000000..e091065382f5
--- /dev/null
+++ b/dev-java/saxpath/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">saxpath</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/saxpath/saxpath-1.0-r2.ebuild b/dev-java/saxpath/saxpath-1.0-r2.ebuild
new file mode 100644
index 000000000000..8cd0d7da790a
--- /dev/null
+++ b/dev-java/saxpath/saxpath-1.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Simple API for XPath"
+HOMEPAGE="http://saxpath.sourceforge.net/"
+SRC_URI="mirror://sourceforge/saxpath/${P}.tar.gz"
+
+LICENSE="JDOM"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND=">=virtual/jre-1.4"
+# doc needs ant-trax
+# test needs ant-junit
+DEPEND=">=virtual/jdk-1.4
+	doc? ( dev-java/ant-trax )
+	test? ( dev-java/ant-junit )"
+
+S=${WORKDIR}/${P}-FCS
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v *.jar lib/*.jar || die
+
+	mkdir src/conf
+	cp "${FILESDIR}/MANIFEST.MF" src/conf
+
+	use test && java-ant_rewrite-classpath
+
+	use doc && ANT_TASKS="ant-trax"
+}
+
+EANT_BUILD_TARGET="package"
+EANT_DOC_TARGET="doc javadoc"
+
+src_test() {
+	ANT_TASKS="ant-junit" eant -Dgentoo.classpath="$(java-pkg_getjar --build-only junit junit.jar)" \
+		test
+}
+
+src_install() {
+	java-pkg_dojar build/saxpath.jar
+
+	if use doc; then
+		# installs things other than javadoc too
+		mv build/doc/javadoc build/doc/apidocs || die
+		java-pkg_dohtml -r build/doc/*
+		dosym /usr/share/doc/${PF}/html/{apidocs,api} || die
+	fi
+	use source && java-pkg_dosrc src/java/main/*
+}
diff --git a/dev-java/sblim-cim-client/Manifest b/dev-java/sblim-cim-client/Manifest
new file mode 100644
index 000000000000..df7b18ef5e10
--- /dev/null
+++ b/dev-java/sblim-cim-client/Manifest
@@ -0,0 +1 @@
+DIST sblim-cim-client2-2.2.1-src.zip 1082959 SHA256 ef1abcd69716f18ff54e588e35aa8d8f0a5da00acd77d8e0f56ce616bdc7f81b SHA512 b7e1f56b87fa24c97d8b3e97261195ff04ce13839e72f4b8824daa8b9854158ba10c0bddd16e0650197125510d68adf6f4458089d132278510e10bd2b25b4aa7 WHIRLPOOL 770958a98cf85dfedddf0766fbef0db6b5cbfefbceb97f66140c804a446ffc48fede4751cbfca06f710ec4a9f60bfde3477dd1e179504f0b15415a447ddc9c15
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..48a24992662a
--- /dev/null
+++ b/dev-java/sblim-cim-client/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>jieryn@gmail.com</email>
+		<name>jieryn</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..e1fdfb5fa518
--- /dev/null
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A WBEM services client that includes an IETF RFC 2614 compliant 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..4d5209770799
--- /dev/null
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A WBEM services client that includes an IETF RFC 2614 compliant 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/Manifest b/dev-java/sbt/Manifest
new file mode 100644
index 000000000000..9436c22ed4f7
--- /dev/null
+++ b/dev-java/sbt/Manifest
@@ -0,0 +1,6 @@
+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.7.jar 1208385 SHA256 6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158 SHA512 ddc62dd85b552a7157ae0c19d0161d77a929adeb4ea81042a3a38c3d979e32674b9174aef47d458e9a7c8ea7942c08f1a7177b9bc739f7cd9e0484aef9915204 WHIRLPOOL 63841a401739aa3eab24632fcec41dc5c186502f4b80fe782106a0c6448b1da2321bf2a7a0b0f83473f7c073cce2ac8f5f85440d955acc191a73bd95200cb2cf
diff --git a/dev-java/sbt/metadata.xml b/dev-java/sbt/metadata.xml
new file mode 100644
index 000000000000..a2d342d21424
--- /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>
+  <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.8.ebuild b/dev-java/sbt/sbt-0.13.8.ebuild
new file mode 100644
index 000000000000..576b73678727
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.8.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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?
+(
+	http://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2
+	http://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+	http://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
+	http://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? ( http://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+
+DEPEND="virtual/jdk:1.6
+	>=dev-lang/scala-2.10.4-r1:${SV}"
+RDEPEND=">=virtual/jre-1.6
+	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 http://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+		# http://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
+		# http://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 ..."
+		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true publishLocal || die
+	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..90a68778e9a6
--- /dev/null
+++ b/dev-java/servletapi/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/dev-java/servletapi/metadata.xml b/dev-java/servletapi/metadata.xml
new file mode 100644
index 000000000000..97d1a13a4e5d
--- /dev/null
+++ b/dev-java/servletapi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..91dfde58caa3
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.2-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..203706597c3f
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.3-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..551d2722032f
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.4-r5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..be26b1cc0fda
--- /dev/null
+++ b/dev-java/shared-objects/Manifest
@@ -0,0 +1 @@
+DIST shared-objects-1.4.tar.gz 45304 SHA256 dc4cbfb58b9ffd097a2fe663a333b32c76c87814eb6b3e8277b76ba6c8d1c4f1 SHA512 f051458244a88e44c249167bfad0f88f0efa971fdadc578efcb83ff5ea805356fc68250bb4511ec181b5a062b4aba69463f212e913cf96ba98bdd3966e219f39 WHIRLPOOL c0910f4e635f01b3194c06dbd6dfd0ac0b39be66c34a97fbe023bd316653160eef7997764b8d04c05fb1f77e3349e2fc7de904e47a5957966f74f150f56069ec
diff --git a/dev-java/shared-objects/files/build.xml b/dev-java/shared-objects/files/build.xml
new file mode 100644
index 000000000000..77d8d8db8c1e
--- /dev/null
+++ b/dev-java/shared-objects/files/build.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" standalone="yes"?>
+<project basedir="." default="jar">
+  <target name="compile">
+    <mkdir dir="bin"/>
+    <mkdir dir="lib"/>
+    <javac srcdir="shared" destdir="bin">
+      <include name="**/*.java"/>
+      <classpath>
+        <fileset dir="lib">
+          <include name="**/*.jar"/>
+        </fileset>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="shared-objects.jar">
+      <zipfileset dir="bin"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/shared-objects/metadata.xml b/dev-java/shared-objects/metadata.xml
new file mode 100644
index 000000000000..f3335ded43dd
--- /dev/null
+++ b/dev-java/shared-objects/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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-r3.ebuild b/dev-java/shared-objects/shared-objects-1.4-r3.ebuild
new file mode 100644
index 000000000000..4c9db6c79d7a
--- /dev/null
+++ b/dev-java/shared-objects/shared-objects-1.4-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java Class implementing a 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/shared-objects-1.4.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="amd64 ~ppc x86"
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cp "${FILESDIR}/build.xml" "${S}" || die
+
+	(
+		echo "#! /bin/sh"
+		echo "java-config -p shared-objects-1"
+	) > "${S}"/shared-objects-config
+}
+
+src_install() {
+	java-pkg_dojar shared-objects.jar
+	dobin shared-objects-config || die
+
+	dodoc AUTHORS ChangeLog || die
+	use source && java-pkg_dosrc "${S}/shared"
+}
diff --git a/dev-java/simplyhtml/Manifest b/dev-java/simplyhtml/Manifest
new file mode 100644
index 000000000000..02965b8538fd
--- /dev/null
+++ b/dev-java/simplyhtml/Manifest
@@ -0,0 +1 @@
+DIST SimplyHTML_src_0_13_1.tar.gz 473258 SHA256 34ad16951e1165261e81f1a23ba6791e8391888749b19429d7f067e3ca1300dd SHA512 e37140ef7461f2c741f43ce14518e224cb41ddb42c4d396f8f934476a5fbbe4d121950dc3186ba1ae603068e81832a92240e99cd25d3778574c0d3f370d501ac WHIRLPOOL 3f29e95d3b5369507f5e769501b01084667125f1a4744f24275168cc417c1d7ab48f6f5e4ea9f1ef17c933a94d868b9de79562ae8bc6db72b16da0bb03474ea8
diff --git a/dev-java/simplyhtml/metadata.xml b/dev-java/simplyhtml/metadata.xml
new file mode 100644
index 000000000000..39c18d820a9d
--- /dev/null
+++ b/dev-java/simplyhtml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">simplyhtml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/simplyhtml/simplyhtml-0.13.1.ebuild b/dev-java/simplyhtml/simplyhtml-0.13.1.ebuild
new file mode 100644
index 000000000000..2b8d08c61569
--- /dev/null
+++ b/dev-java/simplyhtml/simplyhtml-0.13.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_PN="SimplyHTML"
+MY_PV="$(replace_all_version_separators _)"
+#MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="Text processing application based on HTML and CSS files"
+HOMEPAGE="http://${PN}.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_src_${MY_PV}.tar.gz"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+COMMON_DEP="dev-java/javahelp
+	dev-java/gnu-regexp"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}-${MY_PV}/src"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+java_prepare() {
+	# it wants to copy lib jars
+	sed -i '/copy file/d' build.xml || die
+}
+
+src_compile() {
+	local cp="$(java-pkg_getjars javahelp,gnu-regexp-1)"
+	eant -Dclasspath="${cp}" jar $(use_doc)
+}
+
+src_install() {
+	cd ..
+	java-pkg_dojar dist/lib/${MY_PN}*.jar
+
+	dodoc readme.txt || die
+
+	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..10bc43141632
--- /dev/null
+++ b/dev-java/sjsxp/Manifest
@@ -0,0 +1 @@
+DIST sjsxp-1.0.1.tar.bz2 414706 SHA256 3ed146a4726f701ab72c11017655a69471fc1c77a9e668756d7150893f879501 SHA512 0e8e8841d87400f9978b8e053f3658f14f2c1b85007bc431681c6489ae78972cd892021821b00a37ba06098ba1bdf6954a3c294cddbb69e5cdb7936f4736daa5 WHIRLPOOL 56dd5745bdaf15e671a0d0c6fa35da145a237fe4a21b23276393b374fcfe1c61d6051f24876f21302a8da17e5174977f0873a8eb332279eae51264de486d35da
diff --git a/dev-java/sjsxp/metadata.xml b/dev-java/sjsxp/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/sjsxp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/sjsxp/sjsxp-1.0.1-r1.ebuild b/dev-java/sjsxp/sjsxp-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..7bf787574fb7
--- /dev/null
+++ b/dev-java/sjsxp/sjsxp-1.0.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The Sun Java Streaming XML Parser (SJSXP) is an efficient implementation of the StAX API"
+HOMEPAGE="http://sjsxp.dev.java.net/"
+# CVS: cvs -d :pserver:guest@cvs.dev.java.net:/cvs checkout -r sjsxp-1_0_1 sjsxp/zephyr
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="bea.ri.jsr173"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP="java-virtuals/stax-api"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/zephyr"
+
+EANT_GENTOO_CLASSPATH="stax-api"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	java-ant_rewrite-classpath
+}
+
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_dojar "build/${PN}.jar"
+
+	use doc && java-pkg_dojavadoc build/docs/javadocs/sjsxp
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/sjsxp/sjsxp-1.0.1.ebuild b/dev-java/sjsxp/sjsxp-1.0.1.ebuild
new file mode 100644
index 000000000000..64b24b0eb841
--- /dev/null
+++ b/dev-java/sjsxp/sjsxp-1.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The Sun Java Streaming XML Parser (SJSXP) is an efficient implementation of the StAX API"
+HOMEPAGE="http://sjsxp.dev.java.net/"
+# CVS: cvs -d :pserver:guest@cvs.dev.java.net:/cvs checkout -r sjsxp-1_0_1 sjsxp/zephyr
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="bea.ri.jsr173"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP="dev-java/jsr173"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/zephyr"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}/lib"
+	java-pkg_jar-from jsr173 jsr173.jar jsr173_1.0_api.jar
+}
+
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_dojar "build/${PN}.jar"
+
+	use doc && java-pkg_dojavadoc build/docs/javadocs
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/skinlf/Manifest b/dev-java/skinlf/Manifest
new file mode 100644
index 000000000000..dc375c475a72
--- /dev/null
+++ b/dev-java/skinlf/Manifest
@@ -0,0 +1 @@
+DIST skinlf-6.7-20060722.zip 827174 SHA256 3d31ffbe1fa1325049cb94e675971a2b8d89ae24558cb173e7e4e1f926dd7daa SHA512 e4df9c6a85b5bbdbd40af177595641a5ad55a5cb16e5a31217fb3f5badd25727e4b48fa78ba2374f4eb55224068807b5bd6df9fba7f2418b7b810b25cf2043b6 WHIRLPOOL f1ba8c9408fc77fd1d68a5c2b7834ed0f1c79dbaa3095e015f95464da0a852a892e3f40635b86dde14f6af314902f88be3e6218f313a9722d76037fa6a944bba
diff --git a/dev-java/skinlf/files/skinlf-1.2.12-build.xml b/dev-java/skinlf/files/skinlf-1.2.12-build.xml
new file mode 100644
index 000000000000..83dd73ea9055
--- /dev/null
+++ b/dev-java/skinlf/files/skinlf-1.2.12-build.xml
@@ -0,0 +1,299 @@
+<!DOCTYPE project [
+  <!ENTITY build-COMMON SYSTEM "common.xml">
+  <!ENTITY build-COMMONDEVJAVANET SYSTEM "common-devjavanet.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="1.2.12"/>
+  <property name="year"    value="2000-2005"/>
+  <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">
+    <pathelement location="lib/imageconversion.jar"/>
+    <pathelement location="lib/JimiProClasses.zip"/>
+    <pathelement location="lib/xalan.jar"/>
+    <pathelement location="lib/xercesImpl.jar"/>
+    <pathelement location="lib/xml-apis.jar"/>
+  </path>
+
+  <property name="classpath.asprop" refid="classpath"/>
+
+  &build-COMMON;
+  &build-COMMONDEVJAVANET;
+
+  <!-- get some of the dependant jars from maven repository -->
+  <target name="init.jars">
+    <get src="http://www.ibiblio.org/maven/javacc/jars/JavaCC.zip"
+	 dest="lib/JavaCC.zip"
+	 verbose="true"
+	 usetimestamp="true"/>
+    <get src="http://www.ibiblio.org/maven/xalan/jars/xalan-2.5.1.jar"
+         dest="lib/xalan.jar"
+	 verbose="true"
+	 usetimestamp="true"/>
+    <get src="http://www.ibiblio.org/maven/xerces/jars/xercesImpl-2.4.0.jar"
+	 dest="lib/xercesImpl.jar"
+	 verbose="true"
+	 usetimestamp="true"/>
+    <get src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar"
+	 dest="lib/xml-apis.jar"
+	 verbose="true"
+	 usetimestamp="true"/>
+  </target>
+
+  <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"/>
+        <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-1.2.12-common-devjavanet.xml b/dev-java/skinlf/files/skinlf-1.2.12-common-devjavanet.xml
new file mode 100644
index 000000000000..da7cdcf835cc
--- /dev/null
+++ b/dev-java/skinlf/files/skinlf-1.2.12-common-devjavanet.xml
@@ -0,0 +1,38 @@
+<!--
+  Common targets dealing with dev.java.net
+-->
+
+<target name="devjavanet.setup">
+  <property name="cvsroot" value=":pserver:${cvs.user.name}@cvs.dev.java.net:/shared/data/ccvs/repository"/>
+  <property name="cvsweb" value="https://skinlf.dev.java.net/unbranded-source/browse/"/>
+</target>
+
+<target name="cvs.tagdiff" depends="devjavanet.setup">
+  <property name="filename" value="${build.dir}/${startTag}-${endTag}-diff.xml"/>
+  <cvstagdiff cvsroot="${cvsroot}"
+    destfile="${filename}"
+    package="${project}"
+    startTag="${startTag}"
+    endTag="${endTag}"/>
+  <xslt in="${filename}"
+    out="${filename}.html"
+    style="${ant.home}/etc/tagdiff.xsl">
+    <param name="title" expression="${project} diff between ${startTag} and ${endTag}"/>
+    <param name="module" expression="${project}"/>
+    <param name="cvsweb" expression="${cvsweb}"/>
+  </xslt>
+</target>
+
+<target name="cvs.changelog" depends="devjavanet.setup">
+  <property name="filename" value="${build.dir}/${startDate}-clog.xml"/>
+  <cvschangelog
+    start="${startDate}"
+    destfile="${filename}"/>
+  <xslt in="${filename}"
+    out="${filename}.html"
+    style="${ant.home}/etc/changelog.xsl">
+    <param name="title" expression="${project} changelog since ${startDate}"/>
+    <param name="module" expression="${project}"/>
+    <param name="cvsweb" expression="${cvsweb}"/>
+  </xslt>
+</target>
diff --git a/dev-java/skinlf/files/skinlf-1.2.12-common.xml b/dev-java/skinlf/files/skinlf-1.2.12-common.xml
new file mode 100644
index 000000000000..c2803acc5bab
--- /dev/null
+++ b/dev-java/skinlf/files/skinlf-1.2.12-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-1.2.12-image-utils-without-jimi.patch b/dev-java/skinlf/files/skinlf-1.2.12-image-utils-without-jimi.patch
new file mode 100644
index 000000000000..02670136667d
--- /dev/null
+++ b/dev-java/skinlf/files/skinlf-1.2.12-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
+--- skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java	2006-01-24 20:09:36.000000000 +0100
++++ skinlf-1.2.12/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/files/skinlf-1.2.12-image-utils.patch b/dev-java/skinlf/files/skinlf-1.2.12-image-utils.patch
new file mode 100644
index 000000000000..f6d695f2894b
--- /dev/null
+++ b/dev-java/skinlf/files/skinlf-1.2.12-image-utils.patch
@@ -0,0 +1,38 @@
+diff -ru skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java
+--- skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java	2006-01-22 13:14:39.000000000 +0100
++++ skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java	2006-01-22 13:19:13.000000000 +0100
+@@ -6,15 +6,12 @@
+ 

+ import javax.swing.ImageIcon;

+ 

+-import com.ibm.imageconversion.*;

+ import com.sun.jimi.core.*;

+ 

+ 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());

+@@ -30,17 +27,7 @@
+     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) {

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..556630dcc7a3
--- /dev/null
+++ b/dev-java/skinlf/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+<email>zzam@gentoo.org</email>
+<name>Matthias Schwarzott</name>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</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..d745774aa030
--- /dev/null
+++ b/dev-java/skinlf/skinlf-6.7-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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://${PN}.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..482f0fdda7c1
--- /dev/null
+++ b/dev-java/slf4j-api/Manifest
@@ -0,0 +1,5 @@
+DIST slf4j-1.6.6.tar.gz 2703160 SHA256 d169a50fd535417bde88e342a21c1674fef0a560cbe249ff05e56b8178589b55 SHA512 bb22e3c38d451893b79f382d790eb1058465208a1ab462999894c12375ed6b38daced6389d2a8e6015cc718479bfbc50b2b58a354e99a2aadec7c9decd59423f WHIRLPOOL 1903a6513c1b7e133240c19bcf3e6c506ba3c080be66d000c7d3f382c750a8a4ad47faffe9352937bbf77e814152c58e1163b76b012d7d65ad4c3cc9bd9e290d
+DIST slf4j-1.7.5.tar.gz 2862186 SHA256 e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7 WHIRLPOOL 4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
+DIST slf4j-1.7.6.tar.gz 3051903 SHA256 9abf25b99f7c4dfc52a85b79a67b4d878831dfd79c1734b0124ad73615372323 SHA512 c274c0f1700df6b4801fa25d71127c0a35d0f30e421e8661fdaf8074ddfb84c94167bd6ff016cfceae0d062f4cf26a13426c3a9a9dd6b4fc471b18028ae37c4c WHIRLPOOL ee8a3b84a1a1809a893957d52f7a139f3b743796ca934fca0c85aad386f81182f54666000727e7582874ce6ff7a095cce39af5caaa8c415bcad13fe43661c2d4
+DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
+DIST slf4j-api-1.5.11-sources.jar 42350 SHA256 1ab1f0772dd8b232b38fc47a2b3fb9c94c069e5f38ce943ee78601840c452b09 SHA512 ad6d8fc92b3ca6377ca8d93c2222022636644d0eab03ad72af98c7a8169f73874ab768eb80cfc07ec1ad3bcbc60fed68eee03a9e54e383b46ef530d66a46f8c0 WHIRLPOOL 579fbf56ce4d54be392b3a9929c73ac56b1828b8b0c9d309b40fe01abe46b69bb52beda54bfab4aed5578fa654b1eee055fd65139d30999280cc61a10b009e30
diff --git a/dev-java/slf4j-api/files/1.7.5-build.xml b/dev-java/slf4j-api/files/1.7.5-build.xml
new file mode 100644
index 000000000000..42f0e9ce9efd
--- /dev/null
+++ b/dev-java/slf4j-api/files/1.7.5-build.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="slf4j-api-from-maven" default="package" basedir=".">
+
+	<property file="${user.home}/.m2/maven.properties" />
+	<property file="maven-build.properties" />
+
+	<property name="maven.build.finalName" value="slf4j-api" />
+	<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>
+		<delete dir="${maven.build.outputDir}/org/slf4j/impl" />
+		<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, 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" />
+					<exclude name="**/NoBindingTest.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>
+
+	<target name="javadoc" description="Generates the Javadoc of the application">
+		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${basedir}/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" manifest="${basedir}/target/classes/META-INF/MANIFEST.MF" 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/slf4j-api/files/1.7.6-build.xml b/dev-java/slf4j-api/files/1.7.6-build.xml
new file mode 100644
index 000000000000..1dedbda3c4c1
--- /dev/null
+++ b/dev-java/slf4j-api/files/1.7.6-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.5"
+           verbose="false"
+           fork="false"
+           source="1.5">
+      <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.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="**/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/files/build.xml b/dev-java/slf4j-api/files/build.xml
new file mode 100644
index 000000000000..eab564de60a4
--- /dev/null
+++ b/dev-java/slf4j-api/files/build.xml
@@ -0,0 +1,19 @@
+<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="slf4j-api.jar" basedir="build">
+			<exclude name="org/slf4j/impl/**"/>
+		</jar>
+	</target>
+
+	<target name="javadoc" depends="compile">
+		<mkdir dir="docs"/>
+		<javadoc sourcepath="." destdir="docs" classpath="${gentoo.classpath}"/>
+	</target>
+
+</project>
diff --git a/dev-java/slf4j-api/files/slf4j-api_maven-build.xml b/dev-java/slf4j-api/files/slf4j-api_maven-build.xml
new file mode 100644
index 000000000000..cb5c8ee23f18
--- /dev/null
+++ b/dev-java/slf4j-api/files/slf4j-api_maven-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/22/12 3:36 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<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.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.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"/>
+  </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>
+	<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.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="**/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="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"/>
+
+  <!-- ====================================================================== -->
+  <!-- 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://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"/>
+  </target>
+
+</project>
diff --git a/dev-java/slf4j-api/metadata.xml b/dev-java/slf4j-api/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/slf4j-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/slf4j-api/slf4j-api-1.5.11.ebuild b/dev-java/slf4j-api/slf4j-api-1.5.11.ebuild
new file mode 100644
index 000000000000..3e374f906e6a
--- /dev/null
+++ b/dev-java/slf4j-api/slf4j-api-1.5.11.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple Logging Facade for Java"
+HOMEPAGE="http://www.slf4j.org/"
+# Extract from http://www.slf4j.org/dist/${P/-api/}.tar.gz
+SRC_URI="mirror://gentoo/${P}-sources.jar"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	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/slf4j-api/slf4j-api-1.6.6.ebuild b/dev-java/slf4j-api/slf4j-api-1.6.6.ebuild
new file mode 100644
index 000000000000..e48ea292f705
--- /dev/null
+++ b/dev-java/slf4j-api/slf4j-api-1.6.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple Logging Facade for Java"
+HOMEPAGE="http://www.slf4j.org/"
+# Extract from http://www.slf4j.org/dist/${P/-api/}.tar.gz
+#SRC_URI="mirror://gentoo/${P}-sources.jar"
+SRC_URI="http://www.slf4j.org/dist/${P/-api/}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+S="${WORKDIR}/${P/-api/}/${PN}"
+
+java_prepare() {
+	cp -v "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	find "${WORKDIR}" -iname '*.jar' -delete
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.5-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.5-r1.ebuild
new file mode 100644
index 000000000000..275ac6641061
--- /dev/null
+++ b/dev-java/slf4j-api/slf4j-api-1.7.5-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/-api/}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit4:0
+	)"
+
+S="${WORKDIR}/${P/-api/}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+EANT_TEST_ANT_TASKS="ant-junit"
+
+java_prepare() {
+	cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
+	find "${WORKDIR}" -iname '*.jar' -delete || die
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc "${S}"/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.6.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.6.ebuild
new file mode 100644
index 000000000000..d95fa9167ba4
--- /dev/null
+++ b/dev-java/slf4j-api/slf4j-api-1.7.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit4: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-api/slf4j-api-1.7.7.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
new file mode 100644
index 000000000000..7db5cdc425ba
--- /dev/null
+++ b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	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}"/1.7.6-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..ae35a66b516b
--- /dev/null
+++ b/dev-java/slf4j-ext/Manifest
@@ -0,0 +1 @@
+DIST slf4j-1.7.5.tar.gz 2862186 SHA256 e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7 WHIRLPOOL 4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
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/metadata.xml b/dev-java/slf4j-ext/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/slf4j-ext/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</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..a86b78a55c6d
--- /dev/null
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-log4j12/Manifest b/dev-java/slf4j-log4j12/Manifest
new file mode 100644
index 000000000000..c9f3c66a1f92
--- /dev/null
+++ b/dev-java/slf4j-log4j12/Manifest
@@ -0,0 +1,3 @@
+DIST slf4j-1.7.5.tar.gz 2862186 SHA256 e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7 WHIRLPOOL 4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
+DIST slf4j-1.7.6.tar.gz 3051903 SHA256 9abf25b99f7c4dfc52a85b79a67b4d878831dfd79c1734b0124ad73615372323 SHA512 c274c0f1700df6b4801fa25d71127c0a35d0f30e421e8661fdaf8074ddfb84c94167bd6ff016cfceae0d062f4cf26a13426c3a9a9dd6b4fc471b18028ae37c4c WHIRLPOOL ee8a3b84a1a1809a893957d52f7a139f3b743796ca934fca0c85aad386f81182f54666000727e7582874ce6ff7a095cce39af5caaa8c415bcad13fe43661c2d4
+DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
diff --git a/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.5-maven-build.xml b/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.5-maven-build.xml
new file mode 100644
index 000000000000..1df80404173e
--- /dev/null
+++ b/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.5-maven-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 2/3/14 11:52 PM                       -->
+<!-- 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.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/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.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.5/slf4j-api-1.7.5.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" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*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>
+
+  <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/slf4j/slf4j-api/1.7.5"/>
+    <get src="http://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar" 
+         dest="${maven.repo.local}/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.17"/>
+    <get src="http://repo.maven.apache.org/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar" 
+         dest="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.10"/>
+    <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://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/slf4j-log4j12/files/slf4j-log4j12-1.7.6-maven-build.xml b/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.6-maven-build.xml
new file mode 100644
index 000000000000..fe840a760b42
--- /dev/null
+++ b/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.6-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.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"/>
+    <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.6/slf4j-api-1.7.6.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.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"/>
+
+  <!-- ====================================================================== -->
+  <!-- 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..838c00a4a448
--- /dev/null
+++ b/dev-java/slf4j-log4j12/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.5.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.5.ebuild
new file mode 100644
index 000000000000..08e53b1d10b0
--- /dev/null
+++ b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-${PV}:0"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.5
+	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
+}
+
+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-log4j12/slf4j-log4j12-1.7.6.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.6.ebuild
new file mode 100644
index 000000000000..2885081cbdc2
--- /dev/null
+++ b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.5
+	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-log4j12/slf4j-log4j12-1.7.7.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
new file mode 100644
index 000000000000..b5b225e1673f
--- /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
+# $Id$
+
+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.5"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.5
+	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}"/${PN}-1.7.6-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..6ecd81552e79
--- /dev/null
+++ b/dev-java/slf4j-nop/Manifest
@@ -0,0 +1,3 @@
+DIST slf4j-1.6.6.tar.gz 2703160 SHA256 d169a50fd535417bde88e342a21c1674fef0a560cbe249ff05e56b8178589b55 SHA512 bb22e3c38d451893b79f382d790eb1058465208a1ab462999894c12375ed6b38daced6389d2a8e6015cc718479bfbc50b2b58a354e99a2aadec7c9decd59423f WHIRLPOOL 1903a6513c1b7e133240c19bcf3e6c506ba3c080be66d000c7d3f382c750a8a4ad47faffe9352937bbf77e814152c58e1163b76b012d7d65ad4c3cc9bd9e290d
+DIST slf4j-1.7.5.tar.gz 2862186 SHA256 e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7 WHIRLPOOL 4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
+DIST slf4j-nop-1.5.11-sources.jar 5372 SHA256 2cdf4de025c5e564de45599aeaf6c28ab0dfb77e8e9fd139f4fd070f1926a549 SHA512 012dac709c70c3bf514f767fd26efbf46d795440aea206353b8988112992a024b1a916a6c62d9a6b9cd8c75febf93b0dc5a0df0050b71bd038c1d50cba13217d WHIRLPOOL 70e32cc0f5d755ee5dad0cd654d37a990a9570a21ac6bc384dad8733f2cbd6a61bc6a46c5558ee103ff79428d4b881111382894cc785093fa481d9283c8b54b3
diff --git a/dev-java/slf4j-nop/files/1.6.6-build.xml b/dev-java/slf4j-nop/files/1.6.6-build.xml
new file mode 100644
index 000000000000..331523ffdfcf
--- /dev/null
+++ b/dev-java/slf4j-nop/files/1.6.6-build.xml
@@ -0,0 +1,19 @@
+<project name="slf4j-api" default="jar">
+	<target name="compile">
+		<mkdir dir="build"/>
+		<javac srcdir="slf4j-nop/src/main/java/" destdir="build" classpath="${gentoo.classpath}">
+		</javac>
+	</target>
+
+	<target name="jar" depends="compile">
+		<jar destfile="slf4j-nop.jar" basedir="build">
+			<exclude name="org/slf4j/impl/**"/>
+		</jar>
+	</target>
+
+	<target name="javadoc" depends="compile">
+		<mkdir dir="docs"/>
+		<javadoc sourcepath="slf4j-nop/src/main/java/" destdir="docs" classpath="${gentoo.classpath}"/>
+	</target>
+
+</project>
diff --git a/dev-java/slf4j-nop/files/1.7.5-build.xml b/dev-java/slf4j-nop/files/1.7.5-build.xml
new file mode 100644
index 000000000000..9d898d340d34
--- /dev/null
+++ b/dev-java/slf4j-nop/files/1.7.5-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/files/build.xml b/dev-java/slf4j-nop/files/build.xml
new file mode 100644
index 000000000000..e45340800a0b
--- /dev/null
+++ b/dev-java/slf4j-nop/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="slf4j-nop.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/slf4j-nop/metadata.xml b/dev-java/slf4j-nop/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/slf4j-nop/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.5.11.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.5.11.ebuild
new file mode 100644
index 000000000000..32656bf450b6
--- /dev/null
+++ b/dev-java/slf4j-nop/slf4j-nop-1.5.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple Logging Facade for Java"
+HOMEPAGE="http://www.slf4j.org/"
+# Get from http://www.slf4j.org/dist/${P/-nop/}.tar.gz
+SRC_URI="mirror://gentoo/${P}-sources.jar"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+COMMON_DEP="~dev-java/slf4j-api-${PV}:0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+EANT_GENTOO_CLASSPATH="slf4j-api"
+
+java_prepare() {
+	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/slf4j-nop/slf4j-nop-1.6.6.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.6.6.ebuild
new file mode 100644
index 000000000000..9a9bf15cc327
--- /dev/null
+++ b/dev-java/slf4j-nop/slf4j-nop-1.6.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils 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 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEP="~dev-java/slf4j-api-${PV}:0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${P/-api/}"
+
+EANT_GENTOO_CLASSPATH="slf4j-api"
+
+S="${WORKDIR}/${P/-nop/}"
+
+java_prepare() {
+	cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
+
+	# for ecj-3.5
+	java-ant_rewrite-bootclasspath auto
+
+	cd "${S}"
+	rm *.jar integration/lib/*.jar
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.5.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.5.ebuild
new file mode 100644
index 000000000000..4eb6a900a64b
--- /dev/null
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}
+	test? ( dev-java/junit:4 )"
+
+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..c9f3c66a1f92
--- /dev/null
+++ b/dev-java/slf4j-simple/Manifest
@@ -0,0 +1,3 @@
+DIST slf4j-1.7.5.tar.gz 2862186 SHA256 e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7 WHIRLPOOL 4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
+DIST slf4j-1.7.6.tar.gz 3051903 SHA256 9abf25b99f7c4dfc52a85b79a67b4d878831dfd79c1734b0124ad73615372323 SHA512 c274c0f1700df6b4801fa25d71127c0a35d0f30e421e8661fdaf8074ddfb84c94167bd6ff016cfceae0d062f4cf26a13426c3a9a9dd6b4fc471b18028ae37c4c WHIRLPOOL ee8a3b84a1a1809a893957d52f7a139f3b743796ca934fca0c85aad386f81182f54666000727e7582874ce6ff7a095cce39af5caaa8c415bcad13fe43661c2d4
+DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
diff --git a/dev-java/slf4j-simple/files/1.7.5-build.xml b/dev-java/slf4j-simple/files/1.7.5-build.xml
new file mode 100644
index 000000000000..5bf3a09f4463
--- /dev/null
+++ b/dev-java/slf4j-simple/files/1.7.5-build.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="slf4j-simpl-from-maven" default="jar" basedir=".">
+	<property file="${user.home}/.m2/maven.properties" />
+	<property file="maven-build.properties" />
+
+	<property name="maven.build.finalName" value="slf4j-simple" />
+	<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-simple/files/1.7.6-build.xml b/dev-java/slf4j-simple/files/1.7.6-build.xml
new file mode 100644
index 000000000000..f91d565e170a
--- /dev/null
+++ b/dev-java/slf4j-simple/files/1.7.6-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..250f2d1940ea
--- /dev/null
+++ b/dev-java/slf4j-simple/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild
new file mode 100644
index 000000000000..f51f7c774a0e
--- /dev/null
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/-simple/}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}
+	test? ( dev-java/junit )"
+
+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"
+
+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
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.6.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.6.ebuild
new file mode 100644
index 000000000000..1ab365347aaa
--- /dev/null
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+IUSE="test"
+
+COMMON_DEP="dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}
+	test? ( dev-java/junit )"
+
+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/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..b7f975aef35a
--- /dev/null
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+IUSE="test"
+
+COMMON_DEP="dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}
+	test? ( dev-java/junit )"
+
+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}"/1.7.6-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..5800178a61c9
--- /dev/null
+++ b/dev-java/smack/Manifest
@@ -0,0 +1 @@
+DIST smack-dev-2.2.1.tar.gz 4052596 SHA256 8706d0c2fb72a94f3a8c33e720f49fb3ec5179ddd7df87d484f86a775b176814 SHA512 a6f6f70a61dec69ec2f3c82544f83100bf4ef39aa657ed7a8ce635be8484d3ed2cb539961286482ccc9f607520e0646e14668a17b4004ae6bd157b3d894146f0 WHIRLPOOL e75b979afe34f060b84d687f501e9f028fd97d3693647d346ae81bc9dd468819249931fa34d1145b781d875e65e9a83c6d60f6c477e961f9df9c6a4a8d1949d6
diff --git a/dev-java/smack/metadata.xml b/dev-java/smack/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/smack/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</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..9c0feff9d4f1
--- /dev/null
+++ b/dev-java/smack/smack-2.2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..9efae9b08ef9
--- /dev/null
+++ b/dev-java/snakeyaml/Manifest
@@ -0,0 +1,2 @@
+DIST SnakeYAML-all-1.11.zip 11972014 SHA256 dcca58023e8c40cd9b29513f2970791181e71e304c127e99d378fba70ebd7d40 SHA512 f454a8d99b8e08858b64d3ca13443f7934f92e31fb5e1fd57147dc957827ed4278275b201ad7a739eeebf8ee6b70669dc13d3994a876c22f09c7f1d8f312b941 WHIRLPOOL 0796ca3f5314efa6b2c48080acdcbf5c9989bee6d6d68e4a2df8dba4551a767de2f1b9a451ff49abf6daa61b33bcb7cb08f2985846dc97118d845968159e068c
+DIST SnakeYAML-all-1.9.zip 9122570 SHA256 7c1090eb1b2e06f784dc424678f18d513dfe020fd2f0042c63217e09ae9a8853 SHA512 8b2fd5de8374b592b74f52cea66cbb7aed04892fecf7f994fc797fc9fdb185fed4fa02a1fe69e69f137acb01037f77ed18988b83d038bc425fa04186947dab19 WHIRLPOOL f7a9dcd644638b28a35a8a33d81455984455d1b55dddc057db17cb6e60589240331ab2beb56df4f6a81bbe6ff1fe2b63731eff6454b601b1a76ba5c2061baa7c
diff --git a/dev-java/snakeyaml/metadata.xml b/dev-java/snakeyaml/metadata.xml
new file mode 100644
index 000000000000..8c290ebcf0ab
--- /dev/null
+++ b/dev-java/snakeyaml/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="google-code">snakeyaml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/snakeyaml/snakeyaml-1.11.ebuild b/dev-java/snakeyaml/snakeyaml-1.11.ebuild
new file mode 100644
index 000000000000..0451fb4ec7c3
--- /dev/null
+++ b/dev-java/snakeyaml/snakeyaml-1.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A YAML 1.1 parser and emitter for Java 5"
+HOMEPAGE="http://code.google.com/p/snakeyaml/"
+SRC_URI="http://snakeyaml.googlecode.com/files/SnakeYAML-all-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.class' -exec rm {} +
+
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	dodoc AUTHORS src/etc/announcement.msg
+}
diff --git a/dev-java/snakeyaml/snakeyaml-1.9-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.9-r1.ebuild
new file mode 100644
index 000000000000..ae5e9457ef19
--- /dev/null
+++ b/dev-java/snakeyaml/snakeyaml-1.9-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A YAML 1.1 parser and emitter for Java 5"
+HOMEPAGE="http://code.google.com/p/snakeyaml/"
+SRC_URI="http://snakeyaml.googlecode.com/files/SnakeYAML-all-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="1.9"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.class' -exec rm {} +
+
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc AUTHORS src/etc/announcement.msg
+}
diff --git a/dev-java/snakeyaml/snakeyaml-1.9.ebuild b/dev-java/snakeyaml/snakeyaml-1.9.ebuild
new file mode 100644
index 000000000000..1e56652b1d65
--- /dev/null
+++ b/dev-java/snakeyaml/snakeyaml-1.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A YAML 1.1 parser and emitter for Java 5"
+HOMEPAGE="http://code.google.com/p/snakeyaml/"
+SRC_URI="http://snakeyaml.googlecode.com/files/SnakeYAML-all-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.class' -exec rm {} +
+
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc AUTHORS src/etc/announcement.msg
+}
diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
new file mode 100644
index 000000000000..d5472f33cd08
--- /dev/null
+++ b/dev-java/snappy/Manifest
@@ -0,0 +1,2 @@
+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
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..de75276c9b0a
--- /dev/null
+++ b/dev-java/snappy/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..e10ed9b57b4b
--- /dev/null
+++ b/dev-java/snappy/snappy-1.0.3_rc3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..21c5a5f6be03
--- /dev/null
+++ b/dev-java/snappy/snappy-1.1.0.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..89d12fe59b4f
--- /dev/null
+++ b/dev-java/snip/Manifest
@@ -0,0 +1 @@
+DIST snip-0.11-src.tar.gz 23270 SHA256 c8d0e299010e0582d69b3c0567b89190cfab8b123b4bc61920c721c1b82240e7 SHA512 b782559bd542e4d79fa19e351d2e04331f002d139ecc4ae957ceb282c2fc117261c4031fb612c65caead07552de59782d8a0e3c8733d79f1cd2ef0118e60eaa7 WHIRLPOOL 6d72867eb46659d31703c299973ecb2cb47e566afd910122c37819afacf5333db398812af41f82adfcda7c83000e8a021ba17f99d401b185f08758ee2a4b7ef5
diff --git a/dev-java/snip/files/snip-0.11-build.xml.patch b/dev-java/snip/files/snip-0.11-build.xml.patch
new file mode 100644
index 000000000000..6072b930a414
--- /dev/null
+++ b/dev-java/snip/files/snip-0.11-build.xml.patch
@@ -0,0 +1,13 @@
+*** build.xml	2006-08-29 21:39:13.000000000 +0000
+--- build.xml.patched	2006-08-29 21:40:15.000000000 +0000
+***************
+*** 1,8 ****
+  
+  <project default="compile" name="snip">
+  
+- 	<taskdef name="snip" classname="com.martiansoftware.snip.Snip" classpath="build"/>
+- 
+  	<property name="version" value="0.11" />
+  	<property name="jarname" value="snip-${version}.jar"/>
+  	<property name="src.java" value="src/java"/>
+--- 1,6 ----
diff --git a/dev-java/snip/metadata.xml b/dev-java/snip/metadata.xml
new file mode 100644
index 000000000000..456daabcdd66
--- /dev/null
+++ b/dev-java/snip/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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.ebuild b/dev-java/snip/snip-0.11.ebuild
new file mode 100644
index 000000000000..5083dfefebd8
--- /dev/null
+++ b/dev-java/snip/snip-0.11.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="an Apache ANT optional task that extracts snippets of code from text files"
+HOMEPAGE="http://www.martiansoftware.com/lab/index.html"
+SRC_URI="http://www.martiansoftware.com/lab/${PN}/${P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEP=">=dev-java/ant-core-1.5.4"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	rm -v *.jar
+	epatch "${FILESDIR}/${PN}-0.11-build.xml.patch"
+	java-ant_rewrite-classpath
+	eant clean
+}
+
+EANT_GENTOO_CLASSPATH="ant-core"
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/java/com
+}
diff --git a/dev-java/soap/Manifest b/dev-java/soap/Manifest
new file mode 100644
index 000000000000..40f29eef70cc
--- /dev/null
+++ b/dev-java/soap/Manifest
@@ -0,0 +1 @@
+DIST soap-src-2.3.1.tar.gz 142925 SHA256 4b580107a4026801c29975668e03c6fe959662086d910da979450eae2f808c87 SHA512 b289f8399b15e28ee2b7fa6c42fe56ee0cf42ed8202c234cfca2c3f2a877518e04a29af2fe07f140d8ac23bd6b19607964b79757f6c9733c0be746e3eaadcbce WHIRLPOOL a0e696fee2e187f111a1323c77fde3ce4c0d05f37e8595d5316cb62d563fac23a8e87c91013e65372091c8ace3a5c6da2c5658c1b77d0412736cd7d906bc5ff6
diff --git a/dev-java/soap/files/soap-2.3.1-build.xml.patch b/dev-java/soap/files/soap-2.3.1-build.xml.patch
new file mode 100644
index 000000000000..4e8ebd52547f
--- /dev/null
+++ b/dev-java/soap/files/soap-2.3.1-build.xml.patch
@@ -0,0 +1,29 @@
+--- build.xml.orig	2006-12-11 03:00:56.000000000 +0100
++++ build.xml	2006-12-11 03:03:36.000000000 +0100
+@@ -92,7 +92,8 @@
+   <!-- =================================================================== -->

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

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

+-    <available property="bsf.present" classname="com.ibm.bsf.BSFManager" />

++    <!--
++	<available property="bsf.present" classname="com.ibm.bsf.BSFManager" />

+     <available property="xmi.present" classname="com.ibm.xmi.job.Job" />

+     <available property="pop3.present" 

+       classname="com.ibm.network.mail.pop3.event.StatusListener" />

+@@ -101,6 +102,7 @@
+     <available property="ejb.present" classname="javax.ejb.SessionBean" />

+     <available property="ssl.present" classname="javax.net.ssl.SSLSocket" />

+     <available property="junit.present" classname="junit.framework.TestCase" />

++	-->
+ 

+ 

+     <uptodate property="javac.notRequired"

+@@ -173,7 +175,7 @@
+           depends="prepare"

+           description="Compiles the source files.">

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

+-    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}">

++    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}" classpath="${gentoo.classpath}">

+       <patternset refid="javac.source.files"/>

+     </javac>

+ 

diff --git a/dev-java/soap/files/soap-2.3.1-java7-enum.patch b/dev-java/soap/files/soap-2.3.1-java7-enum.patch
new file mode 100644
index 000000000000..65d74c4060d9
--- /dev/null
+++ b/dev-java/soap/files/soap-2.3.1-java7-enum.patch
@@ -0,0 +1,116 @@
+diff --git a/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java b/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
+index 61c9b6a..ac603b3 100644
+--- a/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
++++ b/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
+@@ -92,7 +92,7 @@ public class VectorSerializer implements Serializer, Deserializer
+                         src.getClass().toString() + "' to VectorSerializer");

+ 

+         String lengthStr;

+-        Enumeration enum;

++        Enumeration enumx;

+         

+         if (src instanceof Enumeration) {

+                 /** TODO: Right now we don't include a length on Enumerations,

+@@ -100,11 +100,11 @@ public class VectorSerializer implements Serializer, Deserializer
+                  * doing the length calculation (at the cost of traversing the

+                  * Enumeration) for a particular installation/service/call.

+                  */

+-                enum = (Enumeration)src;

++                enumx = (Enumeration)src;

+                 lengthStr = "";

+         } else {

+                 Vector v = (Vector)src;

+-                enum = v.elements();

++                enumx = v.elements();

+         

+                 lengthStr = src != null

+                        ? v.size() + ""

+@@ -132,7 +132,7 @@ public class VectorSerializer implements Serializer, Deserializer
+ 

+       sink.write(StringUtils.lineSeparator);

+ 

+-      for (Enumeration e = enum; e.hasMoreElements(); )

++      for (Enumeration e = enumx; e.hasMoreElements(); )

+       {

+         nsStack.pushScope();

+ 

+diff --git a/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java b/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java
+index 8d9e773..6498e05 100644
+--- a/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java
++++ b/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java
+@@ -189,8 +189,8 @@ public class StatefulEJBProvider implements Provider {
+         remoteObjRef = (Remote) ret.getValue();

+       } catch (ClassCastException cce) {

+         // Try to cast to an enumeration:

+-        Enumeration enum = (Enumeration) ret.getValue();

+-        remoteObjRef = (Remote) enum.nextElement();

++        Enumeration enumx = (Enumeration) ret.getValue();

++        remoteObjRef = (Remote) enumx.nextElement();

+       }

+       // Set the return value to null, so that the remote object is not

+       // included in the response destined for the client.

+diff --git a/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java b/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java
+index bbf3021..533223f 100644
+--- a/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java
++++ b/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java
+@@ -160,10 +160,10 @@ public class MessageRouterServlet extends HttpServlet {
+       if (factory != null) {

+         try {

+           Properties props = new Properties();

+-          Enumeration enum = servletConfig.getInitParameterNames();

++          Enumeration enumx = servletConfig.getInitParameterNames();

+ 

+-          while (enum.hasMoreElements()) {

+-            String name = (String)enum.nextElement();

++          while (enumx.hasMoreElements()) {

++            String name = (String)enumx.nextElement();

+ 

+             if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)

+                 && !Constants.XML_PARSER.equals(name)) {

+diff --git a/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java b/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java
+index b723d4a..ac6a75c 100644
+--- a/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java
++++ b/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java
+@@ -178,10 +178,10 @@ public class RPCRouterServlet extends HttpServlet {
+ 	  /*First we put in the servletContext parameters, and then

+ 	    overwrite them with the servletConfig parameters if 

+ 	    they are present.*/

+-          Enumeration enum = servletContext.getInitParameterNames();

++          Enumeration enumx = servletContext.getInitParameterNames();

+ 	  

+-          while (enum.hasMoreElements()) {

+-            String name = (String)enum.nextElement();

++          while (enumx.hasMoreElements()) {

++            String name = (String)enumx.nextElement();

+ 

+             if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)

+                 && !Constants.XML_PARSER.equals(name)) {

+@@ -189,10 +189,10 @@ public class RPCRouterServlet extends HttpServlet {
+             }

+           }

+ 

+-          enum = servletConfig.getInitParameterNames();

++          enumx = servletConfig.getInitParameterNames();

+ 

+-          while (enum.hasMoreElements()) {

+-            String name = (String)enum.nextElement();

++          while (enumx.hasMoreElements()) {

++            String name = (String)enumx.nextElement();

+ 

+             if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)

+                 && !Constants.XML_PARSER.equals(name)) {

+diff --git a/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java b/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java
+index 6e7530d..cf6c3e4 100644
+--- a/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java
++++ b/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java
+@@ -397,8 +397,8 @@ public class SOAPHTTPConnection implements SOAPTransport {
+    */

+   private static String getHeaderValue (Hashtable headers, String headerName)

+   {

+-    for (Enumeration enum = headers.keys (); enum.hasMoreElements ();) {

+-      String key = (String) enum.nextElement();

++    for (Enumeration enumx = headers.keys (); enumx.hasMoreElements ();) {

++      String key = (String) enumx.nextElement();

+ 

+       if (key.equalsIgnoreCase (headerName)) {

+         return (String) headers.get(key);

diff --git a/dev-java/soap/metadata.xml b/dev-java/soap/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/soap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/soap/soap-2.3.1-r3.ebuild b/dev-java/soap/soap-2.3.1-r3.ebuild
new file mode 100644
index 000000000000..5dd5334a4cab
--- /dev/null
+++ b/dev-java/soap/soap-2.3.1-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="Apache SOAP (Simple Object Access Protocol) is an implementation of the SOAP submission to W3C"
+HOMEPAGE="http://ws.apache.org/soap/"
+SRC_URI="http://archive.apache.org/dist/ws/soap/version-${PV}/soap-src-${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	java-virtuals/jaf:0
+	java-virtuals/javamail:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="
+	>=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND="
+	>=virtual/jdk-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}"/${PN}-$(replace_all_version_separators _)
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+java_prepare() {
+	# get rid of automagical tests, add gentoo.classpath to <javac>
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+}
+
+EANT_GENTOO_CLASSPATH="javamail,jaf,servlet-api-3.0"
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_register-optional-dependency xerces-2
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/soap/soap-2.3.1-r4.ebuild b/dev-java/soap/soap-2.3.1-r4.ebuild
new file mode 100644
index 000000000000..3604a800a021
--- /dev/null
+++ b/dev-java/soap/soap-2.3.1-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="Apache SOAP (Simple Object Access Protocol) is an implementation of the SOAP submission to W3C"
+HOMEPAGE="http://ws.apache.org/soap/"
+SRC_URI="http://archive.apache.org/dist/ws/soap/version-${PV}/soap-src-${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	java-virtuals/jaf:0
+	java-virtuals/javamail:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="
+	>=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND="
+	>=virtual/jdk-1.4
+	${CDEPEND}"
+
+S="${WORKDIR}"/${PN}-$(replace_all_version_separators _)
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+java_prepare() {
+	# get rid of automagical tests, add gentoo.classpath to <javac>
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+	epatch "${FILESDIR}/${P}-java7-enum.patch"
+}
+
+EANT_GENTOO_CLASSPATH="javamail,jaf,servlet-api-3.0"
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_register-optional-dependency xerces-2
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/soylatte-jdk-bin/Manifest b/dev-java/soylatte-jdk-bin/Manifest
new file mode 100644
index 000000000000..702e15113311
--- /dev/null
+++ b/dev-java/soylatte-jdk-bin/Manifest
@@ -0,0 +1,3 @@
+DIST openjdk7-macppc-2009-12-16-b4.tar.bz2 52825661 SHA256 a31b444214de2f9ff7959a8d9fa626f7be446fa612e78af5ac8087ad30de8a42 SHA512 ac856d91d2d80fcbde99e85a2f603746dd05fa40d113770354d1871ee87a8821a83e41332b56b99a24e832d1c3e7ceeca76ec94cccb010a4e086ebb362b2ee28 WHIRLPOOL 24b41b33ed489b4426545567977377186892a10cb3adec159eba6429d124a55da63d5ef4b09ba658872e1fc3a7031846483d51549f6087ec9058e6b069181304
+DIST soylatte16-amd64-1.0.3.tar.bz2 53888225 SHA256 749762d742450a8711acd7ba981969c0056e9373b453d3e97c58af07f5f92c60 SHA512 51e3499eb56c3177c3cef9416e265769757fc8e5b8075a5eb1cbde74fd7b64edb0ab64ba2c2e9751fc21f5fae035e6224a60ffff2ab8808e7f9a4d106ac1d071 WHIRLPOOL ec3e01cab1c1ddcb126e34b31a1552b65fbc96282e505f672e1e175e14aa22be348f4d3077b93ae711352eee3cbd37271950c4ab246dad58e775210e79f42f90
+DIST soylatte16-i386-1.0.3.tar.bz2 55567606 SHA256 8f389eb9c19336ce18d864ad600edd692c6994259889646d68c2e66494d67ffc SHA512 e19f9755ffea0de8d397c537264334d473ae5678034bed0a04254dc82d9322ab8ae6ddc158d85713fe19c4e51542c46a06cfc7fe86ce17d278673dbd47be3abc WHIRLPOOL d8b9ae1ca8674135f6dd10aa511ee9606f255fdfa8d72b75e50d30daec39b4645137a6d02b5142020029a6a0ac0f5a766673d7833acb41e59ed29339e55f13aa
diff --git a/dev-java/soylatte-jdk-bin/files/soylatte-jdk-bin-1.6.env b/dev-java/soylatte-jdk-bin/files/soylatte-jdk-bin-1.6.env
new file mode 100644
index 000000000000..b34bd732a7b9
--- /dev/null
+++ b/dev-java/soylatte-jdk-bin/files/soylatte-jdk-bin-1.6.env
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Landon Fuller's @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_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/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.6"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.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"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/soylatte-jdk-bin/files/soylatte-jdk-bin-1.7.env b/dev-java/soylatte-jdk-bin/files/soylatte-jdk-bin-1.7.env
new file mode 100644
index 000000000000..7945935e976b
--- /dev/null
+++ b/dev-java/soylatte-jdk-bin/files/soylatte-jdk-bin-1.7.env
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Landon Fuller's OpenJDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_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/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.7"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.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"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/soylatte-jdk-bin/metadata.xml b/dev-java/soylatte-jdk-bin/metadata.xml
new file mode 100644
index 000000000000..d539ee98d50c
--- /dev/null
+++ b/dev-java/soylatte-jdk-bin/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>prefix</herd>
+<longdescription>SoyLatte: Java 6 Port for Mac OS X 10.4 and 10.5 (Intel)</longdescription>
+</pkgmetadata>
diff --git a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild
new file mode 100644
index 000000000000..762a97588e8c
--- /dev/null
+++ b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit java-vm-2 multilib
+
+DESCRIPTION="Landon Fuller's Java 6 for Mac OS X 10.4 and 10.5"
+HOMEPAGE="http://landonf.bikemonkey.org/static/soylatte/"
+DLURL="http://landonf.bikemonkey.org/static/soylatte/bsd-dist/javasrc_1_6_jrl_darwin"
+SRC_URI="
+	x86-macos? ( ${DLURL}/soylatte16-i386-${PV}.tar.bz2 )
+	x64-macos? ( ${DLURL}/soylatte16-amd64-${PV}.tar.bz2 )
+"
+SLOT="1.6"
+LICENSE="sun-jrl"
+KEYWORDS="~x86-macos ~x64-macos"
+IUSE="examples"
+
+RDEPEND="dev-db/unixODBC"
+
+JAVA_PROVIDE="jdbc-stdext"
+
+MY_P=soylatte16-i386-${PV}
+use x64-macos && MY_P=soylatte16-amd64-${PV}
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# fix install_names
+	local arch=i586
+	use x64-macos && arch=amd64
+	local original_root=/data/Users/landonf/Documents/Code/Java/javasrc_1_6_jrl_darwin_stable/control/build/bsd-${arch}
+	local original_demo=${original_root}/demo
+	local original_lib=${original_root}/lib
+	for dir in demo jre ; do
+		for dynamic_lib in $(find ${dir} -name '*.dylib'); do
+			install_name_tool \
+				-id "${EPREFIX}"/opt/${P}/${dynamic_lib} \
+				${dynamic_lib}
+			for linked_against in $(scanmacho -BF'%n#f' ${dynamic_lib} | tr ',' ' '); do
+				case ${linked_against} in
+					${original_lib}/*)
+						install_name_tool -change \
+							${linked_against} \
+							"${EPREFIX}"/opt/${P}/jre${linked_against#${original_root}} \
+							${dynamic_lib}
+					;;
+					${original_demo}/*)
+						install_name_tool -change \
+							${linked_against} \
+							"${EPREFIX}"/opt/${P}${linked_against#${original_root}} \
+							${dynamic_lib}
+					;;
+					libjvm.dylib)
+						# 64-bits binary has no client, so default to server JVM
+						install_name_tool -change \
+							${linked_against} \
+							"${EPREFIX}"/opt/${P}/jre/lib/$(use x86-macos && echo i386/client || echo amd64/server)/libjvm.dylib \
+							${dynamic_lib}
+					;;
+					*/libodbc*.dylib)
+						install_name_tool -change \
+							${linked_against} \
+							"${EPREFIX}"/usr/$(get_libdir)/${linked_against##*/} \
+							${dynamic_lib}
+					;;
+				esac
+			done
+		done
+	done
+}
+
+src_install() {
+	local dirs="bin include jre lib man"
+	dodir /opt/${P}
+
+	cp -pPR $dirs "${ED}/opt/${P}/" || die "failed to copy"
+	dodoc COPYRIGHT || die
+	dohtml README.html || die
+
+	cp -pP src.zip "${ED}/opt/${P}/" || die
+
+	if use examples; then
+		cp -pPR demo sample "${ED}/opt/${P}/" || die
+	fi
+
+	# create dir for system preferences
+	dodir /opt/${P}/jre/.systemPrefs
+	# Create files used as storage for system preferences.
+	touch "${ED}"/opt/${P}/jre/.systemPrefs/.system.lock
+	chmod 644 "${ED}"/opt/${P}/jre/.systemPrefs/.system.lock
+	touch "${ED}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+	chmod 644 "${ED}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+
+	set_java_env
+}
diff --git a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-7.ebuild b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-7.ebuild
new file mode 100644
index 000000000000..b2429181612c
--- /dev/null
+++ b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit java-vm-2 multilib
+
+DESCRIPTION="Landon Fuller's OpenJDK 7 for Mac OS X 10.5/PPC"
+HOMEPAGE="http://landonf.bikemonkey.org/static/soylatte/"
+SRC_URI="http://landonf.bikemonkey.org/static/soylatte/bsd-dist/openjdk7_darwin/openjdk7-macppc-2009-12-16-b4.tar.bz2"
+SLOT="1.7"
+LICENSE="GPL-2-with-exceptions"
+KEYWORDS="~ppc-macos"
+IUSE="examples"
+
+RDEPEND="dev-db/unixODBC"
+
+JAVA_PROVIDE="jdbc-stdext"
+
+S=${WORKDIR}/openjdk7-macppc-2009-12-16-b4
+
+src_prepare() {
+	# fix install_names
+	local original_root=/Users/landonf/Desktop/openjdk-ppc/bsd-port/build/bsd-ppc
+	local original_demo=${original_root}/demo
+	local original_lib=${original_root}/lib
+	for dir in demo jre ; do
+		for dynamic_lib in $(find ${dir} -name '*.dylib'); do
+			install_name_tool \
+				-id "${EPREFIX}"/opt/${P}/${dynamic_lib} \
+				${dynamic_lib}
+			for linked_against in $(scanmacho -BF'%n#f' ${dynamic_lib} | tr ',' ' '); do
+				case ${linked_against} in
+					${original_lib}/*)
+						install_name_tool -change \
+							${linked_against} \
+							"${EPREFIX}"/opt/${P}/jre${linked_against#${original_root}} \
+							${dynamic_lib}
+					;;
+					${original_demo}/*)
+						install_name_tool -change \
+							${linked_against} \
+							"${EPREFIX}"/opt/${P}${linked_against#${original_root}} \
+							${dynamic_lib}
+					;;
+					libjvm.dylib)
+						install_name_tool -change \
+							${linked_against} \
+							"${EPREFIX}"/opt/${P}/jre/lib/ppc/server/libjvm.dylib \
+							${dynamic_lib}
+					;;
+					*/libodbc*.dylib)
+						install_name_tool -change \
+							${linked_against} \
+							"${EPREFIX}"/usr/$(get_libdir)/${linked_against##*/} \
+							${dynamic_lib}
+					;;
+				esac
+			done
+		done
+	done
+}
+
+src_install() {
+	local dirs="bin include jre lib man"
+	dodir /opt/${P}
+
+	cp -pPR $dirs "${ED}/opt/${P}/" || die "failed to copy"
+
+	cp -pP src.zip "${ED}/opt/${P}/" || die
+
+	if use examples; then
+		cp -pPR demo sample "${ED}/opt/${P}/" || die
+	fi
+
+	# create dir for system preferences
+	dodir /opt/${P}/jre/.systemPrefs
+	# Create files used as storage for system preferences.
+	touch "${ED}"/opt/${P}/jre/.systemPrefs/.system.lock
+	chmod 644 "${ED}"/opt/${P}/jre/.systemPrefs/.system.lock
+	touch "${ED}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+	chmod 644 "${ED}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+
+	set_java_env
+}
diff --git a/dev-java/spice-jndikit/Manifest b/dev-java/spice-jndikit/Manifest
new file mode 100644
index 000000000000..e402a50d2ffc
--- /dev/null
+++ b/dev-java/spice-jndikit/Manifest
@@ -0,0 +1 @@
+DIST spice-jndikit-1.2-src.tar.gz 23084 SHA256 3001e72223786e25a132ce8c41ff5e1d9fd8826e98122d5b73517aefd908e11a SHA512 bdb508eac32c8dac05be45553a6877e214dce4135c9ae96b95764254df4c0e57f2a7be3905301b096f140014e04e4fe6b517b7757553de26d73a513f7ff06244 WHIRLPOOL 62206bd937c9a7d9660ebda84782edcd08e331e48e389135a7b708999166ab122ce318aeac14386bbd091407c24a0096c14b72f42a073413b21a2bc65086cc3b
diff --git a/dev-java/spice-jndikit/metadata.xml b/dev-java/spice-jndikit/metadata.xml
new file mode 100644
index 000000000000..f43299979e05
--- /dev/null
+++ b/dev-java/spice-jndikit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+
+<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>
+</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..280f0df73603
--- /dev/null
+++ b/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://spice.codehaus.org/"
+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/spin/Manifest b/dev-java/spin/Manifest
new file mode 100644
index 000000000000..0db00563c728
--- /dev/null
+++ b/dev-java/spin/Manifest
@@ -0,0 +1 @@
+DIST spin-1.5-all.zip 482286 SHA256 5515bb6b6724c856e94271bc3bd11fcc0170cf37835bf5fd93026b98c6bf3594 SHA512 ce1fad3b138781359d472727b186722d6f1f23b7002dd1ada294efd80b3a9caf5de15207cdd682fcbfcafa85c63895c7dd9683fefb5ce5b09cc4115ae3733466 WHIRLPOOL f5e598f01d923cdc202e776fddcefe34abb1a312b5ec9ba68f3745431faf89fb58d9ee233b62225bd1a549ec0829a13bea126e8a3802ec78a72f9dc6ef01eb88
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..a15327b8ef8a
--- /dev/null
+++ b/dev-java/spin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..c42dbb5fe212
--- /dev/null
+++ b/dev-java/spin/spin-1.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..c5987bbdfda6
--- /dev/null
+++ b/dev-java/spring-aop/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/spring-aop/metadata.xml b/dev-java/spring-aop/metadata.xml
new file mode 100644
index 000000000000..e6f191495093
--- /dev/null
+++ b/dev-java/spring-aop/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..f04f360c5a59
--- /dev/null
+++ b/dev-java/spring-aop/spring-aop-3.2.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A comprehensive programming and configuration model for modern Java-based 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
+		http://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..c5987bbdfda6
--- /dev/null
+++ b/dev-java/spring-beans/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/spring-beans/metadata.xml b/dev-java/spring-beans/metadata.xml
new file mode 100644
index 000000000000..e6f191495093
--- /dev/null
+++ b/dev-java/spring-beans/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..c7e03fd4703b
--- /dev/null
+++ b/dev-java/spring-beans/spring-beans-3.2.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A comprehensive programming and configuration model for modern Java-based 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
+		http://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..c5987bbdfda6
--- /dev/null
+++ b/dev-java/spring-core/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/spring-core/metadata.xml b/dev-java/spring-core/metadata.xml
new file mode 100644
index 000000000000..e6f191495093
--- /dev/null
+++ b/dev-java/spring-core/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..5bdd74dce8a7
--- /dev/null
+++ b/dev-java/spring-core/spring-core-3.2.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 modern 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
+		http://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..c5987bbdfda6
--- /dev/null
+++ b/dev-java/spring-expression/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/spring-expression/metadata.xml b/dev-java/spring-expression/metadata.xml
new file mode 100644
index 000000000000..e6f191495093
--- /dev/null
+++ b/dev-java/spring-expression/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..71cde3c7f1cc
--- /dev/null
+++ b/dev-java/spring-expression/spring-expression-3.2.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A comprehensive programming and configuration model for modern Java-based 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
+		http://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..c5987bbdfda6
--- /dev/null
+++ b/dev-java/spring-instrument/Manifest
@@ -0,0 +1,2 @@
+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
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..e6f191495093
--- /dev/null
+++ b/dev-java/spring-instrument/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..14fa0668327d
--- /dev/null
+++ b/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A comprehensive programming and configuration model for modern Java-based 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
+	http://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..d1a77248648f
--- /dev/null
+++ b/dev-java/spymemcached/Manifest
@@ -0,0 +1 @@
+DIST spymemcached-2.9.1-sources.jar 305723 SHA256 ae4e650e112da383f1cd27b63cc9ec2c3a50dcdc4d61a35ca975ae90ce778ea0 SHA512 3d7b593a095094e4b564eef8112f8f9ad0e812f313b5a943e669115c1aa4662795e9321a75e030ab7bb954a810ffb92c399041ed4b29e8f703aecf80d7603614 WHIRLPOOL cf431f3cd2a8e6d4e0f9c3301071827a883310be8d33ca050ff94c2b16264d79b1df6e95e492e0e38cfa1f7e2b5dd2109c616bcde2a30815c3bb116ba893826f
diff --git a/dev-java/spymemcached/metadata.xml b/dev-java/spymemcached/metadata.xml
new file mode 100644
index 000000000000..9cb4302d604b
--- /dev/null
+++ b/dev-java/spymemcached/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<use>
+		<flag name='spring'>Build support for the spring framework</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">spymemcached</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-java/spymemcached/spymemcached-2.9.1.ebuild b/dev-java/spymemcached/spymemcached-2.9.1.ebuild
new file mode 100644
index 000000000000..5a9328d3a369
--- /dev/null
+++ b/dev-java/spymemcached/spymemcached-2.9.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+IUSE="spring"
+
+CDEPEND="dev-java/log4j:0
+	dev-java/slf4j-api:0
+	spring? ( dev-java/spring-beans:3.2 )"
+
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="log4j,slf4j-api"
+
+java_prepare() {
+	if use spring; then
+		JAVA_GENTOO_CLASSPATH+=",spring-beans-3.2"
+	else
+		rm net/spy/memcached/spring/MemcachedClientFactoryBean.java || die
+	fi
+}
diff --git a/dev-java/squareness-jlf/Manifest b/dev-java/squareness-jlf/Manifest
new file mode 100644
index 000000000000..7891fd1e85cc
--- /dev/null
+++ b/dev-java/squareness-jlf/Manifest
@@ -0,0 +1 @@
+DIST squareness_jlf_src-2.3.0.zip 67307 SHA256 a7439f1343f5f13ff3a6709728f2d2ae112097f5da6b858e7b2a4417fd530c57 SHA512 9c3d1de6f682968b2e2db37afdaa571f53857897415df04489ecac1c545ddc0a8342df94c658797979a6024e6e69bbc9a8828029ec428248848c933c9f901a71 WHIRLPOOL 883d3cb71dbd24b22ed2ad2d1b0e9bce468dd8f7ddadc5593590bf69e8680821ef2824d8775577f2c03bd86fa46a9a43cb4ff50d5402d80977737dc7471877f2
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..4fb9ade43357
--- /dev/null
+++ b/dev-java/squareness-jlf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+		<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..cbdcd625624d
--- /dev/null
+++ b/dev-java/squareness-jlf/squareness-jlf-2.3.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1271d5a7b131
--- /dev/null
+++ b/dev-java/stax-ex/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/stax-ex/files/build.xml-1.0 b/dev-java/stax-ex/files/build.xml-1.0
new file mode 100644
index 000000000000..d69c84d82636
--- /dev/null
+++ b/dev-java/stax-ex/files/build.xml-1.0
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<project name="stax-ex" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac debug="false" srcdir="src" destdir="build" encoding="UTF-8">
+      <classpath>
+        <pathelement path="${classpath}"/>
+        <fileset dir="lib/" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="stax-ex.jar">
+      <fileset dir="build" includes="**/*.class"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/stax-ex/metadata.xml b/dev-java/stax-ex/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/stax-ex/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/stax-ex/stax-ex-1.0-r1.ebuild b/dev-java/stax-ex/stax-ex-1.0-r1.ebuild
new file mode 100644
index 000000000000..ac96577d2276
--- /dev/null
+++ b/dev-java/stax-ex/stax-ex-1.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Extensions to complement JSR-173 StAX API"
+HOMEPAGE="http://stax-ex.dev.java.net/"
+SRC_URI="https://stax-ex.dev.java.net/files/documents/4480/44372/${P}-src.tar.gz"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEPEND="java-virtuals/jaf
+	java-virtuals/stax-api"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd "${S}"
+	# build.xml is from maven-1 and tries to download jars to /root/.maven/
+	rm -f build.xml || die
+	cp "${FILESDIR}/build.xml-${PV}" build.xml || die
+
+	mkdir "${S}/lib" || die
+	cd "${S}/lib"
+	java-pkg_jar-from --virtual jaf
+	java-pkg_jar-from --virtual stax-api
+
+}
+
+src_install() {
+
+	java-pkg_dojar "stax-ex.jar"
+
+	use source && java-pkg_dosrc src/java/*
+
+}
diff --git a/dev-java/stax-ex/stax-ex-1.0-r3.ebuild b/dev-java/stax-ex/stax-ex-1.0-r3.ebuild
new file mode 100644
index 000000000000..f53b107d3d25
--- /dev/null
+++ b/dev-java/stax-ex/stax-ex-1.0-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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://stax-ex.java.net/files/documents/4480/44372/${P}-src.tar.gz"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEPEND="java-virtuals/jaf:0
+	java-virtuals/stax-api:0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+
+JAVA_GENTOO_CLASSPATH="jaf,stax-api"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+	rm "${S}"/build.xml || die
+}
diff --git a/dev-java/stax-ex/stax-ex-1.0.ebuild b/dev-java/stax-ex/stax-ex-1.0.ebuild
new file mode 100644
index 000000000000..7312f44ea897
--- /dev/null
+++ b/dev-java/stax-ex/stax-ex-1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Extensions to complement JSR-173 StAX API"
+HOMEPAGE="http://stax-ex.dev.java.net/"
+SRC_URI="https://stax-ex.dev.java.net/files/documents/4480/44372/${P}-src.tar.gz"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEPEND="dev-java/sun-jaf
+	dev-java/jsr173"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd "${S}"
+	# build.xml is from maven-1 and tries to download jars to /root/.maven/
+	rm -f build.xml || die
+	cp "${FILESDIR}/build.xml-${PV}" build.xml || die
+
+	mkdir "${S}/lib" || die
+	cd "${S}/lib"
+	java-pkg_jar-from sun-jaf
+	java-pkg_jar-from jsr173
+
+}
+
+src_install() {
+
+	java-pkg_dojar "stax-ex.jar"
+
+	use source && java-pkg_dosrc src/java/*
+
+}
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..f6aecdf257ae
--- /dev/null
+++ b/dev-java/stax-ex/stax-ex-1.7.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..ce74d6267940
--- /dev/null
+++ b/dev-java/stax/Manifest
@@ -0,0 +1 @@
+DIST stax-src-1.2.0.zip 310738 SHA256 c4dc2ef0be6a21dcdb5643ab89e9cb3b62f18ad213967a9ba3901b71cd97843a SHA512 41686d961c7a211ee02e9432a141ff75326414da9576608a3567ca7e154ed24ad804cd01849364a5ec8def1a6e5048197850bafd67fc5ff2b6a10307a0fec9af WHIRLPOOL 8f9aea0015acb10eaefa184700701a624ed1f45d8e7b236661663da2e3a0a8b2fb129653d08edc19344b573e537c5fb44123a6791c0141bd073aad1b8fb9a621
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..370119aceffe
--- /dev/null
+++ b/dev-java/stax/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..4d9033619442
--- /dev/null
+++ b/dev-java/stax/stax-1.2.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 from and to your application"
+HOMEPAGE="http://stax.codehaus.org/"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${PN}-src-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc 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..f26b79fe4ffd
--- /dev/null
+++ b/dev-java/stax2-api/Manifest
@@ -0,0 +1 @@
+DIST stax2-api-4.0.0.tar.gz 127125 SHA256 7872551a4d8ba75aaa25bea4709df943d90989ffb672a505f71e020aa20eacaa SHA512 a8636de873c97534fe17738efb9892d38c52a1a6adfec9502b727082f24b57dc5bfd10a67b5f5d9e196a53d7ee461978dcf8e6c306168bd1cf96a6d67c655b5b WHIRLPOOL a99dcdd266186d9ac7eda61da43cfe74a45a6396ad790029bf84593fe9dc3644c221a0e3b507a57486e8f2de0c1e9644e02946b5391f25c89887d427c0d38e5c
diff --git a/dev-java/stax2-api/metadata.xml b/dev-java/stax2-api/metadata.xml
new file mode 100644
index 000000000000..7a57fb0cf6c5
--- /dev/null
+++ b/dev-java/stax2-api/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <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.ebuild b/dev-java/stax2-api/stax2-api-4.0.0.ebuild
new file mode 100644
index 000000000000..30f2514e0bba
--- /dev/null
+++ b/dev-java/stax2-api/stax2-api-4.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a2f7a942f4b9
--- /dev/null
+++ b/dev-java/stringtemplate/Manifest
@@ -0,0 +1,2 @@
+DIST stringtemplate-3.2.1.tar.gz 1039803 SHA256 3a0adbb7510c2822ca515c635e1ff1469b3ac78f6d2072e48478876b9191de20 SHA512 fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714 WHIRLPOOL be77636384fdc680d856e8840abf0f629d5115c67f2085db044767847a480b3e2be70bae1d3984172561d14661ae325c677017b55183ff7d2e10ae4c9f83b40e
+DIST stringtemplate-3.2.tar.gz 741708 SHA256 de85449fca6c11bf2efff73fa2c852ccf84b0db1e129a6948748659952f6825e SHA512 23b657fe15fd37ccbacea3f8d7ab4ef4a7870b6bafed73cfb2ffb44b3d8ee1f473aa57d39f864017d74c97f4ee431d776eaf0439065c6d1b94d4d5a2fec5d226 WHIRLPOOL eff58073d8c4773fb75dfa25fb76b5973297dd329c451c1fda1f1d53f3e620119382ffe3986e5b941473b4089807cfc7807bb17545c66dc9d4cfa6575ccc9446
diff --git a/dev-java/stringtemplate/files/stringtemplate-3.1_beta1-javadoc.patch b/dev-java/stringtemplate/files/stringtemplate-3.1_beta1-javadoc.patch
new file mode 100644
index 000000000000..c4fbbf119f12
--- /dev/null
+++ b/dev-java/stringtemplate/files/stringtemplate-3.1_beta1-javadoc.patch
@@ -0,0 +1,19 @@
+--- build.xml	2007-05-25 23:07:06.000000000 +0200
++++ build.xml	2007-05-25 23:07:31.000000000 +0200
+@@ -189,7 +189,7 @@
+   <!-- =================================================================== -->

+   <target name="javadocs" depends="init,prepare-sources">

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

+-    <javadoc packagenames="${packages}"

++    <javadoc
+       sourcepath="${build.src}"

+       destdir="${build.javadocs}"

+       author="true"

+@@ -197,7 +197,6 @@
+       windowtitle="${Name} API"

+       doctitle="${Name} API Documentation"

+       bottom="Copyright &#169; ${copyright}"

+-      additionalparam="${javadocs.additionalparam}"

+       />

+   </target>

+ 

diff --git a/dev-java/stringtemplate/metadata.xml b/dev-java/stringtemplate/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/stringtemplate/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild
new file mode 100644
index 000000000000..130dbca7d253
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="${PV/_beta/b}"
+S_PV="${PV/_beta/.b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A Java template engine"
+HOMEPAGE="http://www.stringtemplate.org/"
+SRC_URI="http://www.stringtemplate.org/download/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEPEND=">=dev-java/antlr-2.7.7:0[java]"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/junit:4 )
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${S_PV}"
+
+java_prepare() {
+	find . -name "*.class" -print -delete || die "Failed deleting precompiled classes"
+	find . -name "*.jar" -print -delete || die "Failed deleting prebuilt classes"
+}
+
+antlr2() {
+	java -cp $(java-pkg_getjars antlr) antlr.Tool "${@}" || die "antlr2 failed"
+}
+
+src_compile() {
+	einfo "Generate from grammars"
+	cd src/org/antlr/stringtemplate/language || die
+	# order same as in pom.xml
+	antlr2 template.g
+	antlr2 angle.bracket.template.g
+	antlr2 action.g
+	antlr2 eval.g
+	antlr2 group.g
+	antlr2 interface.g
+
+	cd "${S}" || die
+	find src -name "*.java" >> "${T}/sources" || die
+	ejavac -d target/classes -cp $(java-pkg_getjars antlr) "@${T}/sources"
+
+	# create javadoc
+	if use doc; then
+		javadoc -classpath $(java-pkg_getjars antlr) -d javadoc "@${T}/sources" || die "Javadoc failed"
+	fi
+
+	# jar things up
+	cd target/classes || die
+	find -type f >> "${T}/classes" || die
+	jar cf ${PN}.jar "@${T}/classes" || die "jar failed"
+}
+
+src_install() {
+	java-pkg_dojar target/classes/${PN}.jar
+	dodoc README.txt CHANGES.txt || die
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc javadoc
+}
+
+src_test() {
+	find test -name "*.java" >> "${T}/test-sources" || die
+	ejavac -cp target/classes:$(java-pkg_getjars antlr,junit-4) -d target/test-classes "@${T}/test-sources"
+	ejunit4 -cp target/classes:target/test-classes org.antlr.stringtemplate.test.TestStringTemplate
+}
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.ebuild
new file mode 100644
index 000000000000..7ff3a2357e4b
--- /dev/null
+++ b/dev-java/stringtemplate/stringtemplate-3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-antlr"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="${PV/_beta/b}"
+S_PV="${PV/_beta/.b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A Java template engine"
+HOMEPAGE="http://www.stringtemplate.org/"
+SRC_URI="http://www.stringtemplate.org/download/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+# no junit targets in build.xml, but unconditional compile and jar of test
+# classes, oh well
+COMMON_DEPEND=">=dev-java/antlr-2.7.7:0[java]
+	dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${S_PV}"
+
+java_prepare() {
+	# fix <javadoc> call
+	epatch "${FILESDIR}/${PN}-3.1_beta1-javadoc.patch"
+	java-ant_rewrite-classpath
+	rm -v lib/*.jar || die
+	# force regeneration with our antlr2
+	touch src/org/antlr/stringtemplate/language/*.g || die
+}
+
+EANT_GENTOO_CLASSPATH="antlr,junit"
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+
+	dodoc README.txt CHANGES.txt || die
+	use doc && java-pkg_dojavadoc docs/api
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/struts-core/Manifest b/dev-java/struts-core/Manifest
new file mode 100644
index 000000000000..c2974670e4ab
--- /dev/null
+++ b/dev-java/struts-core/Manifest
@@ -0,0 +1,2 @@
+DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86
+DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897
diff --git a/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch b/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch
new file mode 100644
index 000000000000..1ce5974427b7
--- /dev/null
+++ b/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch
@@ -0,0 +1,20 @@
+--- a/maven-build.xml
++++ b/maven-build.xml
+@@ -125,7 +125,7 @@
+ 
+   <target name="compile" depends="get-deps" description="Compile the code">
+     <mkdir dir="${maven.build.outputDir}"/>
+-    <javac destdir="${maven.build.outputDir}" 
++    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false" 
+@@ -153,7 +153,7 @@
+           description="Compile the test code" 
+           unless="maven.test.skip">
+     <mkdir dir="${maven.build.testOutputDir}"/>
+-    <javac destdir="${maven.build.testOutputDir}" 
++    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false" 
diff --git a/dev-java/struts-core/files/struts-2.3.15.2-build.xml-manifest.patch b/dev-java/struts-core/files/struts-2.3.15.2-build.xml-manifest.patch
new file mode 100644
index 000000000000..001b5fdb4630
--- /dev/null
+++ b/dev-java/struts-core/files/struts-2.3.15.2-build.xml-manifest.patch
@@ -0,0 +1,15 @@
+--- a/core/maven-build.xml
++++ b/core/maven-build.xml
+@@ -271,12 +271,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/core/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
diff --git a/dev-java/struts-core/metadata.xml b/dev-java/struts-core/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/struts-core/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/struts-core/struts-core-2.3.15.2.ebuild b/dev-java/struts-core/struts-core-2.3.15.2.ebuild
new file mode 100644
index 000000000000..9b3f261db9a8
--- /dev/null
+++ b/dev-java/struts-core/struts-core-2.3.15.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="struts"
+MY_P="${MY_PN}-${PV}-src"
+
+DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets: Core"
+SRC_URI="mirror://apache/struts/source/${MY_P}.zip
+	http://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-build.xml-${PV}.tar.xz"
+HOMEPAGE="http://struts.apache.org/index.html"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+COMMON_DEPS="dev-java/commons-fileupload:0
+	dev-java/commons-lang:3.1
+	dev-java/freemarker:2.3
+	dev-java/ognl:3.0
+	dev-java/struts-xwork:2
+	dev-java/velocity:0
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPS}"
+
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/ant-junit:0 )
+	${COMMON_DEPS}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/src/core"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="struts-xwork-2"
+
+src_unpack() {
+	unpack ${MY_P}.zip
+	cd "${WORKDIR}"/${MY_PN}-${PV}/src || die
+	unpack ${MY_PN}-build.xml-${PV}.tar.xz
+
+	java-pkg_getjars commons-fileupload,commons-lang-3.1,freemarker-2.3,ognl-3.0,velocity,servlet-api-3.0
+}
+
+java_prepare() {
+	find . -name '*.jar' -print -delete || die
+
+	epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-classpath.patch
+	epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-manifest.patch
+}
+
+src_test() {
+	EANT_TEST_EXTRA_ARGS="-Djunit.present=true" java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${MY_PN}2-core-${PV}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/com
+}
diff --git a/dev-java/struts-plugins/Manifest b/dev-java/struts-plugins/Manifest
new file mode 100644
index 000000000000..ff3e70f32de7
--- /dev/null
+++ b/dev-java/struts-plugins/Manifest
@@ -0,0 +1,3 @@
+DIST struts-2.3.15.2-build.xml-classpath.patch 26778 SHA256 757fa1e729a3b196807e53350dbbd9d0a2fb2830095ac0227b4324f019cc27d1 SHA512 c84fd2226ccfaabb9405c27017b52d2a951a106ecc1f8fed1dd447b30e052572e6a81d66b1732ffe51dfd7078944938de417248a5a6816a32fbb1ffc610c3da6 WHIRLPOOL 7d7b7849f49cdc5502b2686555779a6bb231e18bc936f24ee0570319f1f84d57bf9239282e256968a07f067d8815f0a8f63de692221745a744bb91a32daa0859
+DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86
+DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897
diff --git a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-manifest.patch b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-manifest.patch
new file mode 100644
index 000000000000..3944ff651b57
--- /dev/null
+++ b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-manifest.patch
@@ -0,0 +1,406 @@
+--- a/convention/maven-build.xml
++++ b/convention/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/convention/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/config-browser/maven-build.xml
++++ b/config-browser/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/config-browser/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/javatemplates/maven-build.xml
++++ b/javatemplates/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/javatemplates/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/jasperreports/maven-build.xml
++++ b/jasperreports/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/jasperreports/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/jfreechart/maven-build.xml
++++ b/jfreechart/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/jfreechart/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/jsf/maven-build.xml
++++ b/jsf/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/jsf/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/pell-multipart/maven-build.xml
++++ b/pell-multipart/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/pell-multipart/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/plexus/maven-build.xml
++++ b/plexus/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/plexus/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/sitegraph/maven-build.xml
++++ b/sitegraph/maven-build.xml
+@@ -260,13 +260,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/sitegraph/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class" 
+-                   value="org.apache.struts2.sitegraph.SiteGraph"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/sitemesh/maven-build.xml
++++ b/sitemesh/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/sitemesh/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/spring/maven-build.xml
++++ b/spring/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/spring/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/struts1/maven-build.xml
++++ b/struts1/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/struts1/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/tiles/maven-build.xml
++++ b/tiles/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/tiles/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/dojo/maven-build.xml
++++ b/dojo/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/dojo/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/rest/maven-build.xml
++++ b/rest/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/rest/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/portlet/maven-build.xml
++++ b/portlet/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/portlet/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/portlet-tiles/maven-build.xml
++++ b/portlet-tiles/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/portlet-tiles/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/junit/maven-build.xml
++++ b/junit/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/junit/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/testng/maven-build.xml
++++ b/testng/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/testng/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/dwr/maven-build.xml
++++ b/dwr/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/dwr/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/oval/maven-build.xml
++++ b/oval/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/oval/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/osgi/maven-build.xml
++++ b/osgi/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/osgi/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/json/maven-build.xml
++++ b/json/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/json/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/embeddedjsp/maven-build.xml
++++ b/embeddedjsp/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/embeddedjsp/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/gxp/maven-build.xml
++++ b/gxp/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/gxp/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/cdi/maven-build.xml
++++ b/cdi/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/cdi/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/tiles3/maven-build.xml
++++ b/tiles3/maven-build.xml
+@@ -238,12 +238,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/tiles3/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
diff --git a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-codebehind.patch b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-codebehind.patch
new file mode 100644
index 000000000000..14143bad26b0
--- /dev/null
+++ b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-codebehind.patch
@@ -0,0 +1,50 @@
+--- a/plugins/maven-build.xml
++++ b/plugins/maven-build.xml
+@@ -22,7 +22,6 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="clean" description="Clean the output directory">
+-    <ant antfile="build.xml" dir="codebehind" target="clean"/>
+     <ant antfile="build.xml" dir="convention" target="clean"/>
+     <ant antfile="build.xml" dir="config-browser" target="clean"/>
+     <ant antfile="build.xml" dir="javatemplates" target="clean"/>
+@@ -57,7 +56,6 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="compile" description="Compile the code">
+-    <ant antfile="build.xml" dir="codebehind" target="compile"/>
+     <ant antfile="build.xml" dir="convention" target="compile"/>
+     <ant antfile="build.xml" dir="config-browser" target="compile"/>
+     <ant antfile="build.xml" dir="javatemplates" target="compile"/>
+@@ -92,7 +90,6 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="compile-tests" description="Compile the test code">
+-    <ant antfile="build.xml" dir="codebehind" target="compile-tests"/>
+     <ant antfile="build.xml" dir="convention" target="compile-tests"/>
+     <ant antfile="build.xml" dir="config-browser" target="compile-tests"/>
+     <ant antfile="build.xml" dir="javatemplates" target="compile-tests"/>
+@@ -127,7 +124,6 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="test" description="Run the test cases">
+-    <ant antfile="build.xml" dir="codebehind" target="test"/>
+     <ant antfile="build.xml" dir="convention" target="test"/>
+     <ant antfile="build.xml" dir="config-browser" target="test"/>
+     <ant antfile="build.xml" dir="javatemplates" target="test"/>
+@@ -162,7 +158,6 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="javadoc" description="Generates the Javadoc of the application">
+-    <ant antfile="build.xml" dir="codebehind" target="javadoc"/>
+     <ant antfile="build.xml" dir="convention" target="javadoc"/>
+     <ant antfile="build.xml" dir="config-browser" target="javadoc"/>
+     <ant antfile="build.xml" dir="javatemplates" target="javadoc"/>
+@@ -197,7 +192,6 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="package" description="Package the application">
+-    <ant antfile="build.xml" dir="codebehind" target="package"/>
+     <ant antfile="build.xml" dir="convention" target="package"/>
+     <ant antfile="build.xml" dir="config-browser" target="package"/>
+     <ant antfile="build.xml" dir="javatemplates" target="package"/>
diff --git a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-portlet.patch b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-portlet.patch
new file mode 100644
index 000000000000..3c64fbc560e1
--- /dev/null
+++ b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-portlet.patch
@@ -0,0 +1,50 @@
+--- a/maven-build.xml
++++ b/maven-build.xml
+@@ -38,7 +38,5 @@
+     <ant antfile="build.xml" dir="tiles" target="clean"/>
+     <ant antfile="build.xml" dir="dojo" target="clean"/>
+     <ant antfile="build.xml" dir="rest" target="clean"/>
+-    <ant antfile="build.xml" dir="portlet" target="clean"/>
+-    <ant antfile="build.xml" dir="portlet-tiles" target="clean"/>
+     <ant antfile="build.xml" dir="junit" target="clean"/>
+     <ant antfile="build.xml" dir="testng" target="clean"/>
+@@ -73,7 +72,5 @@
+     <ant antfile="build.xml" dir="tiles" target="compile"/>
+     <ant antfile="build.xml" dir="dojo" target="compile"/>
+     <ant antfile="build.xml" dir="rest" target="compile"/>
+-    <ant antfile="build.xml" dir="portlet" target="compile"/>
+-    <ant antfile="build.xml" dir="portlet-tiles" target="compile"/>
+     <ant antfile="build.xml" dir="junit" target="compile"/>
+     <ant antfile="build.xml" dir="testng" target="compile"/>
+@@ -108,7 +106,5 @@
+     <ant antfile="build.xml" dir="tiles" target="compile-tests"/>
+     <ant antfile="build.xml" dir="dojo" target="compile-tests"/>
+     <ant antfile="build.xml" dir="rest" target="compile-tests"/>
+-    <ant antfile="build.xml" dir="portlet" target="compile-tests"/>
+-    <ant antfile="build.xml" dir="portlet-tiles" target="compile-tests"/>
+     <ant antfile="build.xml" dir="junit" target="compile-tests"/>
+     <ant antfile="build.xml" dir="testng" target="compile-tests"/>
+@@ -143,7 +140,5 @@
+     <ant antfile="build.xml" dir="tiles" target="test"/>
+     <ant antfile="build.xml" dir="dojo" target="test"/>
+     <ant antfile="build.xml" dir="rest" target="test"/>
+-    <ant antfile="build.xml" dir="portlet" target="test"/>
+-    <ant antfile="build.xml" dir="portlet-tiles" target="test"/>
+     <ant antfile="build.xml" dir="junit" target="test"/>
+     <ant antfile="build.xml" dir="testng" target="test"/>
+@@ -178,7 +174,5 @@
+     <ant antfile="build.xml" dir="tiles" target="javadoc"/>
+     <ant antfile="build.xml" dir="dojo" target="javadoc"/>
+     <ant antfile="build.xml" dir="rest" target="javadoc"/>
+-    <ant antfile="build.xml" dir="portlet" target="javadoc"/>
+-    <ant antfile="build.xml" dir="portlet-tiles" target="javadoc"/>
+     <ant antfile="build.xml" dir="junit" target="javadoc"/>
+     <ant antfile="build.xml" dir="testng" target="javadoc"/>
+@@ -213,7 +208,5 @@
+     <ant antfile="build.xml" dir="tiles" target="package"/>
+     <ant antfile="build.xml" dir="dojo" target="package"/>
+     <ant antfile="build.xml" dir="rest" target="package"/>
+-    <ant antfile="build.xml" dir="portlet" target="package"/>
+-    <ant antfile="build.xml" dir="portlet-tiles" target="package"/>
+     <ant antfile="build.xml" dir="junit" target="package"/>
+     <ant antfile="build.xml" dir="testng" target="package"/>
diff --git a/dev-java/struts-plugins/metadata.xml b/dev-java/struts-plugins/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/struts-plugins/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/struts-plugins/struts-plugins-2.3.15.2.ebuild b/dev-java/struts-plugins/struts-plugins-2.3.15.2.ebuild
new file mode 100644
index 000000000000..9684ad2e2a0c
--- /dev/null
+++ b/dev-java/struts-plugins/struts-plugins-2.3.15.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="struts"
+MY_P="${MY_PN}-${PV}-src"
+
+DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets: Plugins"
+SRC_URI="mirror://apache/struts/source/${MY_P}.zip
+	http://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-build.xml-${PV}.tar.xz
+	http://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-${PV}-build.xml-classpath.patch"
+HOMEPAGE="http://struts.apache.org/index.html"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+COMMON_DEPS="dev-java/commons-beanutils:1.7
+	dev-java/commons-lang:3.1
+	dev-java/commons-io:1
+	dev-java/freemarker:2.3
+	dev-java/juel:0
+	dev-java/ognl:3.0
+	dev-java/osgi-core-api:0
+	dev-java/struts-core:${SLOT}
+	dev-java/struts-xwork:${SLOT}
+	dev-java/velocity:0
+	java-virtuals/servlet-api:3.0"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPS}"
+
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/ant-junit:0 )
+	${COMMON_DEPS}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/src/plugins"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="struts-core-${SLOT},struts-xwork-${SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}"
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="test"
+
+# javatemplates/maven-build.xml:149:
+# Test org.apache.struts2.views.java.simple.AbstractCommonAttributesTest failed
+# Cannot instantiate test case: testRenderTextFieldDynamicAttrs
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${MY_P}.zip
+	cd "${WORKDIR}"/${MY_PN}-${PV}/src || die
+	unpack ${MY_PN}-build.xml-${PV}.tar.xz
+}
+
+java_prepare() {
+	find . -name '*.jar' -print -delete || die
+
+	epatch "${DISTDIR}"/${MY_PN}-${PV}-build.xml-classpath.patch
+	epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-manifest.patch
+	epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-remove-codebehind.patch
+	epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-remove-portlet.patch
+
+	# Remove tests that don't build due to test files that aren't installed.
+	rm jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
+
+	java-pkg_getjars commons-beanutils-1.7,commons-io-1,commons-lang-3.1,freemarker-2.3,juel,ognl-3.0,osgi-core-api,servlet-api-3.0,velocity
+}
+
+src_test() {
+	EANT_TEST_EXTRA_ARGS="-Dgentoo.test.classpath=$(java-pkg_getjars ${EANT_TEST_GENTOO_CLASSPATH})"
+	EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	for plugin in $(find . -mindepth 1 -maxdepth 1 -type d | sed 's:./::g' | tr '\n' ' ') ; do
+		[[ ! -d ${plugin}/target ]] && continue
+
+		einfo "Installing plugin '${plugin}' ..."
+		java-pkg_newjar ${plugin}/target/${MY_PN}2-${plugin}-plugin-${PV}.jar ${plugin}.jar
+
+		if use doc ; then
+			java-pkg_dojavadoc ${plugin}/target/site/apidocs
+			mkdir "${D}"/usr/share/doc/${P}/${plugin} || die
+			mv "${D}"/usr/share/doc/${P}/{html,${plugin}/html} || die
+		fi
+
+		use source && java-pkg_dosrc ${plugin}/src/main/java/org
+	done
+
+	if use doc ; then
+		rm "${D}"/usr/share/${PN}-${SLOT}/api || die
+	fi
+}
+
+pkg_postinst() {
+	elog "The 'codebehind' and 'portlet' plugins are not in this release because they don't build yet."
+}
diff --git a/dev-java/struts-xwork/Manifest b/dev-java/struts-xwork/Manifest
new file mode 100644
index 000000000000..c2974670e4ab
--- /dev/null
+++ b/dev-java/struts-xwork/Manifest
@@ -0,0 +1,2 @@
+DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86
+DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897
diff --git a/dev-java/struts-xwork/metadata.xml b/dev-java/struts-xwork/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/struts-xwork/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild b/dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild
new file mode 100644
index 000000000000..33b3cf981d10
--- /dev/null
+++ b/dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="struts"
+MY_P="${MY_PN}-${PV}-src"
+
+DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets: XWork Core"
+SRC_URI="mirror://apache/struts/source/${MY_P}.zip
+	http://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-build.xml-${PV}.tar.xz"
+HOMEPAGE="http://struts.apache.org/index.html"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+COMMON_DEPS="dev-java/asm:3
+	dev-java/commons-io:1
+	dev-java/commons-lang:3.1
+	dev-java/commons-logging:0
+	dev-java/ognl:3.0
+	dev-java/slf4j-api:0"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPS}"
+
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/ant-junit:0 )
+	${COMMON_DEPS}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/src/xwork-core"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="asm-3,commons-io-1,commons-lang-3.1,commons-logging,ognl-3.0,slf4j-api"
+
+# Could not open files of the name xwork-jar.xml
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${MY_P}.zip
+	cd "${WORKDIR}"/${MY_PN}-${PV}/src || die
+	unpack ${MY_PN}-build.xml-${PV}.tar.xz
+}
+
+java_prepare() {
+	find . -name '*.jar' -print -delete || die
+}
+
+src_test() {
+	EANT_TEST_EXTRA_ARGS="-Djunit.present=true" java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/xwork-core.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/com
+}
diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
new file mode 100644
index 000000000000..c2974670e4ab
--- /dev/null
+++ b/dev-java/struts/Manifest
@@ -0,0 +1,2 @@
+DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86
+DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897
diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch
new file mode 100644
index 000000000000..d1e414414320
--- /dev/null
+++ b/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch
@@ -0,0 +1,249 @@
+diff -urN a/apps/blank/maven-build.xml b/apps/blank/maven-build.xml
+--- a/apps/blank/maven-build.xml	2013-10-02 15:52:07.637985555 +0200
++++ b/apps/blank/maven-build.xml	2013-10-02 15:52:29.756985531 +0200
+@@ -243,32 +243,6 @@
+ 
+   <target name="package" depends="compile,test" description="Package the application">
+     <mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+     <war destfile="${maven.build.dir}/${maven.build.finalName}.war" 
+          compress="true" 
+          webxml="src/main/webapp/WEB-INF/web.xml">
+--- a/apps/mailreader/maven-build.xml
++++ b/apps/mailreader/maven-build.xml
+@@ -198,36 +198,6 @@
+ 
+   <target name="package" depends="compile,test" description="Package the application">
+     <mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts-mailreader-dao/1.3.5/struts-mailreader-dao-1.3.5.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-digester/commons-digester/2.0/commons-digester-2.0.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+     <war destfile="${maven.build.dir}/${maven.build.finalName}.war" 
+          compress="true" 
+          webxml="src/main/webapp/WEB-INF/web.xml">
+--- a/apps/showcase/maven-build.xml
++++ b/apps/showcase/maven-build.xml
+@@ -334,112 +334,6 @@
+ 
+   <target name="package" depends="compile,test" description="Package the application">
+     <mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-struts1-plugin/2.3.15.2/struts2-struts1-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts-core/1.3.10/struts-core-1.3.10.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-chain/commons-chain/1.2/commons-chain-1.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-dojo-plugin/2.3.15.2/struts2-dojo-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-jsf-plugin/2.3.15.2/struts2-jsf-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-config-browser-plugin/2.3.15.2/struts2-config-browser-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-sitemesh-plugin/2.3.15.2/struts2-sitemesh-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-tiles-plugin/2.3.15.2/struts2-tiles-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/tiles/tiles-core/2.0.6/tiles-core-2.0.6.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/tiles/tiles-api/2.0.6/tiles-api-2.0.6.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-dwr-plugin/2.3.15.2/struts2-dwr-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-json-plugin/2.3.15.2/struts2-json-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/tiles/tiles-jsp/2.0.6/tiles-jsp-2.0.6.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-digester/commons-digester/2.0/commons-digester-2.0.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-convention-plugin/2.3.15.2/struts2-convention-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-spring-plugin/2.3.15.2/struts2-spring-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/velocity/velocity/1.6.4/velocity-1.6.4.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/velocity/velocity-tools/1.3/velocity-tools-1.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/opensymphony/sitemesh/2.4.2/sitemesh-2.4.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/uk/ltd/getahead/dwr/1.1.1/dwr-1.1.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/myfaces/core/myfaces-impl/1.1.2/myfaces-impl-1.1.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-el/commons-el/1.0/commons-el-1.0.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/myfaces/core/myfaces-api/1.1.2/myfaces-api-1.1.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+     <war destfile="${maven.build.dir}/${maven.build.finalName}.war" 
+          compress="true" 
+          webxml="src/main/webapp/WEB-INF/web.xml">
+--- a/apps/rest-showcase/maven-build.xml
++++ b/apps/rest-showcase/maven-build.xml
+@@ -273,56 +273,6 @@
+ 
+   <target name="package" depends="compile,test" description="Package the application">
+     <mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-rest-plugin/2.3.15.2/struts2-rest-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/com/thoughtworks/xstream/xstream/1.4.2/xstream-1.4.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/net/sf/json-lib/json-lib/2.3/json-lib-2.3-jdk15.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/codehaus/jackson/jackson-core-asl/1.9.2/jackson-core-asl-1.9.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-convention-plugin/2.3.15.2/struts2-convention-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-config-browser-plugin/2.3.15.2/struts2-config-browser-plugin-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+-    <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" 
+-          todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
+     <war destfile="${maven.build.dir}/${maven.build.finalName}.war" 
+          compress="true" 
+          webxml="src/main/webapp/WEB-INF/web.xml">
diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch
new file mode 100644
index 000000000000..25d694a198a3
--- /dev/null
+++ b/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch
@@ -0,0 +1,162 @@
+--- a/apps/blank/maven-build.xml
++++ b/apps/blank/maven-build.xml
+@@ -125,7 +125,7 @@
+ 
+   <target name="compile" depends="get-deps" description="Compile the code">
+     <mkdir dir="${maven.build.outputDir}"/>
+-    <javac destdir="${maven.build.outputDir}" 
++    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false" 
+@@ -153,7 +153,7 @@
+           description="Compile the test code" 
+           unless="maven.test.skip">
+     <mkdir dir="${maven.build.testOutputDir}"/>
+-    <javac destdir="${maven.build.testOutputDir}" 
++    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false"
+@@ -159,6 +159,7 @@
+         <path refid="build.test.classpath"/>
+         <pathelement location="${maven.build.outputDir}"/>
+         <pathelement location="${maven.build.testOutputDir}"/>
++        <pathelement path="${gentoo.test.classpath}" />
+       </classpath>
+       <batchtest todir="${maven.test.reports}" unless="test">
+         <fileset dir="${maven.build.testDir.0}"> 
+--- a/apps/mailreader/maven-build.xml
++++ b/apps/mailreader/maven-build.xml
+@@ -125,7 +125,7 @@
+ 
+   <target name="compile" depends="get-deps" description="Compile the code">
+     <mkdir dir="${maven.build.outputDir}"/>
+-    <javac destdir="${maven.build.outputDir}" 
++    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false" 
+--- a/apps/portlet/maven-build.xml
++++ b/apps/portlet/maven-build.xml
+@@ -125,7 +125,7 @@
+ 
+   <target name="compile" depends="get-deps" description="Compile the code">
+     <mkdir dir="${maven.build.outputDir}"/>
+-    <javac destdir="${maven.build.outputDir}" 
++    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false" 
+@@ -153,7 +153,7 @@
+           description="Compile the test code" 
+           unless="maven.test.skip">
+     <mkdir dir="${maven.build.testOutputDir}"/>
+-    <javac destdir="${maven.build.testOutputDir}" 
++    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false"
+@@ -159,6 +159,7 @@
+         <path refid="build.test.classpath"/>
+         <pathelement location="${maven.build.outputDir}"/>
+         <pathelement location="${maven.build.testOutputDir}"/>
++        <pathelement path="${gentoo.test.classpath}" />
+       </classpath>
+       <batchtest todir="${maven.test.reports}" unless="test">
+         <fileset dir="${maven.build.testDir.0}"> 
+--- a/apps/showcase/maven-build.xml
++++ b/apps/showcase/maven-build.xml
+@@ -125,7 +125,7 @@
+ 
+   <target name="compile" depends="get-deps" description="Compile the code">
+     <mkdir dir="${maven.build.outputDir}"/>
+-    <javac destdir="${maven.build.outputDir}" 
++    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false" 
+@@ -153,7 +153,7 @@
+           description="Compile the test code" 
+           unless="maven.test.skip">
+     <mkdir dir="${maven.build.testOutputDir}"/>
+-    <javac destdir="${maven.build.testOutputDir}" 
++    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false"
+@@ -159,6 +159,7 @@
+         <path refid="build.test.classpath"/>
+         <pathelement location="${maven.build.outputDir}"/>
+         <pathelement location="${maven.build.testOutputDir}"/>
++        <pathelement path="${gentoo.test.classpath}" />
+       </classpath>
+       <batchtest todir="${maven.test.reports}" unless="test">
+         <fileset dir="${maven.build.testDir.0}"> 
+--- a/apps/rest-showcase/maven-build.xml
++++ b/apps/rest-showcase/maven-build.xml
+@@ -125,7 +125,7 @@
+ 
+   <target name="compile" depends="get-deps" description="Compile the code">
+     <mkdir dir="${maven.build.outputDir}"/>
+-    <javac destdir="${maven.build.outputDir}" 
++    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false" 
+@@ -153,7 +153,7 @@
+           description="Compile the test code" 
+           unless="maven.test.skip">
+     <mkdir dir="${maven.build.testOutputDir}"/>
+-    <javac destdir="${maven.build.testOutputDir}" 
++    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false"
+@@ -159,6 +159,7 @@
+         <path refid="build.test.classpath"/>
+         <pathelement location="${maven.build.outputDir}"/>
+         <pathelement location="${maven.build.testOutputDir}"/>
++        <pathelement path="${gentoo.test.classpath}" />
+       </classpath>
+       <batchtest todir="${maven.test.reports}" unless="test">
+         <fileset dir="${maven.build.testDir.0}"> 
+--- a/bundles/admin/maven-build.xml
++++ b/bundles/admin/maven-build.xml
+@@ -125,7 +125,7 @@
+ 
+   <target name="compile" depends="get-deps" description="Compile the code">
+     <mkdir dir="${maven.build.outputDir}"/>
+-    <javac destdir="${maven.build.outputDir}" 
++    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false" 
+@@ -153,7 +153,7 @@
+           description="Compile the test code" 
+           unless="maven.test.skip">
+     <mkdir dir="${maven.build.testOutputDir}"/>
+-    <javac destdir="${maven.build.testOutputDir}" 
++    <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false"
+@@ -159,6 +159,7 @@
+         <path refid="build.test.classpath"/>
+         <pathelement location="${maven.build.outputDir}"/>
+         <pathelement location="${maven.build.testOutputDir}"/>
++        <pathelement path="${gentoo.test.classpath}" />
+       </classpath>
+       <batchtest todir="${maven.test.reports}" unless="test">
+         <fileset dir="${maven.build.testDir.0}"> 
+--- a/bundles/demo/maven-build.xml
++++ b/bundles/demo/maven-build.xml
+@@ -125,7 +125,7 @@
+ 
+   <target name="compile" depends="get-deps" description="Compile the code">
+     <mkdir dir="${maven.build.outputDir}"/>
+-    <javac destdir="${maven.build.outputDir}" 
++    <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
+            nowarn="false" 
+            debug="true" 
+            optimize="false" 
diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-manifest.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-manifest.patch
new file mode 100644
index 000000000000..3a046a006399
--- /dev/null
+++ b/dev-java/struts/files/struts-2.3.15.2-build.xml-manifest.patch
@@ -0,0 +1,30 @@
+--- a/bundles/admin/maven-build.xml
++++ b/bundles/admin/maven-build.xml
+@@ -271,12 +271,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/bundles/admin/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
+--- a/bundles/demo/maven-build.xml
++++ b/bundles/demo/maven-build.xml
+@@ -271,12 +271,8 @@
+     <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+          compress="true" 
+          index="false" 
+-         manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/bundles/demo/target/classes/META-INF/MANIFEST.MF" 
+          basedir="${maven.build.outputDir}" 
+          excludes="**/package.html">
+-      <manifest>
+-        <attribute name="Main-Class"/>
+-      </manifest>
+     </jar>
+   </target>
+ 
diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch
new file mode 100644
index 000000000000..27c101ddc5e0
--- /dev/null
+++ b/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch
@@ -0,0 +1,50 @@
+--- a/apps/maven-build.xml
++++ b/apps/maven-build.xml
+@@ -24,7 +24,6 @@
+   <target name="clean" description="Clean the output directory">
+     <ant antfile="build.xml" dir="blank" target="clean"/>
+     <ant antfile="build.xml" dir="mailreader" target="clean"/>
+-    <ant antfile="build.xml" dir="portlet" target="clean"/>
+     <ant antfile="build.xml" dir="showcase" target="clean"/>
+     <ant antfile="build.xml" dir="rest-showcase" target="clean"/>
+   </target>
+@@ -36,7 +35,6 @@
+   <target name="compile" description="Compile the code">
+     <ant antfile="build.xml" dir="blank" target="compile"/>
+     <ant antfile="build.xml" dir="mailreader" target="compile"/>
+-    <ant antfile="build.xml" dir="portlet" target="compile"/>
+     <ant antfile="build.xml" dir="showcase" target="compile"/>
+     <ant antfile="build.xml" dir="rest-showcase" target="compile"/>
+   </target>
+@@ -48,7 +46,6 @@
+   <target name="compile-tests" description="Compile the test code">
+     <ant antfile="build.xml" dir="blank" target="compile-tests"/>
+     <ant antfile="build.xml" dir="mailreader" target="compile-tests"/>
+-    <ant antfile="build.xml" dir="portlet" target="compile-tests"/>
+     <ant antfile="build.xml" dir="showcase" target="compile-tests"/>
+     <ant antfile="build.xml" dir="rest-showcase" target="compile-tests"/>
+   </target>
+@@ -60,7 +57,6 @@
+   <target name="test" description="Run the test cases">
+     <ant antfile="build.xml" dir="blank" target="test"/>
+     <ant antfile="build.xml" dir="mailreader" target="test"/>
+-    <ant antfile="build.xml" dir="portlet" target="test"/>
+     <ant antfile="build.xml" dir="showcase" target="test"/>
+     <ant antfile="build.xml" dir="rest-showcase" target="test"/>
+   </target>
+@@ -72,7 +68,6 @@
+   <target name="javadoc" description="Generates the Javadoc of the application">
+     <ant antfile="build.xml" dir="blank" target="javadoc"/>
+     <ant antfile="build.xml" dir="mailreader" target="javadoc"/>
+-    <ant antfile="build.xml" dir="portlet" target="javadoc"/>
+     <ant antfile="build.xml" dir="showcase" target="javadoc"/>
+     <ant antfile="build.xml" dir="rest-showcase" target="javadoc"/>
+   </target>
+@@ -84,7 +79,6 @@
+   <target name="package" description="Package the application">
+     <ant antfile="build.xml" dir="blank" target="package"/>
+     <ant antfile="build.xml" dir="mailreader" target="package"/>
+-    <ant antfile="build.xml" dir="portlet" target="package"/>
+     <ant antfile="build.xml" dir="showcase" target="package"/>
+     <ant antfile="build.xml" dir="rest-showcase" target="package"/>
+   </target>
diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch
new file mode 100644
index 000000000000..d04acd040d09
--- /dev/null
+++ b/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch
@@ -0,0 +1,56 @@
+--- a/maven-build.xml
++++ b/maven-build.xml
+@@ -22,8 +22,5 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="clean" description="Clean the output directory">
+-    <ant antfile="build.xml" dir="xwork-core" target="clean"/>
+-    <ant antfile="build.xml" dir="core" target="clean"/>
+     <ant antfile="build.xml" dir="apps" target="clean"/>
+-    <ant antfile="build.xml" dir="plugins" target="clean"/>
+     <ant antfile="build.xml" dir="bundles" target="clean"/>
+@@ -35,8 +33,5 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="compile" description="Compile the code">
+-    <ant antfile="build.xml" dir="xwork-core" target="compile"/>
+-    <ant antfile="build.xml" dir="core" target="compile"/>
+     <ant antfile="build.xml" dir="apps" target="compile"/>
+-    <ant antfile="build.xml" dir="plugins" target="compile"/>
+     <ant antfile="build.xml" dir="bundles" target="compile"/>
+@@ -48,8 +44,5 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="compile-tests" description="Compile the test code">
+-    <ant antfile="build.xml" dir="xwork-core" target="compile-tests"/>
+-    <ant antfile="build.xml" dir="core" target="compile-tests"/>
+     <ant antfile="build.xml" dir="apps" target="compile-tests"/>
+-    <ant antfile="build.xml" dir="plugins" target="compile-tests"/>
+     <ant antfile="build.xml" dir="bundles" target="compile-tests"/>
+@@ -61,8 +55,5 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="test" description="Run the test cases">
+-    <ant antfile="build.xml" dir="xwork-core" target="test"/>
+-    <ant antfile="build.xml" dir="core" target="test"/>
+     <ant antfile="build.xml" dir="apps" target="test"/>
+-    <ant antfile="build.xml" dir="plugins" target="test"/>
+     <ant antfile="build.xml" dir="bundles" target="test"/>
+@@ -74,8 +66,5 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="javadoc" description="Generates the Javadoc of the application">
+-    <ant antfile="build.xml" dir="xwork-core" target="javadoc"/>
+-    <ant antfile="build.xml" dir="core" target="javadoc"/>
+     <ant antfile="build.xml" dir="apps" target="javadoc"/>
+-    <ant antfile="build.xml" dir="plugins" target="javadoc"/>
+     <ant antfile="build.xml" dir="bundles" target="javadoc"/>
+@@ -87,8 +77,5 @@
+   <!-- ====================================================================== -->
+ 
+   <target name="package" description="Package the application">
+-    <ant antfile="build.xml" dir="xwork-core" target="package"/>
+-    <ant antfile="build.xml" dir="core" target="package"/>
+     <ant antfile="build.xml" dir="apps" target="package"/>
+-    <ant antfile="build.xml" dir="plugins" target="package"/>
+     <ant antfile="build.xml" dir="bundles" target="package"/>
diff --git a/dev-java/struts/metadata.xml b/dev-java/struts/metadata.xml
new file mode 100644
index 000000000000..815c326402df
--- /dev/null
+++ b/dev-java/struts/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<longdescription>
+The Struts framework provides the invisible underpinnings every professional
+web application needs to survive. Struts helps you create an extensible
+development environment for your application, based on published standards
+and proven design patterns.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/struts/struts-2.3.15.2.ebuild b/dev-java/struts/struts-2.3.15.2.ebuild
new file mode 100644
index 000000000000..beb0b91c62eb
--- /dev/null
+++ b/dev-java/struts/struts-2.3.15.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+WANT_ANT_TASKS="ant-trax"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+
+DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
+SRC_URI="mirror://apache/struts/source/${MY_P}.zip
+	http://dev.gentoo.org/~tomwij/files/dist/${PN}-build.xml-${PV}.tar.xz"
+HOMEPAGE="http://struts.apache.org/index.html"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+COMMON_DEPS="
+	dev-java/felix-shell:0
+	dev-java/osgi-core-api:0
+	dev-java/struts-core:${SLOT}
+	dev-java/struts-plugins:${SLOT}
+	dev-java/struts-xwork:${SLOT}
+	java-virtuals/servlet-api:2.3"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPS}"
+
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/ant-junit:0 )
+	${COMMON_DEPS}"
+
+S="${WORKDIR}/${P}/src"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="struts-core-${SLOT},struts-plugins-${SLOT},struts-xwork-${SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}"
+EANT_BUILD_TARGET="package"
+EANT_TEST_TARGET="test"
+
+# TODO: Incompatible with newer junit; we either need to patch it or slot junit.
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${MY_P}.zip
+	cd "${S}" || die
+	unpack ${PN}-build.xml-${PV}.tar.xz
+}
+
+java_prepare() {
+	find . -name '*.jar' -print -delete || die
+
+	epatch "${FILESDIR}"/${P}-build.xml-remove-core-and-plugins.patch
+	epatch "${FILESDIR}"/${P}-build.xml-classpath.patch
+	epatch "${FILESDIR}"/${P}-build.xml-manifest.patch
+	epatch "${FILESDIR}"/${P}-build.xml-apps-package.patch
+	epatch "${FILESDIR}"/${P}-build.xml-remove-apps-portlet.patch
+
+	java-pkg_getjars felix-shell,osgi-core-api,servlet-api-2.3
+}
+
+src_install() {
+	insinto /usr/share/${PN}-${SLOT}/
+
+	# Misses apps/portlet.
+	for dir in apps/{blank,mailreader,rest-showcase,showcase} bundles/{admin,demo} ; do
+		if [[ ${dir} == "apps/"* ]] ; then
+			doins ${dir}/target/${PN}2-${dir/apps\//}.war
+		else
+			java-pkg_newjar ${dir}/target/${PN}2-osgi-*-bundle-${PV}.jar ${dir/bundles\//}.jar
+		fi
+
+		if use doc ; then
+			java-pkg_dojavadoc ${dir}/target/site/apidocs
+			mkdir "${D}"/usr/share/doc/${P}/${dir/*\//} || die
+			mv "${D}"/usr/share/doc/${P}/{html,${dir/*\//}/html} || die
+		fi
+
+		if [[ ${dir} == *"mailreader"* ]] ; then
+			use source && java-pkg_dosrc ${dir}/src/main/java/mailreader2
+		else
+			use source && java-pkg_dosrc ${dir}/src/main/java/org
+		fi
+	done
+
+	if use doc ; then
+		rm "${D}"/usr/share/${PN}-${SLOT}/api || die
+	fi
+}
+
+src_test() {
+	EANT_TEST_EXTRA_ARGS="-Dgentoo.test.classpath=$(java-pkg_getjars ${EANT_TEST_GENTOO_CLASSPATH})"
+	EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
+
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "The application 'portlet' is not in this release because it doesn't build."
+}
diff --git a/dev-java/sun-dtdparser/Manifest b/dev-java/sun-dtdparser/Manifest
new file mode 100644
index 000000000000..0b19ddcadaa0
--- /dev/null
+++ b/dev-java/sun-dtdparser/Manifest
@@ -0,0 +1 @@
+DIST dtd-parser-1.0-src.zip 67545 SHA256 b420d57ed98ed3d8e56198bf15e0be6b5495ea81656e8f2f00113149573a578a SHA512 7a8b2d27316121e33640ff51819e9edb362197b5af340a92e24b5fcd7cd885efdf3951e12cf5056670273eceffc17c3860b56d437c7cfb2fc12b47abcf82ecfa WHIRLPOOL cadcb0aaca8617ecbf21e474b2418b7e4dac6e99b6e0039d99332abcd4be65ba44298c7c91f6c31affcffbd5ded8676e569adf132d1c019e207403361e847f40
diff --git a/dev-java/sun-dtdparser/metadata.xml b/dev-java/sun-dtdparser/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/sun-dtdparser/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</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..45ab45f87f2d
--- /dev/null
+++ b/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..7359ea9daf0f
--- /dev/null
+++ b/dev-java/sun-httpserver-bin/Manifest
@@ -0,0 +1 @@
+DIST JAXWS2.0.1m1_source_20060817.jar 8993405 SHA256 9725cfb91cecff833055d7af45c3413ca9d1a818a4cfdb86211ed82f383f3865 SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314 WHIRLPOOL fe0727935c592b538b7042808fffa987ea5ae47554367ea0cfc91f65d765bd234713aaa142b2297988d74eec01fce9cd4bedceb0fb7b0068eb38084a1d5f5ba7
diff --git a/dev-java/sun-httpserver-bin/metadata.xml b/dev-java/sun-httpserver-bin/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/sun-httpserver-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</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..e37c5b8465c0
--- /dev/null
+++ b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+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 ppc 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-j2ee-deployment-bin/Manifest b/dev-java/sun-j2ee-deployment-bin/Manifest
new file mode 100644
index 000000000000..0f8151a756b0
--- /dev/null
+++ b/dev-java/sun-j2ee-deployment-bin/Manifest
@@ -0,0 +1,2 @@
+DIST j2ee_deployment-1_1-fr-class.zip 23165 RMD160 f1c88c7f2a795e835be6d602ed7a17d845ac5f1c SHA1 1f606d5f7f477d60486c2eaef4ede4084d77b877 SHA256 9254f972032ad3f0ba9bd6d51eba5e3f800972d404b432fc790f8546b8fbb88c
+DIST j2ee_deployment-1_1-fr-doc.zip 153966 RMD160 34375b342d1a57a6ff823541da61a37a5af08681 SHA1 94adc32a9a7cedbf5eeb3b76f4b8e13e5380605e SHA256 d6b9c9326d695904669c145ab475d003f736fd3461077cfd58ced07734db18a1
diff --git a/dev-java/sun-j2ee-deployment-bin/metadata.xml b/dev-java/sun-j2ee-deployment-bin/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/sun-j2ee-deployment-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild b/dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild
new file mode 100644
index 000000000000..7ee5e69096a9
--- /dev/null
+++ b/dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit java-pkg-2
+
+MY_PV=${PV/./_}
+
+CLASS_URI="j2ee_deployment-${MY_PV}-fr-class.zip"
+DOC_URI="j2ee_deployment-${MY_PV}-fr-doc.zip"
+
+DESCRIPTION="J2EE Application Deployment Specification"
+HOMEPAGE="http://java.sun.com/j2ee/tools/deployment/"
+SRC_URI="${CLASS_URI}
+	doc? ( ${DOC_URI} )"
+LICENSE="sun-bcla-j2ee-deployment"
+SLOT="1.1"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE="doc"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+RESTRICT="fetch"
+
+S=${WORKDIR}
+
+DOWNLOAD_URL="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=J2EE_DEPLOYMENT-1.1-FR-CLASS-G-F@CDS-CDS_Developer"
+DOWNLOAD_URL_DOC="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=J2EE_DEPLOYMENT-1.1-FR-DOC-G-F@CDS-CDS_Developer"
+
+pkg_nofetch() {
+	einfo "Please download \"J2EE Deployment API Class Files 1.1\" - ${CLASS_URI}"
+	einfo "from ${HOMEPAGE} and move it to ${DISTDIR}"
+	einfo "Direct URL: ${DOWNLOAD_URL}"
+	if use doc; then
+		einfo "Also download \"API Documentation 1.1\" - ${DOC_URI}"
+		einfo "from ${HOMEPAGE} and move it to ${DISTDIR}"
+		einfo "Direct URL: ${DOWNLOAD_URL_DOC}"
+	fi
+}
+
+src_compile() {
+	jar cvf ${PN}.jar javax || die "Failed to create the ${PN}.jar"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc doc
+}
diff --git a/dev-java/sun-jacc-api/Manifest b/dev-java/sun-jacc-api/Manifest
new file mode 100644
index 000000000000..39cfbf66fab3
--- /dev/null
+++ b/dev-java/sun-jacc-api/Manifest
@@ -0,0 +1 @@
+DIST sun-jacc-api-20070102.tar.bz2 25672 SHA256 bb85f53ae3ee6a22392c855dfc99d7b1bda715749d16b94162cbafbdd066aa14 SHA512 cccc71e327fd7a947e5b2430a0733f9a22c57388c38476dd253d808a2baaf7474113f809f7f47073b9fd8d0e9f9dea81e8c7192991fb10cd975e8db29b62252b WHIRLPOOL 42e028a5e35e68b4d7099af25b7d09a19accbcc84047b749499e12363f82243bea6c639747a77beeb7695be782a03cdca4abdbd3b3c02c00a4ea38e08e198588
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..7303cef96964
--- /dev/null
+++ b/dev-java/sun-jacc-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..586697369de4
--- /dev/null
+++ b/dev-java/sun-jacc-api/sun-jacc-api-20070102.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a1a273a87b0a
--- /dev/null
+++ b/dev-java/sun-jaf/Manifest
@@ -0,0 +1 @@
+DIST sun-jaf-1.1.1.tar.bz2 125305 SHA256 3c61b1390a92b0116c7c43434d1a81eedfcfed7b95017110ba0d9c9ee31b731d SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001 WHIRLPOOL 2f2fcb4c0b4f649ab6f42ffdf9075b11416e4a09f75760775055ed5dbf0c0a6a633f51738011f87b257dbe552e3aefaba1269ccc8e5fb4d23883432ea08e9856
diff --git a/dev-java/sun-jaf/metadata.xml b/dev-java/sun-jaf/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/sun-jaf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
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..a217cc88da82
--- /dev/null
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..1db2eb81a8cf
--- /dev/null
+++ b/dev-java/sun-jai-bin/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/sun-jai-bin/metadata.xml b/dev-java/sun-jai-bin/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/sun-jai-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</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..885e403a5f74
--- /dev/null
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b56e1db36686
--- /dev/null
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..5cf150a515d9
--- /dev/null
+++ b/dev-java/sun-java3d-bin/Manifest
@@ -0,0 +1,4 @@
+DIST java3d-1_3_2-linux-amd64.zip 1241855 SHA256 e248fc43792db5a351540e7c1a7c4c594fee30d5a8e622dbd8290075becca8a8
+DIST java3d-1_3_2-linux-i586.zip 1235329 SHA256 1fc3a02714bcfd938b5449561cee49c3ffe5f8c320591374caab4a0c2bb9f415
+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
diff --git a/dev-java/sun-java3d-bin/metadata.xml b/dev-java/sun-java3d-bin/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/sun-java3d-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</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..40a626bf57f2
--- /dev/null
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..4ed500086eff
--- /dev/null
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-javamail/Manifest b/dev-java/sun-javamail/Manifest
new file mode 100644
index 000000000000..a4e4efd62746
--- /dev/null
+++ b/dev-java/sun-javamail/Manifest
@@ -0,0 +1 @@
+DIST javamail-1.4.3-src.zip 1174915 SHA256 5204fd4e38b4f2a43fb727c861d7d1f69933d489706de100189970032582becd SHA512 092b44857ed8a7fee25e9dd5085144b9b04aaec2e294ac7271accda8d0f8ea71792671079c2e377dadce02282446f176abbd3f78f55a8342930667a985080210 WHIRLPOOL f0440fd2bd7f3a8db357e9824a81aaa68b08688aab0b77c08dcd8e136a8b5856678fc5e50c5799234e59df4df516c06ac3c78c0f699d757cbfbb06f54296372e
diff --git a/dev-java/sun-javamail/metadata.xml b/dev-java/sun-javamail/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/sun-javamail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild b/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild
new file mode 100644
index 000000000000..0af10b24f428
--- /dev/null
+++ b/dev-java/sun-javamail/sun-javamail-1.4.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+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="http://java.sun.com/products/javamail/index.html"
+
+# error 500 without the double slash, wonder what HTTP standard says about this
+SRC_URI="http://kenai.com/projects/javamail/downloads/download//javamail-${PV}-src.zip"
+
+# either of these
+LICENSE="CDDL GPL-2 BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="java-virtuals/jaf"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+# some not essential classes need 1.5 to compile
+# but 1.4 bytecode for better support
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+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
+}
+
+java_prepare() {
+	java-pkg_jar-from --virtual jaf
+}
+
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Djavaee.jar=activation.jar -Dspec.dir=doc/spec"
+
+src_install() {
+	java-pkg_dojar target/release/mail.jar
+
+	dodoc doc/release/{CHANGES,COMPAT,NOTES,README,SSLNOTES,distributionREADME}.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/sun-jce-bin/Manifest b/dev-java/sun-jce-bin/Manifest
new file mode 100644
index 000000000000..f5ad487560dc
--- /dev/null
+++ b/dev-java/sun-jce-bin/Manifest
@@ -0,0 +1 @@
+DIST jce_policy-6.zip 9101 RMD160 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae SHA1 7b1b021bd63152b93a16c96bb3a64f0e685fc425 SHA256 d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
diff --git a/dev-java/sun-jce-bin/metadata.xml b/dev-java/sun-jce-bin/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/sun-jce-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/sun-jce-bin/sun-jce-bin-1.6.0.ebuild b/dev-java/sun-jce-bin/sun-jce-bin-1.6.0.ebuild
new file mode 100644
index 000000000000..fa5f0df9fe80
--- /dev/null
+++ b/dev-java/sun-jce-bin/sun-jce-bin-1.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+jcefile="jce_policy-6.zip"
+
+DESCRIPTION="Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files ${PV}"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/overview/index-jsp-136246.html"
+SRC_URI="${jcefile}"
+SLOT="1.6"
+LICENSE="Oracle-BCLA-JavaSE"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}/jce"
+
+FETCH_JCE="http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html"
+
+pkg_nofetch() {
+	einfo "Please download ${jcefile} from:"
+	einfo ${FETCH_JCE}
+	einfo "(JCE Unlimited Strength Jurisdiction Policy Files 6)"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	if [ ! -r "${DISTDIR}"/${jcefile} ]; then
+		die "cannot read ${jcefile}. Please check the permission and try again."
+	fi
+
+	unpack ${A}
+}
+
+src_install() {
+	dodir /opt/${P}/jre/lib/security/unlimited-jce
+
+	insinto /opt/${P}/jre/lib/security/unlimited-jce
+	doins *.jar
+	dodoc README.txt
+	dohtml COPYRIGHT.html
+}
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
new file mode 100644
index 000000000000..20152a48bd08
--- /dev/null
+++ b/dev-java/sun-jdk/Manifest
@@ -0,0 +1,15 @@
+DIST jce_policy-6.zip 9101 SHA256 d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262 SHA512 a1aa55f2ad919efcf63452aaa96303328b7449626efb342a7f8d9e7a4fe9c06ce22ce33fb89e768602b172b7d9538c432e82523addb0bbd4d1be22f934576b56 WHIRLPOOL 144a4891ca3f5f88f72c1a13283823845bd7e46b5fe941b4c192705e20e9fcbbf27819ee926577218dd3b222e41f7ee149cab6f9eea5a46febebea00ad2ed3bc
+DIST jdk-6u45-linux-i586-demos.tar.gz 12073459 SHA256 1e748de12946f8ec9b83ed8caa4cfda9a7ebbc52d62f39fcdba27f7f6bcf7d46 SHA512 c19260a669d8b31879421e0eef08f4ec2bb37bae085f656e5e627f405b346a2be2e76aa10f61381fa08244736f1b7d0b49af44c5d6cfff65ed2cefe44ad8d441 WHIRLPOOL 15949ff291fc20b27032e6363a0ebacf8a532fe536f06e29c1f6e8b45cf3a4fcfe5fa47961d2c0ed0fb112e8e84f124067b8002758793682b13dece816d6c7d4
+DIST jdk-6u45-linux-i586.bin 71799552 SHA256 d53b5a2518d80e1d95565f0adda54eee229dc5f4a1d1a3c2f7bf5045b168a357 SHA512 9539da9779c0a74165da24bd5730b8b7e58f4b8a38841de04919af8a957fa83f32367fdcb393d4ac756feccaf0cf014ebf2f74180f9301d22944fa30dfb87777 WHIRLPOOL 47a88a246ac06fc1275e16d6dac6c859ffa4598ce6940f2910d6be616c88475dbd0638654cdba82bdb3a29e9f2f0a80267c127f51392c3400392ffa168cf4631
+DIST jdk-6u45-linux-ia64-demos.tar.gz 6858761 SHA256 4d2ad7d92d7966a009b2006002d80960aac803e7cafe9d0a8bd8976c258a99ec SHA512 82b4e65ca455dcc2d916bd92c6b0d9c9333db7379882610ece3f1d99d35aa7792dc6e4236d74340175c5ec8c02db6d512406ea837d5e0f738dd6211d730e7e03 WHIRLPOOL 9c1cbff1cbf881b502f4a8f8374cae3f3ead0c936b7347fd67b60904957716f5ff457f2bd4e32e81959b54dae18fe4907ab0f8ab5c544bf249148769d2c4c85e
+DIST jdk-6u45-linux-ia64.bin 58719923 SHA256 6979b4e2e6dd11310760d13e8fea040e1be1419b0fac2fd44f1bf7173ce4fee6 SHA512 8acb10bb6335f267ae4b53d08167cebad41bc6a34300305e46a31d13b492fb9e4c3e4c28f0989b1412de3745f54db5d8c730eb76aaf6d1712ed31a2d3268d1cb WHIRLPOOL 50166f80eaafd64d39945d62b4c905cc7cf686e0f210d0a0a0807c100245139c9f136220875821ede9611376b3e8453247908cf4ae00a35d0cbde3caa03b9b44
+DIST jdk-6u45-linux-x64-demos.tar.gz 12104609 SHA256 abc7d2e3fd16f788675403f26af17ae29325002e1ef45ddfa69e8a4bb7964838 SHA512 ecfa8f911c8a73bd00edb82ea5668a589106667fa0a67875ab1a0bbe406574ec804007f7f622b4cc391d7b5a06d2b0d137c3b61a7891a74f0a85a42df463f63b WHIRLPOOL 969b385e3275bfbccfa41885b9ef1c8a2d26b2a292c2187efb0d1218aa744da1e56083f29b30a38a1d36dbbea241621654a73df391b502e557bd6e61e40186ef
+DIST jdk-6u45-linux-x64.bin 72087592 SHA256 6b493aeab16c940cae9e3d07ad2a5c5684fb49cf06c5d44c400c7993db0d12e8 SHA512 bf2fcb8696b9e43af80d9114fd984d86317422e8c65dd464a7abff4017a5c4c0d8ebdbd8418270fc8c6c52c2b97498f02742440ed4f8394b3612d2e2186c30d8 WHIRLPOOL 1c9861e66e3e8f45f7f4284e09e87ee4fd1347687010b8ecc87666b9df070d33921ffd60f727e6630caac4db2b50ae6a3f432987062469daa06130c7b4e62f15
+DIST jdk-6u45-solaris-i586-demos.tar.Z 17934236 SHA256 f23e90da3ccdb964a0b646e2b09cbc442f59f6c5448555f41a7b75b0a25f0022 SHA512 8cd84c860a807de7bb8f73edb403357d307e0f62a37c8fc4721e1645d8088350fd29570eff5bcbe1abbc6114b59f44b4a98624d4e94c905b930e3e9c84aafd60 WHIRLPOOL 3abd2623865c11cfcb7960a8e932258ec32277e80e3178ddf343c8b05c6dee8718d8b7c3327dde26c15eec28d650dcd350be06fff067b88016515abc8e5cccd8
+DIST jdk-6u45-solaris-i586.sh 71704137 SHA256 e62c6e0305b1b69f37a5dab1f2f9369da3749e8f95f106ba96f88bc3232b288b SHA512 f38ee02fd782305e0eec4f9267772bf0b8f145b3e1fda6b8b35a09e4b154c0cb0cb159f1c51d2ee1d1f1dbba1ca0736fcbd50cf5f42ae9dccc58f8cde9f7a038 WHIRLPOOL e76d32e2c85496c6a596edf16ebf3941a05ec65d5f9c758658c7ed983c7ab1245d589a0f2358a57b939ce75fe1bd7d41fb8dbb3ce47552403a2793443912651c
+DIST jdk-6u45-solaris-sparc-demos.tar.Z 17931861 SHA256 719c8662c2bd6ed2b894a5b03096d50a1d8d9dfec54e8a85a12d0298b342b909 SHA512 0d7ab33234319b6e4e6cf2d50496ad57ee15a066ebe97afed7684e47cc907f9bd97ef28c7c7d3c78cc4bc9cef3580221dccd5bd4b0d9706dd15fd6339c1f3ad1 WHIRLPOOL 0a02654bd32f8c850e91a0d6abfc9ff83a7b2bf6c866d292253bcda06de70e7bbcfffbfa712bc8d3a15c70f8012e2c7936c30149b805703b9115114d072dbe35
+DIST jdk-6u45-solaris-sparc.sh 76971070 SHA256 3be55a2491ee332d3beb4653893d699075dab73407b88290304248d81c49d9d9 SHA512 6fff0a4ebb6deb3bbf16367c39e84bb7f88a4f7be6d39d879e7c987eeb0ff7148b6a1f814ec86764f2e4bc74ecbfa429d984c6510e391f1465cffd57c74ac089 WHIRLPOOL 171ae21157ba82e517a5ab7e3957044a0ff914f742e66e6ec13f8fe3cac786dd3bb511f2adab88cc83a2a5747d36cdd320e646e6d50710b75a90bd68b17bcf63
+DIST jdk-6u45-solaris-sparcv9-demos.tar.Z 66473 SHA256 7c4d9b616b802321449d91a2ca8a7d5fe601454be6d88fe0d2321366e3e89975 SHA512 72628ccd35def302d35a44ceb98e68b865fd0edbcb4bfc58f80fa7e7834461280312777ee173f7041b7d0a9469705421ae85a76dc7db36f9ab25bf61c768858a WHIRLPOOL ad706edd9ba0baee5fb1c448330b468b66bb82de178eaae6881ce7fceda7f0b1d028abd5d65e514e17cf514cb1d6daeb714173c3af41046d2142ebff73670336
+DIST jdk-6u45-solaris-sparcv9.sh 12785214 SHA256 2d0e5163effbac3e3eae1bbf0767f56f590a3e71fc74f63dd0ff5f9386384254 SHA512 24cd70c7133d4858e2c124f907f0731c01cbd9f4f599a24f044a4a351767002404cd269be15d6fbbc6888342cd36b2fa2a84c18b0e1aebe9d7974f4d6cbc374a WHIRLPOOL c851b49f5d65a59adc62e8f17ee5d2b8f51999377c4b245d713e3b2a00c49c64187a7bbadf19fd0e74f91ec003ab79475867f2f2b23e9ca5cd8d4254a4a9ea32
+DIST jdk-6u45-solaris-x64-demos.tar.Z 71857 SHA256 86ce6dfad3d4f596dfd40ab432139817062f61c6d800bd2d7dab76e22d2649e7 SHA512 14e0637ec2f0d536e41011996192150848a5311ac5bbae44c2b5e0e9bbdfe0a829e57a7a0a3912cf6fffe9fb26d9360206193957fdd5c0959e81b254a02c0667 WHIRLPOOL d26ed5891fbb5c4dbca0a95de0db683afc633afd0d56dab4c86c85348f763c3da49cf4c57c2ae12f32c77d9b4c7e46b1c5048c096800c1a0149b61e1af32eeaf
+DIST jdk-6u45-solaris-x64.sh 8907780 SHA256 b3f50fc921c07dee97781e322954021ebb10785ac4e8f4a4536dab239860c09e SHA512 cc262d3ef9c070ed7f1eab9141e9f509f16e6fb97534dd3ca48a65dad83124cf745894a3f73c270a0618220d1a541833f08970250bb697f584cf4d1e497d9e1f WHIRLPOOL f75c984d092bd93ae1213a83cc79604e65df118fba77f413979a5d34337cba52b0dedd72559a740911908475d6971fbe5198eabc6878bb20838dd8f3bc12a33d
diff --git a/dev-java/sun-jdk/files/fontconfig.Gentoo.properties-r1 b/dev-java/sun-jdk/files/fontconfig.Gentoo.properties-r1
new file mode 100644
index 000000000000..43cb5eed0c47
--- /dev/null
+++ b/dev-java/sun-jdk/files/fontconfig.Gentoo.properties-r1
@@ -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/sun-jdk/files/sun-jdk-1.6.env-r1 b/dev-java/sun-jdk/files/sun-jdk-1.6.env-r1
new file mode 100644
index 000000000000..97d2e725cd34
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.6.env-r1
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Sun JDK @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_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/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.6"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/sun-jdk/metadata.xml b/dev-java/sun-jdk/metadata.xml
new file mode 100644
index 000000000000..982a85f2eff7
--- /dev/null
+++ b/dev-java/sun-jdk/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <longdescription>Sun Java Development Kit Package. AKA.J2SE</longdescription>
+  <use>
+    <flag name="derby">Enable Installation of Bundled Derby (Java DB)</flag>
+    <flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag>
+    <flag name="pax_kernel">Use paxctl to mark the JVM binaries.</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild
new file mode 100644
index 000000000000..eda940c009ed
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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/jdk6downloads-1902814.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html"
+# This is a list of archs supported by this update. Currently ia64 comes and goes ...
+AT_AVAILABLE=( amd64 ia64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
+# somtimes the demos are missing
+DEMOS_AVAILABLE=( amd64 ia64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris )
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+AT_x86="jdk-${MY_PV}-linux-i586.bin"
+AT_amd64="jdk-${MY_PV}-linux-x64.bin"
+AT_ia64="jdk-${MY_PV}-linux-ia64.bin"
+AT_x86_solaris="jdk-${MY_PV}-solaris-i586.sh"
+AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.sh"
+AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.sh"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.sh"
+
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_ia64="jdk-${MY_PV}-linux-ia64-demos.tar.gz"
+DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.Z"
+DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.Z"
+DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.Z"
+DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.Z"
+
+JCE_FILE="jce_policy-6.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}? ("
+	SRC_URI+=" $(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.6"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel selinux source"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-java/java-sdk-docs:1.6.0 )
+	selinux? ( sec-policy/selinux-java )
+	!prefix? ( sys-libs/glibc )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="
+	jce? ( app-arch/unzip )
+	kernel_SunOS? ( app-arch/unzip )
+	pax_kernel? ( sys-apps/paxctl )
+	selinux? ( sec-policy/selinux-java )"
+
+S="${WORKDIR}"/jdk${S_PV}
+
+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 "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
+			einfo "has become fetch restricted again. Alternatives are switching to"
+			einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
+			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
+	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() {
+	AT=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	DEMOS=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+
+	if use kernel_SunOS; then
+		for i in ${AT}; do
+			rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE
+			# don't die on unzip, it always "fails"
+			unzip "${DISTDIR}"/${i}
+		done
+		for f in $(find "${S}" -name "*.pack") ; do
+			"${S}"/bin/unpack200 ${f} ${f%.pack}.jar
+			rm ${f}
+		done
+	else
+		sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
+	fi
+
+	if has "${ARCH}" "${DEMOS_AVAILABLE[@]}" &&  use examples ; then
+		unpack ${DEMOS}
+		if use kernel_SunOS; then
+			mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} "${S}"/ || die
+		fi
+	fi
+
+	if use jce; then
+		unpack ${JCE_FILE}
+		mv jce "${S}"/jre/lib/security/unlimited-jce || die
+	fi
+}
+
+src_compile() {
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		ia64)
+			bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #405239
+			# this is a workaround and shouldn't be needed.
+			bin/java -server -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			bin/java -server -Xshare:dump || die
+			;;
+	esac
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
+			{,jre/}lib/i386/libjavaplugin_nscp*.so
+		rm -vrf jre/plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
+			{,jre/}lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	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/unlimited-jce/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym "${dest}"/jre/lib/security/unlimited-jce/local_policy.jar \
+			"${dest}"/jre/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	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 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} (sun-jdk)#" \
+		-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
+
+	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.* || die
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto "${dest}"/jre/lib/
+	doins "${T}"/fontconfig.properties
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	elog "If you want Oracles JDK 7 'emerge oracle-jdk-bin' instead."
+}
diff --git a/dev-java/sun-jimi/Manifest b/dev-java/sun-jimi/Manifest
new file mode 100644
index 000000000000..74dfd56f6b98
--- /dev/null
+++ b/dev-java/sun-jimi/Manifest
@@ -0,0 +1 @@
+DIST jimi1_0.zip 3880977 SHA256 06c193de5d78f2597191963c34cf306a960f7144759337264c1c60a3b3b8a0c4 SHA512 28ae3b3044910fca80dbdf23fee5f0d050df64ef48a09c41a836f3ff78365258c747f69a958579abda68d6d6f1c6b6a3ea5e960d36f2199afdb06258a25173d5 WHIRLPOOL c9ff66c4a15eb39c30e70c47bd7c8694024e34ebba09a7a440b927f5e3da0498f4ae2b8c6ddd96e3fe18933b93cacbb9c01f63b672caef45b601e4cf0bcec4fa
diff --git a/dev-java/sun-jimi/metadata.xml b/dev-java/sun-jimi/metadata.xml
new file mode 100644
index 000000000000..239a64a49538
--- /dev/null
+++ b/dev-java/sun-jimi/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+
+<herd>java</herd>
+
+<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..7069ce1a824d
--- /dev/null
+++ b/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..24f3d6b21952
--- /dev/null
+++ b/dev-java/sun-jms/Manifest
@@ -0,0 +1 @@
+DIST jms-1_1-fr-apidocs.zip 361922 SHA256 7091506ff106f29828bc7ef68559f054cb000f1d3b1bcda57b59666efb1ccd8f
diff --git a/dev-java/sun-jms/metadata.xml b/dev-java/sun-jms/metadata.xml
new file mode 100644
index 000000000000..b0850e6c56cd
--- /dev/null
+++ b/dev-java/sun-jms/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..d58f46f4071a
--- /dev/null
+++ b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..e7ac5ba86d2c
--- /dev/null
+++ b/dev-java/sun-jmx/Manifest
@@ -0,0 +1 @@
+DIST jmx-1_2_1-ri.zip 1624569 SHA256 cd61a03be89e169c8efc994e45517a91ed42c4b3fb35c728cb04c10a2b687819
diff --git a/dev-java/sun-jmx/metadata.xml b/dev-java/sun-jmx/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/sun-jmx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</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..7b35d4c6634e
--- /dev/null
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc examples"
+
+inherit java-pkg-2
+
+MY_P=jmx-${PV//./_}
+DESCRIPTION="Java Management Extensions for managing and monitoring devices, applications, and services"
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-freebsd ~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/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
new file mode 100644
index 000000000000..11340bea3b4f
--- /dev/null
+++ b/dev-java/sun-jre-bin/Manifest
@@ -0,0 +1,3 @@
+DIST jre-6u45-linux-i586.bin 21770712 SHA256 6f6155623537162e169044454856c41c4443eab65bdc71eba0b90b242ecf0030 SHA512 5454918675dd27619989fdae2fa46b0f87367deca99632c53a5d0e47010ca5c1256384ed1ebbb504bc0ea24ea605fed518969fae73f5defae26fad7081006e82 WHIRLPOOL e294c4b308516c4117ff7f9b337f652f692fe69db37e098ece4627632e7d49b949d9d37f58be4bef7a9a3949da08d3c725356e238569190d5a184c094fea002a
+DIST jre-6u45-linux-ia64.bin 22968172 SHA256 b9ba88870c64efc768099e4cec72e7c4d6fbe19608cb893c946fa21db99ea711 SHA512 87c54dedd5372980a5736e23d5ed26f03db9120166021e343d51edea0b484b7328a2e03d925302e506ad49366d29439914ec7172a3e5a27ec7c37a81cdd2abeb WHIRLPOOL e5f6394e2c7dc78b0f850bf66c78bac177288eeae27cc0ecaa2595d241a36ce516b0ac5fc57c0afc145a4b2af19666e99cf77c98069fc7fdb22fb209d6d1ae78
+DIST jre-6u45-linux-x64.bin 21381557 SHA256 7f656c723a988b2f2f71d116bb572dd01b9b38f6394fc03f349d627c487199ff SHA512 ba3a372ac660fbfd59694b941d66ca645ab5eb9eecbb651bc40522509122e65ac7ecafaf09874d7c913280afa3a0141490d55f1ffa92ec42ca56826dfa92b9fd WHIRLPOOL dbbedc7c3707d7efcbc20eebf60538099329da0fefa1e331679ccdf408c9125ea0d865c234efc74d5d3d0d0adfc8acd00ec260da29e8a44552e1133439a74345
diff --git a/dev-java/sun-jre-bin/files/construct-1.6.sh b/dev-java/sun-jre-bin/files/construct-1.6.sh
new file mode 100644
index 000000000000..a70e24b86d8a
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/construct-1.6.sh
@@ -0,0 +1,273 @@
+#!/bin/bash
+# construct.sh
+# example construction of JRE and JDK directories from the DLJ bundles
+# 
+# Copyright � 2006 Sun Microsystems, Inc.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# 
+# Sun, Sun Microsystems, the Sun logo and Java, Java HotSpot,
+# and JVM  trademarks or registered trademarks of Sun Microsystems,
+# Inc. in the U.S. and other countries.
+
+
+program=`basename $0`
+
+usage () {
+  echo "usage: ${program} path/to/unbundle-jdk path/to/linux-jdk path/to/linux-jre"
+}
+
+getargs() {
+  undir=$1
+  jdkdir=$2
+  jredir=$3
+  if [ ! -d $undir ]; then
+    echo "${program}: unbundle directory not found: $undir"
+    exit 2
+  fi
+  # make sure javahome is the JDK
+  javahome=`echo $undir/*/demo`
+  if [ ! -d $javahome ]; then
+    echo "${program}: unbundle directory incorrect: $undir"
+    echo "  expecting $undir/jdk1.5.0_xx"
+    exit 2
+  else
+    javahome=`dirname $javahome`
+  fi
+  # verify JDK dir
+  jdkdirp=`dirname $jdkdir`
+  jdkbase=`basename $jdkdir`
+  if [ ! -d $jdkdirp ]; then
+    echo "${program}: parent directory for JDK does not exist: $jdkdirp"
+    exit 2
+  fi
+  savedir=`pwd`
+  cd $jdkdirp
+  jdkdirp=`pwd`
+  cd $savedir
+  jdkdir=$jdkdirp/$jdkbase
+  # verify JRE dir
+  jredirp=`dirname $jredir`
+  jrebase=`basename $jredir`
+  if [ ! -d $jredirp ]; then
+    echo "${program}: parent directory for JRE does not exist: $jredirp"
+    exit 2
+  fi
+  savedir=`pwd`
+  cd $jredirp
+  jredirp=`pwd`
+  cd $savedir
+  jredir=$jredirp/$jrebase
+}
+
+checkfiles() {
+  if [ -r $jdkdir ]; then
+    echo "${program}: directory for JDK already exists: $jdkdir"
+    exit 2
+  fi
+  if [ -r $jredir ]; then
+    echo "${program}: directory for JRE already exists: $jredir"
+    exit 2
+  fi
+}
+
+copytree() {
+  echo "copying over the JDK tree..."
+  cp -a $javahome $jdkdir
+}
+
+linkrel() {
+  target=$1
+  link=$2
+  # make a softlink from the $link to the $target
+  # make this a relative link
+  targetb=(`echo $target | tr '/' ' '`)
+  linkb=(`echo $link | tr '/' ' '`)
+  (( n = ${#targetb[*]} ))
+  (( m = ${#linkb[*]} ))
+  c=$n  # common length
+  if [ $m -lt $c ]; then
+    (( c = m ))
+  fi
+  for (( i = 0 ; i < c ; i++ )); do 
+    if [ ${targetb[$i]} != ${linkb[$i]} ]; then
+      # echo components differ, stopping
+      break
+    fi
+  done
+  rel=""
+  for (( j = i + 1; j < m ; j++ )); do
+    if [ -z $rel ]; then
+      rel=".."
+    else
+      rel="$rel/.."
+    fi
+  done
+  for (( j = i; j < n ; j++ )); do
+    if [ -z $rel ]; then
+      rel=${targetb[$j]}
+    else
+      rel="$rel/${targetb[$j]}"
+    fi
+  done
+  ln -s $rel $link
+}
+
+createjre() {
+  echo "creating JRE directory..."
+  # absolute link
+  # ln -s $jdkdir/jre $jredir
+  # relative link
+  linkrel $jdkdir/jre $jredir
+}
+
+unpackjars() {
+  echo "unpacking jars..."
+  unpack200=$jdkdir/bin/unpack200
+  if [ ! -x $unpack200 ]; then
+    echo "${program}: file missing $unpack200"
+    exit 1
+  fi
+  cd $jdkdir
+  PACKED_JARS=`find . -name '*.pack'`
+  for i in $PACKED_JARS; do
+    # echo $i
+    jdir=`dirname $i`
+    jbase=`basename $i .pack`
+    if ! $unpack200 $jdkdir/$jdir/$jbase.pack $jdkdir/$jdir/$jbase.jar; then
+      echo "${program}: error unpacking $jdkdir/$jdir/$jbase.jar"
+    fi
+    if [ ! -r $jdkdir/$jdir/$jbase.jar ]; then
+      echo "${program}: missing $jdkdir/$jdir/$jbase.jar"
+    else
+      echo "  $jdir/$jbase.jar"
+      # remove pack file
+      rm $jdkdir/$jdir/$jbase.pack
+    fi
+  done
+}
+
+preparecds() {
+  # if this is a client installation...
+  compiler="`$jdkdir/bin/java -client -version 2>&1 | tail -n +3 | cut -d' ' -f1-4`"
+  if [ "X$compiler" = "XJava HotSpot(TM) Client VM" ]; then
+    # create the CDS archive
+    echo "creating the class data sharing archive..."
+    if ! $jdkdir/bin/java -client -Xshare:dump > /dev/null 2>&1; then
+       echo "returned error code $?"
+    fi
+  fi
+}
+
+jreman () {
+  echo "setting up the JRE man pages..."
+  # note this list is slightly different for OpenSolaris bundles
+  jreman="${T}/jre.man.txt"
+cat <<EOF > $jreman
+man/ja_JP.eucJP/man1/java.1
+man/ja_JP.eucJP/man1/javaws.1
+man/ja_JP.eucJP/man1/keytool.1
+man/ja_JP.eucJP/man1/orbd.1
+man/ja_JP.eucJP/man1/pack200.1
+man/ja_JP.eucJP/man1/policytool.1
+man/ja_JP.eucJP/man1/rmid.1
+man/ja_JP.eucJP/man1/rmiregistry.1
+man/ja_JP.eucJP/man1/servertool.1
+man/ja_JP.eucJP/man1/tnameserv.1
+man/ja_JP.eucJP/man1/unpack200.1
+man/man1/java.1
+man/man1/javaws.1
+man/man1/keytool.1
+man/man1/orbd.1
+man/man1/pack200.1
+man/man1/policytool.1
+man/man1/rmid.1
+man/man1/rmiregistry.1
+man/man1/servertool.1
+man/man1/tnameserv.1
+man/man1/unpack200.1
+EOF
+  # create jre/man directory
+  # mkdir $jdkdir/jre/man
+  # move the real JRE man pages to jre/man
+  # link the JDK JRE man pages to jre/man
+  # real JDK man pages stay where they are
+  for m in `cat $jreman`; do
+    manpath=`dirname $jdkdir/jre/$m`
+    mkdir -p $manpath
+    mv $jdkdir/$m $jdkdir/jre/$m
+    linkrel $jdkdir/jre/$m $jdkdir/$m
+  done
+  # link in Japanese man pages
+  ln -s ja_JP.eucJP $jdkdir/jre/man/ja
+  rm $jreman
+}
+
+elimdups() {
+  echo "eliminating duplication between the JDK and JDK/jre..."
+  jdkcomm="${T}/jdk.bin.comm.txt"
+cat <<EOF > $jdkcomm
+bin/ControlPanel
+bin/java
+bin/javaws
+bin/keytool
+bin/orbd
+bin/pack200
+bin/policytool
+bin/rmid
+bin/rmiregistry
+bin/servertool
+bin/tnameserv
+bin/unpack200
+EOF
+  # note there is little point in linking these common files
+  #   COPYRIGHT
+  #   LICENSE
+  #   THIRDPARTYLICENSEREADME.txt
+  # And this file is unique to the JDK
+  #   README.html
+  # And these files are unique to the JDK/jre/
+  #   CHANGES
+  #   README
+  #   Welcome.html
+  for p in `cat $jdkcomm`; do
+    rm $jdkdir/$p
+    # this is a relative link
+    ln -s ../jre/$p $jdkdir/$p
+  done
+  rm $jdkcomm
+}
+
+if [ $# -eq 3 ] ; then
+  getargs $1 $2 $3
+  checkfiles
+  copytree
+  createjre
+  unpackjars
+  #preparecds
+  jreman
+  elimdups
+else
+  usage
+  exit 1
+fi
+
+exit 0
+
diff --git a/dev-java/sun-jre-bin/files/fontconfig.Gentoo.properties-r1 b/dev-java/sun-jre-bin/files/fontconfig.Gentoo.properties-r1
new file mode 100644
index 000000000000..43cb5eed0c47
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/fontconfig.Gentoo.properties-r1
@@ -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/sun-jre-bin/files/sun-jre-bin-1.6.env-r1 b/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env-r1
new file mode 100644
index 000000000000..19ab58229ec8
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/sun-jre-bin-1.6.env-r1
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+VERSION="Sun JRE @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
+LDPATH="${JAVA_HOME}/lib/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/lib/@PLATFORM@/xawt/:${JAVA_HOME}/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.6"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/sun-jre-bin/metadata.xml b/dev-java/sun-jre-bin/metadata.xml
new file mode 100644
index 000000000000..20318a349b45
--- /dev/null
+++ b/dev-java/sun-jre-bin/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <longdescription>Sun Java Resource Package, also known as J2SE</longdescription>
+  <use>
+    <flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag>
+    <flag name="pax_kernel">Use paxctl to mark the JVM binaries.</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.45.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.45.ebuild
new file mode 100644
index 000000000000..b07a2b68bc6f
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.45.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 eutils prefix versionator
+
+# This URIs need to be updated when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6downloads-1902815.html"
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+X86_AT="jre-${MY_PV}-linux-i586.bin"
+AMD64_AT="jre-${MY_PV}-linux-x64.bin"
+IA64_AT="jre-${MY_PV}-linux-ia64.bin"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AMD64_AT} )
+	ia64? ( ${IA64_AT} )
+	x86? ( ${X86_AT} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.6"
+KEYWORDS="amd64 x86"
+IUSE="X alsa jce nsplugin pax_kernel selinux"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+RDEPEND="
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)
+	alsa? ( media-libs/alsa-lib )
+	jce? ( dev-java/sun-jce-bin:1.6 )
+	!prefix? ( sys-libs/glibc )
+	selinux? ( sec-policy/selinux-java )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="
+	pax_kernel? ( sys-apps/paxctl )
+	selinux? ( sec-policy/selinux-java )"
+
+S="${WORKDIR}/jre${S_PV}"
+
+pkg_nofetch() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	elif use ia64; then
+		AT=${IA64_AT}
+	fi
+
+	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
+	einfo "has become fetch restricted again. Alternatives are switching to"
+	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
+	einfo ""
+	einfo "Please download '${AT}' from:"
+	einfo "'${JRE_URI}'"
+	einfo "and move it to '${DISTDIR}'"
+}
+
+src_unpack() {
+	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
+}
+
+src_compile() {
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		ia64)
+			bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #405239
+			# this is a workaround and shouldn't be needed.
+			bin/java -server -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			bin/java -server -Xshare:dump || die
+			;;
+	esac
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf lib/i386/libjavaplugin_oji.so \
+			lib/i386/libjavaplugin_nscp*.so
+		rm -vrf plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf lib/${arch}/libnpjp2.so \
+			lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir "${dest}"
+	cp -pPR bin lib man "${ddest}" || die
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir {} + || die
+
+	dodoc COPYRIGHT README
+
+	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 /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
+			"${dest}"/lib/security/US_export_policy.jar
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
+			"${dest}"/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
+	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 JDK ${SLOT} (${PN})#" \
+		-e "s#Exec=.*#Exec=${dest}/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
+
+	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/lib/fontconfig.* || die
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto "${dest}"/lib/
+	doins "${T}"/fontconfig.properties
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	elog "If you want Oracles JRE 7 'emerge oracle-jre-bin' instead."
+}
diff --git a/dev-java/sux4j/Manifest b/dev-java/sux4j/Manifest
new file mode 100644
index 000000000000..16d8bdb33b6d
--- /dev/null
+++ b/dev-java/sux4j/Manifest
@@ -0,0 +1 @@
+DIST sux4j-2.0-src.tar.gz 103997 SHA256 232845b79e5652ff0fc6e29d06ea0627ba26d9b2f646fae3cb4e6451732f7e35 SHA512 b52e07ea1f4721ad20daf95a02f5c1b79300ce91316696227c04a4af51b9d6d8cecaae0a0abecafb8414157dc1e43659e34402f853466b4ef8040b5dbdd1fc81 WHIRLPOOL d58eb1a9b7d95179679949c4b3df1b109f2c218a469dfd8239dfcfffd37eaacd8848e9ac65f4623bc85938e78294f536d2194dcdde91e05afe9ac2a6472bd4ad
diff --git a/dev-java/sux4j/metadata.xml b/dev-java/sux4j/metadata.xml
new file mode 100644
index 000000000000..18d3cb3a4bb5
--- /dev/null
+++ b/dev-java/sux4j/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription lang="en">
+		Sux in an umbrella nickname for the results of my fiddling with the implementation of basic succinct data strucures.
+
+The resulting code is rather sparse. The main highlights are:
+
+    * a novel, broadword-based implementation of rank/select queries for up to 264 bits that is highly competitive with known 32-bit implementations on 64-bit architectures (additional space required is 25% for ranking and 12.5%-37.5% for selection);
+    * several Java structures using the Elias–Fano representation of monotone sequences for storing pointers, variable-length bit arrays, etc.
+    * Java code implementing minimal perfect hashing using around 2.65 bits per element (also using some broadword ideas);
+    * a few Java implementation of monotone minimal perfect hashing. 
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-java/sux4j/sux4j-2.0.ebuild b/dev-java/sux4j/sux4j-2.0.ebuild
new file mode 100644
index 000000000000..c711a01048d4
--- /dev/null
+++ b/dev-java/sux4j/sux4j-2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Sux: Implementing Succinct Data Structures"
+HOMEPAGE="http://sux.dsi.unimi.it/"
+SRC_URI="http://sux.dsi.unimi.it/${P}-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+COMMON_DEP="dev-java/fastutil:5.0
+			dev-java/commons-io:1
+			dev-java/colt:0
+			dev-java/dsiutils:0
+			dev-java/log4j:0
+			dev-java/commons-collections:0
+			dev-java/commons-configuration:0
+			dev-java/jsap:0
+			dev-java/commons-lang:2.1
+			dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.5
+		${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+		app-arch/unzip
+		${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	java-ant_rewrite-classpath
+}
+
+EANT_GENTOO_CLASSPATH="fastutil-5.0,commons-io-1,colt,dsiutils,log4j,commons-collections,commons-configuration,jsap,commons-lang-2.1,junit"
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc src
+}
diff --git a/dev-java/svgsalamander/Manifest b/dev-java/svgsalamander/Manifest
new file mode 100644
index 000000000000..e29a273982af
--- /dev/null
+++ b/dev-java/svgsalamander/Manifest
@@ -0,0 +1 @@
+DIST svgsalamander-0.0.tar.bz2 2404011 SHA256 38ecb63c6d1e0a39709b69dad8c52f89e3a861bd42ba8a71762a18c03f1276e2 SHA512 70b182d204bac88b33b1c7058c35ae8e83c4ca178829e8c136dee8e1edd9bc6e99dfbd82c8b4c8c556bea110f15dc9e38e7ee266a16cef0ef6792463bb6a8906 WHIRLPOOL 34290892d47f08fbf383e2e5236ae6fece3b0df37d1e0ac71e539e9255396594dc3291fc769eea5b08c8db79849442261599242b39ffb5640b5189cde9dce980
diff --git a/dev-java/svgsalamander/metadata.xml b/dev-java/svgsalamander/metadata.xml
new file mode 100644
index 000000000000..7f188e592ff2
--- /dev/null
+++ b/dev-java/svgsalamander/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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-r1.ebuild b/dev-java/svgsalamander/svgsalamander-0.0-r1.ebuild
new file mode 100644
index 000000000000..445c3a5159de
--- /dev/null
+++ b/dev-java/svgsalamander/svgsalamander-0.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source"
+WANT_ANT_TASKS="ant-nodeps ant-trax"
+
+inherit eutils 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"
+
+RDEPEND="
+	>=virtual/jre-1.5
+	dev-java/ant-core:0"
+
+DEPEND="
+	>=virtual/jdk-1.5
+	dev-java/javacc:0"
+
+java_prepare() {
+	# Delete these so that we don't need junit
+	# They run a dialog any way so not useful for us
+	ecvs_clean
+	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..8a928e3325c5
--- /dev/null
+++ b/dev-java/swarmcache/Manifest
@@ -0,0 +1 @@
+DIST swarmcache-1.0_pre20050106.tar.bz2 34632 SHA256 9d34c3b20c9b227661e2aaecd4aba11bacd46d9f885cdf116cd340966081e382 SHA512 21c05d83a6e05f3c31a1785e0286d2f584375e3aa97e9fa2dd18a0aca5f3678817a6a019524e6b55c2f047547296cec83c9e108c9272401b592ea0f8338878d7 WHIRLPOOL fb30a849e0e6d894b5300a8feb9bc9a5da6792fbc72b3029407621abaf09a09ea164dba4d2d2b2932437c37322c2f66362a155b59394970c8f0dc33c642d127f
diff --git a/dev-java/swarmcache/metadata.xml b/dev-java/swarmcache/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/swarmcache/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</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..4bc905db42d2
--- /dev/null
+++ b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/swidgets/Manifest b/dev-java/swidgets/Manifest
new file mode 100644
index 000000000000..46503a2b5da5
--- /dev/null
+++ b/dev-java/swidgets/Manifest
@@ -0,0 +1 @@
+DIST swidgets-0.1.1-src.zip 60925 SHA256 adee6311304c67cba2ab9238112b941656c0ca6a9b3a3f0c526d5ef8abec0f5c SHA512 2dcc7e1ffefadb1df96e8d5c7d134b0496169689d1fd9bbcb38af7d0e0be3fa4b358901f4871155afe23f7be8cc097d88752c1f6d2816c8aac507795859eb9db WHIRLPOOL a3743769776b2305552c7925dfdaa488cc9d80fae1de4988f837ad0a1422edb7a775033a64c6dd78775e6f9cf0678813adccf6954142010075b34f4f515268ce
diff --git a/dev-java/swidgets/files/build.xml b/dev-java/swidgets/files/build.xml
new file mode 100644
index 000000000000..ab287881393a
--- /dev/null
+++ b/dev-java/swidgets/files/build.xml
@@ -0,0 +1,17 @@
+<project name="swidgets" default="jar" basedir=".">
+   <property file="build.properties"/>
+
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${build}"/>
+      <mkdir dir="${dest}"/>
+   </target>
+
+   <target name="compile" depends="init">
+      <javac classpath="${classpath}" srcdir="${src}" destdir="${build}"/>
+   </target>
+
+   <target name="jar" depends="compile">
+      <jar destfile="${dest}/swidgets-${version}.jar" basedir="${build}"/>
+   </target>
+</project>
diff --git a/dev-java/swidgets/metadata.xml b/dev-java/swidgets/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/swidgets/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/swidgets/swidgets-0.1.1-r1.ebuild b/dev-java/swidgets/swidgets-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..200822864427
--- /dev/null
+++ b/dev-java/swidgets/swidgets-0.1.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Various reusable SWING components"
+HOMEPAGE="http://swidgets.tigris.org"
+SRC_URI="http://swidgets.tigris.org/files/documents/1472/18566/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.3
+		dev-java/toolbar"
+
+DEPEND="${RDEPEND}
+		>=virtual/jdk-1.3
+		app-arch/unzip"
+
+src_unpack() {
+	unpack ${A}
+
+	# Remove the CVS directories
+	ecvs_clean
+
+	# Create the directory structor
+	mkdir "${S}"
+
+	# Move the broken out source file
+	mv src "${S}"
+	mv LabelledLayout.java "${S}"/src/org/tigris/swidgets/
+
+	# Copy the build.xml
+	cp "${FILESDIR}"/build.xml "${S}" || die "Unable to copy the build file!"
+
+	cat > "${S}"/build.properties <<- EOF
+		src=src
+		dest=dest
+		build=build
+		version=${PV}
+		classpath=$(java-config -p toolbar)
+	EOF
+}
+
+src_install() {
+	java-pkg_newjar dest/swidgets-${PV}.jar ${PN}.jar
+	use source && java-pkg_dosrc "${S}"/src/org/
+}
diff --git a/dev-java/swing-layout/Manifest b/dev-java/swing-layout/Manifest
new file mode 100644
index 000000000000..ffbafeaad203
--- /dev/null
+++ b/dev-java/swing-layout/Manifest
@@ -0,0 +1 @@
+DIST swing-layout-1.0.4-src.zip 69859 SHA256 b8169b37e4c6d2e92881e97d3023813f99c7653595e8a93e3cc6b26e5bf70351 SHA512 83fe876b7d35ba204158ea9ee7a313b330c4f0e8b0ea81b3b487e75aa5e14a00c744aa30af049d9feaafc888875ab194fe73a5838b8073852596704e36517dae WHIRLPOOL 12d02c68632dd869663e279516cb101db0c9f1747ef459dfea955d770a7c179576b5db9cd2cb53006386e6094b05a8ce1d6698a0ab0677211c3a16f83cb1349e
diff --git a/dev-java/swing-layout/metadata.xml b/dev-java/swing-layout/metadata.xml
new file mode 100644
index 000000000000..0464ecad005e
--- /dev/null
+++ b/dev-java/swing-layout/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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.ebuild b/dev-java/swing-layout/swing-layout-1.0.4.ebuild
new file mode 100644
index 000000000000..229d6e9a4fa5
--- /dev/null
+++ b/dev-java/swing-layout/swing-layout-1.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Professional cross platform layouts with Swing"
+HOMEPAGE="https://swing-layout.dev.java.net/"
+SRC_URI="https://swing-layout.dev.java.net/files/documents/2752/144673/${P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+EANT_FILTER_COMPILER=jikes
+
+src_install(){
+	java-pkg_dojar dist/swing-layout.jar
+	dodoc releaseNotes.txt || die
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/swing-worker/Manifest b/dev-java/swing-worker/Manifest
new file mode 100644
index 000000000000..578147585bb8
--- /dev/null
+++ b/dev-java/swing-worker/Manifest
@@ -0,0 +1 @@
+DIST swing-worker-src-1.1.zip 26379 SHA256 d412b64b45914a2d26b54840e9eeb3f807c9da32d2d2c832cd72e5767df9e8e7 SHA512 58f963bb9d2960fe886afeec8f945a80253244b940ec58df186026dcff7f20be84035ad87093b72a54447010dd1dc55d4d4237c3a1e000c20bf0644bf7374994 WHIRLPOOL 60ec5806639fe07bc02c53164c23298e7f48f904c229bd2ab420b2a7ffe5ab1a31b75d2d53e45954142403ed54dbaba2037bad58b31336e9204d71db320ca850
diff --git a/dev-java/swing-worker/metadata.xml b/dev-java/swing-worker/metadata.xml
new file mode 100644
index 000000000000..32d1391f65ca
--- /dev/null
+++ b/dev-java/swing-worker/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<longdescription lang="en">
+swing-worker is a backport for Java 1.5 of the Swing Threading libraries
+available within the Java 1.6 API.
+</longdescription>
+</pkgmetadata>
+
diff --git a/dev-java/swing-worker/swing-worker-1.1.ebuild b/dev-java/swing-worker/swing-worker-1.1.ebuild
new file mode 100644
index 000000000000..904e91ee8aaa
--- /dev/null
+++ b/dev-java/swing-worker/swing-worker-1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java 1.6 SwingWorker backport for Java 1.5"
+HOMEPAGE="https://swingworker.dev.java.net"
+SRC_URI="https://swingworker.dev.java.net/files/documents/2810/51774/${PN}-src-${PV}.zip"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5
+		app-arch/unzip
+		dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}"
+
+EANT_BUILD_TARGET="compile"
+
+src_install() {
+	use doc && java-pkg_dojavadoc dist/javadoc
+	cd build
+	jar cf "../${PN}.jar" * || die "Unable to create jar"
+	cd ..
+	java-pkg_dojar "${PN}.jar"
+
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/swingx/Manifest b/dev-java/swingx/Manifest
new file mode 100644
index 000000000000..6f3390918230
--- /dev/null
+++ b/dev-java/swingx/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/swingx/metadata.xml b/dev-java/swingx/metadata.xml
new file mode 100644
index 000000000000..82a57ccd5243
--- /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>
+<herd>java</herd>
+<longdescription lang="en">
+</longdescription>
+</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..bcbfd9b7536f
--- /dev/null
+++ b/dev-java/swingx/swingx-1.6.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..dff8fea97819
--- /dev/null
+++ b/dev-java/swt/Manifest
@@ -0,0 +1,18 @@
+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.6.1-gtk-linux-ppc.zip 5396609 SHA256 71caf4106401c8227696f8fc2c6d84a9c88877a38ed046b830455c65b85412ec SHA512 cee062224f8e5508d9f8d0a099535337c73a18338bb804a37dd79c11e7601ebd9455469300ad17fa2bd260b7ddddc673ac8d7e385250fcf55bf9f70af76b6c7b WHIRLPOOL 9a567eb65eee0e8f29da4eb53f0795469b92bfecddfc753f7e42915586b5b7fc2a33b1e2a5d43b41afd33d8f10e27716331195ede79315307c885fc24a58be39
+DIST swt-3.6.1-gtk-linux-x86.zip 5234373 SHA256 d0df381d82b1483bc2ffc576a55250be12db108f6a77058f87dd87ac7874f9ef SHA512 89159a74b27f3afb31c1ce0360012b0d3f72649bac9f068ceb02a3447033a6d06ce5a434f6fa996a2455569b45d263f960e96a7de3860db8ed688b3554cb8a5f WHIRLPOOL 462a7e1bb706a3335ca623ee1a6f8edc429155fd50a678a4865322af07c5daf0dc6cc970b5369914134fba788031dfbdf9a690f719105d5d529f6921d5548aec
+DIST swt-3.6.1-gtk-linux-x86_64.zip 5529321 SHA256 e4e72278e710ecda4594a143e76cb7dc30ab7bcd5e6334b4c0d08ca75d900b94 SHA512 175d1827108168596ef5c68f1c9c5eef567f5b27aca8fe45374cc5fb2b59ee003a627edfcc24f34222abc078ec28d230535279bd79b04128cccb1e349d2bf0bb WHIRLPOOL 2d2eb7466a268553a6744e7e1f88402cfffd09fb5b0f00522253bd295e23eeb42ab4ab3d302267fb083c0391158124d3b6eca29c6a06c53d37b71560d91d0f24
+DIST swt-3.7.1-gtk-linux-ppc64.zip 5687650 SHA256 11b0ea72554f0f75941b44ae76aaf70b326e1c0cda7328fbb5a83b682a5e653c SHA512 fe73fa10c41cde27393818eab7a3d4c1402fcfad5639d75c9642e2a020e872e7a5d65dd65c1a526b3e70f74ac6cb4bbb7df93ac48cd6923c483754dc74e52125 WHIRLPOOL d599d45cf43b4892faa0d435dc0e22d717234b918b74a29e7d542ebab486dacb3287fd105ba0380ea8b4b53806153ac62cb86d5bd5de4bf236522bb9471d6c49
+DIST swt-3.7.1-gtk-linux-x86.zip 5374283 SHA256 94279a6ab1aab248641daf728bca34f4eb2f4b812aaebc1973c775320cb96942 SHA512 3b9095b04e2cd8d4f3721c7ac51303f93164b47cb2afa992e553b46909e99232d70cceba9088053740fd46ef158f190101f2d84d3e6d1eddeabb40128bde1bf5 WHIRLPOOL f0c5d3190d5a1b2fbf8718591362b1115bb17e583ded59464e5c7108f3e652631bac21e8c8c4d216d4451096d726871b9f64fead3db4234125bae4983f84a00f
+DIST swt-3.7.1-gtk-linux-x86_64.zip 5671004 SHA256 dd11d29a95391afed42ac3883c45a2bda7e4597c72c4b7b1291316e006139b75 SHA512 0d7a3b2bb5facb120682c4a5d7ca9232483aea1dab67172368e723849ed79dee89ecfec2d286c4827e111191b5f7025232c26e0219b6f9fda3705b3b667ae0e2 WHIRLPOOL c2b6ae1d89de955a1df14fa6b6df8e234ccae84e0b01f5a5c414cd8764eee6f826ac7298e1bfe35d92aa527d4caa96cc4a2b54c91350f88b12a28c132e88ab63
+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
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.3-callback-pointer-dereferencing.patch b/dev-java/swt/files/swt-3.3-callback-pointer-dereferencing.patch
new file mode 100644
index 000000000000..92fbab779d1c
--- /dev/null
+++ b/dev-java/swt/files/swt-3.3-callback-pointer-dereferencing.patch
@@ -0,0 +1,23 @@
+# patch from gcj-overlay, not sure if by geki himself
+# removes QA warning about strict-aliasing
+--- callback.c.orig	2006-12-12 17:25:26.000000000 +0100
++++ callback.c	2006-12-12 18:11:34.000000000 +0100
+@@ -250,12 +250,16 @@
+ 
+ #ifdef JNI_VERSION_1_2
+ 	if (IS_JNI_1_2) {
+-		(*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_2);
++		/* http://java.sun.com/j2se/1.5.0/docs/guide/jni/spec/invocation.html */
++		/* jint GetEnv(JavaVM *vm, void **env, jint version);                 */
++		(*jvm)->GetEnv(jvm, (void *)&env, JNI_VERSION_1_2);
+ 	}
+ #endif
+ 	
+ 	if (env == NULL) {
+-		(*jvm)->AttachCurrentThread(jvm, (void **)&env, NULL);
++		/* http://java.sun.com/j2se/1.5.0/docs/guide/jni/spec/invocation.html    */
++		/* jint AttachCurrentThread(JavaVM *vm, JNIEnv **p_env, void *thr_args); */
++		(*jvm)->AttachCurrentThread(jvm, (void *)&env, NULL);
+ 		if (IS_JNI_1_2) detach = 1;
+ 	}
+ 	
diff --git a/dev-java/swt/files/swt-3.4-manifest b/dev-java/swt/files/swt-3.4-manifest
new file mode 100644
index 000000000000..c11c42ab7199
--- /dev/null
+++ b/dev-java/swt/files/swt-3.4-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="[3.0.0,4.0.0)"
+Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
+Bundle-Version: 3.4.0
+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.4-xulrunner-1.9.1-amd64.patch b/dev-java/swt/files/swt-3.4-xulrunner-1.9.1-amd64.patch
new file mode 100644
index 000000000000..db2536bab3ac
--- /dev/null
+++ b/dev-java/swt/files/swt-3.4-xulrunner-1.9.1-amd64.patch
@@ -0,0 +1,325 @@
+# Patch by Grant Gayed
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651#c18
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=130751
+Index: Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java,v
+retrieving revision 1.105.2.3
+diff -u -r1.105.2.3 Mozilla.java
+--- src/org/eclipse/swt/browser/Mozilla.java	21 Aug 2008 16:02:30 -00001.105.2.3
++++ src/org/eclipse/swt/browser/Mozilla.java	2 Apr 2009 19:15:06 -0000
+@@ -47,6 +47,7 @@
+ 	Shell tip = null;
+ 	Listener listener;
+ 	Vector unhookedDOMWindows = new Vector ();
++	byte[] htmlBytes;
+ 
+ 	static nsIAppShell AppShell;
+ 	static AppFileLocProvider LocationProvider;
+@@ -1130,21 +1131,21 @@
+ 				 * Once the client does a proper navigate with either setUrl() or setText() then resume as
+ 				 * normal.  The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=415789.
+ 				 */
+-				awaitingNavigate = true;
+-				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
+-				if (rc != XPCOM.NS_OK) {
+-					browser.dispose ();
+-					error (rc);
+-				}
+-				if (result[0] == 0) {
+-					browser.dispose ();
+-					error (XPCOM.NS_ERROR_NO_INTERFACE);
+-				}
+-				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
+-			    char[] uri = new char[ABOUT_BLANK.length () + 1];
+-			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
+-				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
+-				webNavigation.Release ();
++//				awaitingNavigate = true;
++//				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
++//				if (rc != XPCOM.NS_OK) {
++//					browser.dispose ();
++//					error (rc);
++//				}
++//				if (result[0] == 0) {
++//					browser.dispose ();
++//					error (XPCOM.NS_ERROR_NO_INTERFACE);
++//				}
++//				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
++//			    char[] uri = new char[ABOUT_BLANK.length () + 1];
++//			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
++//				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
++//				webNavigation.Release ();
+ 			}
+ 		}
+ 		result[0] = 0;
+@@ -1223,6 +1224,7 @@
+ }
+ 
+ public boolean back () {
++	htmlBytes = null;
+ 	if (awaitingNavigate) return false;
+ 
+ 	long /*int*/[] result = new long /*int*/[1];
+@@ -1425,6 +1427,7 @@
+ }
+ 
+ public boolean forward () {
++	htmlBytes = null;
+ 	if (awaitingNavigate) return false;
+ 
+ 	long /*int*/[] result = new long /*int*/[1];
+@@ -1635,6 +1638,7 @@
+ 	webBrowser.Release ();
+ 	webBrowser = null;
+ 	webBrowserObject = null;
++	htmlBytes = null;
+ 
+ 	if (tip != null && !tip.isDisposed ()) tip.dispose ();
+ 	tip = null;
+@@ -1696,6 +1700,7 @@
+ }
+ 
+ public void refresh () {
++	htmlBytes = null;
+ 	if (awaitingNavigate) return;
+ 
+ 	long /*int*/[] result = new long /*int*/[1];
+@@ -1817,11 +1822,45 @@
+ 		} else {
+ 			result[0] = 0;
+ 			rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result);
+-			if (rc != XPCOM.NS_OK) error (rc);
+-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+-			nsIDocShell docShell = new nsIDocShell (result[0]);
+-			rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
+-			docShell.Release ();
++			if (rc == XPCOM.NS_OK) {
++				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
++				nsIDocShell docShell = new nsIDocShell (result[0]);
++				rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
++				docShell.Release ();
++			} else {
++				result[0] = 0;
++				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
++				if (rc == XPCOM.NS_OK) {
++					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
++					/*
++					* Setting mozilla's content through nsIWebBrowserStream does not cause a page
++					* load to occur, so the events that usually accompany a page change are not
++					* fired.  To make this behave as expected, navigate to about:blank first and
++					* then set the html content once the page has loaded.
++					*/
++					new nsISupports (result[0]).Release ();
++					result[0] = 0;
++
++					/*
++					* If htmlBytes is not null then the about:blank page is already being loaded,
++					* so no Navigate is required.  Just set the html that is to be shown.
++					*/
++					boolean blankLoading = htmlBytes != null;
++					htmlBytes = data;
++					if (blankLoading) return true;
++
++					/* navigate to about:blank */
++					rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
++					if (rc != XPCOM.NS_OK) error (rc);
++					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
++					nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
++					result[0] = 0;
++				    char[] uriChars = new char[ABOUT_BLANK.length () + 1];
++				    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uriChars, 0);
++					rc = webNavigation.LoadURI (uriChars, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
++					webNavigation.Release ();
++				}
++			}
+ 		}
+ 	}
+ 	if (rc != XPCOM.NS_OK) error (rc);
+@@ -1836,6 +1875,7 @@
+ }
+ 
+ public boolean setUrl (String url) {
++	htmlBytes = null;
+ 	awaitingNavigate = false;
+ 
+ 	long /*int*/[] result = new long /*int*/[1];
+@@ -1852,6 +1892,7 @@
+ }
+ 
+ public void stop () {
++	htmlBytes = null;
+ 	if (awaitingNavigate) return;
+ 
+ 	long /*int*/[] result = new long /*int*/[1];
+@@ -2174,6 +2215,108 @@
+ 			unhookedDOMWindows.remove (ptrObject);
+ 			new nsISupports (ptrObject.value).Release ();
+ 		}
++
++		/*
++		* If htmlBytes is not null then there is html from a previous setText() call
++		* waiting to be set into the about:blank page once it has completed loading. 
++		*/
++		if (htmlBytes != null) {
++			nsIRequest req = new nsIRequest (aRequest);
++			long /*int*/ name = XPCOM.nsEmbedCString_new ();
++			rc = req.GetName (name);
++			if (rc != XPCOM.NS_OK) error (rc);
++			int length = XPCOM.nsEmbedCString_Length (name);
++			long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
++			byte[] dest = new byte[length];
++			XPCOM.memmove (dest, buffer, length);
++			String url = new String (dest);
++			XPCOM.nsEmbedCString_delete (name);
++
++			if (url.startsWith (ABOUT_BLANK)) {
++				/*
++				 * Setting mozilla's content with nsIWebBrowserStream invalidates the 
++				 * DOM listeners that were hooked on it (about:blank), so remove them and
++				 * add new ones after the content has been set.
++				 */
++				unhookDOMListeners ();
++
++				rc = XPCOM.NS_GetServiceManager (result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
++
++				nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
++				result[0] = 0;
++				rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
++				serviceManager.Release ();
++
++				nsIIOService ioService = new nsIIOService (result[0]);
++				result[0] = 0;
++				/*
++				* Note.  Mozilla ignores LINK tags used to load CSS stylesheets
++				* when the URI protocol for the nsInputStreamChannel
++				* is about:blank.  The fix is to specify the file protocol.
++				*/
++				byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
++				long /*int*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
++				rc = ioService.NewURI (aSpec, null, 0, result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
++				XPCOM.nsEmbedCString_delete (aSpec);
++				ioService.Release ();
++
++				nsIURI uri = new nsIURI (result[0]);
++				result[0] = 0;
++
++				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
++
++				nsIWebBrowserStream stream = new nsIWebBrowserStream (result[0]);
++				result[0] = 0;
++
++				byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
++				long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
++
++				rc = stream.OpenStream (uri.getAddress (), aContentType);
++				if (rc != XPCOM.NS_OK) error (rc);
++				long /*int*/ ptr = C.malloc (htmlBytes.length);
++				XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
++				int pageSize = 8192;
++				int pageCount = htmlBytes.length / pageSize + 1;
++				long /*int*/ current = ptr;
++				for (int i = 0; i < pageCount; i++) {
++					length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
++					if (length > 0) {
++						rc = stream.AppendToStream (current, length);
++						if (rc != XPCOM.NS_OK) error (rc);
++					}
++					current += pageSize;
++				}
++				rc = stream.CloseStream ();
++				if (rc != XPCOM.NS_OK) error (rc);
++				C.free (ptr);
++				XPCOM.nsEmbedCString_delete (aContentType);
++				stream.Release ();
++				uri.Release ();
++				htmlBytes = null;
++
++				rc = webBrowser.GetContentDOMWindow (result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
++				boolean isTop = result[0] == domWindow.getAddress ();
++				new nsISupports (result[0]).Release ();
++				result[0] = 0;
++				rc = domWindow.QueryInterface (nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
++				nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
++				result[0] = 0;
++				hookDOMListeners (target, isTop);
++				target.Release ();
++			}
++		}
+ 		domWindow.Release ();
+ 
+ 		/*
+Index: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+===================================================================
+RCS file: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+diff -N Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ src/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java	1 Jan 1970 00:00:00 -0000
+@@ -0,0 +1,55 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (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.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by Netscape are Copyright (C) 1998-1999
++ * Netscape Communications Corporation.  All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * IBM
++ * -  Binding to permit interfacing between Mozilla and SWT
++ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
++ *
++ * ***** END LICENSE BLOCK ***** */
++package org.eclipse.swt.internal.mozilla;
++
++public class nsIWebBrowserStream extends nsISupports {
++
++	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
++
++	public static final String NS_IWEBBROWSERSTREAM_IID_STR =
++		"86d02f0e-219b-4cfc-9c88-bd98d2cce0b8";
++
++	public static final nsID NS_IWEBBROWSERSTREAM_IID =
++		new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
++
++	public nsIWebBrowserStream(long /*int*/ address) {
++		super(address);
++	}
++
++	public int OpenStream(long /*int*/ aBaseURI, long /*int*/ aContentType) {
++		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
++	}
++
++	public int AppendToStream(long /*int*/ aData, int aLen) {
++		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
++	}
++
++	public int CloseStream() {
++		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
++	}
++}
diff --git a/dev-java/swt/files/swt-3.4-xulrunner-1.9.1.patch b/dev-java/swt/files/swt-3.4-xulrunner-1.9.1.patch
new file mode 100644
index 000000000000..8e829943e325
--- /dev/null
+++ b/dev-java/swt/files/swt-3.4-xulrunner-1.9.1.patch
@@ -0,0 +1,325 @@
+# Patch by Grant Gayed
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651#c18
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=130751
+Index: Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java,v
+retrieving revision 1.105.2.3
+diff -u -r1.105.2.3 Mozilla.java
+--- src/org/eclipse/swt/browser/Mozilla.java	21 Aug 2008 16:02:30 -00001.105.2.3
++++ src/org/eclipse/swt/browser/Mozilla.java	2 Apr 2009 19:15:06 -0000
+@@ -47,6 +47,7 @@
+ 	Shell tip = null;
+ 	Listener listener;
+ 	Vector unhookedDOMWindows = new Vector ();
++	byte[] htmlBytes;
+ 
+ 	static nsIAppShell AppShell;
+ 	static AppFileLocProvider LocationProvider;
+@@ -1130,21 +1131,21 @@
+ 				 * Once the client does a proper navigate with either setUrl() or setText() then resume as
+ 				 * normal.  The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=415789.
+ 				 */
+-				awaitingNavigate = true;
+-				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
+-				if (rc != XPCOM.NS_OK) {
+-					browser.dispose ();
+-					error (rc);
+-				}
+-				if (result[0] == 0) {
+-					browser.dispose ();
+-					error (XPCOM.NS_ERROR_NO_INTERFACE);
+-				}
+-				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
+-			    char[] uri = new char[ABOUT_BLANK.length () + 1];
+-			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
+-				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
+-				webNavigation.Release ();
++//				awaitingNavigate = true;
++//				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
++//				if (rc != XPCOM.NS_OK) {
++//					browser.dispose ();
++//					error (rc);
++//				}
++//				if (result[0] == 0) {
++//					browser.dispose ();
++//					error (XPCOM.NS_ERROR_NO_INTERFACE);
++//				}
++//				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
++//			    char[] uri = new char[ABOUT_BLANK.length () + 1];
++//			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
++//				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
++//				webNavigation.Release ();
+ 			}
+ 		}
+ 		result[0] = 0;
+@@ -1223,6 +1224,7 @@
+ }
+ 
+ public boolean back () {
++	htmlBytes = null;
+ 	if (awaitingNavigate) return false;
+ 
+ 	long /*int*/[] result = new long /*int*/[1];
+@@ -1425,6 +1427,7 @@
+ }
+ 
+ public boolean forward () {
++	htmlBytes = null;
+ 	if (awaitingNavigate) return false;
+ 
+ 	long /*int*/[] result = new long /*int*/[1];
+@@ -1635,6 +1638,7 @@
+ 	webBrowser.Release ();
+ 	webBrowser = null;
+ 	webBrowserObject = null;
++	htmlBytes = null;
+ 
+ 	if (tip != null && !tip.isDisposed ()) tip.dispose ();
+ 	tip = null;
+@@ -1696,6 +1700,7 @@
+ }
+ 
+ public void refresh () {
++	htmlBytes = null;
+ 	if (awaitingNavigate) return;
+ 
+ 	long /*int*/[] result = new long /*int*/[1];
+@@ -1817,11 +1822,45 @@
+ 		} else {
+ 			result[0] = 0;
+ 			rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result);
+-			if (rc != XPCOM.NS_OK) error (rc);
+-			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+-			nsIDocShell docShell = new nsIDocShell (result[0]);
+-			rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
+-			docShell.Release ();
++			if (rc == XPCOM.NS_OK) {
++				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
++				nsIDocShell docShell = new nsIDocShell (result[0]);
++				rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
++				docShell.Release ();
++			} else {
++				result[0] = 0;
++				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
++				if (rc == XPCOM.NS_OK) {
++					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
++					/*
++					* Setting mozilla's content through nsIWebBrowserStream does not cause a page
++					* load to occur, so the events that usually accompany a page change are not
++					* fired.  To make this behave as expected, navigate to about:blank first and
++					* then set the html content once the page has loaded.
++					*/
++					new nsISupports (result[0]).Release ();
++					result[0] = 0;
++
++					/*
++					* If htmlBytes is not null then the about:blank page is already being loaded,
++					* so no Navigate is required.  Just set the html that is to be shown.
++					*/
++					boolean blankLoading = htmlBytes != null;
++					htmlBytes = data;
++					if (blankLoading) return true;
++
++					/* navigate to about:blank */
++					rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
++					if (rc != XPCOM.NS_OK) error (rc);
++					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
++					nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
++					result[0] = 0;
++				    char[] uriChars = new char[ABOUT_BLANK.length () + 1];
++				    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uriChars, 0);
++					rc = webNavigation.LoadURI (uriChars, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
++					webNavigation.Release ();
++				}
++			}
+ 		}
+ 	}
+ 	if (rc != XPCOM.NS_OK) error (rc);
+@@ -1836,6 +1875,7 @@
+ }
+ 
+ public boolean setUrl (String url) {
++	htmlBytes = null;
+ 	awaitingNavigate = false;
+ 
+ 	long /*int*/[] result = new long /*int*/[1];
+@@ -1852,6 +1892,7 @@
+ }
+ 
+ public void stop () {
++	htmlBytes = null;
+ 	if (awaitingNavigate) return;
+ 
+ 	long /*int*/[] result = new long /*int*/[1];
+@@ -2174,6 +2215,108 @@
+ 			unhookedDOMWindows.remove (ptrObject);
+ 			new nsISupports (ptrObject.value).Release ();
+ 		}
++
++		/*
++		* If htmlBytes is not null then there is html from a previous setText() call
++		* waiting to be set into the about:blank page once it has completed loading. 
++		*/
++		if (htmlBytes != null) {
++			nsIRequest req = new nsIRequest (aRequest);
++			int /*long*/ name = XPCOM.nsEmbedCString_new ();
++			rc = req.GetName (name);
++			if (rc != XPCOM.NS_OK) error (rc);
++			int length = XPCOM.nsEmbedCString_Length (name);
++			int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
++			byte[] dest = new byte[length];
++			XPCOM.memmove (dest, buffer, length);
++			String url = new String (dest);
++			XPCOM.nsEmbedCString_delete (name);
++
++			if (url.startsWith (ABOUT_BLANK)) {
++				/*
++				 * Setting mozilla's content with nsIWebBrowserStream invalidates the 
++				 * DOM listeners that were hooked on it (about:blank), so remove them and
++				 * add new ones after the content has been set.
++				 */
++				unhookDOMListeners ();
++
++				rc = XPCOM.NS_GetServiceManager (result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
++
++				nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
++				result[0] = 0;
++				rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
++				serviceManager.Release ();
++
++				nsIIOService ioService = new nsIIOService (result[0]);
++				result[0] = 0;
++				/*
++				* Note.  Mozilla ignores LINK tags used to load CSS stylesheets
++				* when the URI protocol for the nsInputStreamChannel
++				* is about:blank.  The fix is to specify the file protocol.
++				*/
++				byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
++				int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
++				rc = ioService.NewURI (aSpec, null, 0, result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
++				XPCOM.nsEmbedCString_delete (aSpec);
++				ioService.Release ();
++
++				nsIURI uri = new nsIURI (result[0]);
++				result[0] = 0;
++
++				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
++
++				nsIWebBrowserStream stream = new nsIWebBrowserStream (result[0]);
++				result[0] = 0;
++
++				byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
++				int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
++
++				rc = stream.OpenStream (uri.getAddress (), aContentType);
++				if (rc != XPCOM.NS_OK) error (rc);
++				int /*long*/ ptr = C.malloc (htmlBytes.length);
++				XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
++				int pageSize = 8192;
++				int pageCount = htmlBytes.length / pageSize + 1;
++				int /*long*/ current = ptr;
++				for (int i = 0; i < pageCount; i++) {
++					length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
++					if (length > 0) {
++						rc = stream.AppendToStream (current, length);
++						if (rc != XPCOM.NS_OK) error (rc);
++					}
++					current += pageSize;
++				}
++				rc = stream.CloseStream ();
++				if (rc != XPCOM.NS_OK) error (rc);
++				C.free (ptr);
++				XPCOM.nsEmbedCString_delete (aContentType);
++				stream.Release ();
++				uri.Release ();
++				htmlBytes = null;
++
++				rc = webBrowser.GetContentDOMWindow (result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
++				boolean isTop = result[0] == domWindow.getAddress ();
++				new nsISupports (result[0]).Release ();
++				result[0] = 0;
++				rc = domWindow.QueryInterface (nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
++				if (rc != XPCOM.NS_OK) error (rc);
++				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
++				nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
++				result[0] = 0;
++				hookDOMListeners (target, isTop);
++				target.Release ();
++			}
++		}
+ 		domWindow.Release ();
+ 
+ 		/*
+Index: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+===================================================================
+RCS file: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+diff -N Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ src/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java	1 Jan 1970 00:00:00 -0000
+@@ -0,0 +1,55 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (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.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by Netscape are Copyright (C) 1998-1999
++ * Netscape Communications Corporation.  All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * IBM
++ * -  Binding to permit interfacing between Mozilla and SWT
++ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
++ *
++ * ***** END LICENSE BLOCK ***** */
++package org.eclipse.swt.internal.mozilla;
++
++public class nsIWebBrowserStream extends nsISupports {
++
++	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
++
++	public static final String NS_IWEBBROWSERSTREAM_IID_STR =
++		"86d02f0e-219b-4cfc-9c88-bd98d2cce0b8";
++
++	public static final nsID NS_IWEBBROWSERSTREAM_IID =
++		new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
++
++	public nsIWebBrowserStream(int /*long*/ address) {
++		super(address);
++	}
++
++	public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
++		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
++	}
++
++	public int AppendToStream(int /*long*/ aData, int aLen) {
++		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
++	}
++
++	public int CloseStream() {
++		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
++	}
++}
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.6-manifest b/dev-java/swt/files/swt-3.6-manifest
new file mode 100644
index 000000000000..cf217b0d0602
--- /dev/null
+++ b/dev-java/swt/files/swt-3.6-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.6
+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-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..2e5728b03433
--- /dev/null
+++ b/dev-java/swt/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..514c9cb42d26
--- /dev/null
+++ b/dev-java/swt/swt-3.5.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="download.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="x86? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)
+		ppc? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-ppc.zip
+		)
+		ppc64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)"
+
+SLOT="3.5"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 ppc 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.6.1.ebuild b/dev-java/swt/swt-3.6.1.ebuild
new file mode 100644
index 000000000000..a33ea996fc0e
--- /dev/null
+++ b/dev-java/swt/swt-3.6.1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201009090800"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)
+		ppc? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-ppc.zip
+		)
+		ppc64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)"
+
+SLOT="3.6"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 ppc 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-3.6.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}-${SLOT}-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.1.ebuild b/dev-java/swt/swt-3.7.1.ebuild
new file mode 100644
index 000000000000..e22a743f051f
--- /dev/null
+++ b/dev-java/swt/swt-3.7.1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201109091335"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)
+		ppc? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		ppc64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
+		)"
+
+SLOT="3.7"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~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
+}
+
+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.7.2-r1.ebuild b/dev-java/swt/swt-3.7.2-r1.ebuild
new file mode 100644
index 000000000000..2420d40ef318
--- /dev/null
+++ b/dev-java/swt/swt-3.7.2-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="download.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="x86? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)
+		ppc? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		ppc64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
+		)"
+
+SLOT="3.7"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 ppc 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.7.2.ebuild b/dev-java/swt/swt-3.7.2.ebuild
new file mode 100644
index 000000000000..821781c78476
--- /dev/null
+++ b/dev-java/swt/swt-3.7.2.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="download.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="x86? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)
+		ppc? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		ppc64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
+		)"
+
+SLOT="3.7"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 ~ppc ~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
+}
+
+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.ebuild b/dev-java/swt/swt-3.8.2.ebuild
new file mode 100644
index 000000000000..b1c1e3b93704
--- /dev/null
+++ b/dev-java/swt/swt-3.8.2.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="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="x86? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)
+		ppc? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		ppc64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
+		)"
+
+SLOT="3.8"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~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
+}
+
+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-r1.ebuild b/dev-java/swt/swt-4.2-r1.ebuild
new file mode 100644
index 000000000000..aa7dcc5689c3
--- /dev/null
+++ b/dev-java/swt/swt-4.2-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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
+}
+
+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/swt/swt-4.2-r2.ebuild b/dev-java/swt/swt-4.2-r2.ebuild
new file mode 100644
index 000000000000..55e353073408
--- /dev/null
+++ b/dev-java/swt/swt-4.2-r2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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/swt/swt-4.2.ebuild b/dev-java/swt/swt-4.2.ebuild
new file mode 100644
index 000000000000..6beffaddcc84
--- /dev/null
+++ b/dev-java/swt/swt-4.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/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 ~ppc ~ppc64 ~x86"
+IUSE="cairo gnome opengl webkit"
+
+COMMON_DEP="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.6
+	>=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
+}
+
+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/tablelayout/Manifest b/dev-java/tablelayout/Manifest
new file mode 100644
index 000000000000..7b5239aff3c8
--- /dev/null
+++ b/dev-java/tablelayout/Manifest
@@ -0,0 +1 @@
+DIST tablelayout.jar 112151 SHA256 8ebba0e79da329d88a7c6c33560631143f2a329fdf0554c4e04e3a3049c99390 SHA512 b6e9ef07b50165679df8338123cc636b8165ab989e71afc9d1279e257bb171675aa46cc304e65d7e301c66117149675bd987c07d6cf5b03cd1c7768144e22902 WHIRLPOOL 323b524eff60c9970c91bb8ab6c870d525f92c674841061f269712e31e6cca40f498c43d5f4d202bf54012dcedc9c715ff3e8915d0bbff61ccf335c77c1c6cd5
diff --git a/dev-java/tablelayout/metadata.xml b/dev-java/tablelayout/metadata.xml
new file mode 100644
index 000000000000..e80ed52a09bd
--- /dev/null
+++ b/dev-java/tablelayout/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<herd>java</herd>
+</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..a0b2fe7c1a8c
--- /dev/null
+++ b/dev-java/tablelayout/tablelayout-1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..6be2ad11c58d
--- /dev/null
+++ b/dev-java/tagsoup/Manifest
@@ -0,0 +1 @@
+DIST tagsoup-1.2.1-src.zip 222757 SHA256 fe4bb031f2c62461337afe81f8f70df463dc5edb39bd4145c002f6d10a891ece SHA512 3bb1608746270663f6ed45318457e3ee27419929411689d962cffc0ab0c32ec4b858020043be46e929014b696c753a01b49d6eea9a98f18d81fb9205e99ac0a1 WHIRLPOOL 45fd3f63d7582dbc9358874f7f15504fb2e364d7d10fb372b7c2f92791e330f0b2e297795c66b789762ee27c5d125c455dd6a0558be2bd459329fb53eba1bb4c
diff --git a/dev-java/tagsoup/metadata.xml b/dev-java/tagsoup/metadata.xml
new file mode 100644
index 000000000000..4618b26cc2d8
--- /dev/null
+++ b/dev-java/tagsoup/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..c6fbb1b6bade
--- /dev/null
+++ b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..be333239ceb4
--- /dev/null
+++ b/dev-java/tapestry/Manifest
@@ -0,0 +1 @@
+DIST Tapestry-3.0.4-src.zip 1174780 SHA256 ff66bf1d4d45e80520aff4ddb08986c6b5b4059dd9bce8bd40e83a7be5643c6a SHA512 ab94cee9745fceeecbc98a27ace90567b3bc8ab880408da0a32526ba3a68b24f90daeca5d2ea0180b5693ae4fd12f01f0db98e78f176cdc0a0370b5554aa9d10 WHIRLPOOL 158c9cc6b717190d3f3e52da6f7b991a6bb33ce96708b257332ca426ba58b3f3c093949e01f54521ba67801cd533df829014bf471391448ea3b76eb49f376b69
diff --git a/dev-java/tapestry/files/Version.properties b/dev-java/tapestry/files/Version.properties
new file mode 100644
index 000000000000..2cd3a4246640
--- /dev/null
+++ b/dev-java/tapestry/files/Version.properties
@@ -0,0 +1,5 @@
+# $Id$
+#
+# 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..df895147d975
--- /dev/null
+++ b/dev-java/tapestry/files/build.properties
@@ -0,0 +1,32 @@
+# $Id$
+# 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..94d02b0e7f0a
--- /dev/null
+++ b/dev-java/tapestry/files/common.properties
@@ -0,0 +1,94 @@
+# $Id$
+#
+# 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..2380d63e9628
--- /dev/null
+++ b/dev-java/tapestry/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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-r1.ebuild b/dev-java/tapestry/tapestry-3.0.4-r1.ebuild
new file mode 100644
index 000000000000..e820ca5d4099
--- /dev/null
+++ b/dev-java/tapestry/tapestry-3.0.4-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An open-source framework for creating dynamic, robust, highly scalable web applications 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"
+
+COMMON_DEP="
+	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:2.6
+	dev-java/servletapi:2.4"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip:0
+	${COMMON_DEP}"
+
+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-2.6,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/tclib/Manifest b/dev-java/tclib/Manifest
new file mode 100644
index 000000000000..9096dd992dc4
--- /dev/null
+++ b/dev-java/tclib/Manifest
@@ -0,0 +1 @@
+DIST tclib-1.1-source.jar 580130 SHA256 741deb4f4a86fe3523502038785f264740cb68bd8242f260bd03fd2274dcbe29 SHA512 69ef6b669986f638308d33ecd8c54393496c0b0019a175820e6dcf36a6479f8daad99aa4bc9613ee07da5f109620cc5ec5a9abd944dfd68aac60b47aeb585135 WHIRLPOOL b7fa545ffb9e52826692671eb5690ac1a61c601c9f0544c8f6842c7404a5ade5ef9f92edae3ec1b55dae04b2b9fba194f0371fe16eb9e3ec8a071e451b784ac2
diff --git a/dev-java/tclib/metadata.xml b/dev-java/tclib/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/tclib/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/tclib/tclib-1.1.ebuild b/dev-java/tclib/tclib-1.1.ebuild
new file mode 100644
index 000000000000..54197ded6ca2
--- /dev/null
+++ b/dev-java/tclib/tclib-1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Type-Specific Collections Library"
+HOMEPAGE="http://www.sosnoski.com/opensrc/tclib/"
+SRC_URI="mirror://gentoo/${P}-source.jar"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	find -name '*.jar' -print -delete
+	find -name '*.class' -print -delete
+}
+
+EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="package"
+
+src_install() {
+	java-pkg_dojar lib/tclib.jar
+	use source && java-pkg_dosrc build/src
+	use doc && java-pkg_dojavadoc build/docs
+}
diff --git a/dev-java/telnetd/Manifest b/dev-java/telnetd/Manifest
new file mode 100644
index 000000000000..f08b744b2f15
--- /dev/null
+++ b/dev-java/telnetd/Manifest
@@ -0,0 +1 @@
+DIST telnetd-2.0.tar.gz 421949 SHA256 40cbf93b4fedb3cbc182ec8379b0ca59862a74a33400943cddff7874707330c0 SHA512 1d25d624b2f8308bee0b3fa9f2aefb1cbbf5abfa415e857ac1ed5d958c218592dc63b322afe76c50afa4b361f85903c1c469a145503bff2bde51783a45f3664f WHIRLPOOL 40710ad224229de583266e642df03f2afb94bf555c7c0b24621e9c04f22dfb7b9b82cf71c5c992b20983d2aaed12a9272dc84eebe29ddced09302e553aef69ed
diff --git a/dev-java/telnetd/metadata.xml b/dev-java/telnetd/metadata.xml
new file mode 100644
index 000000000000..84d9df72e3b3
--- /dev/null
+++ b/dev-java/telnetd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">telnetd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/telnetd/telnetd-2.0.ebuild b/dev-java/telnetd/telnetd-2.0.ebuild
new file mode 100644
index 000000000000..02fc708ae4ae
--- /dev/null
+++ b/dev-java/telnetd/telnetd-2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc x86"
+IUSE=""
+
+COMMON_DEP="dev-java/commons-logging"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd  "${S}/lib/"
+	rm -v *.jar || die
+	java-pkg_jar-from commons-logging
+}
+
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_dojar build/telnetd.jar
+	dodoc README.txt || die
+
+	use doc && java-pkg_dojavadoc build/site/api
+	use source && java-pkg_dosrc src/net
+}
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
new file mode 100644
index 000000000000..4cf5958ee682
--- /dev/null
+++ b/dev-java/testng/Manifest
@@ -0,0 +1 @@
+DIST testng-6.8.zip 11550802 SHA256 72c7241109b149caea01af5f5c37c86b61b08f15864a8a40e15d069593625e0c SHA512 2e8ad30a2c2f68d0aad584ef92246381c8adf8a893af2ca9ff8fb7d304c26956dfc6564f120de80d22e3e7a53a1402e3869f19ef0e6a69c674cbe35a58811920 WHIRLPOOL b7cf05963aaba3009d7326fee12694c32798787ee4295044daabdcf6b5a50dbb4b17f2a201dcdcd6d191bbc6665c12db789be80e71625eb8d08ca29b3cdfcff2
diff --git a/dev-java/testng/files/build-tests.xml b/dev-java/testng/files/build-tests.xml
new file mode 100644
index 000000000000..e94606b60cea
--- /dev/null
+++ b/dev-java/testng/files/build-tests.xml
@@ -0,0 +1,188 @@
+<!-- From: https://github.com/cbeust/testng/blob/master/build-tests.xml -->
+
+<project name="testng" default="all" basedir=".">
+
+  <property file="build.properties"/>
+
+  <property name="report.dir" value="${test.output.dir}"/>
+  <property name="junit.report.dir" value="${report.dir}/test-tmp"/>
+  <property name="testng.report.dir" value="${report.dir}"/>
+
+  <target name="all" depends="prepare,compile,run,reports,done"/>
+
+  <!-- ==================================================================== -->
+  <!-- Compile                                                              -->
+  <!-- ==================================================================== -->
+  <path id="compile.cp">
+    <pathelement location="${testng.jar}" />
+    <fileset dir="${lib.dir}" includes="${guice2.jar}" />
+    <fileset dir="${lib.dir}" includes="${junit.jar}" />
+  </path>
+
+  <target name="env:info">
+    <echo>
+BASEDIR          =${basedir}
+TEST.DIR         =${test.dir}
+TEST.BUILD.DIR   =${test.build.dir}
+REPORT.DIR       =${report.dir}
+JUNIT.REPORT.DIR =${junit.report.dir}
+TESTNG.REPORT.DIR=${testng.report.dir}
+    </echo>
+  </target>
+
+  <target name="compile" depends="prepare">
+    <echo message="                                 -- Compiling tests --"/>
+
+    <property name="build.compiler" value="modern"/>
+    <javac debug="true"
+           source="1.5"
+           classpathref="compile.cp"
+           srcdir="${test.dir}"
+           destdir="${test.build.dir}"
+    />
+
+  </target>
+
+  <target name="prepare">
+    <tstamp/>
+    <mkdir dir="${test.build.dir}"/>
+    <mkdir dir="${junit.report.dir}"/>
+    <mkdir dir="${testng.report.dir}"/>
+
+  <taskdef name="testng"
+             classname="org.testng.TestNGAntTask"
+             classpath="${build.dir}"/>
+  </target>
+
+<!--
+  <property name="cobertura.dir" value="../cobertura-1.9.4.1" />
+
+  <path id="cobertura.classpath">
+      <fileset dir="${cobertura.dir}">
+          <include name="cobertura.jar" />
+          <include name="lib/**/*.jar" />
+      </fileset>
+  </path>
+-->
+
+  <!-- ==================================================================== -->
+  <!-- Run                                                             -->
+  <!-- ==================================================================== -->
+
+  <path id="run.cp">
+<!--
+  	<path location="target/instrumented-classes" />
+  	<path refid="cobertura.classpath" />
+-->
+    <path refid="compile.cp"/>
+    <pathelement location="${test.build.dir}"/>
+  </path>
+
+  <target name="run" description="Run tests" depends="compile,copy-resources">
+    <echo message="                                 -- Running tests --"/>
+    <echo message="                                 -- ${testng.jar} --" />
+    <testng classpathref="run.cp"
+            outputdir="${testng.report.dir}">
+      <xmlfileset dir="${test.resources.dir}" includes="testng.xml"/>
+      <jvmarg value="-Dtest.resources.dir=${test.resources.dir}" />
+      <jvmarg value="-Dsun.io.serialization.extendedDebugInfo=true" />
+    </testng>
+  </target>
+
+  <target name="copy-resources" description="Copies resources.">
+    <copy verbose="false"
+          file="${src.resources.dir}/testngtasks"
+          todir="${build.dir}" />
+    <copy todir="${build.dir}">
+      <fileset dir="${src.resources.dir}">
+        <exclude name="**/.*" />
+        <exclude name="**/CVS/*" />
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="run:single" description="Run 1 property file named with the ant property test" depends="compile">
+      <echo message="                                 -- testng-tests-run1 --"/>
+
+    <testng outputdir="${testng.report.dir}"
+        classpathref="run.cp"
+        useDefaultListeners="true"
+        outputDir="${testng.report.dir}">
+      <xmlfileset dir="${test.resources.dir}" includes="testng-single.xml"/>
+     </testng>
+
+      <echo>Report created in    open ${testng.report.dir}/index.html</echo>
+  </target>
+
+  <target name="run:antprop" description="Run a test to see if ant system propertes are passed correctly" depends="compile">
+      <echo message="                                 -- testng-tests-run-antprop --"/>
+      <property name="syspropset1" value="value 1"/>
+      <property name="syspropset2" value="value 2"/>
+      <propertyset id="propset1">
+          <propertyref name="syspropset1"/>
+          <propertyref name="syspropset2"/>
+      </propertyset>
+
+      <testng outputdir="${testng.report.dir}"
+              classpathref="run.cp">
+          <xmlfileset dir="${test.resources.dir}" includes="testng-single3.xml"/>
+          <propertyset refid="propset1"/>
+          <sysproperty key="sysprop1" value="value 3"/>
+      </testng>
+  </target>
+
+  <!-- ==================================================================== -->
+  <!-- Run specific configuration                                           -->
+  <!-- ==================================================================== -->
+  <target name="run:conf"
+          if="testng.conf"
+          depends="clean:reports,compile"
+          description="Run specified tests">
+    <echo message="                                 -- testng-tests-run --"/>
+    <echo message="using: ${testng.conf}.xml"/>
+
+    <testng classpathref="run.cp"
+            outputDir="${testng.report.dir}">
+        <xmlfileset dir="${test.resources.dir}" includes="${testng.conf}.xml"/>
+    </testng>
+
+    <antcall target="clean.tmp"/>
+  </target>
+
+
+  <!-- ==================================================================== -->
+  <!-- Reports                                                              -->
+  <!-- ==================================================================== -->
+
+  <target name="reports">
+    <junitreport todir="${junit.report.dir}">
+      <fileset dir="${testng.report.dir}">
+        <include name="*.xml"/>
+        <exclude name="testng-failed.xml"/>
+        <exclude name="testng-results.xml" />
+      </fileset>
+      <report format="noframes" todir="${junit.report.dir}"/>
+    </junitreport>
+  </target>
+
+
+  <target name="clean.tmp">
+      <delete dir="${test.output.dir}"/>
+  </target>
+
+  <target name="clean:reports">
+      <delete dir="${report.dir}"/>
+      <delete dir="${junit.report.dir}"/>
+  </target>
+
+  <target name="clean" depends="clean.tmp,clean:reports">
+    <echo message="                                 -- test clean --"/>
+
+    <delete dir="${test.build.dir}"/>
+  </target>
+
+  <target name="done">
+    <echo>Reports can be found in:    open ${testng.report.dir}/index.html</echo>
+  </target>
+
+</project>
diff --git a/dev-java/testng/files/testng-6.8-build-tests.xml b/dev-java/testng/files/testng-6.8-build-tests.xml
new file mode 100644
index 000000000000..e94606b60cea
--- /dev/null
+++ b/dev-java/testng/files/testng-6.8-build-tests.xml
@@ -0,0 +1,188 @@
+<!-- From: https://github.com/cbeust/testng/blob/master/build-tests.xml -->
+
+<project name="testng" default="all" basedir=".">
+
+  <property file="build.properties"/>
+
+  <property name="report.dir" value="${test.output.dir}"/>
+  <property name="junit.report.dir" value="${report.dir}/test-tmp"/>
+  <property name="testng.report.dir" value="${report.dir}"/>
+
+  <target name="all" depends="prepare,compile,run,reports,done"/>
+
+  <!-- ==================================================================== -->
+  <!-- Compile                                                              -->
+  <!-- ==================================================================== -->
+  <path id="compile.cp">
+    <pathelement location="${testng.jar}" />
+    <fileset dir="${lib.dir}" includes="${guice2.jar}" />
+    <fileset dir="${lib.dir}" includes="${junit.jar}" />
+  </path>
+
+  <target name="env:info">
+    <echo>
+BASEDIR          =${basedir}
+TEST.DIR         =${test.dir}
+TEST.BUILD.DIR   =${test.build.dir}
+REPORT.DIR       =${report.dir}
+JUNIT.REPORT.DIR =${junit.report.dir}
+TESTNG.REPORT.DIR=${testng.report.dir}
+    </echo>
+  </target>
+
+  <target name="compile" depends="prepare">
+    <echo message="                                 -- Compiling tests --"/>
+
+    <property name="build.compiler" value="modern"/>
+    <javac debug="true"
+           source="1.5"
+           classpathref="compile.cp"
+           srcdir="${test.dir}"
+           destdir="${test.build.dir}"
+    />
+
+  </target>
+
+  <target name="prepare">
+    <tstamp/>
+    <mkdir dir="${test.build.dir}"/>
+    <mkdir dir="${junit.report.dir}"/>
+    <mkdir dir="${testng.report.dir}"/>
+
+  <taskdef name="testng"
+             classname="org.testng.TestNGAntTask"
+             classpath="${build.dir}"/>
+  </target>
+
+<!--
+  <property name="cobertura.dir" value="../cobertura-1.9.4.1" />
+
+  <path id="cobertura.classpath">
+      <fileset dir="${cobertura.dir}">
+          <include name="cobertura.jar" />
+          <include name="lib/**/*.jar" />
+      </fileset>
+  </path>
+-->
+
+  <!-- ==================================================================== -->
+  <!-- Run                                                             -->
+  <!-- ==================================================================== -->
+
+  <path id="run.cp">
+<!--
+  	<path location="target/instrumented-classes" />
+  	<path refid="cobertura.classpath" />
+-->
+    <path refid="compile.cp"/>
+    <pathelement location="${test.build.dir}"/>
+  </path>
+
+  <target name="run" description="Run tests" depends="compile,copy-resources">
+    <echo message="                                 -- Running tests --"/>
+    <echo message="                                 -- ${testng.jar} --" />
+    <testng classpathref="run.cp"
+            outputdir="${testng.report.dir}">
+      <xmlfileset dir="${test.resources.dir}" includes="testng.xml"/>
+      <jvmarg value="-Dtest.resources.dir=${test.resources.dir}" />
+      <jvmarg value="-Dsun.io.serialization.extendedDebugInfo=true" />
+    </testng>
+  </target>
+
+  <target name="copy-resources" description="Copies resources.">
+    <copy verbose="false"
+          file="${src.resources.dir}/testngtasks"
+          todir="${build.dir}" />
+    <copy todir="${build.dir}">
+      <fileset dir="${src.resources.dir}">
+        <exclude name="**/.*" />
+        <exclude name="**/CVS/*" />
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="run:single" description="Run 1 property file named with the ant property test" depends="compile">
+      <echo message="                                 -- testng-tests-run1 --"/>
+
+    <testng outputdir="${testng.report.dir}"
+        classpathref="run.cp"
+        useDefaultListeners="true"
+        outputDir="${testng.report.dir}">
+      <xmlfileset dir="${test.resources.dir}" includes="testng-single.xml"/>
+     </testng>
+
+      <echo>Report created in    open ${testng.report.dir}/index.html</echo>
+  </target>
+
+  <target name="run:antprop" description="Run a test to see if ant system propertes are passed correctly" depends="compile">
+      <echo message="                                 -- testng-tests-run-antprop --"/>
+      <property name="syspropset1" value="value 1"/>
+      <property name="syspropset2" value="value 2"/>
+      <propertyset id="propset1">
+          <propertyref name="syspropset1"/>
+          <propertyref name="syspropset2"/>
+      </propertyset>
+
+      <testng outputdir="${testng.report.dir}"
+              classpathref="run.cp">
+          <xmlfileset dir="${test.resources.dir}" includes="testng-single3.xml"/>
+          <propertyset refid="propset1"/>
+          <sysproperty key="sysprop1" value="value 3"/>
+      </testng>
+  </target>
+
+  <!-- ==================================================================== -->
+  <!-- Run specific configuration                                           -->
+  <!-- ==================================================================== -->
+  <target name="run:conf"
+          if="testng.conf"
+          depends="clean:reports,compile"
+          description="Run specified tests">
+    <echo message="                                 -- testng-tests-run --"/>
+    <echo message="using: ${testng.conf}.xml"/>
+
+    <testng classpathref="run.cp"
+            outputDir="${testng.report.dir}">
+        <xmlfileset dir="${test.resources.dir}" includes="${testng.conf}.xml"/>
+    </testng>
+
+    <antcall target="clean.tmp"/>
+  </target>
+
+
+  <!-- ==================================================================== -->
+  <!-- Reports                                                              -->
+  <!-- ==================================================================== -->
+
+  <target name="reports">
+    <junitreport todir="${junit.report.dir}">
+      <fileset dir="${testng.report.dir}">
+        <include name="*.xml"/>
+        <exclude name="testng-failed.xml"/>
+        <exclude name="testng-results.xml" />
+      </fileset>
+      <report format="noframes" todir="${junit.report.dir}"/>
+    </junitreport>
+  </target>
+
+
+  <target name="clean.tmp">
+      <delete dir="${test.output.dir}"/>
+  </target>
+
+  <target name="clean:reports">
+      <delete dir="${report.dir}"/>
+      <delete dir="${junit.report.dir}"/>
+  </target>
+
+  <target name="clean" depends="clean.tmp,clean:reports">
+    <echo message="                                 -- test clean --"/>
+
+    <delete dir="${test.build.dir}"/>
+  </target>
+
+  <target name="done">
+    <echo>Reports can be found in:    open ${testng.report.dir}/index.html</echo>
+  </target>
+
+</project>
diff --git a/dev-java/testng/files/testng-6.8-remove-ivy-retrieve.patch b/dev-java/testng/files/testng-6.8-remove-ivy-retrieve.patch
new file mode 100644
index 000000000000..2d7e91e74587
--- /dev/null
+++ b/dev-java/testng/files/testng-6.8-remove-ivy-retrieve.patch
@@ -0,0 +1,22 @@
+--- a/build.xml
++++ b/build.xml
+@@ -12,7 +12,7 @@
+   <!-- ====================================================================== -->

+   <!-- PREPARE                                                                -->

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

+-  <target name="prepare" depends="retrieve-dependencies"

++  <target name="prepare"

+           description="Performs all preparations required to build.">

+     <tstamp />

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

+@@ -419,10 +419,6 @@
+   <!-- Ivy                                                                  -->

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

+ 

+-  <target name="retrieve-dependencies" description="Retrieve dependencies with ivy">

+-    <ivy:retrieve log="quiet" />

+-  </target>

+-

+   <target name="publish">

+     <ivy:resolve />

+     <mkdir dir="dist/jars" />

diff --git a/dev-java/testng/files/testng-6.8-remove-jar-bundling.patch b/dev-java/testng/files/testng-6.8-remove-jar-bundling.patch
new file mode 100644
index 000000000000..ca793971c73a
--- /dev/null
+++ b/dev-java/testng/files/testng-6.8-remove-jar-bundling.patch
@@ -0,0 +1,60 @@
+--- a/build.xml
++++ b/build.xml
+@@ -73,9 +73,6 @@
+       <param name="jar.file" value="${testng.jar}" />

+     </antcall>

+     <jar jarfile="${testng.jar}" update="true">

+-      <zipfileset src="${lib.dir}/${beanshell.jar}" />

+-      <zipfileset src="${lib.dir}/${jcommander.jar}" />

+-      <zipfileset src="${lib.dir}/${yaml.jar}" />

+     </jar>

+ 

+   </target>

+@@ -195,10 +192,6 @@
+       <param name="jar.file" value="${other.jars.dir}/${testng.junit.jar}" />

+     </antcall>

+     <jar jarfile="${other.jars.dir}/${testng.junit.jar}" update="true">

+-      <zipfileset src="${lib.dir}/${beanshell.jar}" />

+-      <zipfileset src="${lib.dir}/${jcommander.jar}" />

+-      <zipfileset src="${lib.dir}/${junit.jar}" />

+-      <zipfileset src="${lib.dir}/${yaml.jar}" />

+     </jar>

+   </target>

+ 

+@@ -207,9 +200,6 @@
+       <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.guice.jar}" />

+     </antcall>

+     <jar jarfile="${other.jars.dir}/${testng.nobsh.guice.jar}" update="true">

+-      <zipfileset src="${lib.dir}/${guice2.jar}" />

+-      <zipfileset src="${lib.dir}/${jcommander.jar}" />

+-      <zipfileset src="${lib.dir}/${junit.jar}" />

+     </jar>

+   </target>

+ 

+@@ -218,9 +208,6 @@
+       <param name="jar.file" value="${other.jars.dir}/${testng.bsh.noguice.jar}" />

+     </antcall>

+     <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true">

+-      <zipfileset src="${lib.dir}/${beanshell.jar}" />

+-      <zipfileset src="${lib.dir}/${jcommander.jar}" />

+-      <zipfileset src="${lib.dir}/${junit.jar}" />

+     </jar>

+   </target>

+ 

+@@ -229,8 +216,6 @@
+       <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.noguice.jar}" />

+     </antcall>

+     <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true">

+-      <zipfileset src="${lib.dir}/${jcommander.jar}" />

+-      <zipfileset src="${lib.dir}/${junit.jar}" />

+     </jar>

+   </target>

+ 

+@@ -239,7 +224,6 @@
+       <param name="jar.file" value="${other.jars.dir}/${testng.dist.jar}" />

+     </antcall>

+     <jar jarfile="${other.jars.dir}/${testng.dist.jar}" update="true">

+-      <zipfileset src="${lib.dir}/${jcommander.jar}" />

+     </jar>

+   </target>

+ 

diff --git a/dev-java/testng/metadata.xml b/dev-java/testng/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/testng/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/testng/testng-6.8-r2.ebuild b/dev-java/testng/testng-6.8-r2.ebuild
new file mode 100644
index 000000000000..e90b7648a71f
--- /dev/null
+++ b/dev-java/testng/testng-6.8-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+WANT_ANT_TASKS="ant-junit"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Testing framework introducing some new functionalities that make it more powerful and easier to use"
+HOMEPAGE="http://testng.org/"
+SRC_URI="http://${PN}.org/${P}.zip"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+CDEPEND="dev-java/ant-core:0
+	dev-java/bsh:0
+	dev-java/guice:2
+	dev-java/jcommander:0
+	dev-java/junit:4
+	dev-java/snakeyaml:1.9"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/zip
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+JAVA_PKG_BSFIX_NAME="build.xml build-tests.xml"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS+=" testng javadocs-current"
+EANT_GENTOO_CLASSPATH="ant-core,bsh,guice-2,jcommander,junit-4,snakeyaml-1.9"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}"
+
+EANT_BUILD_TARGET="build"
+EANT_TEST_TARGET="tests"
+EANT_DOC_TARGET="javadocs"
+
+java_prepare() {
+	find . -name '*.jar' -print -delete || die
+
+	cp "${FILESDIR}"/${P}-build-tests.xml build-tests.xml || die
+
+	epatch "${FILESDIR}"/${P}-remove-ivy-retrieve.patch
+	epatch "${FILESDIR}"/${P}-remove-jar-bundling.patch
+
+	# Removal of tests that break due to restrictions or environment expectations:
+	#     ServiceLoaderTest - Breaks due absolute URL load that Portage prevents;
+	#                         we assume the underlying functionality to work, as
+	#                         the underlying functionality is simple and should
+	#                         show the usage of this package to break.
+	sed -i '/test.serviceloader.ServiceLoaderTest/d' src/test/resources/testng.xml || die
+
+	#     TrueParallelTest - Doesn't always work, especially not on a system
+	#                        under load; since this could fail during parallel
+	#                        emerges, we assume the underlying functionality to
+	#                        work as it has definitely succeeded under lower load.
+	sed -i '/test.thread.TrueParallelTest/d' src/test/resources/testng.xml || die
+
+	mkdir lib || die
+}
+
+src_test() {
+	local tests_file="target/test-output/index.html"
+
+	java-pkg-2_src_test
+
+	if [[ ! -f ${tests_file} ]] ; then
+		die "Tests failed, test output does not exist; a problem with starting the tests."
+	fi
+
+	grep 'method-stats.*failed' target/test-output/index.html > /dev/null && \
+		die "Tests failed; one or more test failed, see ${tests_file} for more details."
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	java-pkg_dolauncher ${PN} --main org.testng.TestNG
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc javadocs
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/main/java/{org,com}
+}
diff --git a/dev-java/texhyphj/Manifest b/dev-java/texhyphj/Manifest
new file mode 100644
index 000000000000..9df2e930833c
--- /dev/null
+++ b/dev-java/texhyphj/Manifest
@@ -0,0 +1 @@
+DIST texhyphj-1.1.tar.gz 118115 SHA256 4ec15d84f66a54f8e0ac6935436581b5a11e3c99d7a2809fc5819a74b50993b3 SHA512 fe410695be95ab6359e396c0694cad35baad6c8dd27ce4947ba22acaa19ed954596d40131fe1131d12ddd0ecf5f45287952221a6b9019cf25594dbb314b15beb WHIRLPOOL 4d8155913f30edcc220e7ef68d03c2f9ea14094650715fae65cfd8becb7b7ecd8e0e88116e3bd5ad6cc25cbac6e223d9c03433e27cb0629da9238e80af7e7db5
diff --git a/dev-java/texhyphj/metadata.xml b/dev-java/texhyphj/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/texhyphj/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..2e554ea9c7f6
--- /dev/null
+++ b/dev-java/texhyphj/texhyphj-1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 http://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..9fe8e8c62c37
--- /dev/null
+++ b/dev-java/tijmp/Manifest
@@ -0,0 +1 @@
+DIST tijmp-0.8.tar.gz 347809 SHA256 e6f0bc1e4a0fff6524154d3dac0f27f4f53761977ecc67d9ce20ced8ad6aac64 SHA512 911efd93c1548db45fcf8fd924675329aa82c6853ffe93074768646d08f80f4b076f336dba0da293d1acb084a12eb62c68803fa9408e2b64b2b82ab62db1de25 WHIRLPOOL 8982f4ad381472e7dd3d4012fc5ac4b56bfc4f7e62dd1f8830dbadb1303b2544727dfcd1c9330cde3fb11b05a0a7084e487089d46129b6563eece2b5a8730a85
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..02ab5b4213aa
--- /dev/null
+++ b/dev-java/tijmp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+
+<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..259fa531d8b2
--- /dev/null
+++ b/dev-java/tijmp/tijmp-0.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc 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..3d40f6296597
--- /dev/null
+++ b/dev-java/tomcat-jstl-compat/Manifest
@@ -0,0 +1 @@
+DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
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..7303cef96964
--- /dev/null
+++ b/dev-java/tomcat-jstl-compat/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild
new file mode 100644
index 000000000000..25cecf5a33fe
--- /dev/null
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="1.2.5"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="java-virtuals/servlet-api:3.0
+	dev-java/tomcat-jstl-spec:1.2.5
+	dev-java/tomcat-jstl-impl:1.2.5"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="compat/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/build.xml
+}
+
+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..3d40f6296597
--- /dev/null
+++ b/dev-java/tomcat-jstl-el/Manifest
@@ -0,0 +1 @@
+DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
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..7303cef96964
--- /dev/null
+++ b/dev-java/tomcat-jstl-el/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
new file mode 100644
index 000000000000..1ca0ec8d8ea3
--- /dev/null
+++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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_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"
+
+LICENSE="Apache-2.0"
+SLOT="1.2.5"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="java-virtuals/servlet-api:3.0
+	dev-java/tomcat-jstl-impl:1.2.5
+	dev-java/tomcat-jstl-spec:1.2.5"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="jstlel/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml
+}
+
+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..3d40f6296597
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/Manifest
@@ -0,0 +1 @@
+DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
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..7303cef96964
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
new file mode 100644
index 000000000000..6ac34002d82c
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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_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"
+
+LICENSE="Apache-2.0"
+SLOT="1.2.5"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/xalan:0
+	dev-java/tomcat-jstl-spec:1.2.5
+	dev-java/tomcat-servlet-api:3.1"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec-1.2.5,xalan"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="impl/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml
+
+	# This patch overrides a couple of methods.
+	epatch "${FILESDIR}"/${P}-ImportSupport.patch
+
+	# This one disables one test case which doesn't work.
+	epatch "${FILESDIR}"/${P}-SetSupport.patch
+
+	# This test case doesn't pass.
+	rm -v \
+		impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
+}
+
+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..3d40f6296597
--- /dev/null
+++ b/dev-java/tomcat-jstl-spec/Manifest
@@ -0,0 +1 @@
+DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
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..7303cef96964
--- /dev/null
+++ b/dev-java/tomcat-jstl-spec/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
new file mode 100644
index 000000000000..64dcb531679e
--- /dev/null
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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_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"
+
+LICENSE="Apache-2.0"
+SLOT="1.2.5"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="java-virtuals/servlet-api:3.0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	${CDEPEND}"
+
+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
+}
+
+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..a4b3064b585e
--- /dev/null
+++ b/dev-java/tomcat-native/Manifest
@@ -0,0 +1,2 @@
+DIST tomcat-native-1.1.32-src.tar.gz 387267 SHA256 26936848f727e162f513bd2b5f7b2300d7d716a5e92e5f4ebcd0e1eff8e09584 SHA512 695f710f91cf720b3115f9933f5dab56e7465ee0fcf6508b53d1de172ba59165b08f27b3cdfef741b60dbf0b3da97ae3ea87c5a0ef9f1d879a9820259197dcba WHIRLPOOL 587c25124ab5b07365a0c26ee558086b690d6b0cb568f6670ecd7b8a79a25fa74091bc7a10574732b96600eca0ae4141119adc40c51b45c7ef87de631a38aeb8
+DIST tomcat-native-1.1.33-src.tar.gz 388787 SHA256 523dde7393c57307eedf4972ebbe19a9e9af6f7699e3b1ef6dabd7a11677866e SHA512 62b3c806cd926ca13878b514714a422f4a5d932ccaee4cc328c101cfa92fd890f708d1fb429320a42f1e340b46f70c82a07b9ecf6cbd9d03c0e719b95e24e09b WHIRLPOOL afb57fdf32becae8860ed042d74e27a7208759c4a7c16163148e65c986b4dcfa9521e83bbe0a3fa6874a87f577be2ad31a043d3ec1888c11faec7ace21035419
diff --git a/dev-java/tomcat-native/metadata.xml b/dev-java/tomcat-native/metadata.xml
new file mode 100644
index 000000000000..356b51e0d53b
--- /dev/null
+++ b/dev-java/tomcat-native/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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.1.32.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.32.ebuild
new file mode 100644
index 000000000000..bd2d60e664c1
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.1.32.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit base eutils java-pkg-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=""
+
+RDEPEND="=dev-libs/apr-1*
+	dev-libs/openssl
+	>=virtual/jre-1.5"
+
+DEPEND=">=virtual/jdk-1.5
+	${RDEPEND}"
+
+S=${WORKDIR}/${P}-src/jni/native
+
+src_configure(){
+	econf --with-apr=/usr/bin/apr-1-config  \
+		--with-ssl=/usr || die "Could not configure native sources"
+}
+
+src_compile() {
+	base_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
+}
+
+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 http://bugs.gentoo.org/"
+	elog
+}
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.33.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.33.ebuild
new file mode 100644
index 000000000000..5950648af7b1
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.1.33.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit base eutils java-pkg-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=""
+
+RDEPEND="=dev-libs/apr-1*
+	dev-libs/openssl:=
+	>=virtual/jre-1.5:*"
+
+DEPEND=">=virtual/jdk-1.5:*
+	${RDEPEND}"
+
+S=${WORKDIR}/${P}-src/jni/native
+
+src_configure(){
+	econf --with-apr=/usr/bin/apr-1-config  \
+		--with-ssl=/usr || die "Could not configure native sources"
+}
+
+src_compile() {
+	base_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
+}
+
+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 http://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..0daa64dc159a
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -0,0 +1,7 @@
+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-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
+DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
+DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/files/2.5-build.xml b/dev-java/tomcat-servlet-api/files/2.5-build.xml
new file mode 100644
index 000000000000..97ade1678713
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/2.5-build.xml
@@ -0,0 +1,82 @@
+<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"/>
+
+  <!-- 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/el/**" />
+      <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>
+  </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/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..97d1a13a4e5d
--- /dev/null
+++ b/dev-java/tomcat-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>
+	<herd>java</herd>
+	<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..ec768ec71d59
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..7c3202087cda
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..aa9e411251ba
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc x86 ~x86-fbsd ~x86-freebsd ~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..355a3c8a6d37
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~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.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
new file mode 100644
index 000000000000..f4acb7f0f90f
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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.xml" build.xml || die "Could not replace build.xml"
+	rm */*/build.xml
+}
+
+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.59.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild
new file mode 100644
index 000000000000..66d434e821a9
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~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.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + || die
+}
+
+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.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild
new file mode 100644
index 000000000000..e980d1e5e5cc
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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 ~x86-freebsd ~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/toolbar/Manifest b/dev-java/toolbar/Manifest
new file mode 100644
index 000000000000..b77dee584acf
--- /dev/null
+++ b/dev-java/toolbar/Manifest
@@ -0,0 +1 @@
+DIST toolbar-1.1.0-src.zip 72829 SHA256 4a873f7f8202e000b050d2777b78ea51410b3d5d7bc8456c111292b81d53c28e SHA512 57f4b7970beb78f979bd3970dfc528e0a26e38828dcb8a2cc81c8f886e900f81fe53ca6cae7b5cfa3ce93cc273fa2f440cb0bd720ba6052e84e9f2df1e77099e WHIRLPOOL 0d16d46392404254726070ad6fc392204f3262adeb6a4f2da0abff1e20317b476afea4ece91c5e527ffca8096bdcbbd4049ab46f6f39129f0cfa5c7ff74852b2
diff --git a/dev-java/toolbar/files/build.xml b/dev-java/toolbar/files/build.xml
new file mode 100644
index 000000000000..85c6368eb1fb
--- /dev/null
+++ b/dev-java/toolbar/files/build.xml
@@ -0,0 +1,21 @@
+<project name="Toolbar" default="jar" basedir=".">
+   <property name="src" value="."/>
+   <property name="build" value="build"/>
+   <property name="dest" value="dest"/>
+
+   <property file="build.properties"/>
+
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${build}"/>
+      <mkdir dir="${dest}"/>
+   </target>
+
+   <target name="compile" depends="init">
+      <javac srcdir="${src}" destdir="${build}"/>
+   </target>
+
+   <target name="jar" depends="compile">
+      <jar destfile="${dest}/toolbar-${version}.jar" basedir="${build}"/>
+   </target>
+</project>
diff --git a/dev-java/toolbar/metadata.xml b/dev-java/toolbar/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/toolbar/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/toolbar/toolbar-1.1.0-r1.ebuild b/dev-java/toolbar/toolbar-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..d53b718a099f
--- /dev/null
+++ b/dev-java/toolbar/toolbar-1.1.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+
+	# Remove the CVS directories
+	ecvs_clean
+
+	# Make the work environment
+	mkdir "${S}"
+
+	# Setup the structure
+	mv src "${S}"
+	rm -rf test
+
+	# Copy over the build.xml
+	cp "${FILESDIR}"/build.xml "${S}" || die "Unable to copy the build file!"
+
+	cat > "${S}/build.properties" <<- EOF
+		src=src
+		dest=dest
+		build=build
+		version=${PV}
+	EOF
+}
+
+src_compile() {
+	eant -Dversion=${PV}
+}
+
+src_install() {
+	java-pkg_newjar dest/toolbar-${PV}.jar ${PN}.jar
+	use source && java-pkg_dosrc "${S}"/src/org/
+}
diff --git a/dev-java/touchgraph-graphlayout/Manifest b/dev-java/touchgraph-graphlayout/Manifest
new file mode 100644
index 000000000000..cdb670712cec
--- /dev/null
+++ b/dev-java/touchgraph-graphlayout/Manifest
@@ -0,0 +1 @@
+DIST TGGL_122_jre11.zip 202777 SHA256 52651209d131f6c012a4a5735271a8f9e572d8fbbece44b643680d725da9c853 SHA512 5c638972264ada2cb91ea1667c0b770629120a01496f7834ef3e4999ad5867ff911e772ea1361e33c168d8681c6f19f46ada33ea637daf4474f66a5cc97610a5 WHIRLPOOL 89180950669d0840af937e983b56a06e58eae6105e70cfb58ae9f11e18efa18981d1e40226536612b25031dfa2c44f65b30dfee8f30083bb2226b59aed4f3957
diff --git a/dev-java/touchgraph-graphlayout/metadata.xml b/dev-java/touchgraph-graphlayout/metadata.xml
new file mode 100644
index 000000000000..ef50d3af37e1
--- /dev/null
+++ b/dev-java/touchgraph-graphlayout/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">touchgraph</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22.ebuild b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22.ebuild
new file mode 100644
index 000000000000..eda9479ab357
--- /dev/null
+++ b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_PN="TGGraphLayout"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+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 ~ppc x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_compile() {
+	mkdir -p bin || die
+	ejavac -d bin `find com -name "*.java" || die`
+	`java-config -j` cvf ${MY_PN}.jar -C bin . || die
+}
+
+src_install() {
+	java-pkg_newjar ${MY_PN}.jar
+	dodoc "TGGL ReleaseNotes.txt" || die
+	use source && java-pkg_dosrc com
+}
diff --git a/dev-java/trident/Manifest b/dev-java/trident/Manifest
new file mode 100644
index 000000000000..2e01d7e78b64
--- /dev/null
+++ b/dev-java/trident/Manifest
@@ -0,0 +1 @@
+DIST trident-1.3.zip 112050 SHA256 22184d8bf04652fa439ac18723ced54e2ab8958ec339aec1778680265437314c SHA512 2ecccf80c654ad8cff6a2907d4f81409034bd5cc07542e87db7b53a646fb63ee38a472eb778f6f77f6cf1885f8dc5b85d50a6a033ab430e7e03a07000463f68b WHIRLPOOL f26ce8563d0d0a37700a7f4adfe5a966579aed7d3079fa1043bbbbf060b3f1d31fb95c30572e829b1b4f61ccb94ef1b55a5a0c641335056fa85a939f76693c38
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..604e0a4238bb
--- /dev/null
+++ b/dev-java/trident/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..24de5640177f
--- /dev/null
+++ b/dev-java/trident/trident-1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+COMMON_DEPEND="dev-java/swt:3.7"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEPEND}"
+
+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..7175d4a4db33
--- /dev/null
+++ b/dev-java/trove/Manifest
@@ -0,0 +1,2 @@
+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
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..e0f411981bd4
--- /dev/null
+++ b/dev-java/trove/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..a7cb022999fb
--- /dev/null
+++ b/dev-java/trove/trove-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..4c449e3c45fa
--- /dev/null
+++ b/dev-java/trove/trove-3.0.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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.ebuild b/dev-java/trove/trove-3.0.2.ebuild
new file mode 100644
index 000000000000..bf4d5c067ccc
--- /dev/null
+++ b/dev-java/trove/trove-3.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..161c06ff3e59
--- /dev/null
+++ b/dev-java/txw2-runtime/Manifest
@@ -0,0 +1 @@
+DIST txw2-20070407.zip 1183977 SHA256 e90e7385f42be3a379547e497093e0c5ffd1033e18056ca4df69eb8cdc2108ed SHA512 60c4ea2110e09f4cecd348ef5cb2f75f872479b058870a8ab45eb03578c1cd2efb4db5e028a8090f9c1f46c6fc30985dfb9faa3682055c49c2accb6aa4010081 WHIRLPOOL 8cc5b787394d6f28a9ae1614ee07960e9eb1175ea96c883fef65eae9590d6bd3090b8b106a66f6d3b3b311585a349f5aeb5b758157138efb2bae76d35d573cb3
diff --git a/dev-java/txw2-runtime/files/build.xml-20070407 b/dev-java/txw2-runtime/files/build.xml-20070407
new file mode 100644
index 000000000000..3e1cbaac1024
--- /dev/null
+++ b/dev-java/txw2-runtime/files/build.xml-20070407
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<project name="txw2" basedir=".">
+  <target name="compiler-compile" depends="runtime-jar">
+    <mkdir dir="build-compiler"/>
+    <javac debug="false" srcdir="compiler" destdir="build-compiler">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+        <fileset dir="." includes="txwc2.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="runtime-compile">
+    <mkdir dir="build-runtime"/>
+    <javac debug="false" srcdir="runtime" destdir="build-runtime">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="compiler-jar" depends="compiler-compile">
+    <jar destfile="txwc2.jar">
+      <fileset dir="build-compiler" includes="**/*.class"/>
+    </jar>
+  </target>
+  <target name="runtime-jar" depends="runtime-compile">
+    <jar destfile="txw2.jar">
+      <fileset dir="build-runtime" includes="**/*.class"/>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/txw2-runtime/metadata.xml b/dev-java/txw2-runtime/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/txw2-runtime/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/txw2-runtime/txw2-runtime-20070407-r2.ebuild b/dev-java/txw2-runtime/txw2-runtime-20070407-r2.ebuild
new file mode 100644
index 000000000000..53df77ff76f9
--- /dev/null
+++ b/dev-java/txw2-runtime/txw2-runtime-20070407-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="TXW is a library that allows you to write XML documents"
+HOMEPAGE="https://txw.dev.java.net/"
+SRC_URI="https://txw.dev.java.net/files/documents/3310/54821/txw2-${PV}.zip"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="java-virtuals/stax-api"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/txw2-${PV}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd "${S}"
+	rm -v *.jar || die
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jarfrom --build-only ant-core
+	java-pkg_jarfrom --virtual stax-api
+
+	cd "${S}"
+	unzip -qq txw2-src.zip -d runtime || die unzip failed
+	unzip -qq txw2c-src.zip -d compiler || die unzip failed
+
+	cp -i "${FILESDIR}/build.xml-20070407" "${S}/build.xml" || die cp failed
+
+}
+
+EANT_BUILD_TARGET="runtime-jar"
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_newjar txw2.jar
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc runtime/*
+}
diff --git a/dev-java/unkrig-nullanalysis/Manifest b/dev-java/unkrig-nullanalysis/Manifest
new file mode 100644
index 000000000000..2075bda9107e
--- /dev/null
+++ b/dev-java/unkrig-nullanalysis/Manifest
@@ -0,0 +1 @@
+DIST unkrig-nullanalysis-0_pre1644.tar.bz2 2322 SHA256 ecbe44bad11afdac33d9ab6f1f75c70090fbee833b2a00e23c3a4b3931155d6b SHA512 6e4f069023043ac24f7e68f748ad4c6cfaf16312310abfd9c6d395b34491b68a7c3cca6b3a36b18c4dd656cc15f17755dbd4ce3e6379da06f82a2691453c3c03 WHIRLPOOL b16b22ff2b5f719c41568536b43c0fca777459b3d0861fe684de3771fe79117099656286dfc4ef4e5aab7b01734ef1d140b94f30f1c73a0baabba2fae02b297d
diff --git a/dev-java/unkrig-nullanalysis/metadata.xml b/dev-java/unkrig-nullanalysis/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/unkrig-nullanalysis/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..f69cf502d3fd
--- /dev/null
+++ b/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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/validation-api/Manifest b/dev-java/validation-api/Manifest
new file mode 100644
index 000000000000..3c761aceae70
--- /dev/null
+++ b/dev-java/validation-api/Manifest
@@ -0,0 +1 @@
+DIST validation-api-1.0.0.GA-sources.jar 65220 SHA256 a394d52a9b7fe2bb14f0718d2b3c8308ffe8f37e911956012398d55c9f9f9b54 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0 WHIRLPOOL 9eef9230c08a712ddcdb81c85961fb3be7661bce3276adc77b91f274ba2df2edd7c919fad38e2499ccd58287477ca75cff55d4f86bc8d86c6c6020900e08cf6c
diff --git a/dev-java/validation-api/files/build.xml b/dev-java/validation-api/files/build.xml
new file mode 100644
index 000000000000..d720ce51efcb
--- /dev/null
+++ b/dev-java/validation-api/files/build.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" standalone="yes"?>
+<project basedir="." default="jar">
+	<target name="compile">
+		<mkdir dir="bin"/>
+		<javac srcdir="src" destdir="bin">
+			<include name="**/*.java"/>
+		</javac>
+	</target>
+	<target name="jar" depends="compile">
+		<jar destfile="validation-api.jar" manifest="src/META-INF/MANIFEST.MF">
+			<zipfileset dir="bin"/>
+		</jar>
+	</target>
+	<target name="doc">
+		<mkdir dir="api"/>
+		<javadoc packagenames="javax.*" destdir="api">
+			<fileset dir="src/" includes="**/*.java"/>
+		</javadoc>
+	</target>
+</project>
diff --git a/dev-java/validation-api/metadata.xml b/dev-java/validation-api/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/validation-api/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/validation-api/validation-api-1.0.0.ebuild b/dev-java/validation-api/validation-api-1.0.0.ebuild
new file mode 100644
index 000000000000..7f3227441440
--- /dev/null
+++ b/dev-java/validation-api/validation-api-1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Bean Validation (JSR-303) API"
+HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA"
+SRC_URI="https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/${PN}/${PV}.GA/${P}.GA-sources.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"
+
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="doc"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	mkdir -p "${S}/src"
+	cd "${S}/src"
+	unpack ${A}
+	cp "${FILESDIR}/build.xml" "${S}/"
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+	use doc && java-pkg_dojavadoc "${S}/api"
+	use source && java-pkg_dosrc "${S}/src/javax"
+}
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
new file mode 100644
index 000000000000..ecdc3f9593b1
--- /dev/null
+++ b/dev-java/velocity/Manifest
@@ -0,0 +1 @@
+DIST velocity-1.7.tar.gz 5882643 SHA256 6cabbc45ead01b32e9833db31b1726f2e34f5ff6a03346df9822e70909d06766 SHA512 542c9cc0efa118693bf1c952ac4b0c7c3d0229ef804afaa4f0f1c01ad40b0112055c21df7f800c302bf173d58461a864b29b9bc4b9174029d9748f88f2fcf9ab WHIRLPOOL 59e44fb361162be0f07917f2a137a01cb26551da64896a8b7f3a747e328e6ec72d7a32d620aefddce160617b36132047d932a253dcf8e2afd40ae6712f462be9
diff --git a/dev-java/velocity/files/velocity-1.4-versioned_jar.patch b/dev-java/velocity/files/velocity-1.4-versioned_jar.patch
new file mode 100644
index 000000000000..5b445594058c
--- /dev/null
+++ b/dev-java/velocity/files/velocity-1.4-versioned_jar.patch
@@ -0,0 +1,48 @@
+diff -ru velocity-1.4/build/build.xml velocity-1.4-gentoo/build/build.xml
+--- velocity-1.4/build/build.xml	2004-04-14 08:26:40.000000000 -0400
++++ velocity-1.4-gentoo/build/build.xml	2005-07-14 21:33:37.000000000 -0400
+@@ -287,7 +287,7 @@
+   <!-- =================================================================== -->

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

+          

+-    <jar jarfile="${build.dir}/${project}-${version}.jar">

++    <jar jarfile="${build.dir}/${project}.jar">

+ 

+       <fileset dir="${build.dest}">

+         <exclude name="**/package.html"/>

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

+   <target name="jar-J2EE" depends="compile-J2EE" if="J2EE.present">

+         

+-    <jar jarfile="${build.dir}/${project}-J2EE-${version}.jar"

++    <jar jarfile="${build.dir}/${project}-J2EE.jar"

+       basedir="${build.dest}"

+       excludes="**/package.html"

+     />

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

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

+         

+-    <jar compress="true" jarfile="${build.dir}/${project}-core-${version}.jar">

++    <jar compress="true" jarfile="${build.dir}/${project}-core.jar">

+       <fileset dir="${build.dest}">

+         <exclude name="**/package.html"/>

+         <exclude name="org/apache/oro/**"/>

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

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

+         

+-    <jar jarfile="${build.dir}/${project}-util-${version}.jar">

++    <jar jarfile="${build.dir}/${project}-util.jar">

+       <fileset dir="${build.dest}">

+         <exclude name="**/package.html"/>

+         <include name="org/apache/velocity/anakia/**"/>

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

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

+         

+-    <jar jarfile="${build.dir}/${project}-servlet-${version}.jar">

++    <jar jarfile="${build.dir}/${project}-servlet.jar">

+       <fileset dir="${build.dest}">

+         <exclude name="**/package.html"/>

+         <include name="org/apache/velocity/servlet/**"/>

diff --git a/dev-java/velocity/metadata.xml b/dev-java/velocity/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/velocity/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/velocity/velocity-1.7.ebuild b/dev-java/velocity/velocity-1.7.ebuild
new file mode 100644
index 000000000000..f4ad82edfbe3
--- /dev/null
+++ b/dev-java/velocity/velocity-1.7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="examples doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A Java-based template engine for easy creation/rendering of documents that format and present data"
+HOMEPAGE="http://velocity.apache.org"
+SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE="test"
+
+CDEPEND="
+	dev-java/commons-collections:0
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/jdom:1.0
+	dev-java/log4j:0
+	dev-java/avalon-logkit:2.0
+	dev-java/jakarta-oro:2.0
+	java-virtuals/servlet-api:2.3
+	dev-java/werken-xpath:0
+	dev-java/ant-core:0
+"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit:0
+		dev-java/ant-antlr:0
+		dev-db/hsqldb:0
+	)
+"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+	commons-collections
+	commons-lang-2.1
+	commons-logging
+	jdom-1.0
+	log4j
+	avalon-logkit-2.0
+	jakarta-oro-2.0
+	servlet-api-2.3
+	werken-xpath
+	ant-core
+"
+
+# One test fails. see #219668
+RESTRICT="test"
+
+java_prepare() {
+	rm -v *.jar lib/test/*.jar lib/*.jar || die
+}
+
+src_compile () {
+	cd "${S}"/build
+	eant jar -Dskip-download=true #prebuilt javadocs
+}
+
+src_test() {
+	mkdir -p bin/test-lib || die
+	cd bin/test-lib || die
+	java-pkg_jar-from junit,hsqldb
+	java-pkg_jar-from --virtual servlet-api-2.3
+	cd "${S}"/build
+	ANT_TASKS="ant-junit ant-antlr" eant test -Dskip-download=true
+}
+
+src_install () {
+	java-pkg_newjar bin/*.jar
+
+	dodoc NOTICE README.txt
+	# has other stuff besides api too
+	use doc && java-pkg_dohtml -r docs/*
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/webgraph/Manifest b/dev-java/webgraph/Manifest
new file mode 100644
index 000000000000..8e03d8d80f33
--- /dev/null
+++ b/dev-java/webgraph/Manifest
@@ -0,0 +1 @@
+DIST webgraph-1.4.1-src.tar.gz 55467 SHA256 a91402ae46c60234f8234a9b05078feb7d23bfa12a68447ef410e24ceb4dc133 SHA512 6c7ae24ad1a3f05d547bd49b83446f42177d50b86db60815208a18fe86129dc1264c9c2d67f6992dd930333e7150b952e27d8cc510179fd362879c719900d5cb WHIRLPOOL 34ba6c65f7051a400eb2de07ff0eaec3cf20fe3b3cb10db927249a3ca269206be990cdb2018101c4695a77e5b8892f77ca18d25e1bd38b4b50d46c9dc30bd666
diff --git a/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch b/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch
new file mode 100644
index 000000000000..a4ad2d262a15
--- /dev/null
+++ b/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch
@@ -0,0 +1,36 @@
+--- build.xml.orig	2005-04-15 14:36:14.000000000 +0200
++++ build.xml	2005-04-15 14:38:45.000000000 +0200
+@@ -19,6 +19,14 @@
+ 	<property name="jar.base" value="/usr/share/java"/>
+ 	<property name="javadoc.base" value="/usr/share/javadoc"/>
+ 
++	<path id="compile.classpath">
++		<pathelement location="lib/jal.jar" />
++		<pathelement location="lib/colt.jar" />
++		<pathelement location="lib/fastutil.jar" />
++		<pathelement location="lib/gnu.getopt.jar" />
++		<pathelement location="lib/mg4j.jar" />
++	</path>
++	
+ 	<!--
+ 		Groovy and Cobertura need different versions of asm.
+ 		Due to the delegation-based class-loading model used
+@@ -119,7 +127,9 @@
+ 	<target name="all" depends="jar,javadoc"/>
+ 
+ 	<target name="compile" depends="init" description="Compile standard sources (not test files)">
+-		<javac srcdir="${src}" includes="**${subdir}" excludes="test/**" debug="on" optimize="on" destdir="${build}" source="1.4"/>
++		<javac srcdir="${src}" includes="**${subdir}" excludes="test/**" debug="on" optimize="on" destdir="${build}" source="1.4" target="1.4">
++			<classpath refid="compile.classpath" />
++		</javac>
+ 	</target>
+ 
+ 	<target name="jar" depends="compile" description="Creates jar (without tests)">
+@@ -144,6 +154,7 @@
+ 			<link href="${colt.apiurl}"/>
+ 			<link href="${jal.apiurl}"/>
+ 			<link href="${mg4j.apiurl}"/>
++			<classpath refid="compile.classpath" />
+ 		</javadoc>
+ 	</target>
+ 
diff --git a/dev-java/webgraph/metadata.xml b/dev-java/webgraph/metadata.xml
new file mode 100644
index 000000000000..2ff9b03e8808
--- /dev/null
+++ b/dev-java/webgraph/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<longdescription>
+WebGraph is a framework to study the web graph. It provides simple ways to
+manage very large graphs, exploiting modern compression techniques.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/webgraph/webgraph-1.4.1-r1.ebuild b/dev-java/webgraph/webgraph-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..13d57e54a2e8
--- /dev/null
+++ b/dev-java/webgraph/webgraph-1.4.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="WebGraph is a framework to study the web graph"
+SRC_URI="http://webgraph.dsi.unimi.it/${P}-src.tar.gz"
+HOMEPAGE="http://webgraph.dsi.unimi.it"
+LICENSE="LGPL-2.1"
+SLOT="1.4"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+COMMON_DEP="=dev-java/java-getopt-1.0*
+	=dev-java/fastutil-4.4*
+	=dev-java/colt-1*
+	>=dev-java/jal-20031117
+	=dev-java/mg4j-0.9*"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	mkdir lib/ && cd lib/
+	java-pkg_jar-from java-getopt-1
+	java-pkg_jar-from fastutil-4.4
+	java-pkg_jar-from colt colt.jar
+	java-pkg_jar-from jal jal.jar
+	java-pkg_jar-from mg4j-0.9
+
+}
+
+src_install() {
+
+	java-pkg_newjar ${P}.jar ${PN}.jar
+
+	dodoc CHANGES
+
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc java/it
+
+}
diff --git a/dev-java/werken-xpath/Manifest b/dev-java/werken-xpath/Manifest
new file mode 100644
index 000000000000..72526f3c6ee4
--- /dev/null
+++ b/dev-java/werken-xpath/Manifest
@@ -0,0 +1 @@
+DIST werken.xpath-0.9.4-beta-src.tar.gz 1652916 SHA256 e0d649230f3fa07f0860a355adde20e1ee08ba1a7809f00cb938b9b0dc3f76f3 SHA512 c58878ee0b6e88651335e2be60d0afcd65fc164864e826bb209ec660e97315233b25341733a4118ed3ee003f61998d84e480706bda5be4630c599efb616b845d WHIRLPOOL 2593fa630fcb50cbbeaf627c09682ee9822e938b845c53b6413600413a74b9b6b9417368273ebd258707ee3434a3ba8347a046ed27a0f94290687a246d38734e
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..838c00a4a448
--- /dev/null
+++ b/dev-java/werken-xpath/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild
new file mode 100644
index 000000000000..9eebae77cecd
--- /dev/null
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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 ppc x86 ~x86-fbsd"
+
+COMMON_DEP="
+	dev-java/jdom:1.0
+	>=dev-java/antlr-2.7.7:0[java]"
+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-1.0"
+
+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.0
+	epatch "${FILESDIR}"/${P}-jdom-1.0.patch
+
+	cd "${S}"/lib
+	# In here we have ant starter scripts
+	rm -fr bin
+	rm -f *.jar
+}
+
+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..09e839c0666d
--- /dev/null
+++ b/dev-java/ws-commons-util/Manifest
@@ -0,0 +1 @@
+DIST ws-commons-util-1.0.1-src.tar.gz 24838 SHA256 cede9cc3136e09fedfe8ccdf61e3e963afb3c54ccc833262316ceb103b74df88 SHA512 4eefe61daf462105ca8cfb8ec42ef42ef414d1426b201da044fe9a72e9ab7d3fd34bd80d19d8f6220f1f91d9de7cab3d8d2dec4c267784ba3d3bbd69a1c62c4c WHIRLPOOL 545b790e44023d8f0a0fb81de587ea6846eb7ae7af9dbc31f6921d06268d1474ea055134b8485113e991fbe5bcd09ecffff7f48efe99434b5c41e50e0c715e31
diff --git a/dev-java/ws-commons-util/metadata.xml b/dev-java/ws-commons-util/metadata.xml
new file mode 100644
index 000000000000..604e0a4238bb
--- /dev/null
+++ b/dev-java/ws-commons-util/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
+
diff --git a/dev-java/ws-commons-util/ws-commons-util-1.0.1.ebuild b/dev-java/ws-commons-util/ws-commons-util-1.0.1.ebuild
new file mode 100644
index 000000000000..302d75dcee90
--- /dev/null
+++ b/dev-java/ws-commons-util/ws-commons-util-1.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="1"
+JAVA_PKG_IUSE="source test"
+inherit java-pkg-2
+
+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 ppc x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/junit:0 )"
+
+RDEPEND=">=virtual/jre-1.4"
+
+src_compile() {
+	mkdir -p bin || die
+	ejavac -d bin `find src/main -name "*.java" || die`
+	`java-config -j` cvf "${PN}.jar" -C bin . || die
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+	use source && java-pkg_dosrc src/main/java/*
+}
+
+src_test() {
+	local class files=`find src/test -name "*.java" || die`
+	ejavac -cp bin:`java-pkg_getjars junit` -d bin ${files}
+
+	for class in ${files} ; do
+		class=${class#src/test/java/}
+		class=${class%.java}
+		ejunit -cp bin ${class//\//.}
+	done
+}
diff --git a/dev-java/wsdl4j/Manifest b/dev-java/wsdl4j/Manifest
new file mode 100644
index 000000000000..8075b8ae4896
--- /dev/null
+++ b/dev-java/wsdl4j/Manifest
@@ -0,0 +1,2 @@
+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
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..1236e4d06274
--- /dev/null
+++ b/dev-java/wsdl4j/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..5de603e1a8c2
--- /dev/null
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~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..ccf388de7248
--- /dev/null
+++ b/dev-java/wstx/Manifest
@@ -0,0 +1 @@
+DIST wstx-src-3.2.9.zip 2218419 SHA256 b0f8489bbd1c5fdba8d39228686d75e18185e3052c887f7329bb9d313f9356c1 SHA512 316679a6586e453b85ffe4dd573a92019282b0d2028e931f33fafa8b0f3aef856c8326c72049ce42645e4b520bbd1bd91e74005f090dc22dc7ca7c76a0640117 WHIRLPOOL d1ee4b5eb3bb3de7e4ed3bd3cec72d0fe9cf068673d7c7702f28c61ab36d33e6ebe94e9e885a2530e50fd92d73c004339ad8a59bf0ac564d836af75225b05a79
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..e067f959642b
--- /dev/null
+++ b/dev-java/wstx/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>mike@weisso.com</email>
+		<name>Mike Weissman</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>
+</pkgmetadata>
+
diff --git a/dev-java/wstx/wstx-3.2.9.ebuild b/dev-java/wstx/wstx-3.2.9.ebuild
new file mode 100644
index 000000000000..a9852b817a16
--- /dev/null
+++ b/dev-java/wstx/wstx-3.2.9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Woodstox is a high-performance validating namespace-aware XML-processor"
+HOMEPAGE="http://woodstox.codehaus.org/"
+SRC_URI="http://woodstox.codehaus.org/${PV}/${PN}-src-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="3.2"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+COMMON_DEP="
+	dev-java/emma:0
+	dev-java/sax:0
+	java-virtuals/jaxp-virtual
+	dev-java/stax:0
+	dev-java/msv:0
+	dev-java/xsdlib:0
+	dev-java/relaxng-datatype:0
+	dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+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="emma,sax,jaxp-virtual,msv,xsdlib,relaxng-datatype,junit"
+
+src_test(){
+	ANT_TASKS="ant-junit ant-nodeps ant-trax" eant test || die "Tests failed"
+}
+
+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..7c4afdf2bd17
--- /dev/null
+++ b/dev-java/xalan-serializer/Manifest
@@ -0,0 +1 @@
+DIST xalan-j_2_7_2-src.tar.gz 8416261 SHA256 5c184ad2984973cc19783c7f9339c28a210cca724b25b0d706f1e310627adb98 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8 WHIRLPOOL 388545a97f230183c91896738bef3f9ae8bbf2beb24f02bece79a8e76351b8c2f16edf83fd6084896262cdfbc412a550695579c4b3b4a07d17714eb26a94fbb0
diff --git a/dev-java/xalan-serializer/metadata.xml b/dev-java/xalan-serializer/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/xalan-serializer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</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..8eef30878cfe
--- /dev/null
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..2de370152108
--- /dev/null
+++ b/dev-java/xalan/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/xalan/metadata.xml b/dev-java/xalan/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/xalan/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</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..1d9c5b5a44de
--- /dev/null
+++ b/dev-java/xalan/xalan-2.7.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="Apache's XSLT processor for 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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/xdoclet/Manifest b/dev-java/xdoclet/Manifest
new file mode 100644
index 000000000000..50f7649bb4fa
--- /dev/null
+++ b/dev-java/xdoclet/Manifest
@@ -0,0 +1 @@
+DIST xdoclet-src-1.2.3.tgz 5880180 SHA256 b7b8e00954497928626db15e9759280a0dc18397dc54b02924a162e819eff4ef SHA512 ecad04c0bed00215c55f84782a74148644425efe6db4bde2717dc04854769c7617b9e396be67f9b4b6357f2f023e1658eb418f2e671305c36374d4f8849eb90f WHIRLPOOL 29f8379876ae5834a1371be582869205803248df4fa76835467ac0e14e2399f17a8e3e8d870a583940050456aba7647acb2e5ddaf252cf0cd7e57ddb211c7e03
diff --git a/dev-java/xdoclet/files/xdoclet-1.2.2-buildfile.patch b/dev-java/xdoclet/files/xdoclet-1.2.2-buildfile.patch
new file mode 100644
index 000000000000..968485e71959
--- /dev/null
+++ b/dev-java/xdoclet/files/xdoclet-1.2.2-buildfile.patch
@@ -0,0 +1,48 @@
+diff -urpN xdoclet-1.2.2.orig/build.xml xdoclet-1.2.2/build.xml
+--- xdoclet-1.2.2.orig/build.xml	2005-04-03 05:13:08.000000000 +0200
++++ xdoclet-1.2.2/build.xml	2005-04-03 05:13:12.000000000 +0200
+@@ -75,7 +75,7 @@
+         <ant dir="${samples.dir}"/>
+     </target>
+ 
+-    <target name="l10n" depends="core, modules">
++    <target name="l10n">
+         <!-- messages for each locale get built into a separate jar -->
+         <jar jarfile="${dist.lib.dir}/${name}-pt_BR-locale-${version}.jar">
+             <fileset dir="${l10n.build.dir}">
+diff -urpN xdoclet-1.2.2.orig/core/build.xml xdoclet-1.2.2/core/build.xml
+--- xdoclet-1.2.2.orig/core/build.xml	2005-04-03 05:13:08.000000000 +0200
++++ xdoclet-1.2.2/core/build.xml	2005-04-03 05:13:12.000000000 +0200
+@@ -106,7 +106,7 @@
+     <!-- =================================================================== -->
+     <!-- Compiles the source code                                            -->
+     <!-- =================================================================== -->
+-    <target name="compile" depends="beautify">
++    <target name="compile" depends="prepare">
+         <mkdir dir="${modules.all-src.dir}"/>
+         <copy todir="${modules.all-src.dir}">
+             <fileset dir="${core.src.dir}">
+diff -urpN xdoclet-1.2.2.orig/maven/build.xml xdoclet-1.2.2/maven/build.xml
+--- xdoclet-1.2.2.orig/maven/build.xml	2005-04-03 05:13:08.000000000 +0200
++++ xdoclet-1.2.2/maven/build.xml	2005-04-03 05:13:14.000000000 +0200
+@@ -77,7 +77,7 @@
+         </jar>
+         
+         <!-- Install the plugin if MAVEN_HOME/MAVEN_LOCAL_HOME is defined -->
+-        <antcall target="install"/>
++        <!--antcall target="install"/-->
+     </target>
+     
+     <target name="clean">
+diff -urpN xdoclet-1.2.2.orig/modules/modules-common.ent xdoclet-1.2.2/modules/modules-common.ent
+--- xdoclet-1.2.2.orig/modules/modules-common.ent	2005-04-03 05:13:08.000000000 +0200
++++ xdoclet-1.2.2/modules/modules-common.ent	2005-04-03 05:13:12.000000000 +0200
+@@ -190,7 +190,7 @@
+     <!-- =================================================================== -->
+     <!-- Compiles the source code                                            -->
+     <!-- =================================================================== -->
+-    <target name="compile" depends="beautify" unless="module.jar.uptodate">
++    <target name="compile" depends="init" unless="module.jar.uptodate">
+         <mkdir dir="${module.classes.dir}"/>
+         <javac
+             destdir="${module.classes.dir}"
diff --git a/dev-java/xdoclet/files/xdoclet-1.2.2-interface.patch b/dev-java/xdoclet/files/xdoclet-1.2.2-interface.patch
new file mode 100644
index 000000000000..d7f9c2897873
--- /dev/null
+++ b/dev-java/xdoclet/files/xdoclet-1.2.2-interface.patch
@@ -0,0 +1,271 @@
+diff -uprN xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java
+--- xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java	2004-10-14 04:39:06.000000000 +0200
++++ xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java	2005-04-03 15:20:31.000000000 +0200
+@@ -4,10 +4,7 @@
+  */
+ package xdoclet.modules.hibernate;
+ 
+-import java.util.Collection;
+-import java.util.Iterator;
+-import java.util.LinkedList;
+-import java.util.Properties;
++import java.util.*;
+ 
+ import org.apache.commons.logging.Log;
+ import org.apache.tools.ant.types.Parameter;
+@@ -48,6 +45,18 @@ public class HibernateTagsHandler
+ 
+     private Parameter currentOtherMapping;
+ 
++    private static boolean isHibernated(XClass xClass)
++    {
++        if (xClass == null) {
++            return false;
++        }
++
++        return (
++            xClass.getDoc().getTag("hibernate.class") != null ||
++            xClass.getDoc().getTag("hibernate.subclass") != null
++            );
++    }
++
+     /**
+      * Returns full path of hibernate file for the current class.
+      *
+@@ -594,9 +603,11 @@ public class HibernateTagsHandler
+                 log.debug("typeName=" + typeName);
+ 
+             Collection classes = getXJavaDoc().getSourceClasses();
++            List reorderedClasses = flattenHierachy(getCurrentClass(), classes);
++
+             XClass clazz;
+ 
+-            for (Iterator i = classes.iterator(); i.hasNext(); ) {
++            for (Iterator i = reorderedClasses.iterator(); i.hasNext(); ) {
+                 clazz = (XClass) i.next();
+ 
+                 log.debug("clazz=" + clazz);
+@@ -604,8 +615,13 @@ public class HibernateTagsHandler
+                 if (DocletSupport.isDocletGenerated(clazz)) {
+                     log.debug("isDocletGenerated");
+                 }
+-                else if (clazz.getSuperclass() != null && clazz.getSuperclass().getQualifiedName().equals(typeName)) {
+-                    log.debug("is a subclass");
++                else if (isValidSubclass(clazz, getCurrentClass())) {
++                    if (getCurrentClass().isInterface()) {
++                        log.debug("is an implementing class");
++                    }
++                    else {
++                        log.debug("is a subclass");
++                    }
+ 
+                     XClass current = getCurrentClass();
+ 
+@@ -735,10 +751,108 @@ public class HibernateTagsHandler
+         //TODO: Why do we need this!!??
+     }
+ 
++    private boolean isValidSubclass(XClass clazz, XClass currentClass)
++    {
++        String typeName = currentClass.getQualifiedName();
++
++        // easy case, clazz is implementing interface of hibernated class
++        // NB: not easy anymore, if we've got a hibernated interface hierachy
++        // only return true for "deepest" implemented interface in this hierachy
++        if (currentClass.isInterface() && clazz.isImplementingInterface(typeName)) {
++            List extending = currentClass.getExtendingInterfaces();
++
++            if (extending.isEmpty()) {
++                return true;
++            }
++
++            for (int i = 0; i < extending.size(); i++) {
++                XClass xClass = (XClass) extending.get(i);
++
++                if (isHibernated(xClass) && clazz.isImplementingInterface(xClass.getQualifiedName())) {
++                    // we found an interface deeper in the hierachy
++                    return false;
++                }
++            }
++            return true;
++        }
++
++        if (clazz.getSuperclass() != null) {
++            // easy case, this class is direct subclass of the hibernated type
++            if (clazz.getSuperclass().equals(typeName)) {
++                return true;
++            }
++            else {
++                // go up class hierarchy to find first hibernate tag
++                XClass xc = clazz;
++
++                do {
++                    xc = xc.getSuperclass();
++
++                } while (xc != null && !isHibernated(xc));
++
++                // did we find a valid superclass, is it the current ?
++                if (xc != null) {
++                    return xc.equals(currentClass);
++                }
++            }
++        }
++
++        return false;
++    }
++
+     private HibernateSubTask getHibernateSubTask()
+     {
+         return ((HibernateSubTask) (DocletContext.getInstance()
+             .getSubTaskBy(DocletTask.getSubTaskName(HibernateSubTask.class))));
+     }
++
++    /**
++     * Flattens the collection of classes by eliminating descendants (for hibernated non 
++     * interface classes).
++     *
++     * @param currentClass
++     * @param classes
++     * @return
++     */
++    private List flattenHierachy(XClass currentClass, Collection classes)
++    {
++        Log log = LogUtil.getLog(HibernateTagsHandler.class, "flattenHierachy");
++
++        log.debug("for class " + currentClass);
++
++        if (!currentClass.isInterface()) {
++            List l = new ArrayList(classes);
++
++            l.retainAll(currentClass.getAllSubclasses());
++            return l;
++        }
++
++        Set s = new HashSet(classes);
++
++        log.debug("initial set size: " + s.size());
++
++        for (Iterator iterator = classes.iterator(); iterator.hasNext(); ) {
++            XClass xClass = (XClass) iterator.next();
++
++            if (xClass.isInterface() || !isHibernated(xClass)) {
++                continue;
++            }
++
++            List subClasses = xClass.getAllSubclasses();
++
++            for (int i = 0; i < subClasses.size(); i++) {
++                XClass aClass = (XClass) subClasses.get(i);
++
++                if (s.contains(aClass)) {
++                    log.debug("removing " + aClass + " from set");
++                    s.remove(aClass);
++                }
++            }
++        }
++
++        log.debug("new set size: " + s.size());
++
++        return new ArrayList(s);
++    }
+ }
+ 
+diff -uprN xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt
+--- xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt	2004-10-10 11:43:05.000000000 +0200
++++ xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt	2005-04-03 15:20:31.000000000 +0200
+@@ -1,4 +1,4 @@
+-    <XDtMethod:ifHasMethodTag tagName="hibernate.property">
++    <XDtMethod:ifHasMethodTag tagName="hibernate.property" superclasses="false">
+         <property
+             name="<XDtMethod:propertyName />"
+             type="<XDtMethod:methodTagValue tagName="hibernate.property" paramName="type" default="<XDtMethod:methodType/>"/>"
+@@ -20,7 +20,7 @@
+             </XDtHibernate:setCurrentTag>
+         </XDtMethod:ifHasMethodTag>
+ 
+-    <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one">
++    <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one" superclasses="false">
+         <many-to-one
+             name="<XDtMethod:propertyName/>"
+             class="<XDtMethod:methodTagValue tagName="hibernate.many-to-one" paramName="class" default="<XDtMethod:methodType/>" />"
+@@ -43,7 +43,7 @@
+           </XDtHibernate:setCurrentTag>
+     </XDtMethod:ifHasMethodTag>
+ 
+-     <XDtMethod:ifHasMethodTag tagName="hibernate.one-to-one">
++     <XDtMethod:ifHasMethodTag tagName="hibernate.one-to-one" superclasses="false">
+         <one-to-one
+             name="<XDtMethod:propertyName/>"
+             class="<XDtMethod:methodTagValue tagName="hibernate.one-to-one" paramName="class" default="<XDtMethod:methodType/>"/>"
+@@ -59,7 +59,7 @@
+         />
+      </XDtMethod:ifHasMethodTag>
+ 
+-     <XDtMethod:ifHasMethodTag tagName="hibernate.component">
++     <XDtMethod:ifHasMethodTag tagName="hibernate.component" superclasses="false">
+         <component
+             name="<XDtMethod:propertyName />"
+             class="<XDtMethod:methodTagValue tagName="hibernate.component" paramName="class" default="<XDtMethod:methodType/>"/>"
+@@ -84,7 +84,7 @@
+         />
+      </XDtMethod:ifHasMethodTag>
+ 
+-        <XDtMethod:ifHasMethodTag tagName="hibernate.set">
++        <XDtMethod:ifHasMethodTag tagName="hibernate.set" superclasses="false">
+         <set
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.set" paramName="table">
+@@ -114,7 +114,7 @@
+         </set>
+         </XDtMethod:ifHasMethodTag>
+ 
+-        <XDtMethod:ifHasMethodTag tagName="hibernate.bag">
++        <XDtMethod:ifHasMethodTag tagName="hibernate.bag" superclasses="false">
+         <bag
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.bag" paramName="table">
+@@ -143,7 +143,7 @@
+         </bag>
+         </XDtMethod:ifHasMethodTag>
+ 
+-    <XDtMethod:ifHasMethodTag tagName="hibernate.list">
++    <XDtMethod:ifHasMethodTag tagName="hibernate.list" superclasses="false">
+         <list
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.list" paramName="table">
+@@ -166,7 +166,7 @@
+         </list>
+         </XDtMethod:ifHasMethodTag>
+ 
+-        <XDtMethod:ifHasMethodTag tagName="hibernate.map">
++        <XDtMethod:ifHasMethodTag tagName="hibernate.map" superclasses="false">
+         <map
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.map" paramName="table">
+@@ -193,7 +193,7 @@
+         </map>
+         </XDtMethod:ifHasMethodTag>
+ 
+-        <XDtMethod:ifHasMethodTag tagName="hibernate.array">
++        <XDtMethod:ifHasMethodTag tagName="hibernate.array" superclasses="false">
+         <array
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.array" paramName="table">
+@@ -218,7 +218,7 @@
+         </array>
+         </XDtMethod:ifHasMethodTag>
+ 
+-        <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array">
++        <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array" superclasses="false">
+         <primitive-array
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array" paramName="table">
+@@ -236,7 +236,7 @@
+         </primitive-array>
+         </XDtMethod:ifHasMethodTag>
+ 
+-          <XDtMethod:ifHasMethodTag tagName="hibernate.any">
++          <XDtMethod:ifHasMethodTag tagName="hibernate.any" superclasses="false">
+               <any
+                   name="<XDtMethod:propertyName />"
+                   id-type="<XDtMethod:methodTagValue tagName="hibernate.any" paramName="id-type"/>"
diff --git a/dev-java/xdoclet/files/xdoclet-1.2.3-buildfile.patch b/dev-java/xdoclet/files/xdoclet-1.2.3-buildfile.patch
new file mode 100644
index 000000000000..968485e71959
--- /dev/null
+++ b/dev-java/xdoclet/files/xdoclet-1.2.3-buildfile.patch
@@ -0,0 +1,48 @@
+diff -urpN xdoclet-1.2.2.orig/build.xml xdoclet-1.2.2/build.xml
+--- xdoclet-1.2.2.orig/build.xml	2005-04-03 05:13:08.000000000 +0200
++++ xdoclet-1.2.2/build.xml	2005-04-03 05:13:12.000000000 +0200
+@@ -75,7 +75,7 @@
+         <ant dir="${samples.dir}"/>
+     </target>
+ 
+-    <target name="l10n" depends="core, modules">
++    <target name="l10n">
+         <!-- messages for each locale get built into a separate jar -->
+         <jar jarfile="${dist.lib.dir}/${name}-pt_BR-locale-${version}.jar">
+             <fileset dir="${l10n.build.dir}">
+diff -urpN xdoclet-1.2.2.orig/core/build.xml xdoclet-1.2.2/core/build.xml
+--- xdoclet-1.2.2.orig/core/build.xml	2005-04-03 05:13:08.000000000 +0200
++++ xdoclet-1.2.2/core/build.xml	2005-04-03 05:13:12.000000000 +0200
+@@ -106,7 +106,7 @@
+     <!-- =================================================================== -->
+     <!-- Compiles the source code                                            -->
+     <!-- =================================================================== -->
+-    <target name="compile" depends="beautify">
++    <target name="compile" depends="prepare">
+         <mkdir dir="${modules.all-src.dir}"/>
+         <copy todir="${modules.all-src.dir}">
+             <fileset dir="${core.src.dir}">
+diff -urpN xdoclet-1.2.2.orig/maven/build.xml xdoclet-1.2.2/maven/build.xml
+--- xdoclet-1.2.2.orig/maven/build.xml	2005-04-03 05:13:08.000000000 +0200
++++ xdoclet-1.2.2/maven/build.xml	2005-04-03 05:13:14.000000000 +0200
+@@ -77,7 +77,7 @@
+         </jar>
+         
+         <!-- Install the plugin if MAVEN_HOME/MAVEN_LOCAL_HOME is defined -->
+-        <antcall target="install"/>
++        <!--antcall target="install"/-->
+     </target>
+     
+     <target name="clean">
+diff -urpN xdoclet-1.2.2.orig/modules/modules-common.ent xdoclet-1.2.2/modules/modules-common.ent
+--- xdoclet-1.2.2.orig/modules/modules-common.ent	2005-04-03 05:13:08.000000000 +0200
++++ xdoclet-1.2.2/modules/modules-common.ent	2005-04-03 05:13:12.000000000 +0200
+@@ -190,7 +190,7 @@
+     <!-- =================================================================== -->
+     <!-- Compiles the source code                                            -->
+     <!-- =================================================================== -->
+-    <target name="compile" depends="beautify" unless="module.jar.uptodate">
++    <target name="compile" depends="init" unless="module.jar.uptodate">
+         <mkdir dir="${module.classes.dir}"/>
+         <javac
+             destdir="${module.classes.dir}"
diff --git a/dev-java/xdoclet/files/xdoclet-1.2.3-interface.patch b/dev-java/xdoclet/files/xdoclet-1.2.3-interface.patch
new file mode 100644
index 000000000000..d7f9c2897873
--- /dev/null
+++ b/dev-java/xdoclet/files/xdoclet-1.2.3-interface.patch
@@ -0,0 +1,271 @@
+diff -uprN xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java
+--- xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java	2004-10-14 04:39:06.000000000 +0200
++++ xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java	2005-04-03 15:20:31.000000000 +0200
+@@ -4,10 +4,7 @@
+  */
+ package xdoclet.modules.hibernate;
+ 
+-import java.util.Collection;
+-import java.util.Iterator;
+-import java.util.LinkedList;
+-import java.util.Properties;
++import java.util.*;
+ 
+ import org.apache.commons.logging.Log;
+ import org.apache.tools.ant.types.Parameter;
+@@ -48,6 +45,18 @@ public class HibernateTagsHandler
+ 
+     private Parameter currentOtherMapping;
+ 
++    private static boolean isHibernated(XClass xClass)
++    {
++        if (xClass == null) {
++            return false;
++        }
++
++        return (
++            xClass.getDoc().getTag("hibernate.class") != null ||
++            xClass.getDoc().getTag("hibernate.subclass") != null
++            );
++    }
++
+     /**
+      * Returns full path of hibernate file for the current class.
+      *
+@@ -594,9 +603,11 @@ public class HibernateTagsHandler
+                 log.debug("typeName=" + typeName);
+ 
+             Collection classes = getXJavaDoc().getSourceClasses();
++            List reorderedClasses = flattenHierachy(getCurrentClass(), classes);
++
+             XClass clazz;
+ 
+-            for (Iterator i = classes.iterator(); i.hasNext(); ) {
++            for (Iterator i = reorderedClasses.iterator(); i.hasNext(); ) {
+                 clazz = (XClass) i.next();
+ 
+                 log.debug("clazz=" + clazz);
+@@ -604,8 +615,13 @@ public class HibernateTagsHandler
+                 if (DocletSupport.isDocletGenerated(clazz)) {
+                     log.debug("isDocletGenerated");
+                 }
+-                else if (clazz.getSuperclass() != null && clazz.getSuperclass().getQualifiedName().equals(typeName)) {
+-                    log.debug("is a subclass");
++                else if (isValidSubclass(clazz, getCurrentClass())) {
++                    if (getCurrentClass().isInterface()) {
++                        log.debug("is an implementing class");
++                    }
++                    else {
++                        log.debug("is a subclass");
++                    }
+ 
+                     XClass current = getCurrentClass();
+ 
+@@ -735,10 +751,108 @@ public class HibernateTagsHandler
+         //TODO: Why do we need this!!??
+     }
+ 
++    private boolean isValidSubclass(XClass clazz, XClass currentClass)
++    {
++        String typeName = currentClass.getQualifiedName();
++
++        // easy case, clazz is implementing interface of hibernated class
++        // NB: not easy anymore, if we've got a hibernated interface hierachy
++        // only return true for "deepest" implemented interface in this hierachy
++        if (currentClass.isInterface() && clazz.isImplementingInterface(typeName)) {
++            List extending = currentClass.getExtendingInterfaces();
++
++            if (extending.isEmpty()) {
++                return true;
++            }
++
++            for (int i = 0; i < extending.size(); i++) {
++                XClass xClass = (XClass) extending.get(i);
++
++                if (isHibernated(xClass) && clazz.isImplementingInterface(xClass.getQualifiedName())) {
++                    // we found an interface deeper in the hierachy
++                    return false;
++                }
++            }
++            return true;
++        }
++
++        if (clazz.getSuperclass() != null) {
++            // easy case, this class is direct subclass of the hibernated type
++            if (clazz.getSuperclass().equals(typeName)) {
++                return true;
++            }
++            else {
++                // go up class hierarchy to find first hibernate tag
++                XClass xc = clazz;
++
++                do {
++                    xc = xc.getSuperclass();
++
++                } while (xc != null && !isHibernated(xc));
++
++                // did we find a valid superclass, is it the current ?
++                if (xc != null) {
++                    return xc.equals(currentClass);
++                }
++            }
++        }
++
++        return false;
++    }
++
+     private HibernateSubTask getHibernateSubTask()
+     {
+         return ((HibernateSubTask) (DocletContext.getInstance()
+             .getSubTaskBy(DocletTask.getSubTaskName(HibernateSubTask.class))));
+     }
++
++    /**
++     * Flattens the collection of classes by eliminating descendants (for hibernated non 
++     * interface classes).
++     *
++     * @param currentClass
++     * @param classes
++     * @return
++     */
++    private List flattenHierachy(XClass currentClass, Collection classes)
++    {
++        Log log = LogUtil.getLog(HibernateTagsHandler.class, "flattenHierachy");
++
++        log.debug("for class " + currentClass);
++
++        if (!currentClass.isInterface()) {
++            List l = new ArrayList(classes);
++
++            l.retainAll(currentClass.getAllSubclasses());
++            return l;
++        }
++
++        Set s = new HashSet(classes);
++
++        log.debug("initial set size: " + s.size());
++
++        for (Iterator iterator = classes.iterator(); iterator.hasNext(); ) {
++            XClass xClass = (XClass) iterator.next();
++
++            if (xClass.isInterface() || !isHibernated(xClass)) {
++                continue;
++            }
++
++            List subClasses = xClass.getAllSubclasses();
++
++            for (int i = 0; i < subClasses.size(); i++) {
++                XClass aClass = (XClass) subClasses.get(i);
++
++                if (s.contains(aClass)) {
++                    log.debug("removing " + aClass + " from set");
++                    s.remove(aClass);
++                }
++            }
++        }
++
++        log.debug("new set size: " + s.size());
++
++        return new ArrayList(s);
++    }
+ }
+ 
+diff -uprN xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt
+--- xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt	2004-10-10 11:43:05.000000000 +0200
++++ xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt	2005-04-03 15:20:31.000000000 +0200
+@@ -1,4 +1,4 @@
+-    <XDtMethod:ifHasMethodTag tagName="hibernate.property">
++    <XDtMethod:ifHasMethodTag tagName="hibernate.property" superclasses="false">
+         <property
+             name="<XDtMethod:propertyName />"
+             type="<XDtMethod:methodTagValue tagName="hibernate.property" paramName="type" default="<XDtMethod:methodType/>"/>"
+@@ -20,7 +20,7 @@
+             </XDtHibernate:setCurrentTag>
+         </XDtMethod:ifHasMethodTag>
+ 
+-    <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one">
++    <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one" superclasses="false">
+         <many-to-one
+             name="<XDtMethod:propertyName/>"
+             class="<XDtMethod:methodTagValue tagName="hibernate.many-to-one" paramName="class" default="<XDtMethod:methodType/>" />"
+@@ -43,7 +43,7 @@
+           </XDtHibernate:setCurrentTag>
+     </XDtMethod:ifHasMethodTag>
+ 
+-     <XDtMethod:ifHasMethodTag tagName="hibernate.one-to-one">
++     <XDtMethod:ifHasMethodTag tagName="hibernate.one-to-one" superclasses="false">
+         <one-to-one
+             name="<XDtMethod:propertyName/>"
+             class="<XDtMethod:methodTagValue tagName="hibernate.one-to-one" paramName="class" default="<XDtMethod:methodType/>"/>"
+@@ -59,7 +59,7 @@
+         />
+      </XDtMethod:ifHasMethodTag>
+ 
+-     <XDtMethod:ifHasMethodTag tagName="hibernate.component">
++     <XDtMethod:ifHasMethodTag tagName="hibernate.component" superclasses="false">
+         <component
+             name="<XDtMethod:propertyName />"
+             class="<XDtMethod:methodTagValue tagName="hibernate.component" paramName="class" default="<XDtMethod:methodType/>"/>"
+@@ -84,7 +84,7 @@
+         />
+      </XDtMethod:ifHasMethodTag>
+ 
+-        <XDtMethod:ifHasMethodTag tagName="hibernate.set">
++        <XDtMethod:ifHasMethodTag tagName="hibernate.set" superclasses="false">
+         <set
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.set" paramName="table">
+@@ -114,7 +114,7 @@
+         </set>
+         </XDtMethod:ifHasMethodTag>
+ 
+-        <XDtMethod:ifHasMethodTag tagName="hibernate.bag">
++        <XDtMethod:ifHasMethodTag tagName="hibernate.bag" superclasses="false">
+         <bag
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.bag" paramName="table">
+@@ -143,7 +143,7 @@
+         </bag>
+         </XDtMethod:ifHasMethodTag>
+ 
+-    <XDtMethod:ifHasMethodTag tagName="hibernate.list">
++    <XDtMethod:ifHasMethodTag tagName="hibernate.list" superclasses="false">
+         <list
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.list" paramName="table">
+@@ -166,7 +166,7 @@
+         </list>
+         </XDtMethod:ifHasMethodTag>
+ 
+-        <XDtMethod:ifHasMethodTag tagName="hibernate.map">
++        <XDtMethod:ifHasMethodTag tagName="hibernate.map" superclasses="false">
+         <map
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.map" paramName="table">
+@@ -193,7 +193,7 @@
+         </map>
+         </XDtMethod:ifHasMethodTag>
+ 
+-        <XDtMethod:ifHasMethodTag tagName="hibernate.array">
++        <XDtMethod:ifHasMethodTag tagName="hibernate.array" superclasses="false">
+         <array
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.array" paramName="table">
+@@ -218,7 +218,7 @@
+         </array>
+         </XDtMethod:ifHasMethodTag>
+ 
+-        <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array">
++        <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array" superclasses="false">
+         <primitive-array
+             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
+           <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array" paramName="table">
+@@ -236,7 +236,7 @@
+         </primitive-array>
+         </XDtMethod:ifHasMethodTag>
+ 
+-          <XDtMethod:ifHasMethodTag tagName="hibernate.any">
++          <XDtMethod:ifHasMethodTag tagName="hibernate.any" superclasses="false">
+               <any
+                   name="<XDtMethod:propertyName />"
+                   id-type="<XDtMethod:methodTagValue tagName="hibernate.any" paramName="id-type"/>"
diff --git a/dev-java/xdoclet/files/xdoclet-modules_common_ent.patch b/dev-java/xdoclet/files/xdoclet-modules_common_ent.patch
new file mode 100644
index 000000000000..8db9e5f84ec3
--- /dev/null
+++ b/dev-java/xdoclet/files/xdoclet-modules_common_ent.patch
@@ -0,0 +1,9 @@
+--- modules/modules-common.ent.orig	2005-02-23 15:47:39.000000000 -0500
++++ modules/modules-common.ent	2005-02-23 17:25:17.000000000 -0500
+@@ -294,5 +294,6 @@
+             out="${module.tag.doclipse.file}"
+             extension=".xml"
+             style="${docs.stylesheets.dir}/doclipse.xslt">
++            <xmlcatalog refid="xtags"/>
+         </xslt>
+     </target>
diff --git a/dev-java/xdoclet/metadata.xml b/dev-java/xdoclet/metadata.xml
new file mode 100644
index 000000000000..d7880ffb1370
--- /dev/null
+++ b/dev-java/xdoclet/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<herd>proxy-maintainers</herd>
+	<longdescription>
+  XDoclet is an extended Javadoc Doclet engine. It's a generic Java
+  tool that lets you create custom Javadoc @tags and based on those
+  @tags generate source code or other files (such as XML-ish
+  deployment descriptors) using a template engine it provides.  
+
+  It enables Attribute Oriented Programming for Java.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xdoclet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/xdoclet/xdoclet-1.2.3.ebuild b/dev-java/xdoclet/xdoclet-1.2.3.ebuild
new file mode 100644
index 000000000000..414660e1f28f
--- /dev/null
+++ b/dev-java/xdoclet/xdoclet-1.2.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="source"
+WANT_ANT_TASKS="ant-nodeps ant-trax"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="XDoclet is an extended Javadoc Doclet engine"
+HOMEPAGE="http://xdoclet.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+CDEPEND=">=dev-java/bsf-2.3
+	dev-java/commons-collections
+	dev-java/commons-logging
+	dev-java/log4j
+	dev-java/mockobjects
+	dev-java/velocity
+	dev-java/xjavadoc
+	=dev-java/junit-3.8*"
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/ant-core
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-interface.patch
+	epatch "${FILESDIR}"/${P}-buildfile.patch
+
+	cd "${S}"/lib && rm -f *.jar
+	java-pkg_jar-from xjavadoc
+	java-pkg_jar-from bsf-2.3
+	java-pkg_jar-from velocity
+	java-pkg_jar-from log4j
+	java-pkg_jar-from mockobjects
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from commons-collections
+	java-pkg_jar-from velocity
+	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from junit
+}
+
+# TODO investigate why compiling needs junit, ie is build not sane enough to
+# devide building of test classes separate from rest of classes?
+src_compile() {
+	# bug #167445
+	use amd64 && export ANT_OPTS="-Xmx512m"
+	eant core modules maven
+}
+
+src_install() {
+	for jar in target/lib/*.jar; do
+		java-pkg_newjar ${jar} $(basename ${jar/-${PV}/})
+	done
+
+	dodoc README.txt
+	use source && java-pkg_dosrc core/src/xdoclet modules/*
+}
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
new file mode 100644
index 000000000000..ac71250fc674
--- /dev/null
+++ b/dev-java/xerces/Manifest
@@ -0,0 +1,2 @@
+DIST Xerces-J-src.1.3.1.tar.gz 900263 SHA256 d59f57ef4ec540f75b4b79aeef20e85ccb4f2c3b516dc995f1fc88f526f5f1e1 SHA512 2a7990a63d0ff3c491af4e5d7480583378dbcd8ce6042d4be6e87e53aa1012f2f0e709e7e0cde1ec9b930822a1e386550a899a1ef29a01267806dbfe595a9d64 WHIRLPOOL ecc7abc65c6b22e8e749e5f2ccc5b45d3b99d0439f2a020cfda2c4db5958ce66df743a978df475ee855f07129c8ef801d2c8cd97635738c1df404873d4287e9a
+DIST Xerces-J-src.2.11.0.tar.gz 1792762 SHA256 f59a5ef7b51bd883f2e9bda37a9360692e6c5e439b98d9b6ac1953e1f98b0680 SHA512 de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411 WHIRLPOOL 891a1a04dd781c3dd4c01f295679b069dca9ae7126b3a4e3ab0e9da8ae6bd00e62e97b606acb233d3cd7b0da21012a6aa4f8339b42d26e251440d01057d24973
diff --git a/dev-java/xerces/files/xerces-1.3.1-build.xml b/dev-java/xerces/files/xerces-1.3.1-build.xml
new file mode 100644
index 000000000000..d688a62057ce
--- /dev/null
+++ b/dev-java/xerces/files/xerces-1.3.1-build.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+
+<project name="xerces" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="src" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="docs" />
+	<property name="dist.dir" value="dist" />
+	<property name="jarfile" value="${dist.dir}/xerces.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}" />
+
+		<copy todir="${build.dir}">
+			<fileset dir="${src.dir}">
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
+	</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="org.* , javax.*"
+           		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/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/files/xerces-2.3.0-gentoo.patch b/dev-java/xerces/files/xerces-2.3.0-gentoo.patch
new file mode 100644
index 000000000000..08f95ed7a6fa
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.3.0-gentoo.patch
@@ -0,0 +1,61 @@
+diff -urpN xerces-2_3_0.orig/build.sh xerces-2_3_0/build.sh
+--- xerces-2_3_0.orig/build.sh	2005-01-15 15:14:51.682424232 +0100
++++ xerces-2_3_0/build.sh	2005-01-15 16:22:11.299309120 +0100
+@@ -19,7 +19,7 @@ uname | grep WIN && CLPATHSEP=\;
+ 
+ # Keep this classpath to the minimum required to run ant
+ # Application dependent classpaths are specified in build.xml 
+-LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar${CLPATHSEP}${JAVA_HOME}/lib/classes.zip${CLPATHSEP}./tools/ant.jar${CLPATHSEP}./tools/xercesImpl.jar${CLPATHSEP}./tools/xml-apis.jar${CLPATHSEP}./tools/bin/xjavac.jar"
++LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar${CLPATHSEP}${JAVA_HOME}/lib/classes.zip${CLPATHSEP}./tools/ant.jar${CLPATHSEP}./tools/ant-launcher.jar${CLPATHSEP}./tools/xercesImpl.jar${CLPATHSEP}./tools/xml-apis.jar${CLPATHSEP}./tools/bin/xjavac.jar"
+ ANT_HOME=./tools
+ 
+ echo Building with classpath \"$LOCALCLASSPATH\"
+diff -urpN xerces-2_3_0.orig/build.xml xerces-2_3_0/build.xml
+--- xerces-2_3_0.orig/build.xml	2005-01-15 15:14:51.682424232 +0100
++++ xerces-2_3_0/build.xml	2005-01-15 16:38:48.751673312 +0100
+@@ -173,7 +173,6 @@ Copyright:
+     <copy file="${src.dir}/org/apache/xerces/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration"
+       tofile="${build.dest}/META-INF/services/org.apache.xerces.xni.parser.XMLParserConfiguration"/>
+ 
+-    <!-- copy src files -->
+     <copy todir="${build.src}">
+         <fileset 
+             dir="${src.dir}"
+@@ -187,8 +186,8 @@ Copyright:
+                        org/apache/xerces/dom3/ls/**">
+         </fileset>
+     </copy>
+-
+-    <!-- now deal with API's:  -->
++    
++    <!-- now deal with API's:  
+     <unzip src="${src.apis.zip}" dest="${build.src}">
+         <patternset
+             includes="org/xml/sax/** 
+@@ -200,7 +199,7 @@ Copyright:
+                 org/w3c/dom/traversal/**"
+         />
+     </unzip>
+-    
++    -->
+     <!-- substitute tokens as needed -->
+     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
+              token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
+@@ -221,16 +220,7 @@ Copyright:
+            debug="${debug}"
+            deprecation="${deprecation}"
+            optimize="${optimize}"
+-           includeAntRuntime="false"
+-           includeJavaRuntime="false"
+-           excludes="org/xml/sax/** 
+-                javax/xml/parsers/**
+-                org/w3c/dom/*
+-                org/w3c/dom/events/**
+-                org/w3c/dom/html/**
+-                org/w3c/dom/ranges/**
+-                org/w3c/dom/traversal/**"
+-           />
++	   classpath="tools/xml-apis.jar" />
+   </target>
+ 
+   <!-- =================================================================== -->
diff --git a/dev-java/xerces/files/xerces-2.9.0-gentoo.patch b/dev-java/xerces/files/xerces-2.9.0-gentoo.patch
new file mode 100644
index 000000000000..61445ea6fe88
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.9.0-gentoo.patch
@@ -0,0 +1,21 @@
+diff -urpN xerces-2_6_2.old/build.xml xerces-2_6_2/build.xml
+--- xerces-2_6_2.old/build.xml	2004-02-20 19:58:14.000000000 +0100
++++ xerces-2_6_2/build.xml	2005-01-15 14:41:08.603978904 +0100
+@@ -190,7 +190,7 @@ Copyright:
+         </fileset>
+     </copy>
+ 
+-    <!-- now deal with API's:  -->
++    <!-- now deal with API's:  
+     <unzip src="${src.apis.zip}" dest="${build.src}">
+         <patternset
+             includes="org/xml/sax/** 
+@@ -202,7 +202,7 @@ Copyright:
+                 org/w3c/dom/traversal/**"
+         />
+     </unzip>
+-    
++    -->
+     <!-- substitute tokens as needed -->
+     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
+              token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
diff --git a/dev-java/xerces/files/xerces-2.9.0-no_dom3.patch b/dev-java/xerces/files/xerces-2.9.0-no_dom3.patch
new file mode 100644
index 000000000000..8f485adcdbfd
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.9.0-no_dom3.patch
@@ -0,0 +1,20 @@
+diff -ru xerces-2_7_1/build.xml xerces-2_7_1-patched/build.xml
+--- xerces-2_7_1/build.xml	2005-07-26 16:09:07.000000000 -0400
++++ xerces-2_7_1-patched/build.xml	2005-12-08 23:51:32.000000000 -0500
+@@ -442,16 +442,6 @@
+       additionalparam='${additional.param}'
+       />
+     <mkdir dir='${build.dir}/docs/javadocs/other'/>
+-    <javadoc packagenames='org.apache.html.*,
+-                           org.apache.wml.*,
+-                           org.apache.xml.serialize.*'
+-      locale='en_US'
+-      sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/other'
+-      author='true' version='true'
+-      windowtitle='Other Classes' doctitle='Other Classes'
+-      bottom='${copyright}'
+-      additionalparam='${additional.param}'
+-      />
+   </target>
+ 
+   <!-- =================================================================== -->
diff --git a/dev-java/xerces/files/xerces-2.9.1-gentoo.patch b/dev-java/xerces/files/xerces-2.9.1-gentoo.patch
new file mode 100644
index 000000000000..61445ea6fe88
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.9.1-gentoo.patch
@@ -0,0 +1,21 @@
+diff -urpN xerces-2_6_2.old/build.xml xerces-2_6_2/build.xml
+--- xerces-2_6_2.old/build.xml	2004-02-20 19:58:14.000000000 +0100
++++ xerces-2_6_2/build.xml	2005-01-15 14:41:08.603978904 +0100
+@@ -190,7 +190,7 @@ Copyright:
+         </fileset>
+     </copy>
+ 
+-    <!-- now deal with API's:  -->
++    <!-- now deal with API's:  
+     <unzip src="${src.apis.zip}" dest="${build.src}">
+         <patternset
+             includes="org/xml/sax/** 
+@@ -202,7 +202,7 @@ Copyright:
+                 org/w3c/dom/traversal/**"
+         />
+     </unzip>
+-    
++    -->
+     <!-- substitute tokens as needed -->
+     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
+              token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
diff --git a/dev-java/xerces/files/xerces-2.9.1-no_dom3.patch b/dev-java/xerces/files/xerces-2.9.1-no_dom3.patch
new file mode 100644
index 000000000000..8f485adcdbfd
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.9.1-no_dom3.patch
@@ -0,0 +1,20 @@
+diff -ru xerces-2_7_1/build.xml xerces-2_7_1-patched/build.xml
+--- xerces-2_7_1/build.xml	2005-07-26 16:09:07.000000000 -0400
++++ xerces-2_7_1-patched/build.xml	2005-12-08 23:51:32.000000000 -0500
+@@ -442,16 +442,6 @@
+       additionalparam='${additional.param}'
+       />
+     <mkdir dir='${build.dir}/docs/javadocs/other'/>
+-    <javadoc packagenames='org.apache.html.*,
+-                           org.apache.wml.*,
+-                           org.apache.xml.serialize.*'
+-      locale='en_US'
+-      sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/other'
+-      author='true' version='true'
+-      windowtitle='Other Classes' doctitle='Other Classes'
+-      bottom='${copyright}'
+-      additionalparam='${additional.param}'
+-      />
+   </target>
+ 
+   <!-- =================================================================== -->
diff --git a/dev-java/xerces/metadata.xml b/dev-java/xerces/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/xerces/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/xerces/xerces-1.3.1-r2.ebuild b/dev-java/xerces/xerces-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..2f50c144f299
--- /dev/null
+++ b/dev-java/xerces/xerces-1.3.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+S=${WORKDIR}/xerces-${PV//./_}
+DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
+HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
+SRC_URI="http://archive.apache.org/dist/xml/xerces-j/old_xerces1/Xerces-J-src.${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="1.3"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/xalan-2.5.2"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	cp "${FILESDIR}/${P}-build.xml" build.xml || die
+}
+
+EANT_DOC_TARGET="docs"
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	dodoc README STATUS || die
+	dohtml Readme.html || die
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc "${S}/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..2776621deb10
--- /dev/null
+++ b/dev-java/xerces/xerces-2.11.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 in the Apache Xerces family"
+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 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..bb7174ad4cd2
--- /dev/null
+++ b/dev-java/xerial-core/Manifest
@@ -0,0 +1 @@
+DIST xerial-core-2.0.1.tar.bz2 519709 SHA256 18fc5948ef4007edeb8c373c4b28057f08aa20a3514ed257cf592ee8db7437a1 SHA512 39236e8a653301a6899ce80d3240d505e91f0cfc8878fa1a698113d06f3af3fd7adef540d72da1c0e1fb7101542c43e92fb9388243d95c3185a561532c18c6fb WHIRLPOOL 860729ac4badeff692f603cd6d0e31b21e3876833c9f6c9d4a31e0c9bd95e7ccef0c924477cf0fdf525877625ef24f66b3fe6183c484381d577bd4a56aa602e6
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..e39d18f86245
--- /dev/null
+++ b/dev-java/xerial-core/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..cd20c8daa304
--- /dev/null
+++ b/dev-java/xerial-core/xerial-core-2.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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..59f33b6b30b6
--- /dev/null
+++ b/dev-java/xjavac/Manifest
@@ -0,0 +1 @@
+DIST xjavac-20110814.tar.gz 2217 SHA256 b26f1bacb391cc5f38d6ec99113fba86eeda1c50d2e86bef165d979869af2275 SHA512 f4c5aa437d135a8495c926387df68df8f47878e206ea8f279a7c3e8e32561dbac5a8c8002f77a2bf03863f42475cad5068e3c1031121b64b32fb4d15242c3b3e WHIRLPOOL f75fbf242c629f3e1833ebbd41b073d5d93dc064ba3aba020cc8ac30fcdc015a4959fe46db94da896025f8b39cef6548a040f48f2421df15f18f72d9b7a356d6
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..7303cef96964
--- /dev/null
+++ b/dev-java/xjavac/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/xjavac/xjavac-20110814.ebuild b/dev-java/xjavac/xjavac-20110814.ebuild
new file mode 100644
index 000000000000..ed2706a93ad8
--- /dev/null
+++ b/dev-java/xjavac/xjavac-20110814.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/xjavadoc/Manifest b/dev-java/xjavadoc/Manifest
new file mode 100644
index 000000000000..1a30ae71e0da
--- /dev/null
+++ b/dev-java/xjavadoc/Manifest
@@ -0,0 +1,2 @@
+DIST xjavadoc-1.1-src.tar.gz 58804 SHA256 dca21a4568f0ce349e797c4c942c788735f8e637d2a3305a781378b8b26a3c67 SHA512 e186d2b790def023bde797ca1693b06bcd00e564cf99400b0bd4c95b46a43ee65ee6b37528878afd8c415820972b43c35ba660f4321b15ca8be4d27342b64a92 WHIRLPOOL eea59a799cd5e14dae11771ae01560400c4f4f4f673b8dc56f723057e0cb9377ee9801dd08c67d34730c605e4c7303680e004f8ee4e272c983e5c517f7cb7946
+DIST xjavadoc-1.1-supplement.tar.bz2 458861 SHA256 e9f704c01f0891d386792821a7cf0cad0bcefb3af5b7f0c105a7db634526d16b SHA512 64d9c43ea75ebb9c1faf22b69e6f818e2deadfb4064cfc5d0fdda7e18bcd4fb8c806bb0d12b42080f10488c8ae466764de26a7f070085a1db108b0b9e801cc2b WHIRLPOOL 25ccf314eaa80972849d569aec434a7486fc04670bb7320e33d98e5c5da35c190a0ecff24827feb857201e9aad034d2e279978cef1b45ecd0a4e83b7c14dc549
diff --git a/dev-java/xjavadoc/files/xjavadoc-1.1-buildfile.patch b/dev-java/xjavadoc/files/xjavadoc-1.1-buildfile.patch
new file mode 100644
index 000000000000..68845a1e9b1c
--- /dev/null
+++ b/dev-java/xjavadoc/files/xjavadoc-1.1-buildfile.patch
@@ -0,0 +1,26 @@
+--- build.xml.orig	2005-04-03 04:24:07.000000000 +0200
++++ build.xml	2005-04-03 04:31:17.000000000 +0200
+@@ -38,12 +38,6 @@
+             <include name="**/package.html"/>

+          </fileset>

+       </copy>

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

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

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

+-            <include name="**/package.html"/>

+-         </fileset>

+-      </copy>

+    </target>

+ 

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

+@@ -64,8 +58,8 @@
+    <!-- =================================================================== -->

+    <!-- Makes the jar                                                       -->

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

+-   <target name="jar" depends="junit">

+-      <jar jarfile="${jardir}/xjavadoc-${version}.jar">

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

++      <jar jarfile="${jardir}/xjavadoc.jar">

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

+             <exclude name="**/*Test.class"/>

+          </fileset>

diff --git a/dev-java/xjavadoc/files/xjavadoc-1.1-nojunit.patch b/dev-java/xjavadoc/files/xjavadoc-1.1-nojunit.patch
new file mode 100644
index 000000000000..8d50ae1427e4
--- /dev/null
+++ b/dev-java/xjavadoc/files/xjavadoc-1.1-nojunit.patch
@@ -0,0 +1,27 @@
+--- build.xml.orig	2004-10-03 11:15:32.000000000 +0200
++++ build.xml	2006-08-21 16:44:57.000000000 +0200
+@@ -38,12 +38,6 @@
+             <include name="**/package.html"/>
+          </fileset>
+       </copy>
+-      <copy todir="${build.dir}/junit">
+-         <fileset dir="${basedir}/junit">
+-            <include name="**/*.java"/>
+-            <include name="**/package.html"/>
+-         </fileset>
+-      </copy>
+    </target>
+ 
+    <!-- =================================================================== -->
+@@ -64,8 +58,8 @@
+    <!-- =================================================================== -->
+    <!-- Makes the jar                                                       -->
+    <!-- =================================================================== -->
+-   <target name="jar" depends="junit">
+-      <jar jarfile="${jardir}/xjavadoc-${version}.jar">
++   <target name="jar" depends="compile">
++      <jar jarfile="${jardir}/xjavadoc.jar">
+          <fileset dir="${build.dir}/classes">
+             <exclude name="**/*Test.class"/>
+          </fileset>
+
diff --git a/dev-java/xjavadoc/metadata.xml b/dev-java/xjavadoc/metadata.xml
new file mode 100644
index 000000000000..bfcb77c44f83
--- /dev/null
+++ b/dev-java/xjavadoc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">xdoclet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/xjavadoc/xjavadoc-1.1-r2.ebuild b/dev-java/xjavadoc/xjavadoc-1.1-r2.ebuild
new file mode 100644
index 000000000000..d26197ee90a0
--- /dev/null
+++ b/dev-java/xjavadoc/xjavadoc-1.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A standalone implementation of JavaDoc engine suited for XDoclet"
+HOMEPAGE="http://xdoclet.sourceforge.net/xjavadoc/"
+SRC_URI="mirror://sourceforge/xdoclet/${P}-src.tar.gz
+	mirror://gentoo/${P}-supplement.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-java/commons-collections:0
+	dev-java/junit:0"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	dev-java/javacc
+	${COMMON_DEPEND}"
+
+java_prepare() {
+	# remove the junit tests, would need xdoclet, causing circular dep
+	epatch "${FILESDIR}"/${P}-nojunit.patch
+
+	cd "${S}"/lib || die
+	rm -v *.jar || die
+	java-pkg_jar-from commons-collections,junit
+	java-pkg_jar-from --build-only javacc
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
new file mode 100644
index 000000000000..4a0297f62bfa
--- /dev/null
+++ b/dev-java/xml-commons-external/Manifest
@@ -0,0 +1,2 @@
+DIST xml-commons-external-1.3.04.tar.bz2 659665 SHA256 4fde2dbe7707ebcec2b10f4d0214f6f30f608ab6c62b7833e183177ed6dd4dc8 SHA512 8bc71a0850e751ae4a5057833d57b2235734facbae43c733b0a9d86e5be99af016b737f12f5566c736f71374a709dee9954089db8fbeff4fb4cbb236a9fd6abb WHIRLPOOL df6004b449cae74d8e81c079c29bd2f9fed58df2ed65e488094c59c4cd687245a4b0bb6576874535ef61d7228c1e70e418518e0cf9387aa1e068584346751b3f
+DIST xml-commons-external-1.4.01.tar.bz2 683486 SHA256 37adf00788ea7716062ef86c2bf61d46eed4dfb71f0f7e4be1117ab6d47bf305 SHA512 fe22afb25e17b69a5416025ea812348af83474c26dcf88613ebc7b5f1288af9a73428b3f70544907afae4ba9dacb2aa7b8e5e2375d0aa712fe9d4e672d2e02db WHIRLPOOL 3d15e8dab2b966521f01b40b7a34c638f27ec7a9c256bd52b8804376f1f33425c5d5994cbb332201f8e739bcdef6662f9decd26ce7d31e6655132598465b8589
diff --git a/dev-java/xml-commons-external/metadata.xml b/dev-java/xml-commons-external/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/xml-commons-external/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</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..33818c5b7649
--- /dev/null
+++ b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An Apache-hosted set of externally-defined standards 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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
new file mode 100644
index 000000000000..10f80337fad4
--- /dev/null
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An Apache-hosted set of externally-defined standards 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 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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..87a4fbdb1fc7
--- /dev/null
+++ b/dev-java/xml-commons-resolver/Manifest
@@ -0,0 +1 @@
+DIST xml-commons-resolver-1.2.tar.gz 262701 SHA256 55dbe7bd56452c175320ce9a97b752252c5537427221323c72e9b9c1ac221efe SHA512 0c91057da3198fc488c7b2c20afb029aa4441ad979159c378d532b02caa294d27e730ae2f9857062af5e3815a603a6110c5441dd3fe6b36c342a78beac3c8a6f WHIRLPOOL 37308ea9d08a0bfa5fccd666283786e7bce78532b97b00964f8f994572ea38b7e60d91c9209dac8ce9c88e723905e8b305ca74e8b3b5aedfca9683c9583995f2
diff --git a/dev-java/xml-commons-resolver/metadata.xml b/dev-java/xml-commons-resolver/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/xml-commons-resolver/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
new file mode 100644
index 000000000000..b168fd243320
--- /dev/null
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="An XML Entity and URI Resolver"
+HOMEPAGE="http://xml.apache.org/commons/"
+SRC_URI="mirror://apache/xml/commons/${P}.tar.gz"
+DEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+JAVA_PKG_BSFIX_NAME="resolver.xml"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -rf apidocs resolver.jar || die
+}
+
+EANT_BUILD_XML="resolver.xml"
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_newjar build/resolver.jar
+
+	dodoc KEYS LICENSE.resolver.txt NOTICE-resolver.txt || die
+	if use doc; then
+		java-pkg_dojavadoc build/apidocs/resolver
+		java-pkg_dohtml docs/*.html
+	fi
+
+	use source && java-pkg_dosrc src/org
+}
diff --git a/dev-java/xml-commons/Manifest b/dev-java/xml-commons/Manifest
new file mode 100644
index 000000000000..1b5c2d46fad2
--- /dev/null
+++ b/dev-java/xml-commons/Manifest
@@ -0,0 +1 @@
+DIST xml-commons-1.0.b2.tar.gz 1821110 SHA256 22b9e53919e4aa15fdd074a515c8a8dc9823a91d72eb91fbb3e1bd8cfc488375 SHA512 72e4df0776e96514bf787b958f80309bd9e4ea47cde9b3fa157db08c921e7e7607899b1b0d43b16cf34e1c055812d052b3b873b13246ef693ebb7c74fdcfda94 WHIRLPOOL 2e73c513fa3f72823c001f8676b925ce87b0759da91c848a55f2245738245e5f557aaff3fdc14b0b8aef5de8122c97fd3f1d856738cd4112d315c38c8b99caf4
diff --git a/dev-java/xml-commons/files/1.0_beta2-jdk15.patch b/dev-java/xml-commons/files/1.0_beta2-jdk15.patch
new file mode 100644
index 000000000000..6080e14e7232
--- /dev/null
+++ b/dev-java/xml-commons/files/1.0_beta2-jdk15.patch
@@ -0,0 +1,36 @@
+diff -uprN xml-commons-1.0.b2/java/external/build.xml java/external/build.xml
+--- xml-commons-1.0.b2/java/external/build.xml	2002-02-06 16:52:59.000000000 +0100
++++ java/external/build.xml	2005-02-06 20:42:52.645987384 +0100
+@@ -65,7 +65,7 @@
+ 

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

+     description="Compile all classes">

+-   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" />

++   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" source="1.4" target="1.4" />

+   </target>

+ 

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

+diff -uprN xml-commons-1.0.b2/java/resolver.xml java/resolver.xml
+--- xml-commons-1.0.b2/java/resolver.xml	2002-02-06 16:52:46.000000000 +0100
++++ java/resolver.xml	2005-02-06 20:45:57.003960712 +0100
+@@ -63,7 +63,7 @@ Build file for org.apache.xml.resolver. 
+ 

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

+     description="Compile all classes">

+-   <javac srcdir="${src.dir}" destdir="${build.classes.dir}">

++   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" source="1.4" target="1.4">

+      <include name="${resolver.subdir}/*.java"/>

+      <include name="${resolver.subdir}/helpers/*.java"/>

+      <include name="${resolver.subdir}/readers/*.java"/>

+diff -uprN xml-commons-1.0.b2/java/which.xml java/which.xml
+--- xml-commons-1.0.b2/java/which.xml	2002-02-06 16:52:28.000000000 +0100
++++ java/which.xml	2005-02-06 20:45:38.379792016 +0100
+@@ -64,7 +64,7 @@ Build file for org.apache.env.Which serv
+   <target name="compile" depends="init"

+     description="Compile all classes">

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

+-       includes="${env.subdir}/*.java" />

++       includes="${env.subdir}/*.java" source="1.4" target="1.4" />

+   </target>

+ 

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

diff --git a/dev-java/xml-commons/metadata.xml b/dev-java/xml-commons/metadata.xml
new file mode 100644
index 000000000000..b910167b8e80
--- /dev/null
+++ b/dev-java/xml-commons/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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.0_beta2-r1.ebuild b/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..28ea21b0d34a
--- /dev/null
+++ b/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV=${PV/_beta/.b}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Jakarta project for for XML bindings for java"
+HOMEPAGE="http://xml.apache.org/commons/"
+SRC_URI="mirror://apache/xml/commons/${MY_P}.tar.gz"
+
+# Resolver is under Apache-1.1
+# SAX2 is public-domain
+# DOM documentation is under W3C-document
+# DOM software is under W3C
+# See ${S}/java/external for the license files
+LICENSE="Apache-1.1 public-domain W3C-document W3C"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PV}-jdk15.patch"
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadocs"
+
+	cd "${S}"/java
+	eant -f resolver.xml ${antflags} || die "XML-Resolver Compile failed"
+	eant -f which.xml ${antflags} || die "XML-Which Compile failed"
+}
+
+src_install() {
+	java-pkg_dojar java/build/which.jar
+	java-pkg_dojar java/build/resolver.jar
+	java-pkg_dojar java/external/build/xml-apis.jar
+
+	dodoc README.html || die
+	use doc && java-pkg_dojavadoc java/build/docs/javadocs
+	use source && java-pkg_dosrc java/src/org
+}
diff --git a/dev-java/xml-im-exporter/Manifest b/dev-java/xml-im-exporter/Manifest
new file mode 100644
index 000000000000..af34cb9e7deb
--- /dev/null
+++ b/dev-java/xml-im-exporter/Manifest
@@ -0,0 +1 @@
+DIST xml-im-exporter1.1.tgz 235161 SHA256 26b7ec388b39f2094af8d270dde5d84c46839328e5c58446f3dd2e857b153c76 SHA512 a762fe18a90abcc558fe3921038db7338a8bd98d9a7a0fe3ce86d733df5641541663126afcfa06dd1723dc9da205c80e2cf5f38f39ad84300b4750ceb77aa19c WHIRLPOOL 04accb4fedd521a529868c47c138256d158ab3b15d961f357e7d147708a9f392de631c1b96b1de676997a96f3af9b1b070dc7649fdcbd65a13f878917ad1c465
diff --git a/dev-java/xml-im-exporter/metadata.xml b/dev-java/xml-im-exporter/metadata.xml
new file mode 100644
index 000000000000..a153dd1cad8d
--- /dev/null
+++ b/dev-java/xml-im-exporter/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>
+		XML Im-/Exporter is a low level library to assist you in the
+		straight forward process of importing and exporting XML from
+		and to your Java classes.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xml-im-exporter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/xml-im-exporter/xml-im-exporter-1.1-r1.ebuild b/dev-java/xml-im-exporter/xml-im-exporter-1.1-r1.ebuild
new file mode 100644
index 000000000000..caf6a619e99a
--- /dev/null
+++ b/dev-java/xml-im-exporter/xml-im-exporter-1.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="XML Im-/Exporter is a library to assist you in the process of importing and exporting XML"
+HOMEPAGE="http://xml-im-exporter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${PN}"
+
+EANT_DOC_TARGET="javadocs"
+
+src_install() {
+	java-pkg_newjar "lib/${PN}${PV}.jar"
+
+	dodoc Changes.txt Open-Issues.txt Readme.txt Version.txt
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/xml-security/Manifest b/dev-java/xml-security/Manifest
new file mode 100644
index 000000000000..50df9d104a7d
--- /dev/null
+++ b/dev-java/xml-security/Manifest
@@ -0,0 +1 @@
+DIST xml-security-bin-1_5_7.zip 9164667 SHA256 37e31a3f80da74efddc5aabc9515366741aa68dfa3f71e903c0a870dec871011 SHA512 ae8e538fe7c90013a89d139358efc06d8921b1b0050a686dcacd123f5a8a8f100be163e88fef59998ea0ba27ebe9855f06d1f33b1ac92fa3f31acbce9934bd36 WHIRLPOOL faa1cd472b013a69ca38505806630aa423706a9a95f83a8bdd98813c8fc870875def6cf5c5157b1409280c362fb4070a8b9822c981bd8bc49b5a3688ccfd1b70
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..7303cef96964
--- /dev/null
+++ b/dev-java/xml-security/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/xml-security/xml-security-1.5.7.ebuild b/dev-java/xml-security/xml-security-1.5.7.ebuild
new file mode 100644
index 000000000000..212ad77ba35b
--- /dev/null
+++ b/dev-java/xml-security/xml-security-1.5.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5"
+DEPEND="${CDEPEND}
+	test? ( dev-java/junit:4 )
+	>=virtual/jdk-1.5"
+
+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"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-build.xml.patch"
+	find "${S}" -name "*.jar" -delete || die
+	rm "${S}"/src/test/java/org/apache/xml/security/test/utils/OldApiTest.java || 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..648c7c489b10
--- /dev/null
+++ b/dev-java/xml-writer/Manifest
@@ -0,0 +1 @@
+DIST xml-writer-0.2.zip 51666 SHA256 bbc839398d678b8ae7519c2525771b49920159720222e60afc4e3c8010426298 SHA512 6097d3515b0b6b06710c0913dbd378b2008a485d28000f7397151464747f0156f7e427efd33a8d0f43494b6c3d80470207fcbc742b338f3adec7d4d0f3a2b6d5 WHIRLPOOL add94d00872a7b5d30724eca5f94d437d36e71bc4f7280c81f4a4165657a2359e4ee5713218e6b83b20ef405450e93ed5de9c6656043ab49d67bb101b4f39b1d
diff --git a/dev-java/xml-writer/metadata.xml b/dev-java/xml-writer/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/xml-writer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/xml-writer/xml-writer-0.2.ebuild b/dev-java/xml-writer/xml-writer-0.2.ebuild
new file mode 100644
index 000000000000..982014d90492
--- /dev/null
+++ b/dev-java/xml-writer/xml-writer-0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+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 ppc ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	java-ant_xml-rewrite -f build.xml -e javac -d -a filtering
+	rm -v *.jar || die
+	rm -v *.class || die
+	rm -rv classes || die
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+	dodoc README ChangeLog BUGS || die
+	use doc && java-pkg_dojavadoc docs/javadoc
+	use examples && java-pkg_doexamples *.java sample.xml
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest
new file mode 100644
index 000000000000..38726e036900
--- /dev/null
+++ b/dev-java/xml-xmlbeans/Manifest
@@ -0,0 +1,2 @@
+DIST xml-xmlbeans-20041217.tar.bz2 2436239 SHA256 c2a53c653c9f49e172e2c364fc8e111ad3d258f906bbd6b8c65ca0b3f0c57a68 SHA512 93f662a10a12948bace265a34a23e851c1210da8d8af5e699d0f51eb6d1959220eaee8f9072d1a33330217aec08321eac7bf91d8aaa160f56b751b0ab4408619 WHIRLPOOL 0fd5c098d5b1c2ca49d00b639f0a49c87f62f6c74bce1bdf4bcdfe3b77a833dbc9bd7ad99fc40ab2bfb5561ebfb253d0c74a13a03803ad8cfba9f2063e0016bb
+DIST xmlbeans-2.6.0-src.zip 9005098 SHA256 3dff52b0854236adbbff9dc76722372415cd9a8f406f6133886a6c5228595390 SHA512 162dc3d283ebf9f7fae823a2ae8d835b708c2cbeed48349c85996e60b2b8dfe0e51b17bd37eb34327c6452b2c0fc7df8a4902816b145993e36ca614ceb43b2b7 WHIRLPOOL cd775fa268e56aa02d744be67012d807e1cebf978d453610b48a8ca865f8d1587f27ced161d622d5d6ae0badab80de80ee4b46b7bf3bb753f69242c20d1e03d5
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/files/xml-xmlbeans-gentoo.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch
new file mode 100644
index 000000000000..9f3a7656fd2f
--- /dev/null
+++ b/dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch
@@ -0,0 +1,156 @@
+diff -uprN xml-xmlbeans-20041217.orig/v1/build.xml xml-xmlbeans-20041217/v1/build.xml
+--- xml-xmlbeans-20041217.orig/v1/build.xml	2004-12-24 13:27:42.347587336 +0100
++++ xml-xmlbeans-20041217/v1/build.xml	2004-12-24 13:35:28.859666720 +0100
+@@ -340,7 +340,7 @@
+        srcdir="test/src/drt"
+        destdir="build/private/classes/drt"
+        classpathref="test.compile.path"
+-       source="1.4"
++       source="1.4" target="1.4"
+        debug="on"/>
+   </target>
+ 
+@@ -372,7 +372,7 @@
+ 
+   <target name="soaptest.classes" depends="dirs, stsschema.jar">
+     <mkdir dir="build/private/classes/soaptest"/>
+-    <javac srcdir="test/src/soaptest" destdir="build/private/classes/soaptest" source="1.4" debug="on">
++    <javac srcdir="test/src/soaptest" destdir="build/private/classes/soaptest" source="1.4" target="1.4" debug="on">
+       <classpath>
+         <pathelement location="external/lib/jdom.jar"/>
+         <pathelement location="external/lib/junit.jar"/>
+@@ -395,7 +395,7 @@
+        srcdir="test/src/erictest"
+        destdir="build/private/classes/erictest"
+        classpathref="test.compile.path"
+-       source="1.4"
++       source="1.4" target="1.4"
+        debug="on"/>
+   </target>
+ 
+@@ -411,7 +411,7 @@
+        srcdir="test/src/random"
+        destdir="build/private/classes/random"
+        classpathref="test.compile.path"
+-       source="1.4"
++       source="1.4" target="1.4"
+        debug="on"/>
+   </target>
+ 
+@@ -423,7 +423,7 @@
+ 
+   <target name="teststore.classes" depends="dirs">
+     <mkdir dir="build/private/classes/teststore"/>
+-    <javac srcdir="test/src/teststore" destdir="build/private/classes/teststore" source="1.4" debug="on">
++    <javac srcdir="test/src/teststore" destdir="build/private/classes/teststore" source="1.4" target="1.4" debug="on">
+       <classpath>
+         <pathelement location="build/private/classes/simpletypes"/>
+         <pathelement location="build/private/classes/xmlcomp"/>
+@@ -557,7 +557,7 @@
+     <property name="docs.dir" value="build/docs"/>
+     <delete dir="${docs.dir}"/>
+     <mkdir dir="${docs.dir}"/>
+-    <javadoc packagenames="*" sourcepath="src/xmlpublic" classpath="${javadoc.path}" destdir="${docs.dir}/reference" windowtitle="XMLBeans Documentation" source="1.4" stylesheetfile="docs/stylesheet.css">
++    <javadoc packagenames="*" sourcepath="src/xmlpublic" classpath="${javadoc.path}" source="1.4" destdir="${docs.dir}/reference" windowtitle="XMLBeans Documentation" stylesheetfile="docs/stylesheet.css">
+       <link href="http://xml.apache.org/xmlbeans/docs/reference/index.html"/>
+       <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
+       <link href="http://java.sun.com/j2ee/1.4/docs/api/"/>
+@@ -583,7 +583,7 @@
+       srcdir="test/src/streamtest"
+       destdir="build/private/classes/streamtest"
+       classpathref="test.compile.path"
+-      source="1.4"
++      source="1.4" target="1.4"
+       debug="on"/>
+   </target>
+ 
+@@ -736,7 +736,7 @@
+ 
+   <target name="xmlpublic.classes" depends="dirs, xmlinputstream.classes">
+     <mkdir dir="build/classes/xmlpublic"/>
+-    <javac srcdir="src/xmlpublic" destdir="build/classes/xmlpublic" source="1.4" debug="on">
++    <javac srcdir="src/xmlpublic" destdir="build/classes/xmlpublic" source="1.4" target="1.4" debug="on">
+       <classpath>
+         <pathelement location="build/classes/xmlinputstream"/>
+       </classpath>
+@@ -756,7 +756,7 @@
+ 
+   <target name="typestore.classes" depends="dirs, xmlpublic.classes, common.classes, xmlinputstream.classes">
+     <mkdir dir="build/classes/typestore"/>
+-    <javac srcdir="src/typestore" destdir="build/classes/typestore" source="1.4" debug="on">
++    <javac srcdir="src/typestore" destdir="build/classes/typestore" source="1.4" target="1.4" debug="on">
+       <classpath>
+         <pathelement location="build/classes/xmlinputstream"/>
+         <pathelement location="build/classes/xmlpublic"/>
+@@ -770,7 +770,7 @@
+ 
+   <target name="common.classes" depends="dirs, xmlpublic.jar, xmlinputstream.classes">
+     <mkdir dir="build/classes/common"/>
+-    <javac srcdir="src/common" destdir="build/classes/common" source="1.4" debug="on">
++    <javac srcdir="src/common" destdir="build/classes/common" source="1.4" target="1.4" debug="on">
+       <classpath>
+         <pathelement location="build/classes/xmlinputstream"/>
+         <pathelement location="build/lib/xmlpublic.jar"/>
+@@ -783,7 +783,7 @@
+ 
+   <target name="typeimpl.classes" depends="dirs, repackage.classes, xmlpublic.classes, typestore.classes, xsdschema.classes, configschema.classes, toolschema.classes">
+     <mkdir dir="build/classes/typeimpl"/>
+-    <javac destdir="build/classes/typeimpl" source="1.4" debug="on">
++    <javac destdir="build/classes/typeimpl" source="1.4" target="1.4" debug="on">
+       <classpath>
+         <pathelement location="build/classes/xmlinputstream"/>
+         <pathelement location="build/classes/common"/>
+@@ -816,7 +816,7 @@
+ 
+   <target name="xmlcomp.classes" depends="dirs, repackage.classes, typeimpl.classes, xmlpublic.classes, typestore.classes">
+     <mkdir dir="build/classes/xmlcomp"/>
+-    <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="1.4" debug="on">
++    <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="1.4" target="1.4" debug="on">
+       <classpath>
+         <pathelement location="build/classes/xmlinputstream"/>
+         <pathelement location="build/classes/xmlpublic"/>
+@@ -837,7 +837,7 @@
+   <target name="xmlstore.classes"
+         depends="dirs, common.classes, typestore.classes, xmlpublic.classes">
+     <mkdir dir="build/classes/xmlstore"/>
+-    <javac srcdir="src/xmlstore" destdir="build/classes/xmlstore" source="1.4" debug="on">
++    <javac srcdir="src/xmlstore" destdir="build/classes/xmlstore" source="1.4" target="1.4" debug="on">
+       <classpath id="xmlstore.compile.path">
+         <pathelement location="build/classes/xmlinputstream"/>
+         <pathelement location="build/classes/typestore"/>
+@@ -916,7 +916,7 @@
+ 
+   <target name="xmlconfig.classes" depends="dirs, xmlpublic.jar, configschema.classes">
+     <mkdir dir="build/classes/xmlconfig"/>
+-    <javac srcdir="src/xmlconfig" destdir="build/classes/xmlconfig" source="1.4" debug="on">
++    <javac srcdir="src/xmlconfig" destdir="build/classes/xmlconfig" source="1.4" target="1.4" debug="on">
+       <classpath>
+         <pathelement location="build/lib/xmlpublic.jar"/>
+         <pathelement location="build/classes/configschema"/>
+@@ -1044,7 +1044,7 @@
+ 
+     <target name="repackage.classes">
+         <mkdir dir="build/classes/repackage"/>
+-        <javac srcdir="src/repackage" destdir="build/classes/repackage" source="1.4" debug="on"/>
++        <javac srcdir="src/repackage" destdir="build/classes/repackage" source="1.4" target="1.4" debug="on"/>
+     </target>
+ 
+    <target name="check.jaxen.jar">
+@@ -1068,7 +1068,7 @@
+        srcdir="src/xpath"
+        destdir="build/private/classes/xpath"
+        classpathref="xpath.compile.path"
+-       source="1.4"
++       source="1.4" target="1.4"
+        debug="on">
+       <classpath id="xpath.compile.path">
+           <pathelement location="build/lib/xmlpublic.jar"/>
+@@ -1090,7 +1090,7 @@
+        srcdir="test/src/xpath"
+        destdir="build/private/classes/testxpath"
+        classpathref="testxpath.compile.path"
+-       source="1.4"
++       source="1.4" target="1.4"
+        debug="on">
+       <classpath id="testxpath.compile.path">
+           <pathelement location="build/lib/xmlpublic.jar"/>
diff --git a/dev-java/xml-xmlbeans/metadata.xml b/dev-java/xml-xmlbeans/metadata.xml
new file mode 100644
index 000000000000..3f89838776b7
--- /dev/null
+++ b/dev-java/xml-xmlbeans/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>java</herd>
+
+<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-1.0.4_pre20041217-r1.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
new file mode 100644
index 000000000000..c8677efee61b
--- /dev/null
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${PN}-20041217"
+
+DESCRIPTION="An XML-Java binding tool"
+HOMEPAGE="http://xmlbeans.apache.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-java/jaxen:1.1
+	dev-java/ant-core:0"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.4"
+
+S="${WORKDIR}/${MY_P}/v1"
+
+java_prepare() {
+	epatch "${FILESDIR}/xml-xmlbeans-gentoo.patch"
+	java-ant_rewrite-classpath build.xml
+
+	cd "${S}"/external/lib
+	#TODO: includes and old copy named oldxbean.jar
+	#that probably should not be used
+	#rm -v *.jar
+
+	java-pkg_jar-from jaxen-1.1 jaxen.jar jaxen-1.1-beta-2.jar
+	java-pkg_filter-compiler jikes
+}
+
+src_compile() {
+	eant xbean.jar $(use_doc docs) \
+		-Dgentoo.classpath=$(java-pkg_getjars ant-core)
+}
+
+# Tests always seem to fail #100895
+
+src_install() {
+	java-pkg_dojar build/lib/xbean*.jar
+
+	dodoc CHANGES.txt 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/*
+}
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild
new file mode 100644
index 000000000000..a71b7e581b88
--- /dev/null
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${PN}-20041217"
+
+DESCRIPTION="An XML-Java binding tool"
+HOMEPAGE="http://xmlbeans.apache.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/jaxen-1.1*
+	>=dev-java/ant-core-1.6.2"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}/v1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/xml-xmlbeans-gentoo.patch"
+	java-ant_rewrite-classpath build.xml
+
+	cd "${S}"/external/lib
+	#TODO: includes and old copy named oldxbean.jar
+	#that probably should not be used
+	#rm -v *.jar
+
+	java-pkg_jar-from jaxen-1.1 jaxen.jar jaxen-1.1-beta-2.jar
+	java-pkg_filter-compiler jikes
+}
+
+src_compile() {
+	eant xbean.jar $(use_doc docs) \
+		-Dgentoo.classpath=$(java-pkg_getjars ant-core)
+}
+
+# Tests always seem to fail #100895
+
+src_install() {
+	java-pkg_dojar build/lib/xbean*.jar
+
+	dodoc CHANGES.txt 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/*
+}
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..95abb656787e
--- /dev/null
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-2.6.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils 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"
+
+COMMON_DEP="dev-java/annogen:0
+	dev-java/ant-core:0
+	dev-java/jsr173:0
+	dev-java/piccolo:0
+	dev-java/saxon:9
+	dev-java/xml-commons-resolver:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	# 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
+
+	# Remove broken jamsupport.
+	epatch "${FILESDIR}"/${P}-remove-jamsupport.patch
+
+	# Patch package imports.
+	epatch "${FILESDIR}"/${P}-piccolo.patch
+	epatch "${FILESDIR}"/${P}-jam.patch
+
+	# Create empty directories to let the build pass.
+	mkdir -p build/classes/{jam,piccolo}
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="annogen,ant-core,piccolo,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/xmlc/Manifest b/dev-java/xmlc/Manifest
new file mode 100644
index 000000000000..b3039a951a40
--- /dev/null
+++ b/dev-java/xmlc/Manifest
@@ -0,0 +1 @@
+DIST xmlc-src-2.3.1.zip 8147268 SHA256 b95b422fc143c8bd2d61706d70ab4985431d5155b88df528951fc6f0c76b1b04 SHA512 377ec4d57373038e550b2f1902b019e413aeddc8b80f297898156a17c1fa437948b1e1f9302ca82f6b46fc8114a96f32bef9d27f68662fcf4fae1e7c3a52c16a WHIRLPOOL 819526aca87805a545237720b39fadbf3cb9f19bfab5acd38a24a084a0406ac7ece1b0d83b76cbe9fbd18286b45e846832afe58dfbc52cc6fb3c8d6c315d461e
diff --git a/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch b/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch
new file mode 100644
index 000000000000..58c3db7f62ae
--- /dev/null
+++ b/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch
@@ -0,0 +1,53 @@
+diff -Nur xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties
+--- xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties	2007-04-22 00:40:58.000000000 +0300
++++ xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties	2009-01-31 20:00:27.000000000 +0200
+@@ -37,7 +37,7 @@
+ # Comma seperated list of libraries (or more exactly, include patterns) this

+ # module depends on for building.

+ # They are searched relative to ${lib.dir}

+-module.depends=xmlc.jar

++module.depends=xmlc.jar,ant.jar

+ 

+ # Javadoc settings

+ javadoc.packages=org.enhydra.*

+diff -Nur xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml
+--- xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml	2007-11-04 01:07:36.000000000 +0200
++++ xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml	2009-01-31 20:13:12.000000000 +0200
+@@ -148,15 +148,12 @@
+ 	  description="Build the module .jar file">

+   	<tstamp/>

+   	<delete file="${module.jar}"/>

+-  	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar.jar"/>

+-  	<jarjar jarfile="${module.jar}"><!-- index="true"-->

++  	<jar jarfile="${module.jar}"><!-- index="true"-->

+       <fileset file="${dist.root}/../LICENSE-xmlc"/>

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

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

+ 	    includes="${module.lib.extra.includes}"

+ 	    excludes="${module.lib.extra.excludes}" />

+-      <zipfileset src="${build.lib.dir}/asm.jar"/>

+-      <rule pattern="org.objectweb.asm.**" result="org.enhydra.xml.xmlc.deferredparsing.asm.@1"/>

+       <manifest>

+         <attribute name="Built-By" value="${user.name}"/>

+         <attribute name="Built-On" value="${TODAY}"/>

+@@ -171,18 +168,13 @@
+           <attribute name="Implementation-Vendor" value="OW2 Consortium"/>

+           <attribute name="Implementation-Vendor-Id" value="org.ow2"/>

+           <attribute name="Implementation-URL" value="http://www.enhydra.org/tech/xmlc/"/>

+-        </section>

+-      	<section name="org/enhydra/xml/xmlc/deferredparsing/asm/">

+-          <attribute name="Implementation-Title" value="ASM"/>

+-          <attribute name="Implementation-Version" value="3.1"/> 

+-          <attribute name="Implementation-Vendor" value="France Telecom R&amp;D"/>

+-      	</section>

++        </section>


+       </manifest>

+       <!--indexjars>

+         <fileset dir="${dist.root}/lib" includes="*.jar"/>

+         <fileset dir="${dist.root}/build-lib" includes="*.jar"/>

+       </indexjars-->

+-    </jarjar>

++    </jar>

+   </target>

+ 

+   <target name="lib-tests" depends="init,compile-tests" unless="lib-test.skip"

diff --git a/dev-java/xmlc/metadata.xml b/dev-java/xmlc/metadata.xml
new file mode 100644
index 000000000000..88da3839a529
--- /dev/null
+++ b/dev-java/xmlc/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<longdescription>
+Enhydra XMLC is the presentation technology that supports the needs of 
+designers, developers and architects alike, delivering what JSP cannot - strict 
+separation of markup and logic in a true object view of dynamic presentations.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-java/xmlc/xmlc-2.3.1-r1.ebuild b/dev-java/xmlc/xmlc-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..1d93761ebfc1
--- /dev/null
+++ b/dev-java/xmlc/xmlc-2.3.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-src-${PV}"
+DESCRIPTION="Open Source Java/XML Presentation Compiler"
+HOMEPAGE="http://xmlc.objectweb.org/"
+SRC_URI="http://download.forge.objectweb.org/${PN}/${MY_P}.zip
+	http://download.us.forge.objectweb.org/${PN}/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/ant-core:0
+	dev-java/asm:3
+	dev-java/gnu-regexp:1
+	dev-java/log4j:0
+	dev-java/nekohtml:0
+	dev-java/xerces:2
+	dev-java/xml-commons-external:1.4
+	dev-java/xml-commons-resolver:0
+	java-virtuals/servlet-api:2.5"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	# get rid of jarjar, and add ant.jar to the taskdef module's classpath
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_BUILD_TARGET="all-libs"
+EANT_GENTOO_CLASSPATH="xerces-2,gnu-regexp-1,log4j,nekohtml,asm-3,xml-commons-external-1.4,xml-commons-resolver,servlet-api-2.5,ant-core"
+
+src_install() {
+	# the rest of jars are included in all-runtime
+	java-pkg_dojar release/lib/{xmlc-all-runtime,xmlc-taskdef}.jar
+	java-pkg_register-ant-task
+
+	newdoc xmlc/modules/xmlc/README.XMLC README || die
+	dodoc xmlc/modules/xmlc/ChangeLog || die
+	dohtml release/release-notes/xmlc-${PV//./-}-release-note.html \
+		xmlc/bugs/bugs.html || die
+
+	# move the generated documentation around
+	if use doc; then
+		mv ${PN}/modules/taskdef/doc ${PN}/modules/${PN}/doc/taskdef || die
+		mv ${PN}/modules/wireless/doc ${PN}/modules/${PN}/doc/wireless || die
+		mv ${PN}/modules/xhtml/doc ${PN}/modules/${PN}/doc/xhtml || die
+		java-pkg_dohtml -r ${PN}/modules/xmlc/doc/* || die "Failed to install documentation"
+	fi
+}
diff --git a/dev-java/xmldb/Manifest b/dev-java/xmldb/Manifest
new file mode 100644
index 000000000000..1acb5cccb3f9
--- /dev/null
+++ b/dev-java/xmldb/Manifest
@@ -0,0 +1 @@
+DIST xmldb-api-11112001.tar.gz 36553 SHA256 9bf195503b6ce45d17e1953041c125602bc69e3f6812a031055d26ca558d1006 SHA512 20123801a57b5350ade4dc82aba5ba2492cfbbe2e0389aaba4b73cdd3a8d07981a895ec2318885358102e48644cdaa30a18996ab9315891e506506fbc25658a2 WHIRLPOOL b96742f2da55b3330c5554c103b9998a69138a71050e9b48b71926df2b41dc92c3449b9f75843e9ba03b16cd480d23b6d2db1d56b29ae39b55a062836047e014
diff --git a/dev-java/xmldb/files/build-20011111.xml b/dev-java/xmldb/files/build-20011111.xml
new file mode 100644
index 000000000000..27e6a4469fc0
--- /dev/null
+++ b/dev-java/xmldb/files/build-20011111.xml
@@ -0,0 +1,59 @@
+<?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="xmldb-api"/>
+
+   <property name="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+   <property name="sdk-jar" value="${project.name}-sdk.jar"/>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${build}"/>
+      <mkdir dir="${dist}"/>
+      <mkdir dir="${dist}/doc"/>
+   </target>
+
+   <target name="compile" depends="init">
+	   <javac source="1.4" srcdir="${src}" destdir="${build}" classpath="${classpath}" excludes="**/test"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+	      <fileset dir="${build}" includes="org/xmldb/api/*.class,org/xmldb/api/base/**,org/xmldb/api/modules/**"/>
+      </jar>
+      <jar jarfile="${dist}/${sdk-jar}" manifest="${build}/MANIFEST.MF">
+	      <fileset dir="${build}" includes="org/xmldb/api/*.class,org/xmldb/api/reference/**,org/xmldb/api/sdk/**"/>
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+      <javadoc destdir="${dist}/doc/api" source="1.4">
+      	<fileset dir="${src}"/>
+      </javadoc>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
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..3e081e6e2d47
--- /dev/null
+++ b/dev-java/xmldb/files/xmldb-20011111-unreachable.patch
@@ -0,0 +1,12 @@
+diff -ru xmldb/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java xmldb-patched/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java
+--- xmldb/org/xmldb/api/reference/modules/XPathQueryServiceImpl.java	2002-01-30 04:46:43.000000000 -0500
++++ xmldb/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..2b157ce3b0f5
--- /dev/null
+++ b/dev-java/xmldb/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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-r1.ebuild b/dev-java/xmldb/xmldb-20011111-r1.ebuild
new file mode 100644
index 000000000000..b0e125b9859e
--- /dev/null
+++ b/dev-java/xmldb/xmldb-20011111-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+MY_PN="${PN}-api"
+MY_PV="11112001"
+MY_P="${MY_PN}-${MY_PV}"
+DESCRIPTION="Java implementation for specifications made by XML:DB"
+HOMEPAGE="http://sourceforge.net/projects/xmldb-org/"
+SRC_URI="mirror://sourceforge/xmldb-org/${MY_P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# TODO please make compiling the junit tests optional
+COMMON_DEP="
+	>=dev-java/xerces-2.7
+	>=dev-java/xalan-2.7
+	=dev-java/junit-3.8*"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v *.jar || die
+	mkdir lib
+
+	epatch "${FILESDIR}/${P}-unreachable.patch"
+
+	mkdir src && mv org src
+	cp "${FILESDIR}/build-${PV}.xml" build.xml
+}
+
+src_compile() {
+	# --with-dependencies because of indirectly referenced xml-commons-external
+	eant jar $(use_doc) \
+		-Dclasspath=$(java-pkg_getjars --with-dependencies xerces-2,xalan,junit)
+}
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+
+	use doc && java-pkg_dojavadoc dist/doc/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
new file mode 100644
index 000000000000..c166ff5d98e2
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -0,0 +1 @@
+DIST xmlgraphics-commons-2.0.1-src.tar.gz 2716982 SHA256 41938d4b27cb80b0ef9a240164e2137e51708d2f481488e5ae8c4e43c8da311c SHA512 fca5c593ceec18b040a0a57b74ba5377d5e070030f48b7835285986382795b19072bdf6320fd7e37182e4127883b795249ee1cb4255bcdfb1b00da1cf6032018 WHIRLPOOL 81554e5eab606378af8a536a3a630bf3ba041609d16b8fa49a41361d701658aec3131a3947b53341b4f99145f6701a4125b8e38b1a802eca5a16c8bfd5984e36
diff --git a/dev-java/xmlgraphics-commons/metadata.xml b/dev-java/xmlgraphics-commons/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</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..faa0c90b9ded
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 x86 ppc ppc64"
+
+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..ee4a39c1772e
--- /dev/null
+++ b/dev-java/xmlrpc/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-java/xmlrpc/files/xmlrpc-2.0.1.build.xml.patch b/dev-java/xmlrpc/files/xmlrpc-2.0.1.build.xml.patch
new file mode 100644
index 000000000000..d4bfefd9d6bf
--- /dev/null
+++ b/dev-java/xmlrpc/files/xmlrpc-2.0.1.build.xml.patch
@@ -0,0 +1,14 @@
+--- build.xml.orig	2005-12-21 10:09:45.000000000 +0100
++++ build.xml	2007-04-24 23:28:42.000000000 +0200
+@@ -302,9 +302,10 @@
+     <delete dir="${test.reportsDirectory}"/>
+     <mkdir dir="${test.reportsDirectory}"/>
+     
+-    <junit printSummary="yes">
++    <junit printSummary="yes" haltonfailure="true">
+       <formatter type="plain"/>
+       <classpath refid="classpath"/>
++	  <classpath path="${gentoo.classpath}"/>
+       <classpath>
+         <!-- <pathelement location="${xerces.jar}"/> -->
+         <pathelement path="${build.dest}"/>
diff --git a/dev-java/xmlrpc/metadata.xml b/dev-java/xmlrpc/metadata.xml
new file mode 100644
index 000000000000..72ca6b4edc74
--- /dev/null
+++ b/dev-java/xmlrpc/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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..00bf3a3686cf
--- /dev/null
+++ b/dev-java/xmlrpc/xmlrpc-3.1.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+		http://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}-build.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 ppc 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..3d8aae418f47
--- /dev/null
+++ b/dev-java/xmlstreambuffer/Manifest
@@ -0,0 +1 @@
+DIST streambuffer-1.5.3-sources.jar 63319 SHA256 c4f2363062517c3ffe008f238db93af8c17f67116aa570327c49c57cb0569edf SHA512 5f906af01bc2a796efb8f3221c60da3faf20c2a695d0d86afcc1439857ce55a90ecd9df6853b3717e28736c02524e05735770300eecbe83ba58c217c9da92740 WHIRLPOOL 097c95f81d23d7e5ac5ec27db6973c47747745124c35c6c6a7ebb3cb12249f3c87d4930b3ce3d8c1c912ca02d9de3ee24d959860b708ed4382d9070982e620a1
diff --git a/dev-java/xmlstreambuffer/metadata.xml b/dev-java/xmlstreambuffer/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/xmlstreambuffer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</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..3a226bccc58c
--- /dev/null
+++ b/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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..4adf3c3f996f
--- /dev/null
+++ b/dev-java/xmlunit/Manifest
@@ -0,0 +1 @@
+DIST xmlunit-1.6-src.zip 830899 SHA256 d3aeb0c9737c1184e7c70bb1f8eb986dc449c03f09f6d3c65406d51a7f879c8c SHA512 a7d15905d959ab5bfeb1807c80eab3e0aa58d501a2136335961da842b9571b95b4aab18189e9a21e59afac960ea83f9a2d32e3af398f63c0f839587b60b9f96b WHIRLPOOL 0cd507e5564e7d426385bcffb6cc0305a13fcf7e70699994789d23c5a91c0c0bb52c79b372eb5e07e37e08b791aa71b8cea1ccc801f2153d5af9793c1c3a8cec
diff --git a/dev-java/xmlunit/metadata.xml b/dev-java/xmlunit/metadata.xml
new file mode 100644
index 000000000000..515ace5efb61
--- /dev/null
+++ b/dev-java/xmlunit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..e7210f3e7694
--- /dev/null
+++ b/dev-java/xmlunit/xmlunit-1.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc 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/xom/Manifest b/dev-java/xom/Manifest
new file mode 100644
index 000000000000..173d2b995697
--- /dev/null
+++ b/dev-java/xom/Manifest
@@ -0,0 +1,2 @@
+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
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..f202e54d9df3
--- /dev/null
+++ b/dev-java/xom/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..f6d3a90bbc53
--- /dev/null
+++ b/dev-java/xom/xom-1.2.10.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~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..7c79dc5ee865
--- /dev/null
+++ b/dev-java/xp/Manifest
@@ -0,0 +1 @@
+DIST xp.zip 281324 SHA256 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6 WHIRLPOOL 677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
diff --git a/dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch b/dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch
new file mode 100644
index 000000000000..d2c11ab3ed59
--- /dev/null
+++ b/dev-java/xp/files/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/files/build.xml b/dev-java/xp/files/build.xml
new file mode 100644
index 000000000000..cea20e923774
--- /dev/null
+++ b/dev-java/xp/files/build.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+
+<project name="xp" default="jar">
+	<target name="compile">
+		<mkdir dir="build" />
+		<javac srcdir="." destdir="build" />
+	</target>
+
+	<target name="jar" depends="compile">
+		<jar jarfile="xp.jar" basedir="build" />
+	</target>
+</project>
diff --git a/dev-java/xp/metadata.xml b/dev-java/xp/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/xp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/xp/xp-0.5-r2.ebuild b/dev-java/xp/xp-0.5-r2.ebuild
new file mode 100644
index 000000000000..3ba1678245a2
--- /dev/null
+++ b/dev-java/xp/xp-0.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+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/xp.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	rm -v xp.jar || die
+	cp "${FILESDIR}/build.xml" . || die
+	epatch "${FILESDIR}"/${PV}-*.patch
+}
+
+#premade javadocs
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar xp.jar
+	dodoc docs/copying.txt
+	#has index.html and javadocs here
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc com
+}
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
new file mode 100644
index 000000000000..934182db530d
--- /dev/null
+++ b/dev-java/xpp2/Manifest
@@ -0,0 +1 @@
+DIST PullParser2.1.10.tgz 2310288 SHA256 ad82569b809e29c19b8223feaa12923f97bb4bbc942ff985857f9d853db489cf SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590 WHIRLPOOL 983aa4f0b062b46d756857c60d3a3e4dab6c7914571d1c23cfb61be230cead82c89c3c41576390c3f6d1d7066059411cf06e2c1eaf6bd4d265033da90403ce0e
diff --git a/dev-java/xpp2/metadata.xml b/dev-java/xpp2/metadata.xml
new file mode 100644
index 000000000000..03397f28c094
--- /dev/null
+++ b/dev-java/xpp2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<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-r1.ebuild b/dev-java/xpp2/xpp2-2.1.10-r1.ebuild
new file mode 100644
index 000000000000..2c06826af2f4
--- /dev/null
+++ b/dev-java/xpp2/xpp2-2.1.10-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+S="${WORKDIR}/${MY_P}"
+
+CDEPEND="dev-java/xerces:2"
+DEPEND=">=virtual/jdk-1.3
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.3
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v lib/*/*.jar build/*/*.jar || die
+	find build/ -name '*.jar' -o -name '*.class' -delete
+
+	# add xercesImpl.jar to relevant javac classpaths
+	java-ant_xml-rewrite -f build.xml -e javac -a classpath -i 7 -c -v \
+		'${build_intf}:lib/xercesImpl.jar' -i 7
+	java-ant_xml-rewrite -f build.xml -e javac -a classpath -i 8 -c -v \
+		'${build_intf}:${build_impl_tag}:${build_x2impl_pp}:${build_impl_node}:${build_impl_format}:lib/xercesImpl.jar'
+
+	cd lib
+	java-pkg_jar-from xerces-2
+}
+
+# override check for xerces-2 presence
+EANT_EXTRA_ARGS="-Dx2_present=true"
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="api"
+
+src_install() {
+	java-pkg_newjar build/lib/${MY_PN}-${PV}.jar ${MY_PN}.jar
+	java-pkg_newjar build/lib/${MY_PN}-intf-${PV}.jar ${MY_PN}-intf.jar
+	java-pkg_newjar build/lib/${MY_PN}-standard-${PV}.jar ${MY_PN}-standard.jar
+	java-pkg_newjar build/lib/${MY_PN}-x2-${PV}.jar ${MY_PN}-x2.jar
+
+	dohtml README.html || die
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/java/*
+}
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..289eef10c699
--- /dev/null
+++ b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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..e2373f59b06a
--- /dev/null
+++ b/dev-java/xpp3/Manifest
@@ -0,0 +1 @@
+DIST xpp3-1.1.4c_src.zip 959795 SHA256 c12c8c1bab5ce2c1d28a4075319d78c51d986581284b920faa5ed85df60437f4 SHA512 e9513b8c97a2fd04154f3717b802b81cb01c584e693303f6c6dcb763aa07e03f2f50178b80926457cb7f9147ff91c3e49cfce5e8ed522b4885d634f2f5a792fd WHIRLPOOL 6c0b541d1617e073827b9824c82014b106561d5941f2e68cae564a4d45e7c9af6f027030da1950b9a4e6d959a6659271fbe0f7a7069b3148860ae628a8fcd67d
diff --git a/dev-java/xpp3/files/xpp3-1.1.4c-build.xml.patch b/dev-java/xpp3/files/xpp3-1.1.4c-build.xml.patch
new file mode 100644
index 000000000000..33790c150393
--- /dev/null
+++ b/dev-java/xpp3/files/xpp3-1.1.4c-build.xml.patch
@@ -0,0 +1,20 @@
+--- build.xml.original	2007-02-09 20:06:21.000000000 +0100
++++ build.xml	2007-02-09 20:07:18.000000000 +0100
+@@ -426,7 +426,7 @@
+      depends="check_junit,impl,update_tests,wrapper,dom2_builder">
+     <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+       srcdir="${src_addons_tests}" destdir="${build_tests}"
+-      classpath="${build_api}:${build_classes}"      
++      classpath="${build_api}:${build_classes}:${gentoo.classpath}"      
+       />
+   </target>
+ 
+@@ -434,7 +434,7 @@
+      depends="check_junit,impl,update_tests">
+     <mkdir dir="${build_tests}"/>
+     <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+-      srcdir="${src_tests}" destdir="${build_tests}" classpath="${build_api}"
++      srcdir="${src_tests}" destdir="${build_tests}" classpath="${build_api}:${gentoo.classpath}"
+       />
+     <copy todir="${build_tests_xml}">
+       <fileset dir="${src_xml_tests}">
diff --git a/dev-java/xpp3/metadata.xml b/dev-java/xpp3/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/xpp3/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild
new file mode 100644
index 000000000000..42506fd42ebb
--- /dev/null
+++ b/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=${PV/m/.M}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="An implementation of XMLPULL V1 API"
+HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
+SRC_URI="http://www.extreme.indiana.edu/dist/java-repository/${PN}/distributions/${MY_P}_src.zip"
+
+LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	test? ( dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v *.jar || die
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" \
+		eant -Dgentoo.classpath=$(java-pkg_getjars junit) junit_main
+}
+
+src_install() {
+	java-pkg_newjar build/${MY_P}.jar ${PN}.jar
+
+	dohtml doc/*.html || die
+	dodoc doc/*.txt || die
+
+	use doc && java-pkg_dojavadoc doc/api_impl
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r2.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r2.ebuild
new file mode 100644
index 000000000000..446c4176458e
--- /dev/null
+++ b/dev-java/xpp3/xpp3-1.1.4c-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=${PV/m/.M}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="An implementation of XMLPULL V1 API"
+HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
+SRC_URI="http://www.extreme.indiana.edu/dist/java-repository/${PN}/distributions/${MY_P}_src.zip"
+
+LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:0
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+S=${WORKDIR}/${MY_P}
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+java_prepare() {
+	rm -v *.jar || die
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" \
+		eant -Dgentoo.classpath=$(java-pkg_getjars junit) junit_main
+}
+
+src_install() {
+	java-pkg_newjar build/${MY_P}.jar ${PN}.jar
+
+	dohtml doc/*.html || die
+	dodoc doc/*.txt || die
+
+	use doc && java-pkg_dojavadoc doc/api_impl
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/xsd2jibx/Manifest b/dev-java/xsd2jibx/Manifest
new file mode 100644
index 000000000000..b7df9359c3e2
--- /dev/null
+++ b/dev-java/xsd2jibx/Manifest
@@ -0,0 +1 @@
+DIST xsd2jibx-beta2a.zip 961258 SHA256 615d573d944d361dfa23ff1099c543c78fae1943af0735c7a7743a0472c865db SHA512 d525b5e71358c4ce259d7e65abe5ee0214b89093d209c07861f4069919d6c13ffae292b5db80a6f01b8451363aa6b40706beadd04f663bbf1224aaf3bed5b0a2 WHIRLPOOL 7fda5e53a5d96422edd679cd489038760951a39afc2337dac4ce0d103e33ad293c8fad558fed5a3d4626f804050b8bd1d331a727579fc3ee84d74f80526eab2f
diff --git a/dev-java/xsd2jibx/files/build.xml b/dev-java/xsd2jibx/files/build.xml
new file mode 100644
index 000000000000..b41ca64cf949
--- /dev/null
+++ b/dev-java/xsd2jibx/files/build.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+
+<project basedir="." default="jar">
+  
+  <!-- JiBX binding compiler task definition -->
+  <property environment="env"/>
+  <property name="jibxhome" value="${env.JIBX_HOME}"/>
+  <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
+    <classpath>
+      <pathelement location="${jibxhome}/lib/bcel.jar"/>
+      <pathelement location="${jibxhome}/lib/jibx-bind.jar"/>
+      <pathelement location="${jibxhome}/lib/jibx-run.jar"/>
+      <pathelement location="${jibxhome}/lib/jibx-extras.jar"/>
+      <pathelement location="${jibxhome}/lib/xpp3.jar"/>  
+    </classpath>
+  </taskdef>
+  
+  <!-- compile the class files -->
+  <target name="compile">
+    <delete quiet="true" dir="${basedir}/classes"/>
+    <mkdir dir="${basedir}/classes"/>
+    <javac srcdir="${basedir}/src/main"
+      destdir="${basedir}/classes"
+      excludes="org/jibx/xsd2jibx/GeneratorAntTask.java"
+      debug="true"
+      deprecation="on">
+      <classpath>
+        <fileset dir="${basedir}/lib">
+          <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${jibxhome}/lib">
+          <include name="jibx-run.jar"/>
+          <include name="xpp3.jar"/>
+        </fileset>
+      </classpath>
+    </javac>
+    <copy todir="${basedir}/classes/org/jibx/xsd2jibx">
+      <fileset dir="${basedir}/src/main/org/jibx/xsd2jibx" includes="**/*.xsl"/>
+    </copy>
+  </target>
+  
+  <!-- bind the class files -->
+  <target name="bind" depends="compile">
+    <echo message="Running binding compiler..."/>
+    <bind verbose="true" load="true">
+      <bindingfileset dir="${basedir}/src/main/org/jibx/xsd2jibx">
+        <include name="xsd.jibx.xml"/>
+        <include name="jibx.jibx.xml"/>
+      </bindingfileset>
+      <classpathset dir="${basedir}/classes"/>
+    </bind> 
+  </target>
+
+  <target name="javadoc" description="Produce JavaDoc">
+    <javadoc sourcepath="${basedir}/src/main" destdir="${basedir}/api"/>
+   </target>
+  
+  <!-- Build the jar files for the distribution -->
+  <target name="jar" depends="bind">
+    <delete file="${basedir}/lib/xsd2jibx.jar" quiet="true"/>
+    <jar jarfile="${basedir}/lib/xsd2jibx.jar" basedir="${basedir}/classes">
+      <manifest>
+        <attribute name="Main-Class" value="org/jibx/xsd2jibx/Generate"/>
+        <attribute name="Class-Path" value="commons-lang-2.0.jar commons-logging-1.0.4.jar jaxme-js-0.3.jar log4j-1.2.8.jar jibx-run.jar xpp3.jar"/>
+      </manifest>
+    </jar>
+  </target>
+
+</project>
diff --git a/dev-java/xsd2jibx/files/xsd2jibx-0.2a_beta-freemind.patch b/dev-java/xsd2jibx/files/xsd2jibx-0.2a_beta-freemind.patch
new file mode 100644
index 000000000000..bcd67e9eece4
--- /dev/null
+++ b/dev-java/xsd2jibx/files/xsd2jibx-0.2a_beta-freemind.patch
@@ -0,0 +1,74 @@
+Index: src/main/org/jibx/xsd2jibx/JSource.java
+===================================================================
+RCS file: /cvsroot/jibx/xsd2jibx/src/main/org/jibx/xsd2jibx/JSource.java,v
+retrieving revision 1.6
+diff -u -B -r1.6 JSource.java
+--- src/main/org/jibx/xsd2jibx/JSource.java	19 Feb 2005 20:02:31 -0000	1.6
++++ src/main/org/jibx/xsd2jibx/JSource.java	6 May 2007 21:16:33 -0000
+@@ -89,6 +89,12 @@
+ 			jm.addParam(jqname, element.getFieldName());
+ 			jm.addLine(element.getFieldList() + ".add(" + element.getFieldName() + ");");
+ 
++			// create add to position method:
++			jm = source.newJavaMethod(element.getAddPositionMethod(), JQName.VOID.getJavaQName(), PUBLIC);
++			jm.addParam(JQName.INT.getJavaQName(), "position");
++			jm.addParam(jqname, element.getFieldName());
++			jm.addLine(element.getFieldList() + ".add(position, " + element.getFieldName() + ");");
++
+ 			// create getMethod
+ 			jm = source.newJavaMethod(element.getGetMethod(), jqname, PUBLIC);
+ 			jm.addParam(JQName.INT.getJavaQName(), "index");
+@@ -97,6 +103,13 @@
+ 			//create size method
+ 			jm = source.newJavaMethod(element.getSizeMethod(), JQName.INT.getJavaQName(), JavaSource.PUBLIC);
+ 			jm.addLine("return " + element.getFieldList() + ".size();");
++
++			//create clear method
++			jm = source.newJavaMethod(element.getClearMethod(), JQName.VOID.getJavaQName(), JavaSource.PUBLIC);
++			jm.addLine(element.getFieldList() + ".clear();");
++			//create unmodified method
++			jm = source.newJavaMethod(element.getListMethod(), "java.util.List", JavaSource.PUBLIC);
++			jm.addLine("return java.util.Collections.unmodifiableList("+element.getFieldList() + ");");
+ 		} else { // it is not a collection
+ 			newBeanProperty(element);
+ 		}
+Index: src/main/org/jibx/xsd2jibx/XsdElement.java
+===================================================================
+RCS file: /cvsroot/jibx/xsd2jibx/src/main/org/jibx/xsd2jibx/XsdElement.java,v
+retrieving revision 1.6
+diff -u -B -r1.6 XsdElement.java
+--- src/main/org/jibx/xsd2jibx/XsdElement.java	19 Feb 2005 20:02:31 -0000	1.6
++++ src/main/org/jibx/xsd2jibx/XsdElement.java	6 May 2007 21:16:33 -0000
+@@ -60,6 +60,12 @@
+ 		return sb.toString();
+ 	}
+ 
++	public String getAddPositionMethod() {
++		StringBuffer sb = new StringBuffer("addAt");
++		sb.append(NameUtil.toUpperCamelCase(getJavaName()));
++		return sb.toString();
++	}
++
+ 	public String getSizeMethod() {
+ 		StringBuffer sb = new StringBuffer("size");
+ 		sb.append(NameUtil.toUpperCamelCase(getJavaName()));
+@@ -67,6 +73,19 @@
+ 		return sb.toString();
+ 	}
+ 
++	public String getClearMethod() {
++		StringBuffer sb = new StringBuffer("clear");
++		sb.append(NameUtil.toUpperCamelCase(getJavaName()));
++		sb.append(NameUtil.addListSuffix);
++		return sb.toString();
++	}
++	public String getListMethod() {
++		StringBuffer sb = new StringBuffer("getList");
++		sb.append(NameUtil.toUpperCamelCase(getJavaName()));
++		sb.append(NameUtil.addListSuffix);
++		return sb.toString();
++	}
++
+ 	protected void importRef() {
+ 		
+ 		if (this.ref != null) {
diff --git a/dev-java/xsd2jibx/metadata.xml b/dev-java/xsd2jibx/metadata.xml
new file mode 100644
index 000000000000..bc6fbe14e0bb
--- /dev/null
+++ b/dev-java/xsd2jibx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">jibx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.ebuild b/dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.ebuild
new file mode 100644
index 000000000000..42b8a66673f4
--- /dev/null
+++ b/dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+MY_PV="beta2a"
+
+DESCRIPTION="JiBX binding and code from schema generator"
+HOMEPAGE="http://jibx.sourceforge.net/xsd2jibx/"
+SRC_URI="mirror://sourceforge/jibx/${PN}-${MY_PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+COMMON_DEP="dev-java/commons-logging:0
+	dev-java/xpp3:0
+	dev-java/jaxme:0
+	dev-java/jibx:0
+	dev-java/commons-lang:2.1"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	cp "${FILESDIR}/build.xml" .
+	# patch from freemind authors, freemind won't build without it
+	# they sent upstream (that's how I found it) which said he's preparing
+	# complete rewrite. It only adds non-abstract functionality.
+	epatch "${FILESDIR}/${P}-freemind.patch"
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+	java-pkg_jar-from commons-logging,xpp3,jaxme,jibx,commons-lang-2.1
+}
+
+EANT_ANT_TASKS="jibx"
+EANT_EXTRA_ARGS="-Djibxhome=${EPREFIX}/usr/share/jibx/"
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+
+	dohtml -r docs/*
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/main/org
+}
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
new file mode 100644
index 000000000000..c0f740a1371a
--- /dev/null
+++ b/dev-java/xsdlib/Manifest
@@ -0,0 +1 @@
+DIST xsdlib.20090415.zip 914126 SHA256 6da506ce95cd52b850b85b4b46f087f97fbc581f8a9046f33e35953223adba2a SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2 WHIRLPOOL de1e1f50ca92fe7f1011543e602a1134d821f4140c21fe6a9e047743b209976cccf882046bec760bfff3379f59dbab97e237fb044650f96af35fcffe380fa251
diff --git a/dev-java/xsdlib/files/build-20050627-r1.xml b/dev-java/xsdlib/files/build-20050627-r1.xml
new file mode 100644
index 000000000000..7b6413f34dba
--- /dev/null
+++ b/dev-java/xsdlib/files/build-20050627-r1.xml
@@ -0,0 +1,63 @@
+<?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="libdir" value="lib"/>
+
+   <property name="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+   <path id="lib.classpath">
+		<fileset dir="${libdir}">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <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}" classpathref="lib.classpath"/>
+      <javac srcdir="${src}-apache" destdir="${build}" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+         <fileset dir="${build}"/>
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+	   <javadoc destdir="${dist}/doc/api" classpathref="lib.classpath" sourcepath="${src}">
+		   <fileset dir="${src}" includes="**/*.java"/>
+	   </javadoc>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/xsdlib/files/build-20050627-r2.xml b/dev-java/xsdlib/files/build-20050627-r2.xml
new file mode 100644
index 000000000000..6f03df9ea4cf
--- /dev/null
+++ b/dev-java/xsdlib/files/build-20050627-r2.xml
@@ -0,0 +1,65 @@
+<?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="libdir" value="lib"/>
+
+   <property name="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+   <path id="lib.classpath">
+		<fileset dir="${libdir}">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <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}" classpathref="lib.classpath"/>
+      <javac srcdir="${src}-apache" destdir="${build}" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+         <fileset dir="${build}"/>
+		 <fileset dir="${src}" includes="**/*.properties"/>
+		 <fileset dir="${src}-apache" includes="**/*.properties"/>
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+	   <javadoc destdir="${dist}/doc/api" classpathref="lib.classpath" sourcepath="${src}">
+		   <fileset dir="${src}" includes="**/*.java"/>
+	   </javadoc>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>
diff --git a/dev-java/xsdlib/files/build-20050627.xml b/dev-java/xsdlib/files/build-20050627.xml
new file mode 100644
index 000000000000..e2cc15a1c8dc
--- /dev/null
+++ b/dev-java/xsdlib/files/build-20050627.xml
@@ -0,0 +1,63 @@
+<?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="libdir" value="lib"/>
+
+   <property name="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+   <path id="lib.classpath">
+		<fileset dir="${libdir}">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <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}" classpathref="lib.classpath"/>
+      <javac srcdir="${src}-apache" destdir="${build}" classpathref="lib.classpath"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+         <fileset dir="${build}"/>
+      </jar>
+   </target>
+
+   <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/xsdlib/metadata.xml b/dev-java/xsdlib/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/xsdlib/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild
new file mode 100644
index 000000000000..34b79e742449
--- /dev/null
+++ b/dev-java/xsdlib/xsdlib-20090415.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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..6ba1fe70717c
--- /dev/null
+++ b/dev-java/xsom/Manifest
@@ -0,0 +1 @@
+DIST xsom-src-20060901.tar.bz2 105215 SHA256 98e3cf0dce95f4ad21524461a50696544a4e60a07e0691202211b12271dd8aee SHA512 e49e83d0b6ef2d2f368d89119bb833217a2e527a661b8e3ee7f1a58a8769637bbeeb388edc452284305f3754abebfc732a39f7f12a6ce520080f34f125411ffe WHIRLPOOL db5449cb1110e5e705f736321df78786929eafa408c6154670cf05b29df734798d89d32ab2df27ebcf5930cc27bccebdd566e5ccc5174957f17d0a6407d3367f
diff --git a/dev-java/xsom/metadata.xml b/dev-java/xsom/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/xsom/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/xsom/xsom-20060901.ebuild b/dev-java/xsom/xsom-20060901.ebuild
new file mode 100644
index 000000000000..382619dc95e4
--- /dev/null
+++ b/dev-java/xsom/xsom-20060901.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="XML Schema Object Model (XSOM) allows Java apps to easy parse and inspect XML Schema docs"
+HOMEPAGE="https://xsom.dev.java.net/"
+# Upstream does not have versioned source bundles :|
+SRC_URI="mirror://gentoo/xsom-src-${PV}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+COMMON_DEP="
+	dev-java/relaxng-datatype
+	dev-java/relaxngcc"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}/lib"
+	java-pkg_jarfrom relaxng-datatype
+	java-pkg_jarfrom relaxngcc
+
+	cd "${S}"
+	sed -i \
+		-e 's/target name="compile" depends="ngcc,javacc"/target name="compile"/g' \
+		-e 's/target name="jar" depends="clean,compile"/target name="jar" depends="compile"/g' \
+		build.xml || die "sed failed"
+
+}
+
+src_test() { :; }
+
+src_install() {
+	java-pkg_dojar build/xsom.jar
+
+	use doc && java-pkg_dojavadoc build/javadoc
+	use source && java-pkg_dosrc src/* build/src/*
+}
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
new file mode 100644
index 000000000000..7b2a3d2133da
--- /dev/null
+++ b/dev-java/xstream/Manifest
@@ -0,0 +1 @@
+DIST xstream-distribution-1.3.1-src.zip 7505723 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b SHA512 c8c92879a26599d7444fce0638ba13d185fd3c1f42962b92fe1b984d2ea41f8e434acb6af5613ac9f44354816fb7abc60f751f864f36deb9c2413b0caec5c2ac WHIRLPOOL 13ac006402bbecbf6d3ff9fe30662cc6e3807cdf3a391255f878cea37800842adc929914f2e4aace3a7788294809afb26edd64181f85a7e5dc46f3e1f9c0e9b6
diff --git a/dev-java/xstream/metadata.xml b/dev-java/xstream/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/xstream/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/xstream/xstream-1.3.1-r3.ebuild b/dev-java/xstream/xstream-1.3.1-r3.ebuild
new file mode 100644
index 000000000000..46fdf943ee69
--- /dev/null
+++ b/dev-java/xstream/xstream-1.3.1-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again"
+HOMEPAGE="http://xstream.codehaus.org/index.html"
+SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+# By default, these tests exit successfully on failure. Chewi has fixed
+# that below but it's probably because they blow up spectacularly on
+# every VM he has tried.
+RESTRICT="test"
+
+CDEPEND="dev-java/cglib:3
+	dev-java/dom4j:1
+	dev-java/jdom:1.0
+	dev-java/joda-time:0
+	dev-java/xom:0
+	dev-java/xpp3:0
+	dev-java/xml-commons-external:1.3
+	dev-java/jettison:0
+	java-virtuals/stax-api:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit:0
+		dev-java/ant-trax:0
+		dev-java/junit:4
+		dev-java/xml-writer:0
+		dev-java/commons-lang:2.1
+		dev-java/jmock:1.0
+		dev-java/jakarta-oro:2.0
+		dev-java/stax:0
+		dev-java/wstx:3.2
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="xpp3,jdom-1.0,xom,dom4j-1,joda-time,cglib-3,xml-commons-external-1.3,jettison,stax-api"
+EANT_BUILD_TARGET="benchmark:compile jar"
+EANT_EXTRA_ARGS="-Dversion=${PV} -Djunit.haltonfailure=true"
+
+java_prepare() {
+	rm -v lib/*.jar || die
+	rm -rfv lib/jdk1.3 || die
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,jmock-1.0,commons-lang-2.1,xml-writer,wstx-3.2,stax,jakarta-oro-2.0"
+EANT_TEST_TARGET="test"
+ANT_TASKS="ant-junit ant-trax"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install(){
+	java-pkg_newjar target/${P}.jar
+	java-pkg_newjar target/${PN}-benchmark-${PV}.jar ${PN}-benchmark.jar
+
+	use doc && java-pkg_dojavadoc target/javadoc
+	use source && java-pkg_dosrc src/java/com
+}
+
+pkg_postinst(){
+	elog "Major Changes from 1.2 See:"
+	elog "http://xstream.codehaus.org/changes.html"
+	elog "to prevent breakage ..."
+}
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
new file mode 100644
index 000000000000..83456e5fb262
--- /dev/null
+++ b/dev-java/xz-java/Manifest
@@ -0,0 +1,2 @@
+DIST xz-java-1.4.zip 131280 SHA256 e3d00de1569b6caae24a85b19d7b2eb16517a2c4898669d9c95a164e7f24fd0b SHA512 bbeb8c8acf97bc8b559653b38960bd5b61ad69ff2eb32c9647ee6859ea2c189df84b2ec89c7d4aef7eecef8de959e4bc4b781e8b9855a07ff97571b749b1da34 WHIRLPOOL df96ecc141656d72420532db7a92d87c6e587f6a4fc6e4f164bb1c8dc1639f32b5668b024cd600b54df6678f232aea0e9eda8a291c76007ed5b48d41605a0fb3
+DIST xz-java-1.5.zip 131544 SHA256 0146e437b01ac77046d256a2e7537768b6922c49635c27fa40b3cf745bb2db74 SHA512 8f425b86b216927490c1ab7303ae9db7faf2c275777765ec7d10c4acd4717d2ecf76068afe9a81d099ea0941c05c517cd5e7fe1b4e8bfec804fd3355dd064f41 WHIRLPOOL 5bcaa40f44bd89592e3a4f4a74884551284379f6e5a7985abf0c3673d73bc48144b457f67502097a96a82d0496526f2d5ce9f7b64bef48bd84a00eea87927839
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..3c82eff350b0
--- /dev/null
+++ b/dev-java/xz-java/files/xz-java-stop-fetching-external-files.patch
@@ -0,0 +1,16 @@
+--- build.xml	2011-10-22 12:16:36.000000000 +0200
++++ build.xml.new	2012-06-01 17:54:41.000000000 +0200
+@@ -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..93e6e97c447b
--- /dev/null
+++ b/dev-java/xz-java/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau (Tommy[D])</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/dev-java/xz-java/xz-java-1.4.ebuild b/dev-java/xz-java/xz-java-1.4.ebuild
new file mode 100644
index 000000000000..dfb76ed26d13
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.5.ebuild b/dev-java/xz-java/xz-java-1.5.ebuild
new file mode 100644
index 000000000000..79cb2112854b
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/yanfs/Manifest b/dev-java/yanfs/Manifest
new file mode 100644
index 000000000000..f671d043edee
--- /dev/null
+++ b/dev-java/yanfs/Manifest
@@ -0,0 +1 @@
+DIST yanfs-1.0.tar.bz2 107232 SHA256 b1332f97391cf91e544c2668e2a1d81e4d4c76d3bd84b348bbe448eb58a7b719 SHA512 e7031ba630360240de136f588c337a3a4b551320f5e121c1910fc58ba08c7b7c6fe95fb87b57263c19e00a3e44fe81c36d9e8e8971d4fdf910bb3797c0a1eeeb WHIRLPOOL 05ecf92100f3fa760ba694659e8f401e69adbbef8ba31e5dbf36bfd81b387afc1bfc2d335dfe6d0f321579813fd0f9a60ead5db7b7450b3e71e80579ddd89713
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..604e0a4238bb
--- /dev/null
+++ b/dev-java/yanfs/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</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..964cec3c55ea
--- /dev/null
+++ b/dev-java/yanfs/yanfs-1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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.5"
+DEPEND=">=virtual/jdk-1.5"
+
+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..b25983e5c1ef
--- /dev/null
+++ b/dev-java/zemberek/Manifest
@@ -0,0 +1 @@
+DIST zemberek-2.1.1-nolibs-src.zip 1196289 SHA256 0a1a9a3bb2c76c9c40a96aea81e99abc0fab1baadc31fcc975bc5b235937cca3 SHA512 e97342271294504a0e9df7bbc60f68beed137311254f5cc6d7558befa106737b75b0dcb7a86033f506eda3783d98ba2788cf5da69497f18861dd8cd79bb27955 WHIRLPOOL 55a039caefcd0d4c36a2b977de424d62f8780aa4e37c24c55666b0088c6914756cc070792847a61d460b650617bf6df94b87671e9ef8fe300b38f9416d63a09f
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..755a350e8c7f
--- /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>
+	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">zemberek</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..7bc465909362
--- /dev/null
+++ b/dev-java/zemberek/zemberek-2.1.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+JAVA_PKG_IUSE="source doc test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Zemberek NLP library"
+HOMEPAGE="http://code.google.com/p/zemberek/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}-nolibs-src.zip"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+LANGS="tr tk"
+
+S=${WORKDIR}/${P}-nolibs-src
+
+IUSE="linguas_tk +linguas_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 http://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() {
+	strip-linguas ${LANGS}
+	local anttargs
+	for jar in cekirdek demo ${LINGUAS}; do
+		anttargs="${anttargs} jar-${jar}"
+	done
+	eant ${anttargs} $(use_doc javadocs)
+}
+
+src_install() {
+	strip-linguas ${LANGS}
+	local sourcetrees=""
+	for jar in cekirdek demo ${LINGUAS}; 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..a51bf65189fa
--- /dev/null
+++ b/dev-java/zeus-jscl/Manifest
@@ -0,0 +1,2 @@
+DIST zeus-jscl_v1_08.zip 411676 SHA256 c33ef05673399d3da9c8ae495bd7efd9513bfae953c056d5bb62467d0be37953 SHA512 7c8de7475fdcf307ed1b604eed98eb3ec28304f112e1aed9e5349f648356ace38338ebbc0a204b40e10c52dcd48bed878523187ba75165f494a08d688d8d38ac WHIRLPOOL 2e5a5e0adcd4791657da1094c4b4502affc32096dbd26fe1faebe822976f3633a1e84e285dcb49106ab5bbcd72a7c90583fcec807ce09d2105fb5a504bdd5bc9
+DIST zeus-jscl_v1_64.zip 585558 SHA256 d76ddc5b76648b75b5ede5f02df6ed498db12d708413adec2900a67e1e0c4e9a SHA512 e756df28da39322121575041a949965f47eecea6106e7dd619a4f0764a239131e1ab8a9dcf7c6d461fc4861ea86acaceb19a5a51c8002c990999193050e03b10 WHIRLPOOL 832b7198472a8e0ed1ceeceb171b18fc66a3c9249c785e40430e2e01e75d21a3848a31afbe92ffb0f479e462357cf782e611b6e9f131d0fa9e0a5b3f6b59e3ad
diff --git a/dev-java/zeus-jscl/metadata.xml b/dev-java/zeus-jscl/metadata.xml
new file mode 100644
index 000000000000..92b5efac03a2
--- /dev/null
+++ b/dev-java/zeus-jscl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="sourceforge">zeus-jscl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/zeus-jscl/zeus-jscl-1.08.ebuild b/dev-java/zeus-jscl/zeus-jscl-1.08.ebuild
new file mode 100644
index 000000000000..47ba26be9f39
--- /dev/null
+++ b/dev-java/zeus-jscl/zeus-jscl-1.08.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}_v${PV//./_}"
+
+DESCRIPTION="Zeus Java Swing Components Library"
+HOMEPAGE="http://sourceforge.net/projects/zeus-jscl/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=""
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+	java-pkg_newjar lib/${PN}.jar ${PN}.jar
+	use source && java-pkg_dosrc src
+	use doc && java-pkg_dojavadoc doc/api
+}
diff --git a/dev-java/zeus-jscl/zeus-jscl-1.64.ebuild b/dev-java/zeus-jscl/zeus-jscl-1.64.ebuild
new file mode 100644
index 000000000000..ba1e0cba539f
--- /dev/null
+++ b/dev-java/zeus-jscl/zeus-jscl-1.64.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}_v${PV//./_}"
+
+DESCRIPTION="Zeus Java Swing Components Library"
+HOMEPAGE="http://sourceforge.net/projects/zeus-jscl/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=""
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+	java-pkg_newjar lib/${P}.jar ${PN}.jar
+	use source && java-pkg_dosrc src
+	use doc && java-pkg_dojavadoc doc/api
+}