Fix running tests. #426426

Bump EAPI and make better use of eclasses, fix QA issues.
Drop unneeded deps xerces and forehead.
Bump servlet-api dep to 2.5.

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

3 files changed, 92 insertions, 3 deletions

diff --git a/dev-java/commons-jelly/ChangeLog b/dev-java/commons-jelly/ChangeLog
index 401a0e695880..1be7f6e0f6b0 100644
--- a/dev-java/commons-jelly/ChangeLog
+++ b/dev-java/commons-jelly/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-jelly
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.16 2010/05/24 15:00:56 caster Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.17 2012/07/13 13:47:12 sera Exp $
+
+*commons-jelly-1.0-r5 (13 Jul 2012)
+
+  13 Jul 2012; Ralph Sennhauser <sera@gentoo.org> +commons-jelly-1.0-r5.ebuild:
+  Fix running tests. #426426
+  Bump EAPI and make better use of eclasses, fix QA issues.
+  Drop unneeded deps xerces and forehead.
+  Bump servlet-api dep to 2.5.
 
   24 May 2010; Vlastimil Babka <caster@gentoo.org>
   -commons-jelly-1.0-r3.ebuild:
diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
index e90412941c5c..b162ed71539c 100644
--- a/dev-java/commons-jelly/Manifest
+++ b/dev-java/commons-jelly/Manifest
@@ -1,5 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX commons-jelly-1.0-gentoo.patch 2224 SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533 SHA512 726b64273320f1a089ce9d9b8121359cc377e070ce4b49155de52ce31559d0601b137fb6e208b8c5ab696c64224047592c26957ad3d7a49dc390b523c821f7b5 WHIRLPOOL 6b09b85d489eac94ed99d92a999f513033f03f20f7472b4aaf7c76745a8b2a3f9087c0bcabe379610cb591fcf7f99c7d0111fe4e288d5863d75767a6b61a400d
 DIST commons-jelly-1.0-src.tar.gz 174769 SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1 SHA512 a72ae2dc8eea3fc19838f386dca38807a16326a3a93f483219212844f8ec033088b7721c78a4370f78a06cbee0c685144a2b16f171d54134822d06f653bcef35 WHIRLPOOL 3e92b517ce621cda2477354a1342c59d7cf7756edbc3c7746c262f5cdca5d015976979e35056dc2f588de37f4b882f21929e8c7a095251b1eba5857115659d2c
 EBUILD commons-jelly-1.0-r4.ebuild 1813 SHA256 88f0cfa8e67bc4d4fab08988f545e00e72db52dfdee7124791f2c986b67e0f55 SHA512 1b42954af3da6bb63aae132f9feb3c8337f74232eefeec6c6bfa3d999ea55fd775e324a0965844a598d191ffe1710faf2e3737b4ece970d16f09e71a0bc98cec WHIRLPOOL 7cd6d43870e66b296d0be5b1ea988aa8eec364005f633ecd5b3e8f346b7bb96d81427d14967267259f97cdd42db14d6367740b28c73be58d9bd78d3c3e2f2546
-MISC ChangeLog 2668 SHA256 b09e66425eb3bd6bc1b696adad9726c77fdf1bae07afd5baf92dc7bf464156bc SHA512 bd3d69d5fdb708c69aee254ca2033c5c88baa0048a3734c95cef7f7d046e5dc32b0fe9f2f50b550dc5136194d93e51368700d819136616419ab01d2bf910d08b WHIRLPOOL 82822693b604a375146ea7e60d8906f755fcbe92a178ea7cc674f76b0a3cebe24e352ebfed27505b1147541b315b59d5b5d6ef260556c1281ea86a2a15e3cf36
+EBUILD commons-jelly-1.0-r5.ebuild 1672 SHA256 56699b8a337fc1c5c9123e2129ca5bdbbcffbb7c66e60c3a8699960ee9630aa4 SHA512 628d27276272d73d7c3719d42aa9bed713516951c0450f18079cbb1036413c9878fa69297b08be86375e83dc922343cad957e32b7ca22eb62a5e398d4b91760a WHIRLPOOL 1a1bf9921e9875285da917af2492725c4e8c0b2b711d7e30d83797963279304afce963cf9f57e027864056ee34979f67a4f3bd132b39c2ed163eee6cdd294052
+MISC ChangeLog 2946 SHA256 fbcf9a1b3b7e614b8baf9c79086de78c5cd98a96a08455d6b8bebad2b0dd7216 SHA512 aecfc2351161af63c4ebf540d350df2b66015609482714883510cc55a961ce20a271e2bbf8c40f2713f599167c3ba4c3b83318be36c305132b9081c0ceffbbdc WHIRLPOOL b982f4e50f91a7167b2481b5116044b145fa4f51a9df39fbf29063d35afa0ecc4a6bda0063f831e64c3521bad6bdf1914b8faf23ddb6d5518cbb7584b6dc77a8
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJQACbuAAoJEIUJ+svaV163TvAH/RHnik9AMCzROKGROdYKPqHx
+oqIVuCe7mwn37F2DDer+7z12WLSeoj9sGQFpfhZ2Rwpsng9Kw2Qr90NWj6VJ310x
+KcT/BL0xuSxI4RdihxlosTyLg0NcVo9TxhC0+z5PwOs16EONM8841XSDXZ65yo+Q
+lEHoCr08zdN89GiqqGqGC0h51jOCCY9kpWsrIyFtdsd0sqOsLv8gHQFTuRxjpv/l
+fFu6c6fds+e0jH1aGAPMKzaFrI/j3o47bLyogwR6S+qryLwA2GoQ4ffrjUdgVE1y
+BDU2XCuj1l5pCCrGVtPHe/D9ZKzY/RrnWy6Gk1/u2pLheBzWkW2SOVCZoST80lc=
+=/dOX
+-----END PGP SIGNATURE-----
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..932c05e3572f
--- /dev/null
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild,v 1.1 2012/07/13 13:47:12 sera Exp $
+
+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/*
+}