1.0 stable on amd64, ppc and x86. did some cleanup and introduced support for the source useflag

(Portage version: 2.0.51.19)

7 files changed, 15 insertions, 129 deletions

diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index 116d32a9ee0d..04aa72ae4268 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xom
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.12 2005/01/21 17:24:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.13 2005/04/28 19:19:18 luckyduck Exp $
+
+  28 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> xom-1.0.ebuild,
+  -xom-1.0_beta5.ebuild, -xom-1.0_beta6.ebuild:
+  1.0 stable on amd64, ppc and x86. did some cleanup and introduced support for
+  the source useflag
 
 *xom-1.0 (21 Jan 2005)
 
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 55962427afe2..0b4e0b9f03ab 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,8 +1,4 @@
-MD5 1e99f24ec6c5613c8328ac7d0fe37f47 xom-1.0_beta6.ebuild 1431
-MD5 95d9bde9f22c6fe0c5a9e4d720596b0b xom-1.0.ebuild 1490
-MD5 0b4defa280611a12a53ee4969e10996a xom-1.0_beta5.ebuild 1414
-MD5 c2a7455886cc25da7e3b669432b41c09 ChangeLog 1597
+MD5 7bfa9d74566f988ed879e8f396b8656c xom-1.0.ebuild 1583
+MD5 7d10644ba2509dde7ca5ada009480584 ChangeLog 1815
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 a5d63e4795719a77ec4ed37989972163 files/digest-xom-1.0_beta5 59
-MD5 af8e4185c36e77a42b75df927966d03b files/digest-xom-1.0_beta6 59
 MD5 deb2f00f818f16deba73b81503a0a169 files/digest-xom-1.0 60
diff --git a/dev-java/xom/files/digest-xom-1.0_beta5 b/dev-java/xom/files/digest-xom-1.0_beta5
deleted file mode 100644
index ce938236b4e9..000000000000
--- a/dev-java/xom/files/digest-xom-1.0_beta5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7eebde7a1279f51407d589d286f6b0c xom-1.0b5.zip 4029687
diff --git a/dev-java/xom/files/digest-xom-1.0_beta6 b/dev-java/xom/files/digest-xom-1.0_beta6
deleted file mode 100644
index e4392b1d125a..000000000000
--- a/dev-java/xom/files/digest-xom-1.0_beta6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 37e218646a05ad7759e80084a6bc726d xom-1.0b6.zip 4055549
diff --git a/dev-java/xom/xom-1.0.ebuild b/dev-java/xom/xom-1.0.ebuild
index 0ba0238faf6d..9679adb502c6 100644
--- a/dev-java/xom/xom-1.0.ebuild
+++ b/dev-java/xom/xom-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0.ebuild,v 1.1 2005/01/21 17:24:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0.ebuild,v 1.2 2005/04/28 19:19:18 luckyduck Exp $
 
 inherit java-pkg
 
@@ -11,8 +11,8 @@ SRC_URI="http://cafeconleche.org/XOM/${XOMVER}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="doc jikes"
+KEYWORDS="x86 ppc amd64"
+IUSE="doc jikes source"
 
 DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.4
@@ -21,7 +21,9 @@ DEPEND=">=virtual/jdk-1.3
 	dev-java/junit
 	dev-java/icu4j
 	dev-java/tagsoup
-	=dev-java/servletapi-2.3*"
+	=dev-java/servletapi-2.3*
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jdk-1.3"
 
 S=${WORKDIR}/XOM
@@ -56,4 +58,5 @@ src_install() {
 		cd ${WORKDIR}/XOM/
 		java-pkg_dohtml -r apidocs/
 	fi
+	use source && java-pkg_dosrc src/*
 }
diff --git a/dev-java/xom/xom-1.0_beta5.ebuild b/dev-java/xom/xom-1.0_beta5.ebuild
deleted file mode 100644
index e729c29e1e83..000000000000
--- a/dev-java/xom/xom-1.0_beta5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0_beta5.ebuild,v 1.5 2005/01/21 17:24:14 luckyduck Exp $
-
-inherit java-pkg
-
-XOMVER="xom-1.0b5"
-DESCRIPTION="XOM is a new XML object model. It is a tree-based API for processing XML with Java that strives for correctness and simplicity."
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-SRC_URI="http://cafeconleche.org/XOM/${XOMVER}.zip"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-
-DEPEND=">=dev-java/ant-1.4
-		app-arch/unzip
-		>=dev-java/xerces-2.6.2-r1
-		dev-java/xalan
-		dev-java/junit
-		dev-java/icu4j
-		dev-java/tagsoup
-		=dev-java/servletapi-2.3*"
-RDEPEND=">=virtual/jdk-1.2"
-
-S=${WORKDIR}/XOM
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	rm -f *.jar
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from junit
-	java-pkg_jar-from xalan
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from servletapi-2.3 servletapi-2.3.jar servlet.jar
-	java-pkg_jar-from icu4j icu4j.jar normalizer.jar
-	java-pkg_jar-from tagsoup tagsoup.jar tagsoup-0.9.7.jar
-}
-
-src_compile() {
-	local antflags="jar -Ddebug=off"
-	ant ${antflags} || die "Failed Compiling"
-}
-
-src_install() {
-	mv ${WORKDIR}/XOM/build/${XOMVER}.jar xom.jar
-	java-pkg_dojar xom.jar
-	dodoc Todo.txt
-
-	if use doc ; then
-		dodir /usr/share/doc/${P}
-		cd ${WORKDIR}/XOM/
-		java-pkg_dohtml -r apidocs/
-	fi
-}
diff --git a/dev-java/xom/xom-1.0_beta6.ebuild b/dev-java/xom/xom-1.0_beta6.ebuild
deleted file mode 100644
index 0fd405d74999..000000000000
--- a/dev-java/xom/xom-1.0_beta6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0_beta6.ebuild,v 1.6 2005/01/21 17:24:14 luckyduck Exp $
-
-inherit java-pkg
-
-XOMVER="xom-${PV/_beta/b}"
-DESCRIPTION="XOM is a new XML object model. It is a tree-based API for processing XML with Java that strives for correctness and simplicity."
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-SRC_URI="http://cafeconleche.org/XOM/${XOMVER}.zip"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="doc"
-
-DEPEND=">=dev-java/ant-1.4
-		app-arch/unzip
-		>=dev-java/xerces-2.6.2-r1
-		dev-java/xalan
-		dev-java/junit
-		dev-java/icu4j
-		dev-java/tagsoup
-		=dev-java/servletapi-2.3*"
-RDEPEND=">=virtual/jdk-1.2"
-
-S=${WORKDIR}/XOM
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	rm -f *.jar
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from junit
-	java-pkg_jar-from xalan
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from servletapi-2.3 servletapi-2.3.jar servlet.jar
-	java-pkg_jar-from icu4j icu4j.jar normalizer.jar
-	java-pkg_jar-from tagsoup
-}
-
-src_compile() {
-	local antflags="jar -Ddebug=off -Dtagsoup.jar=lib/tagsoup.jar"
-	ant ${antflags} || die "Failed Compiling"
-}
-
-src_install() {
-	mv ${WORKDIR}/XOM/build/${XOMVER}.jar ${PN}.jar
-	java-pkg_dojar ${PN}.jar
-	dodoc Todo.txt
-
-	if use doc ; then
-		dodir /usr/share/doc/${P}
-		cd ${WORKDIR}/XOM/
-		java-pkg_dohtml -r apidocs/
-	fi
-}