updated commons-beanutils dependency to reflect new slotting. see #71952

(Portage version: 2.0.51.21)

4 files changed, 25 insertions, 16 deletions

diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog
index 4b1cc4c07543..44d67fcfb528 100644
--- a/dev-java/commons-jxpath/ChangeLog
+++ b/dev-java/commons-jxpath/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-jxpath
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.8 2005/02/06 01:51:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.9 2005/05/14 16:10:09 luckyduck Exp $
+
+*commons-jxpath-1.1-r1 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -commons-jxpath-1.1.ebuild, +commons-jxpath-1.1-r1.ebuild:
+  updated commons-beanutils dependency to reflect new slotting. see #71952
 
   06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> commons-jxpath-1.1.ebuild:
   stable on amd64
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index fa774c780083..1e51acdc4673 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1,4 +1,4 @@
-MD5 c143f74e8b625582336179c6e770c7a9 ChangeLog 1026
+MD5 7c008188396f7d39df1ed88387c37333 commons-jxpath-1.1-r1.ebuild 1230
+MD5 f972e771f89a11031998c538e68728f3 ChangeLog 1253
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 192937b2cee3ab3736c159cd473598a6 commons-jxpath-1.1.ebuild 1188
-MD5 6bee458c65c0dad2d6afd4bb6c5464d7 files/digest-commons-jxpath-1.1 74
+MD5 6bee458c65c0dad2d6afd4bb6c5464d7 files/digest-commons-jxpath-1.1-r1 74
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.1.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.1-r1.ebuild
index 21fb0b1be2de..b6468ca30926 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.1.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.1-r1.ebuild
@@ -1,34 +1,37 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.1.ebuild,v 1.9 2005/02/06 01:51:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.1-r1.ebuild,v 1.1 2005/05/14 16:10:09 luckyduck Exp $
 
 inherit java-pkg
 
-DESCRIPTION=" JXPath applies XPath expressions to graphs of objects of all kinds."
+DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds."
 HOMEPAGE="http://jakarta.apache.org/commons/jxpath/"
 SRC_URI="mirror://apache/jakarta/commons/jxpath/source/${PN}-${PV}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	=dev-java/servletapi-2.3*
-	~dev-java/jdom-1.0_beta9
-	>=dev-java/ant-1.4
-	junit? ( >=dev-java/junit-3.7 )"
-RDEPEND=">=virtual/jdk-1.3"
+
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 amd64"
-IUSE="doc junit"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core"
+RDEPEND=">=virtual/jdk-1.3
+	=dev-java/commons-beanutils-1.6*
+	=dev-java/servletapi-2.3*
+	~dev-java/jdom-1.0_beta9"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	echo "jdom.jar=`java-config -p jdom-1.0_beta9`" > build.properties
-	echo "servlet.jar=`java-config -p servletapi-2.3`" >> build.properties
+	echo "jdom.jar=$(java-config -p jdom-1.0_beta9)" > build.properties
+	echo "servlet.jar=$(java-config -p servletapi-2.3)" >> build.properties
+	echo "commons-beanutils.jar=$(java-config -p commons-beanutils-1.6)" \
+		>> build.properties
 }
 
 src_compile() {
 	local antflags="jar"
 	use doc && antflags="${antflags} javadoc"
-	use junit && antflags="${antflags} test"
 	ant ${antflags} || die "compile problem"
 }
 
diff --git a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1 b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r1
index 0b74e49268cb..0b74e49268cb 100644
--- a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1
+++ b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r1