Replaced junit USE flag with test, which is done in src_test(). Added examples USE flag.

Package-Manager: portage-2.1.1

4 files changed, 81 insertions, 1 deletions

diff --git a/dev-java/commons-digester/ChangeLog b/dev-java/commons-digester/ChangeLog
index 62dbf3b09b70..8b25d532be00 100644
--- a/dev-java/commons-digester/ChangeLog
+++ b/dev-java/commons-digester/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-digester
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.31 2006/07/22 20:23:54 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.32 2006/09/10 23:31:53 caster Exp $
+
+*commons-digester-1.7-r2 (10 Sep 2006)
+
+  10 Sep 2006; Vlastimil Babka <caster@gentoo.org>
+  +commons-digester-1.7-r2.ebuild:
+  Replaced junit USE flag with test, which is done in src_test(). Added
+  examples USE flag.
 
 *commons-digester-1.7-r1 (22 Jul 2006)
 
diff --git a/dev-java/commons-digester/commons-digester-1.7-r2.ebuild b/dev-java/commons-digester/commons-digester-1.7-r2.ebuild
new file mode 100644
index 000000000000..ef91a4191618
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-1.7-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 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.7-r2.ebuild,v 1.1 2006/09/10 23:31:53 caster Exp $
+
+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://jakarta.apache.org/commons/digester/"
+SRC_URI="mirror://apache/jakarta/commons/digester/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples source test"
+
+# 1.3 support might be possible by adding an additional depend on 
+# xml-commons[-external, but 1.3 is gone anyway
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/commons-beanutils-1.6*
+	>=dev-java/commons-collections-2.1
+	>=dev-java/commons-logging-1.0.2"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.4
+	test? ( >=dev-java/junit-3.7 )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+# don't rewrite build.xml in examples 
+JAVA_PKG_BSFIX_ALL="no"
+
+src_unpack() {
+	unpack ${A}
+	cd  "${S}"
+	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.6 \
+		 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_compile() {
+	eant jar $(use_doc)
+}
+
+src_test() {
+	eant -Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" test
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	dodoc NOTICE.txt RELEASE-NOTES.txt
+
+	use doc && java-pkg_dohtml -r dist/docs/api
+	use source && java-pkg_dosrc src/java/org
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -r src/examples/* ${D}/usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-java/commons-digester/files/digest-commons-digester-1.6-r1 b/dev-java/commons-digester/files/digest-commons-digester-1.6-r1
index 379783f0e852..03028428acf7 100644
--- a/dev-java/commons-digester/files/digest-commons-digester-1.6-r1
+++ b/dev-java/commons-digester/files/digest-commons-digester-1.6-r1
@@ -1 +1,3 @@
 MD5 1bdc6d353a28c1944a4699c8b1cce065 commons-digester-1.6-src.tar.gz 251103
+RMD160 2246cbe276c4db7e4f5d25ea1d2b75071d5a14ad commons-digester-1.6-src.tar.gz 251103
+SHA256 5bf82ffc59496a4553c891589d4b52f8dfecbcbb7ab0cd4705867203a3464452 commons-digester-1.6-src.tar.gz 251103
diff --git a/dev-java/commons-digester/files/digest-commons-digester-1.7-r2 b/dev-java/commons-digester/files/digest-commons-digester-1.7-r2
new file mode 100644
index 000000000000..aa77a0dd4fc9
--- /dev/null
+++ b/dev-java/commons-digester/files/digest-commons-digester-1.7-r2
@@ -0,0 +1,3 @@
+MD5 718f91f6958da865826bca455f644076 commons-digester-1.7-src.tar.gz 237780
+RMD160 ae5689a2520d0c70619d40704a66201b46ee280e commons-digester-1.7-src.tar.gz 237780
+SHA256 b08cea063578c272374df08be010f4a841c87a5cea278f4bd20f89531eeab069 commons-digester-1.7-src.tar.gz 237780