Bumping commons-digester

Package-Manager: portage-2.1.4_rc11

5 files changed, 141 insertions, 15 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/Manifest b/dev-java/commons-digester/Manifest
index b6fa09fc3aa7..c177d3bdfdff 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -1,19 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.7-build.xml-jar-target.patch 1148 RMD160 9387b53ab675cc223db2824b0dadd994994ce16e SHA1 59cbb1207313b24b0cbcf0f81e973c1c6d34af09 SHA256 c1a0724bd448bb2d98ae58d72d3b842c8313a9933df13dac56c9ea6e835bb69d
 MD5 79044065870df490120faeed1137a72f files/1.7-build.xml-jar-target.patch 1148
 RMD160 9387b53ab675cc223db2824b0dadd994994ce16e files/1.7-build.xml-jar-target.patch 1148
 SHA256 c1a0724bd448bb2d98ae58d72d3b842c8313a9933df13dac56c9ea6e835bb69d files/1.7-build.xml-jar-target.patch 1148
+AUX 1.8-build.xml-jar-target.patch 1824 RMD160 4551dae52a428c91079029431e2bc4fbd51dfe82 SHA1 dd175de66aa0967dea45e57a8ada643dcb6dd2e3 SHA256 9faa97825bb85c6d0c0e31e08a278e39e808b9a6ac98c47e6aa0af6992ccbf36
+MD5 974d2030b7b7689bc106e6c70f6846d2 files/1.8-build.xml-jar-target.patch 1824
+RMD160 4551dae52a428c91079029431e2bc4fbd51dfe82 files/1.8-build.xml-jar-target.patch 1824
+SHA256 9faa97825bb85c6d0c0e31e08a278e39e808b9a6ac98c47e6aa0af6992ccbf36 files/1.8-build.xml-jar-target.patch 1824
 DIST commons-digester-1.7-src.tar.gz 237780 RMD160 ae5689a2520d0c70619d40704a66201b46ee280e SHA1 b83eafe7b7c3e150bf36b5f86b008f42c2891fe9 SHA256 b08cea063578c272374df08be010f4a841c87a5cea278f4bd20f89531eeab069
+DIST commons-digester-1.8-src.tar.gz 279771 RMD160 e1b90e30a4783061150f2c4c34a78ec515fde920 SHA1 5f7615040ae8e687a0a4e890cb542470c15c60fe SHA256 d9a965c82828a881d2ab6256fba7076f62815a9545b3af9d553dc5271577182b
 EBUILD commons-digester-1.7-r2.ebuild 2104 RMD160 5f460911e3c5ca4c5f0cfb62e59b38df612fded5 SHA1 b48c2f85fef4630124bf41f603b1993d4937a797 SHA256 0cee38d29fdb938ccf70c94ccdd6919f425f4960336c5124fcbc7e3086d3ab7c
 MD5 fcd10a34ec84353b3134ad275697db95 commons-digester-1.7-r2.ebuild 2104
 RMD160 5f460911e3c5ca4c5f0cfb62e59b38df612fded5 commons-digester-1.7-r2.ebuild 2104
 SHA256 0cee38d29fdb938ccf70c94ccdd6919f425f4960336c5124fcbc7e3086d3ab7c commons-digester-1.7-r2.ebuild 2104
-MISC ChangeLog 6179 RMD160 cf5d56a0d6d9368f03ac606561dc3e6e2d0c05a7 SHA1 1f482b5513a332b4075ecf188d0aafff958889ac SHA256 d2c55fdc345f4eb21ca31bbc64efc61022a031e4c6de1c10e315666869a9cea2
-MD5 b58f0c43f3094284f8c3d6b4a4064ff3 ChangeLog 6179
-RMD160 cf5d56a0d6d9368f03ac606561dc3e6e2d0c05a7 ChangeLog 6179
-SHA256 d2c55fdc345f4eb21ca31bbc64efc61022a031e4c6de1c10e315666869a9cea2 ChangeLog 6179
+EBUILD commons-digester-1.8.ebuild 2104 RMD160 15ba4b41bd0c8c1662a87dd6b14c40c259e1d17a SHA1 994b12ff63e46fa74cd69c2e163d187a02c7bc3f SHA256 c5c58d6fac120b62df6896453ed5c8b82a1323112d605f9107468c1a680c2c15
+MD5 5a0d8fa2be91919ad39350099813106f commons-digester-1.8.ebuild 2104
+RMD160 15ba4b41bd0c8c1662a87dd6b14c40c259e1d17a commons-digester-1.8.ebuild 2104
+SHA256 c5c58d6fac120b62df6896453ed5c8b82a1323112d605f9107468c1a680c2c15 commons-digester-1.8.ebuild 2104
+MISC ChangeLog 6350 RMD160 27ff288a5c71bd2ae4b1b3bd067ac0ee239cb509 SHA1 ed635d29d04b3c2eb83b5757adc9e09f5ec12543 SHA256 805c8554755cef6ad745f96643b7d879807aa187d703011650569557d4ecb018
+MD5 0fefaea8faa42179a863b70d8abf58dd ChangeLog 6350
+RMD160 27ff288a5c71bd2ae4b1b3bd067ac0ee239cb509 ChangeLog 6350
+SHA256 805c8554755cef6ad745f96643b7d879807aa187d703011650569557d4ecb018 ChangeLog 6350
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -21,10 +27,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 2a9227ee129b36e3601a7bc5591d22ed files/digest-commons-digester-1.7-r2 274
 RMD160 4b168dc960c641b72564d1e9e8938c3fedc99065 files/digest-commons-digester-1.7-r2 274
 SHA256 f020b21b6d35afa02686b829693e2d91387441525b8e2e094dceb3ae475bf632 files/digest-commons-digester-1.7-r2 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGWNH9cxLzpIGCsLQRAhJXAJ47vZtUKkGV+7bul+ikHMsTXJTSWgCfTSya
-serjUBjbG3ikudWym7BNfB8=
-=2BbV
------END PGP SIGNATURE-----
+MD5 978d04ec8291ead105a5c4b964ecd7fd files/digest-commons-digester-1.8 274
+RMD160 3cd390c16f074f01b62388d767803d04b2e5f863 files/digest-commons-digester-1.8 274
+SHA256 f00630e1fee6e89abe9f10f1da5497890116de4c6b79279536bcfca266757536 files/digest-commons-digester-1.8 274
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