Version bump (bug #117698).

(Portage version: 2.1_pre3-r1)

5 files changed, 101 insertions, 11 deletions

diff --git a/dev-java/commons-digester/ChangeLog b/dev-java/commons-digester/ChangeLog
index 6f5efadc2304..4b7c93c2e7e6 100644
--- a/dev-java/commons-digester/ChangeLog
+++ b/dev-java/commons-digester/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2006/01/05 14:04:52 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.30 2006/01/09 01:52:57 nichoj Exp $
+
+*commons-digester-1.7 (09 Jan 2006)
+
+  09 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/1.7-build.xml-jar-target.patch, +commons-digester-1.7.ebuild:
+  Version bump (bug #117698).
 
   05 Jan 2006; Petteri Räty <betelgeuse@gentoo.org>
   commons-digester-1.6-r1.ebuild:
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index 056a6b7c80e5..e0d0b11ddd07 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4f622a3c7f442be629890d65c71444ed ChangeLog 4168
 MD5 3c3aafb5fa628c46aef826e330ba279a commons-digester-1.6-r1.ebuild 1650
+MD5 c82ac0236db8a71c8894bad7d6c6bd86 commons-digester-1.7.ebuild 1908
+MD5 79044065870df490120faeed1137a72f files/1.7-build.xml-jar-target.patch 1148
 MD5 dffdbb44be5308d2e17beeea612d909d files/digest-commons-digester-1.6-r1 76
+MD5 f8d1dcb13181fff60009ec5c8d344a3b files/digest-commons-digester-1.7 76
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDvSeSQiJ/wx066S4RAnyPAJ9edqk66X/bSjXIlnUuO+HxpD/BxgCcDRLh
-c24/YQWaFXR5FPfkMELXk5s=
-=9DWc
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-digester/commons-digester-1.7.ebuild b/dev-java/commons-digester/commons-digester-1.7.ebuild
new file mode 100644
index 000000000000..b78217da3cfa
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-1.7.ebuild
@@ -0,0 +1,57 @@
+# 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.ebuild,v 1.1 2006/01/09 01:52:57 nichoj Exp $
+
+inherit eutils java-pkg
+
+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 jikes junit source"
+
+# 1.3 support might be possible by adding an additional depend on xml-commons[-external]
+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
+	junit? ( >=dev-java/junit-3.7 )
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack "${A}"
+	cd  "${S}"
+	epatch "${FILESDIR}/${PV}-build.xml-jar-target.patch"
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadoc"
+	use junit && antflags="${antflags} test"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+
+	use junit && antflags="${antflags} -Djunit.jar=$(java-pkg_getjars junit)"
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)"
+	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
+	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
+	ant ${antflags} || die "compilation failed"
+}
+
+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
+}
diff --git a/dev-java/commons-digester/files/1.7-build.xml-jar-target.patch b/dev-java/commons-digester/files/1.7-build.xml-jar-target.patch
new file mode 100644
index 000000000000..33f725e09dea
--- /dev/null
+++ b/dev-java/commons-digester/files/1.7-build.xml-jar-target.patch
@@ -0,0 +1,33 @@
+Index: build.xml
+===================================================================
+--- build.xml	(revision 366176)
++++ build.xml	(working copy)
+@@ -248,20 +248,22 @@
+     </javadoc>
+   </target>
+ 
++  <target name="jar" depends="compile"
++   description="Create commons-digester.jar">
++    <mkdir      dir="${dist.home}"/>
++    <jar    jarfile="${dist.home}/commons-${component.name}.jar"
++            basedir="${build.home}/classes"
++           manifest="${build.home}/conf/MANIFEST.MF"/>
++  </target>
+ 
+-  <target name="dist" depends="compile,javadoc"
++  <target name="dist" depends="jar,javadoc"
+    description="Create binary distribution">
+-    <mkdir      dir="${dist.home}"/>
+     <copy      file="LICENSE.txt"
+               todir="${dist.home}"/>
+-    <mkdir      dir="${build.home}/classes/META-INF"/>
+     <copy      file="RELEASE-NOTES.txt"
+               todir="${dist.home}"/>
+     <copy      file="NOTICE.txt"
+               todir="${dist.home}"/>
+-    <jar    jarfile="${dist.home}/commons-${component.name}.jar"
+-            basedir="${build.home}/classes"
+-           manifest="${build.home}/conf/MANIFEST.MF"/>
+   </target>
+ 
+ 
diff --git a/dev-java/commons-digester/files/digest-commons-digester-1.7 b/dev-java/commons-digester/files/digest-commons-digester-1.7
new file mode 100644
index 000000000000..f1c2269a5edc
--- /dev/null
+++ b/dev-java/commons-digester/files/digest-commons-digester-1.7
@@ -0,0 +1 @@
+MD5 718f91f6958da865826bca455f644076 commons-digester-1.7-src.tar.gz 237780