summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/xml-xmlbeans')
-rw-r--r--dev-java/xml-xmlbeans/ChangeLog6
-rw-r--r--dev-java/xml-xmlbeans/Manifest14
-rw-r--r--dev-java/xml-xmlbeans/xml-xmlbeans-20041217.ebuild18
3 files changed, 16 insertions, 22 deletions
diff --git a/dev-java/xml-xmlbeans/ChangeLog b/dev-java/xml-xmlbeans/ChangeLog
index 8fa63e730f0c..ad33e830d963 100644
--- a/dev-java/xml-xmlbeans/ChangeLog
+++ b/dev-java/xml-xmlbeans/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/xml-xmlbeans
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/ChangeLog,v 1.9 2005/06/12 12:59:31 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/ChangeLog,v 1.10 2005/07/09 16:09:59 axxo Exp $
+
+ 09 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+ xml-xmlbeans-20041217.ebuild:
+ fix deps
12 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
xml-xmlbeans-20041217.ebuild:
diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest
index b60135957ce6..fcca8b98fcb3 100644
--- a/dev-java/xml-xmlbeans/Manifest
+++ b/dev-java/xml-xmlbeans/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 507b27692fdeb03ae81fca5692f5236e xml-xmlbeans-20041217.ebuild 1461
-MD5 6de077e111ad2666dd89db333802e49d ChangeLog 1420
+MD5 341a37f48f54e2a486691d9ab42e15ff xml-xmlbeans-20041217.ebuild 1428
+MD5 5736d1f2ea3f04c0ce8ef7017e5109de ChangeLog 1513
MD5 2f7eb11c0417ec3403532aa25b5a6c6e metadata.xml 1122
MD5 d17fbe1ca053cfb927b65bec2afd966f files/digest-xml-xmlbeans-20041217 75
MD5 27c134bfb7f6284ad713592a1bba9919 files/xml-xmlbeans-gentoo.patch 7484
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCrDHL06ebR+OMO78RAkINAJ9ZZNkPDMknXAyCkFjcJF9NW21GZwCeOLId
-8GZfiaFgZY5S0BFAXLgS+Zk=
-=ERLy
------END PGP SIGNATURE-----
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-20041217.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-20041217.ebuild
index 7229b879cb0a..a81667b54c6f 100644
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-20041217.ebuild
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-20041217.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/xml-xmlbeans/xml-xmlbeans-20041217.ebuild,v 1.8 2005/06/12 12:59:31 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/xml-xmlbeans-20041217.ebuild,v 1.9 2005/07/09 16:09:59 axxo Exp $
inherit eutils java-pkg
@@ -13,13 +13,13 @@ SLOT="1"
KEYWORDS="x86 amd64 ~ppc"
IUSE="doc junit source"
-DEPEND=">=virtual/jdk-1.4
- junit? ( >=dev-java/ant-1.6.2 )
- !junit? ( >=dev-java/ant-core-1.6.2 )
- source? ( app-arch/zip )"
RDEPEND=">=virtual/jre-1.4
=dev-java/jaxen-1.1*
junit? ( >=dev-java/junit-3.8 )"
+DEPEND=">=virtual/jdk-1.4
+ >=dev-java/ant-core-1.6.2
+ source? ( app-arch/zip )
+ ${RDEPEND}"
S=${WORKDIR}/${P}/v1
@@ -33,8 +33,8 @@ src_unpack() {
rm -f jaxen-1.1-beta-2.jar junit.jar
java-pkg_jar-from jaxen-1.1 jaxen.jar jaxen-1.1-beta-2.jar
- if has_version dev-java/ant-tasks; then
- if use junit; then
+ if use junit; then
+ if has_version dev-java/ant-tasks; then
java-pkg_jar-from junit
fi
fi
@@ -43,8 +43,8 @@ src_unpack() {
src_compile() {
local antflags="xbean.jar"
use doc && antflags="${antflags} docs"
- if has_version dev-java/ant-tasks; then
- if use junit; then
+ if use junit; then
+ if has_version dev-java/ant-tasks; then
antflags="${antflags} random.jar drt.jar drt"
fi
fi