Removed the strict dependency on icu4j-3.0, as it compiles fine with 3.6.1.

Package-Manager: portage-2.1.3.19

4 files changed, 82 insertions, 5 deletions

diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index d29fc3976e4f..5b14f6e0bca6 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xom
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.40 2008/01/10 22:39:35 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.41 2008/01/14 10:23:50 elvanor Exp $
+
+*xom-1.0-r5 (14 Jan 2008)
+
+  14 Jan 2008; Jean-Noël Rivasseau <elvanor@gentoo.org> +xom-1.0-r5.ebuild:
+  Removed the strict dependency on icu4j-3.0, as it compiles fine with 3.6.1.
 
   10 Jan 2008; Vlastimil Babka <caster@gentoo.org> -xom-1.0-r2.ebuild,
   -xom-1.0-r3.ebuild, xom-1.0-r4.ebuild:
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index e07685a0d71e..eaea5725a231 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -3,10 +3,14 @@ EBUILD xom-1.0-r4.ebuild 1630 RMD160 e798af677b902e8e4beeaf72dc09920a57c762b9 SH
 MD5 0437cc8a4dd24fff426106a7bfdde84a xom-1.0-r4.ebuild 1630
 RMD160 e798af677b902e8e4beeaf72dc09920a57c762b9 xom-1.0-r4.ebuild 1630
 SHA256 2f1de1999d3d5375c58a6887a2dc9efffba0584f05abd901fcd03a1b0c74e80d xom-1.0-r4.ebuild 1630
-MISC ChangeLog 5100 RMD160 f1528072609eb795aa5a01e2a928cc21d7e6fff1 SHA1 0c3f503a99d8db9653055d849b251a5262944cb9 SHA256 0c505a6aca4fe5b4594c97543ff3a6ff605096539dffb876f3348d6c0358cf3d
-MD5 e7fa3443395eec526b460868ce7d4db4 ChangeLog 5100
-RMD160 f1528072609eb795aa5a01e2a928cc21d7e6fff1 ChangeLog 5100
-SHA256 0c505a6aca4fe5b4594c97543ff3a6ff605096539dffb876f3348d6c0358cf3d ChangeLog 5100
+EBUILD xom-1.0-r5.ebuild 1623 RMD160 f6587675a7153fb9e4112d4951236a2f1b2904bc SHA1 e6ebe01c1c9e5e48c7739f87a884c35414309088 SHA256 1fd186513470a5a744906793f0da1baba4521f1f45b876f84af94b562605d6e5
+MD5 cced4859d8632d2f5276036a4ba44986 xom-1.0-r5.ebuild 1623
+RMD160 f6587675a7153fb9e4112d4951236a2f1b2904bc xom-1.0-r5.ebuild 1623
+SHA256 1fd186513470a5a744906793f0da1baba4521f1f45b876f84af94b562605d6e5 xom-1.0-r5.ebuild 1623
+MISC ChangeLog 5284 RMD160 e36b3e48f94ecbabccb172420c009ce27b66ed80 SHA1 69801c1ed0d827c2590cb195400b2b0d57d4077f SHA256 7c5f0dfaafda9e90f4276c26d5f0521ace574e5481ceedc22279d603c0fe4bca
+MD5 edabb0ab8ec8cf83c1f7b2f5e31ef6b9 ChangeLog 5284
+RMD160 e36b3e48f94ecbabccb172420c009ce27b66ed80 ChangeLog 5284
+SHA256 7c5f0dfaafda9e90f4276c26d5f0521ace574e5481ceedc22279d603c0fe4bca ChangeLog 5284
 MISC metadata.xml 329 RMD160 6eae130480bb2aaffeb7d11f07ced2bad8eab1e3 SHA1 09cb7ea27575a9d281a52b46b19fe63f6ea54adc SHA256 3f4ca05bff0b5512bd08e7e4471ff434786c27b458e840dda8e64c02e1901d1d
 MD5 5f4257662fe77d4baf7943fdef689354 metadata.xml 329
 RMD160 6eae130480bb2aaffeb7d11f07ced2bad8eab1e3 metadata.xml 329
@@ -14,3 +18,6 @@ SHA256 3f4ca05bff0b5512bd08e7e4471ff434786c27b458e840dda8e64c02e1901d1d metadata
 MD5 83f964d202477e2a439016433b2e4b8f files/digest-xom-1.0-r4 226
 RMD160 cdd6d43994408957232f5c7774163d78bb612c6d files/digest-xom-1.0-r4 226
 SHA256 6f97856b30a3b3f4617263197f7887d4867f241b97e9ad765dc3e893ea217703 files/digest-xom-1.0-r4 226
+MD5 83f964d202477e2a439016433b2e4b8f files/digest-xom-1.0-r5 226
+RMD160 cdd6d43994408957232f5c7774163d78bb612c6d files/digest-xom-1.0-r5 226
+SHA256 6f97856b30a3b3f4617263197f7887d4867f241b97e9ad765dc3e893ea217703 files/digest-xom-1.0-r5 226
diff --git a/dev-java/xom/files/digest-xom-1.0-r5 b/dev-java/xom/files/digest-xom-1.0-r5
new file mode 100644
index 000000000000..27aa669027b5
--- /dev/null
+++ b/dev-java/xom/files/digest-xom-1.0-r5
@@ -0,0 +1,3 @@
+MD5 af472e90685eef0ac1e731eb84a49763 xom-1.0.tar.gz 3396586
+RMD160 9e524b87d0cce968aaabe9aff3010de210e23745 xom-1.0.tar.gz 3396586
+SHA256 d37fbb5a2e6f1dd716c1f55f2e2ce6d96f9227788c2cd73e436c1cd087925a16 xom-1.0.tar.gz 3396586
diff --git a/dev-java/xom/xom-1.0-r5.ebuild b/dev-java/xom/xom-1.0-r5.ebuild
new file mode 100644
index 000000000000..bcb56bb3609b
--- /dev/null
+++ b/dev-java/xom/xom-1.0-r5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0-r5.ebuild,v 1.1 2008/01/14 10:23:50 elvanor Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+XOMVER="xom-${PV/_beta/b}"
+DESCRIPTION="A new XML object model."
+HOMEPAGE="http://cafeconleche.org/XOM/index.html"
+SRC_URI="http://cafeconleche.org/XOM/${XOMVER}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEPEND=">=dev-java/xerces-2.7
+		dev-java/xalan
+		dev-java/junit
+		dev-java/icu4j
+		examples? ( =dev-java/servletapi-2.4* )
+		dev-java/tagsoup"
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON_DEPEND}"
+
+S=${WORKDIR}/XOM
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	java-ant_ignore-system-classes
+	rm -v *.jar || die
+	cd "${S}/lib"
+	rm -v *.jar || die
+	java-pkg_jar-from junit
+	java-pkg_jar-from xalan
+	java-pkg_jar-from xerces-2
+	java-pkg_jar-from icu4j icu4j.jar normalizer.jar
+	java-pkg_jar-from tagsoup
+}
+
+src_compile() {
+	ant_flags="-Ddebug=off -Dtagsoup.jar=lib/tagsoup.jar"
+	use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
+
+	eant jar ${ant_flags}\
+		$(use examples && echo samples)
+}
+
+src_install() {
+	java-pkg_newjar build/${XOMVER}.jar ${PN}.jar
+	use examples && java-pkg_dojar build/xom-samples.jar
+	dodoc Todo.txt || die
+
+	use doc && java-pkg_dojavadoc apidocs/
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples
+}