Bumping commons-digester

(Portage version: 2.1.4_rc11)

4 files changed, 125 insertions, 1 deletions

diff --git a/dev-java/commons-digester/ChangeLog b/dev-java/commons-digester/ChangeLog
index ae7b4a57b474..9d7ae85a4fe4 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.42 2007/05/27 00:34:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.43 2007/12/26 00:55:00 ali_bush Exp $
+
+*commons-digester-1.8 (26 Dec 2007)
+
+  26 Dec 2007; <alistair@gentoo.org> +files/1.8-build.xml-jar-target.patch,
+  +commons-digester-1.8.ebuild:
+  Bump commons-collections
 
   27 May 2007; Petteri Räty <betelgeuse@gentoo.org>
   -commons-digester-1.6-r1.ebuild:
diff --git a/dev-java/commons-digester/commons-digester-1.8.ebuild b/dev-java/commons-digester/commons-digester-1.8.ebuild
new file mode 100644
index 000000000000..75a6fc29f290
--- /dev/null
+++ b/dev-java/commons-digester/commons-digester-1.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 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.ebuild,v 1.1 2007/12/26 00:55:00 ali_bush 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 ~x86 ~x86-fbsd"
+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 && 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/1.8-build.xml-jar-target.patch b/dev-java/commons-digester/files/1.8-build.xml-jar-target.patch
new file mode 100644
index 000000000000..316d2e2a54b1
--- /dev/null
+++ b/dev-java/commons-digester/files/1.8-build.xml-jar-target.patch
@@ -0,0 +1,47 @@
+--- build.xml.orig	2007-12-26 13:43:35.000000000 +1300
++++ build.xml	2007-12-26 13:47:32.000000000 +1300
+@@ -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,20 +258,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.8 b/dev-java/commons-digester/files/digest-commons-digester-1.8
new file mode 100644
index 000000000000..57a227d6de71
--- /dev/null
+++ b/dev-java/commons-digester/files/digest-commons-digester-1.8
@@ -0,0 +1,3 @@
+MD5 689f41905a68c67f7231f9afbb3e2147 commons-digester-1.8-src.tar.gz 279771
+RMD160 e1b90e30a4783061150f2c4c34a78ec515fde920 commons-digester-1.8-src.tar.gz 279771
+SHA256 d9a965c82828a881d2ab6256fba7076f62815a9545b3af9d553dc5271577182b commons-digester-1.8-src.tar.gz 279771