summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-07-09 16:10:20 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-07-09 16:10:20 +0000
commit067be5b79e6285210b267ed70f7d87a3e641dd5e (patch)
tree9c538ce06dd31df222cafe00d763d2bd55f424bf /dev-java/xom
parentQA: ${PN}-${PV} -> ${P} (diff)
downloadhistorical-067be5b79e6285210b267ed70f7d87a3e641dd5e.tar.gz
historical-067be5b79e6285210b267ed70f7d87a3e641dd5e.tar.bz2
historical-067be5b79e6285210b267ed70f7d87a3e641dd5e.zip
fix deps, some cleanup
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-java/xom')
-rw-r--r--dev-java/xom/ChangeLog5
-rw-r--r--dev-java/xom/Manifest10
-rw-r--r--dev-java/xom/xom-1.0-r1.ebuild24
3 files changed, 24 insertions, 15 deletions
diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index c40ba2d0a69b..19c502bcf842 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,9 @@
# 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.15 2005/06/12 18:11:04 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.16 2005/07/09 16:10:20 axxo Exp $
+
+ 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> xom-1.0-r1.ebuild:
+ fix deps, some cleanup
12 Jun 2005; Jason Wever <weeve@gentoo.org> xom-1.0-r1.ebuild:
Added ~sparc keyword wrt bug #95859.
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 067a5a79336c..415c190160dd 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
MD5 d23a5fe5d6cc30e0637852340f25b6d4 xom-1.0-r1.ebuild 1473
MD5 56dd165e66eb81ab7f51accc5c9c0679 ChangeLog 2224
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
MD5 deb2f00f818f16deba73b81503a0a169 files/digest-xom-1.0-r1 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCz/cH/rLF9B432nYRAsg+AJ0fyzYvGzK1fXXCiu8aJNGmft3bswCgpDvP
+TaNghXAhg84cLteU8omuNnk=
+=rJAI
+-----END PGP SIGNATURE-----
diff --git a/dev-java/xom/xom-1.0-r1.ebuild b/dev-java/xom/xom-1.0-r1.ebuild
index 7f8a21cde1d7..e9464da6fe40 100644
--- a/dev-java/xom/xom-1.0-r1.ebuild
+++ b/dev-java/xom/xom-1.0-r1.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-r1.ebuild,v 1.2 2005/06/12 18:11:04 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0-r1.ebuild,v 1.3 2005/07/09 16:10:20 axxo Exp $
inherit java-pkg
@@ -14,17 +14,18 @@ SLOT="0"
KEYWORDS="amd64 ppc ~sparc x86"
IUSE="doc jikes source"
-DEPEND=">=virtual/jdk-1.3
- >=dev-java/ant-1.4
- jikes? ( dev-java/jikes )
- source? ( app-arch/zip )"
RDEPEND=">=virtual/jre-1.3
=dev-java/xerces-2.6*
dev-java/xalan
dev-java/junit
dev-java/icu4j
dev-java/tagsoup
- =dev-java/servletapi-2.3*"
+ =dev-java/servletapi-2.4*"
+DEPEND=">=virtual/jdk-1.3
+ dev-java/ant-core
+ jikes? ( dev-java/jikes )
+ source? ( app-arch/zip )
+ ${RDEPEND}"
S=${WORKDIR}/XOM
@@ -37,7 +38,7 @@ src_unpack() {
java-pkg_jar-from junit
java-pkg_jar-from xalan
java-pkg_jar-from xerces-2
- java-pkg_jar-from servletapi-2.3
+ java-pkg_jar-from servletapi-2.4
java-pkg_jar-from icu4j icu4j.jar normalizer.jar
java-pkg_jar-from tagsoup
}
@@ -49,14 +50,9 @@ src_compile() {
}
src_install() {
- mv ${WORKDIR}/XOM/build/${XOMVER}.jar ${PN}.jar
- java-pkg_dojar ${PN}.jar
+ java-pkg_newjar build/${XOMVER}.jar ${PN}.jar
dodoc Todo.txt
- if use doc ; then
- dodir /usr/share/doc/${P}
- cd ${WORKDIR}/XOM/
- java-pkg_dohtml -r apidocs/
- fi
+ use doc && java-pkg_dohtml -r apidocs/
use source && java-pkg_dosrc src/*
}