summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-07-12 22:31:30 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-07-12 22:31:30 +0000
commitcc546f0b00b34ae836c8ca696b6f34c629972815 (patch)
tree6977876b5741a7c7860fe863e543af13720f00ec /dev-java/nanoxml
parentRemove old version. (diff)
downloadgentoo-2-cc546f0b00b34ae836c8ca696b6f34c629972815.tar.gz
gentoo-2-cc546f0b00b34ae836c8ca696b6f34c629972815.tar.bz2
gentoo-2-cc546f0b00b34ae836c8ca696b6f34c629972815.zip
sun-jdk-1.6 from u2 works fine now so removing the work around from DEPEND.
(Portage version: 2.1.3_rc8)
Diffstat (limited to 'dev-java/nanoxml')
-rw-r--r--dev-java/nanoxml/ChangeLog6
-rw-r--r--dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild11
2 files changed, 11 insertions, 6 deletions
diff --git a/dev-java/nanoxml/ChangeLog b/dev-java/nanoxml/ChangeLog
index dba1043dcca9..49adb3f80841 100644
--- a/dev-java/nanoxml/ChangeLog
+++ b/dev-java/nanoxml/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/nanoxml
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nanoxml/ChangeLog,v 1.14 2007/05/06 09:44:53 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nanoxml/ChangeLog,v 1.15 2007/07/12 22:31:30 betelgeuse Exp $
+
+ 12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
+ nanoxml-2.2.3-r2.ebuild:
+ sun-jdk-1.6 from u2 works fine now so removing the work around from DEPEND.
06 May 2007; Vlastimil Babka <caster@gentoo.org> -nanoxml-2.2.3-r1.ebuild:
Remove old revision.
diff --git a/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild b/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild
index c4e1556a2c0e..e44067db1c29 100644
--- a/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild
+++ b/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild,v 1.4 2007/05/05 18:23:41 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild,v 1.5 2007/07/12 22:31:30 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
@@ -12,11 +14,10 @@ SRC_URI="http://nanoxml.cyberelf.be/downloads/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
KEYWORDS="~amd64 ppc x86"
-IUSE="doc source"
+IUSE=""
+
COMMON_DEP="dev-java/sax"
-DEPEND="
- !doc? ( >=virtual/jdk-1.4 )
- doc? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )
+DEPEND=">=virtual/jdk-1.4
${COMMON_DEP}"
RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"