EAPI 5 bump.

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

4 files changed, 99 insertions, 11 deletions

diff --git a/dev-java/avalon-framework/ChangeLog b/dev-java/avalon-framework/ChangeLog
index ec20f9255607..c3524a445d1e 100644
--- a/dev-java/avalon-framework/ChangeLog
+++ b/dev-java/avalon-framework/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/avalon-framework
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/ChangeLog,v 1.28 2013/11/30 08:07:24 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/ChangeLog,v 1.29 2015/07/22 16:10:30 monsieurp Exp $
+
+*avalon-framework-4.1.5-r2 (22 Jul 2015)
+*avalon-framework-4.2.0-r2 (22 Jul 2015)
+
+  22 Jul 2015; Patrice Clement <monsieurp@gentoo.org>
+  +avalon-framework-4.1.5-r2.ebuild, +avalon-framework-4.2.0-r2.ebuild:
+  EAPI 5 bump.
 
   30 Nov 2013; Tom Wijsman <TomWij@gentoo.org> avalon-framework-4.1.5-r1.ebuild,
   avalon-framework-4.2.0-r1.ebuild:
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index c4e94b2c03a2..5e5686464afe 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -5,17 +5,19 @@ AUX build.xml 1838 SHA256 336dbf8253d921987528416da50b557c786313b2c0fd2454b2b25a
 DIST avalon-framework-4.1.5.src.tar.gz 99475 SHA256 29ec054ff5da5dede98e90156fb2f3037c617a04f9fa2753ab034718031e058d SHA512 7a15dc2f7c691d7daaa5cbb589eb21e23ef8d6232b5bd1b6b3bb1d6962f4a4dd2dff0c0a1793309d7e8f3aaf4e75de65a9705431e1103c2e33c575770131471b WHIRLPOOL 6c08d0c3596a4169fa0afdc65cac0b2e551a51a2e79d32809ab1fa7eaa2598446cf51179ab4d8794518e1f5821464aace4bbb3d1b8d8f8f6e93880416173ecbd
 DIST avalon-framework-4.2.0-src.tar.gz 68887 SHA256 16374c0a1f67e21c5d44030ba2a01df614775a9c3ec3a387632c3c6e592d8e7d SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671 WHIRLPOOL 8591e594a44366b48040d5fa600362c3ceaa418c0ce4d92fb6874fc4e5fd93dac992eade72525f177dc7b219ce022d0bad8439dcc11d16c28eeb4100530a2319
 EBUILD avalon-framework-4.1.5-r1.ebuild 1078 SHA256 6f977586289e487d4c804dba35b59d9a2178275217f0f90d02740d385f36df8c SHA512 9986f1b0340060be94dceb866b1171e3cd0be44d60bbf8dad9dcfbaffe010d2984946e8f70ca09eac4b1d9699250389dccca7b6f66be82142f54d6bd5e6a9077 WHIRLPOOL 85f485f1fbd09a7f0c84b98d4129236db58c7f148c6aebc8b254c86d34c7327ed26dfb8a43aa534f149a9ee8811a547a35b6c6b10a4803df4c05df1f1760a929
+EBUILD avalon-framework-4.1.5-r2.ebuild 1055 SHA256 161eadd900fb08c35f03d2853e01ae62c8d0e46cce226ab0a7bea4acf427ec03 SHA512 30d6dc47f227fcec7eb40eb49799e2e97998a9180470e096a35486f27762053ec8ee661440954591309e25fb08a08f3add57337f0d21a3677ef6fd69a50fb6dc WHIRLPOOL a155ae35fbc3a8d55c6883c33a08b1f0985ad921f47b4519369420281662b9e27cf803179234938160ec3a6e13850dc729bfd02a251357ba5fb30814861f967f
 EBUILD avalon-framework-4.2.0-r1.ebuild 1181 SHA256 d0ce52de9cce6f19250286b7cf6089a1913920d92011d998d260f4a39c357af8 SHA512 ac5276d689ffffac299c24b7a30ec1a08098188b2f546e9e5192d275a991f320fd0ae985d001beecd05a7df9f7953e47231116ad2bedba483acb1a4276487e0f WHIRLPOOL 470f7f3bce172136bf6ae1e6837f62a3ed7f8d20083d78547c5fa4627c044dd1f2c2a8c0fe4610e14202f38ca5fbe22a608d3350deaeffd466b265114a711b08
