This revision should never have been added.

(Portage version: 2.1.4)

4 files changed, 7 insertions, 68 deletions

diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index 5b14f6e0bca6..04e98e3dc1da 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,10 @@
 # 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.41 2008/01/14 10:23:50 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.42 2008/01/19 16:55:48 betelgeuse Exp $
+
+  19 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> xom-1.0-r4.ebuild,
+  -xom-1.0-r5.ebuild:
+  This revision should never have been added.
 
 *xom-1.0-r5 (14 Jan 2008)
 
diff --git a/dev-java/xom/files/digest-xom-1.0-r5 b/dev-java/xom/files/digest-xom-1.0-r5
deleted file mode 100644
index 27aa669027b5..000000000000
--- a/dev-java/xom/files/digest-xom-1.0-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-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-r4.ebuild b/dev-java/xom/xom-1.0-r4.ebuild
index baeadf1c1c82..70c9301942ed 100644
--- a/dev-java/xom/xom-1.0-r4.ebuild
+++ b/dev-java/xom/xom-1.0-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.6 2008/01/10 22:39:35 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0-r4.ebuild,v 1.7 2008/01/19 16:55:48 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc examples source"
 
@@ -19,7 +19,7 @@ IUSE=""
 COMMON_DEPEND=">=dev-java/xerces-2.7
 		dev-java/xalan
 		=dev-java/junit-3.8*
-		=dev-java/icu4j-3.0*
+		dev-java/icu4j
 		examples? ( =dev-java/servletapi-2.4* )
 		dev-java/tagsoup"
 RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/xom/xom-1.0-r5.ebuild b/dev-java/xom/xom-1.0-r5.ebuild
deleted file mode 100644
index bcb56bb3609b..000000000000
--- a/dev-java/xom/xom-1.0-r5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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
-}