EAPI 5 bump.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

3 files changed, 78 insertions, 3 deletions

diff --git a/dev-java/commons-configuration/ChangeLog b/dev-java/commons-configuration/ChangeLog
index cfc2feef3cc1..d4829c26a86f 100644
--- a/dev-java/commons-configuration/ChangeLog
+++ b/dev-java/commons-configuration/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-configuration
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-configuration/ChangeLog,v 1.13 2015/05/24 19:32:56 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-configuration/ChangeLog,v 1.14 2015/06/20 22:14:04 monsieurp Exp $
+
+*commons-configuration-1.6-r2 (20 Jun 2015)
+
+  20 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +commons-configuration-1.6-r2.ebuild, commons-configuration-1.6-r1.ebuild:
+  EAPI 5 bump.
 
 *commons-configuration-1.6-r1 (24 May 2015)
 
diff --git a/dev-java/commons-configuration/commons-configuration-1.6-r1.ebuild b/dev-java/commons-configuration/commons-configuration-1.6-r1.ebuild
index 7a1c14183007..fe961bbaf59a 100644
--- a/dev-java/commons-configuration/commons-configuration-1.6-r1.ebuild
+++ b/dev-java/commons-configuration/commons-configuration-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-configuration/commons-configuration-1.6-r1.ebuild,v 1.1 2015/05/24 19:32:56 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-configuration/commons-configuration-1.6-r1.ebuild,v 1.2 2015/06/20 22:14:04 monsieurp Exp $
 
 EAPI=1
 
@@ -66,6 +66,6 @@ RESTRICT="test"
 src_install() {
 	java-pkg_newjar target/${P}.jar
 	dodoc RELEASE-NOTES.txt || die
-	use doc && java-pkg_dojavadoc dist/docs/api
+	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..e350b0efb51a
--- /dev/null
+++ b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild,v 1.1 2015/06/20 22:14:04 monsieurp Exp $
+
+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/*
+}