-MISC ChangeLog 4475 SHA256 5426843c6ba2bb18685c16580b427dbce5b03cd8e55b72aca4f4dbef7887fd2f SHA512 357abce9207dfe23cd60fda59e21e214dcc47648d40f1bf827582021178ac944810ef3eac77d9a6b02706351a6ca2eb7192091d11e866b59dc0e01db90e6148c WHIRLPOOL a151b106b7d8629fc79c7cf80245134efb1f8d11f5271f5fbb0201480a26fea97ab9961602a70ed19f2c58d401f381ad7b50d30333507ac39def874d35950457
+EBUILD avalon-framework-4.2.0-r2.ebuild 1160 SHA256 1b07fef5d218afe6cb1c53203e7a9f68d6294779d329f2c0c31e64f0926fae40 SHA512 4739df2fb46cbbc5754c63a46cfbb3dbc86b4997cb99a891213773e31417e6cb2b9b7a7aebc6e2b523f1a323226863c29dca82de5528a05186fa19f0e245fd2e WHIRLPOOL 7ae0bc010489c6289d9b308e9292aaa745ce47eac6f23ca6fcbb1354950fc003a6f1426e8c0b444c261a5a9d21adde5980021fb9ad49a786a3110d7a18ef591e
+MISC ChangeLog 4703 SHA256 ebffc03f9d1d7a441f2dee191f97f9a4b7998eb4965b34fb9d17ef1d715a2d0a SHA512 38a51dd1b7fe01b8b0d673f3ad46673814b4f7d24ab1742a0e1ec97bb2de2c1733a47c1083fab53c644d156479c88796603ec5f97276cfacc671cf2f64f230ad WHIRLPOOL 7dc19c05653df676decdb6558a67bff78878057fd20b60e56a52cbfc8f2f14098fe254b6cbbaf0b1a08bc78f1758804bcbbfcec4ffbd321f9385c38fdb13bcfa
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJSmZx2AAoJEJWyH81tNOV9oa0H/jaOHQLesV3dYxZaTaljcc93
-8dCPLYGpfTuc77GBEiaB3+wZ4f2VO+iAODjemmgE3ii2jwx0cjp2EoK8MyFBp/cg
-5UxzPIfD1KtCe1VchpolpN1glN/yrib4wmRI3cDvO/tZdNYWe/a1TC9I4kFQUylz
-3XtXn8fG1iw0w77y3R2OjgeJh92cR4iJK52HWArEWKol2x65j6ZgWTCuloQlQESP
-ZdIy4hFQ7A5TRQIhadAv1NZ+5Xx4JYzftPpKk7iGmE9+eF5H9no6i7ywpvwHOntY
-KDJtwBqpKhmjnuBCMBLMJgmUKtZ806aTG9uN1olCNyBMtM+9sruXnRKQ+Hu3P6Q=
-=j7ya
+iQEcBAEBCAAGBQJVr87EAAoJEJGRpfGTSRu4OvgH/R3vshMFlEGKgs4ROeTZB37d
+pNZOZsExzTHpdG9MsGQ/d0DZ8pqKl52J+dnfVzyW1jU6Y2NlmTlU4/7P1qPD48TT
+sOHTKx13qO7JAkFxgvelRxyW4ye37/lM4WPWUi2NId5p3qdMYz8WVFyliynP/G29
+GeZ2xzRW0JIgZf0eoKg0gZDO4fSj21GbyPJo5JW1y9WD5lHajIwZ0iqwXw8jzScC
+xKN4/rTEDymfNPPKpjLf6I4NmMiZQGsh5GpY/sjJF8lMM6lD4S2YBHhr3xf/AyuF
+FKngbQyg6lti/DbFabvhZd4W9AFrSCYC+aY6RRlaG9NRuYFqJhnu790Kfgzd8o8=
+=gjF5
 -----END PGP SIGNATURE-----
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..2514f3e564c5
--- /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
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild,v 1.1 2015/07/22 16:10:30 monsieurp Exp $
+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-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
new file mode 100644
index 000000000000..7fa756114592
--- /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
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild,v 1.1 2015/07/22 16:10:30 monsieurp Exp $
+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/*
+}