Version bump.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 101 insertions, 35 deletions

diff --git a/dev-java/commons-digester/ChangeLog b/dev-java/commons-digester/ChangeLog
index 0ab3d7b1c821..01e8a4ded3f7 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.52 2008/04/05 00:43:36 betelgeuse Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.53 2009/02/15 20:12:12 caster Exp $
+
+*commons-digester-1.8.1 (15 Feb 2009)
+
+  15 Feb 2009; Vlastimil Babka <caster@gentoo.org>
+  -files/1.7-build.xml-jar-target.patch,
+  +files/1.8.1-build.xml-jar-target.patch, +commons-digester-1.8.1.ebuild:
+  Version bump.
 
   05 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
   -commons-digester-1.7-r2.ebuild:
diff --git a/dev-java/commons-digester/commons-digester-1.8.1.ebuild b/dev-java/commons-digester/commons-digester-1.8.1.ebuild
new file mode 100644
index 000000000000..53833b7c41b7
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-1.8.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2009 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.ebuild,v 1.1 2009/02/15 20:12:12 caster Exp $
+
+EAPI=1
+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.6
+	>=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"
+
+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_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
+}
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
deleted file mode 100644
index 33f725e09dea..000000000000
--- a/dev-java/commons-digester/files/1.7-build.xml-jar-target.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/1.8.1-build.xml-jar-target.patch b/dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch
new file mode 100644
index 000000000000..ec523a011458
--- /dev/null
+++ b/dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch
@@ -0,0 +1,27 @@
+--- build.xml.orig	2009-02-15 21:06:33.000000000 +0100
++++ build.xml	2009-02-15 21:07:25.000000000 +0100
+@@ -117,6 +117,7 @@
+     <pathelement location="${jaxp.jaxp.jar}"/>

+     <pathelement location="${jaxp.parser.jar}"/>

+     <pathelement location="${commons-beanutils.jar}"/>

++    <pathelement location="${commons-collections.jar}" />

+     <pathelement location="${commons-logging.jar}"/>

+     <pathelement location="${junit.jar}"/>

+   </path>

+@@ -140,6 +141,7 @@
+     <pathelement location="${junit.jar}"/>

+     <pathelement location="${jaxp.jaxp.jar}"/>

+     <pathelement location="${jaxp.parser.jar}"/>

++    <pathelement location="${commons-collections.jar}" />

+     <pathelement location="${commons-beanutils.jar}"/>

+     <pathelement location="${commons-logging.jar}"/>

+   </path>

+@@ -256,7 +258,7 @@
+     </javadoc>

+   </target>

+ 

+-  <target name="jar" depends="compile, test"

++  <target name="jar" depends="compile"

+    description="Create commons-digester.jar">

+     <mkdir      dir="${dist.home}"/>

+     <jar    jarfile="${dist.home}/commons-${component.name}.jar"