Update the slot of commons-beanutils used to the upstream recommendation.

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

3 files changed, 74 insertions, 5 deletions

diff --git a/dev-java/commons-digester/ChangeLog b/dev-java/commons-digester/ChangeLog
index 75fdedbaf6d2..190ea45ddf40 100644
--- a/dev-java/commons-digester/ChangeLog
+++ b/dev-java/commons-digester/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-digester
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.57 2010/03/20 10:30:18 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.58 2010/03/20 10:35:18 betelgeuse Exp $
+
+*commons-digester-1.8.1-r1 (20 Mar 2010)
+
+  20 Mar 2010; Petteri Räty <betelgeuse@gentoo.org>
+  +commons-digester-1.8.1-r1.ebuild:
+  Update the slot of commons-beanutils used to the upstream recommendation.
 
   20 Mar 2010; Petteri Räty <betelgeuse@gentoo.org>
   -commons-digester-1.8.ebuild:
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index 56ecd025a677..e51ed81b6fab 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -4,13 +4,14 @@ Hash: SHA1
 AUX 1.8-build.xml-jar-target.patch 1824 RMD160 4551dae52a428c91079029431e2bc4fbd51dfe82 SHA1 dd175de66aa0967dea45e57a8ada643dcb6dd2e3 SHA256 9faa97825bb85c6d0c0e31e08a278e39e808b9a6ac98c47e6aa0af6992ccbf36
 AUX 1.8.1-build.xml-jar-target.patch 1099 RMD160 e5ebb10afa07edb07a9c222d57c30378e328ef8a SHA1 38627b8cd440aaba0c678350ed35e9b882233505 SHA256 9f9fbbbd23f17bc89becc5e5ebc19c9d3a3dbe5c412f83b10ceb7c4f6f329bc0
 DIST commons-digester-1.8.1-src.tar.gz 303266 RMD160 a9082096d5d5aa94236ab7ac13a5dd84f5da55ac SHA1 b836b71face1ac2bf3d0d82aa2dc5a01b8e4685e SHA256 9ecb98ffeb2f910d5554571875a8ed36b4d09f5cdc7ccece8e275d85ba4bf6f1
+EBUILD commons-digester-1.8.1-r1.ebuild 1870 RMD160 1bb8178577a546058b49c166c1cbcd3ec2859df6 SHA1 e3ac369292b34026544c5bd651fd0a1e5a803d51 SHA256 7a2c68c183181784f6f14c1ff905cffd8f04d45d36f23ce80fee3c8f043d48b1
 EBUILD commons-digester-1.8.1.ebuild 1882 RMD160 acaf8174fc42b72d6c9207db982b3488072c657a SHA1 e42b3046453a544914e7b5a2ece2f704216eb6b6 SHA256 ec910c5eb7468b9fb79cdac8795f011396fd140983fa66c5a0989940adac2482
-MISC ChangeLog 7894 RMD160 406d4b232feba1f9099a15c605c077aa08768d8a SHA1 3da43b688646193f9c6258b9c5bdb35ba02681af SHA256 db25433147d68a8f5b5a82feb355ee3ccfd2ea73b18eec6b54362ec0ab69e8f8
+MISC ChangeLog 8103 RMD160 07105edce69ebde16d6798f3e46fe785264b099b SHA1 1c35e8ce714627d5ccd09a34dd856094c713cbbf SHA256 7365b79caa86f97a36912bf79e5ebfcdeef849ad842edcfe65511300b1afecd2
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuko78ACgkQcxLzpIGCsLTIagCgnQDf9HcktzIUpz2a3QKdWwv1
-eooAn2wsap2DQw0zDurJtbCsoi3/rQ4K
-=nhih
+iEYEARECAAYFAkukpOwACgkQcxLzpIGCsLQoTwCfXmGEw4X2CyuA7Z0f1cLU5nrn
+iLIAn0KBW7dGEptrrHk7LmYHOXqS98nb
+=Or2l
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r1.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..c2e61199f14c
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.8.1-r1.ebuild,v 1.1 2010/03/20 10:35:18 betelgeuse Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects within the system."
+HOMEPAGE="http://commons.apache.org/digester/"
+SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/commons-beanutils:1.7
+	>=dev-java/commons-collections-2.1:0
+	>=dev-java/commons-logging-1.0.2:0"
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit
+	)
+	${RDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+# don't rewrite build.xml in examples
+JAVA_PKG_BSFIX_ALL="no"
+
+java_prepare() {
+	epatch "${FILESDIR}/${PV}-build.xml-jar-target.patch"
+
+	# this build.xml honours build.properties so we use it for common depends
+	# needed for both compile and test, so getjar is called only once
+	echo "commons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 \
+		commons-beanutils.jar)" > build.properties
+	echo "commons-collections.jar=$(java-pkg_getjar commons-collections \
+		commons-collections.jar)" >> build.properties
+	echo "commons-logging.jar=$(java-pkg_getjar commons-logging \
+		commons-logging.jar)" >> build.properties
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant \
+		-Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" test
+}
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+
+	dodoc RELEASE-NOTES.txt || die
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/org
+	use examples && java-pkg_doexamples src/examples
+}