version bump and no longer uses packed jars, ebuild contributed by Josh Nichols <nichoj@alum.rpi.edu>

(Portage version: 2.0.51.22-r1)

4 files changed, 88 insertions, 2 deletions

diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog
index 6268dfb265c2..77c52dffc25e 100644
--- a/dev-java/dom4j/ChangeLog
+++ b/dev-java/dom4j/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/dom4j
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.20 2005/05/29 15:55:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.21 2005/06/29 18:53:08 axxo Exp $
+
+*dom4j-1.6.1 (29 Jun 2005)
+
+  29 Jun 2005; Thomas Matthijs <axxo@gentoo.org> +dom4j-1.6.1.ebuild:
+  version bump and no longer uses packed jars, ebuild contributed by Josh
+  Nichols <nichoj@alum.rpi.edu>
 
   29 May 2005; Markus Rothe <corsair@gentoo.org> dom4j-1.5.ebuild:
   Stable on ppc64
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 37680728f7b3..50df93e8646f 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,6 +1,8 @@
-MD5 c1728d4b09929e638daef38b3c39d9df ChangeLog 2060
 MD5 70adc8cfc4e8dad6a1c4418139d35686 dom4j-1.4-r1.ebuild 847
+MD5 64ac3430846be0d7eb6d6d64664c9dff dom4j-1.6.1.ebuild 2185
 MD5 4d263e28892fb76a56792b659150407a dom4j-1.5.ebuild 932
+MD5 c1728d4b09929e638daef38b3c39d9df ChangeLog 2060
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 48544058c2c90c92b7e7a2bd9c9de6d0 files/digest-dom4j-1.4-r1 63
+MD5 d39295fd6f79fddbccc7d05723d49111 files/digest-dom4j-1.6.1 64
 MD5 08461e3c2f9380aa2a055cfb2f9865e1 files/digest-dom4j-1.5 63
diff --git a/dev-java/dom4j/dom4j-1.6.1.ebuild b/dev-java/dom4j/dom4j-1.6.1.ebuild
new file mode 100644
index 000000000000..28dbcf73277d
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1.ebuild,v 1.1 2005/06/29 18:53:08 axxo Exp $
+
+inherit java-pkg
+
+DESCRIPTION="Easy to use, open source library for working with XML, XPath and XSLT on the Java platform using the Java Collections Framework and with full support for DOM, SAX and JAXP."
+HOMEPAGE="http://dom4j.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz"
+LICENSE="Apache-1.1"
+SLOT="1"
+KEYWORDS="~x86"
+IUSE="doc jikes source"
+RDEPEND="|| ( =virtual/jre-1.3* =virtual/jre-1.4* )
+	dev-java/jaxme
+	dev-java/jsr173
+	dev-java/msv
+	dev-java/xpp2
+	dev-java/xpp3
+	dev-java/relaxng-datatype
+	=dev-java/xerces-2*
+	dev-java/xsdlib"
+DEPEND="|| (  =virtual/jdk-1.3* =virtual/jdk-1.4* )
+	jikes? ( dev-java/jikes )
+	dev-java/ant-core
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/lib
+	#circular deps with jaxen
+	rm -f $(echo *.jar | sed 's/jaxen[^ ]\+//')
+	java-pkg_jar-from jaxme
+	java-pkg_jar-from jsr173
+	java-pkg_jar-from msv
+	java-pkg_jar-from xpp2
+	java-pkg_jar-from xpp3
+	java-pkg_jar-from relaxng-datatype
+	java-pkg_jar-from xsdlib
+
+	cd ${S}/lib/endorsed
+	rm -f *.jar
+	java-pkg_jar-from xerces-2 || die
+
+	rm -r ${S}/lib/test
+	# we don't really to fix any of these if we're not doing testing
+#	# TODO: replace jsr173_1.0_ri.jar
+#	java-pkg_jar-from ${JUNITPERF} || die
+
+	# We don't need the stuff in tools
+	rm -r ${S}/lib/tools
+#	cd ${S}/lib/tools
+#	# apparently we don't really need clover's jar
+#	rm clover*
+#	java-pkg_jar-from ${ISORELAX} || die
+#	# TODO: replace jaxme-0.3.jar
+#	# TODO: replace jaxme-js-0.3.jar
+#	# TODO: replace jaxme-xs-0.3.jar
+#	java-pkg_jar-from ${TIDY} || die
+#	java-pkg_jar-from ${XALAN} || die
+#	java-pkg_jar-from ${XERCES_IMPL} || die
+}
+
+src_compile() {
+	local antflags="clean package"
+	use doc && antflags="${antflags} -Dbuild.javadocs=build/doc/api javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+
+	ant ${antflags} || die "Compilation failed"
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	use doc && java-pkg_dohtml -r build/doc/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/dom4j/files/digest-dom4j-1.6.1 b/dev-java/dom4j/files/digest-dom4j-1.6.1
new file mode 100644
index 000000000000..b769bc4d8c00
--- /dev/null
+++ b/dev-java/dom4j/files/digest-dom4j-1.6.1
@@ -0,0 +1 @@
+MD5 1e7ef6d20939315714de4a8502f27b2d dom4j-1.6.1.tar.gz 9687211