Upgrade the slot of commons-beanutils used.

Package-Manager: portage-2.2_rc65/cvs/Linux i686

3 files changed, 80 insertions, 5 deletions

diff --git a/dev-java/commons-jelly/ChangeLog b/dev-java/commons-jelly/ChangeLog
index dcd5229cc324..c84becc17fb7 100644
--- a/dev-java/commons-jelly/ChangeLog
+++ b/dev-java/commons-jelly/ChangeLog
@@ -1,6 +1,12 @@
 # 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.12 2010/03/20 10:39:16 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.13 2010/03/20 10:47:37 betelgeuse Exp $
+
+*commons-jelly-1.0-r4 (20 Mar 2010)
+
+  20 Mar 2010; Petteri Räty <betelgeuse@gentoo.org>
+  +commons-jelly-1.0-r4.ebuild:
+  Upgrade the slot of commons-beanutils used.
 
   20 Mar 2010; Petteri Räty <betelgeuse@gentoo.org>
   commons-jelly-1.0-r3.ebuild:
diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
index 50064e01baf7..981b377bc298 100644
--- a/dev-java/commons-jelly/Manifest
+++ b/dev-java/commons-jelly/Manifest
@@ -4,12 +4,13 @@ Hash: SHA1
 AUX commons-jelly-1.0-gentoo.patch 2224 RMD160 ab9179ac39196b1dbe6fc8f9bffdc498ad363697 SHA1 9509b52e2841561c7ee50ff2bc96884764a4d55b SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533
 DIST commons-jelly-1.0-src.tar.gz 174769 RMD160 c273e80fb10327a833d192e89500a08302d68c58 SHA1 a0aedfa7ce69288277cc3c06b1d832a7a97affe5 SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1
 EBUILD commons-jelly-1.0-r3.ebuild 1879 RMD160 9493df41bc4966b2c8a2606c17aefa61d2b41fbf SHA1 dcb8dfc49fdfd10b99978a6afc0e283e866c95a1 SHA256 39034c2f363d1b4a8dffd4e97164c8073364855f9061d2cf7d33627530ec4ca9
-MISC ChangeLog 2178 RMD160 1b8dddd1f26602a9a6a0f0d70d38627fc5e726d0 SHA1 4acebe90d156d6f957b98487cb21860b2af11de8 SHA256 906efef96420a92d11ee38dc7b9e34d88d6bd181bee35381ddb60649b3b19aa8
+EBUILD commons-jelly-1.0-r4.ebuild 1817 RMD160 664150dda94f7c22afd312bc0af905a321dfd2be SHA1 283398f2962f654e64ea6b123ab3f0890ba8c1da SHA256 cc14419c045298f42dc5cd6b0b26d1cdf6987354805fdd9879e7c91f59be46af
+MISC ChangeLog 2347 RMD160 b1aaa88ac582da94ddb70f27183eebb53d061e10 SHA1 2488ab3a2f6ef179cda34bf1839ac2f79a15d5ab SHA256 0ecf64893404a2166c455b985410e58afabb487b3f723cc2386aa1d407247128
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkukpdkACgkQcxLzpIGCsLRPTwCeJ9x7y5YQlNk6nA3zctgbTMrE
-AQEAnRo8itM6JvZFJWilKelrqIaSUiVd
-=kC30
+iEYEARECAAYFAkukp9IACgkQcxLzpIGCsLSrWwCfXdLXjqHvM64iKozbRupEjDPc
+u9cAn39wPfHOAN7WBTS6QORTLDqgtkJY
+=2AkH
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r4.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r4.ebuild
new file mode 100644
index 000000000000..4c8f0810c5a8
--- /dev/null
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 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-r4.ebuild,v 1.1 2010/03/20 10:47:37 betelgeuse Exp $
+
+EAPI=2
+
+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="doc test source"
+
+RDEPEND=">=virtual/jre-1.4
+	java-virtuals/servlet-api:2.3
+	dev-java/commons-cli:1
+	dev-java/commons-lang:0
+	dev-java/commons-discovery:0
+	dev-java/forehead:0
+	dev-java/jakarta-jstl:0
+	dev-java/commons-jexl:1.0
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/jaxen:1.1
+	>=dev-java/xerces-2.7:2
+	dev-java/junit:0
+	dev-java/commons-logging:0"
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	# disables dependency fetching, and remove tests as a dependency of jar
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	mkdir -p "${S}/lib"
+	cd "${S}/lib"
+	java-pkg_jar-from --virtual servlet-api-2.3
+	java-pkg_jar-from commons-cli-1,commons-lang
+	java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0
+	java-pkg_jar-from commons-beanutils-1.7,commons-collections
+	java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2
+	java-pkg_jar-from commons-logging,junit
+}
+
+EANT_EXTRA_ARGS="-Dlibdir=lib"
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test -Dlibdir=lib
+}
+
+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/*
+}