Replace dev-java/servletapi slot with java-virtuals/servlet-api. Fix bug 398689.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 89 insertions, 6 deletions

diff --git a/dev-java/commons-configuration/ChangeLog b/dev-java/commons-configuration/ChangeLog
index 6dfa2cd2750c..cfc2feef3cc1 100644
--- a/dev-java/commons-configuration/ChangeLog
+++ b/dev-java/commons-configuration/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-configuration
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-configuration/ChangeLog,v 1.12 2014/08/10 20:10:16 slyfox Exp $
+# 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 $
+
+*commons-configuration-1.6-r1 (24 May 2015)
+
+  24 May 2015; Patrice Clement <monsieurp@gentoo.org>
+  +commons-configuration-1.6-r1.ebuild:
+  Replace dev-java/servletapi slot with java-virtuals/servlet-api. Fix bug
+  398689.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   commons-configuration-1.6.ebuild:
diff --git a/dev-java/commons-configuration/Manifest b/dev-java/commons-configuration/Manifest
index 6b865af008ee..82aa184ca15d 100644
--- a/dev-java/commons-configuration/Manifest
+++ b/dev-java/commons-configuration/Manifest
@@ -4,13 +4,18 @@ Hash: SHA256
 AUX commons-configuration-1.4-gentoo.patch 1177 SHA256 05a7a92e4f64f54b444b8ef8c134c6f6afedc543214c093e779976dd76910f94 SHA512 14ba08be8e95014bb71582b41e442cb1b49ff5dd106d052e81da5bafd2ae31fd9c4453b8079092cbeba51aa7a86fbd710a117cdab99c9c35e292391338385797 WHIRLPOOL 9a5db724a254154aceb4f8e0c8db876baeae4ef16e35dca3c923b899ab30a3808a80ec9d1feb6f47aff688460460a93ccf1c18495dd6d8a6317d61210281c90c
 AUX commons-configuration-1.6-gentoo.patch 979 SHA256 b412760dd9ab98266f3ae3776bad7b2a1975f2abea79ad5767fcb64b704dccd7 SHA512 6e0e3e69a77b31a39ad2f160a80ff08b9cdac2b0788b58b06e09f9a07a90a36bc1a4171e6bd739495b8e4c6271cc49ffbfe221dda73756f3407cf268dafec5a7 WHIRLPOOL d8a94c45a47755a960bf4a5f0b4dfeeb3a42494cc46ed118c092ad6aafceb2b8ccd5d0c1b4a2b6546656a76021c5721e62964094eefecc5676929a384668ba6c
 DIST commons-configuration-1.6-src.tar.gz 559621 SHA256 3874f0c7227874474e538c41f28e2d11584eff3c14323985a1f92da97841cf5b SHA512 5d82b844cf39162976820d030d05afeeec1151aa33bf4353f9ca844e552c55ea26daa1b74158baa31d0677e311e9dd83a1d9721c8d5f4e23d21068c4ca2eeb01 WHIRLPOOL 5ae3d17fbd32d3445e04a8f8eb3ad91e59ae3220cee0f17bb27176a18d2c1ff79e2099b90d828268b8bc3ddeeaacb4fed57df722ad7b0cca97dbe4d5a45d30f6
+EBUILD commons-configuration-1.6-r1.ebuild 1877 SHA256 cbebaf873f316691658c3ac4b4f8961ded13e06e1397c02c24c97c15f05d914b SHA512 9d12337a8fe675747532e5848c8e37df16c22984c97d3ff8a985064aa10054778a40453230b750be472a57c53a7ed3e224316e40b71b0dbd8252d64e2fa01f80 WHIRLPOOL 1b8947e0c0e5fd8af8645c2fbd7d4946121c5ab0e7bd86bcf3f366d305841a0167185d170fcbfd22ba598a085686445dbc17bba06b260a3374231a01c882215c
 EBUILD commons-configuration-1.6.ebuild 1860 SHA256 0895d667c356a34104c710fda7afc64c5d664f625f5791da34a166f650b09000 SHA512 a40f4090a28d24bab1d2b379ac08b0795df186ee048fe1dbf049ad3824a6169424aa6a9fd530eb80dd6be3e283493c9d0a7dcd9f6a5b298e58d90f1453b16020 WHIRLPOOL c5eb1a9ef026d8a93476bc1f94efea03994a02257bbf3a7a386a70c66c730e66822e16607a11b508cf0ea80c5cdcb7eee2a236469060a82770655603637a4e0a
-MISC ChangeLog 1862 SHA256 a14930f484694e89e687d6fdfa3614d39ce1213670aa090a7d9163f0fdfb94ce SHA512 a50b48af7accf6ed6c0743a31b6bbb95964c1a9903c18f97ea5721b1b64508df899b54f005f263fc3c47c9ab0230e7b8d85f66c883f4d1f12527cb6b625021ba WHIRLPOOL cbc2a85a4557b0781871d05b1fcd20187ff07d4466fa8ea3e30e5db7fd9b01e271ad4c7cc8c11d3b9642b292e4864717e1b04d5327a76994d3ca7d301bb7ffb7
+MISC ChangeLog 2090 SHA256 5e9dbcb8d0960fd7a111fb444dea288f6955bdf16f1610cdde0f1c8c5596f7bb SHA512 229ab99d459bdcb579cf7071ddc8dfa8aa54dfaba525241f3eb7632bbd25bf975b058cdbe64fed1213ab32934f57af34c3056b66c474c9c7b7075b2431b90056 WHIRLPOOL 161266593bac5eb295330dbf87b17c4284f60a31eba8c28cfa19cadae8fcbe7939070e26a2c8532052052ff2845ece19b553540a8beacfe07b8317c1d74491f7
 MISC metadata.xml 351 SHA256 17a87d190d83e2407c6b52330a051391f3f75946cb1abbf413f6757ac19a2482 SHA512 96f3ab7c867dafed8e85a413f6c5231651aae9bb9d50d1a8b059189d79271ff59bbacd21f0c70b8d6ca7f61357ea9eb9ad033c71d320371e3b89edc30998009d WHIRLPOOL bc1569a064f06e2419642bb25d5204c6bd018d3f620c71abe6750fcd27ce9155a1c247777db0979c610b75c8c9d12964d912caad400ed44ce1b2489219ab2afe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0akACgkQcaHudmEf86qtowCfYdyMCQkJNJ+R/1c9xg93uVYC
-h8oAnRvhu62DxCk4K5HCt7B72J9Bkygt
-=eA9z
+iQEcBAEBCAAGBQJVYib/AAoJEJGRpfGTSRu4jfcH/39Exey5KSOa8JkfQntheqF0
+X07dUOutVXKKtV7JBEQq7rn/RH2bKL2ZuIFdItynGplE0L1LRIFDFi1B1jhbUF4O
+MkcXS7LVARgDQlq71K4PZmI6SU5ocH6CxtVsC4yGAgkDfdCl6WH6Aa6VlV1CRnQn
+KCgUVbR2MLJGeOZDXLL8JL6WhHM5aux2+y68TazilUE/mcsygAoAVEOKVAfa0mA4
+oxVyQNYos++BBuDybxHPUVRDCftsxN1KLxQIuzobGIVKqywPhKaMXAKYtABfxzZc
+yy+oOlfrS2EzVVjAMTH/BOorlgYPVo38e/qFLFOPWHgNXkva3drm7b2ma/WtQXU=
+=vMeq
 -----END PGP SIGNATURE-----
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..7a1c14183007
--- /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
+# $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 $
+
+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_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}