From 60f0df773e30b433f6ca26a7abe0b05554bef41d Mon Sep 17 00:00:00 2001 From: Krzysztof Pawlik Date: Tue, 1 May 2007 22:04:51 +0000 Subject: [PATCH] Fix DEPEND. Package-Manager: portage-2.1.2.5 --- dev-java/fastinfoset/ChangeLog | 6 +++++- dev-java/fastinfoset/fastinfoset-1.2.1.ebuild | 10 ++++++---- dev-java/rngom/ChangeLog | 5 ++++- dev-java/rngom/rngom-20051226.ebuild | 11 +++++++---- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dev-java/fastinfoset/ChangeLog b/dev-java/fastinfoset/ChangeLog index ab53f40b013e..034309e9db11 100644 --- a/dev-java/fastinfoset/ChangeLog +++ b/dev-java/fastinfoset/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/fastinfoset # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fastinfoset/ChangeLog,v 1.1 2007/05/01 19:11:13 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fastinfoset/ChangeLog,v 1.2 2007/05/01 22:04:51 nelchael Exp $ + + 01 May 2007; Krzysiek Pawlik + fastinfoset-1.2.1.ebuild: + Fix DEPEND. *fastinfoset-1.2.1 (01 May 2007) diff --git a/dev-java/fastinfoset/fastinfoset-1.2.1.ebuild b/dev-java/fastinfoset/fastinfoset-1.2.1.ebuild index 6c0c74e01784..54fe1b004ea0 100644 --- a/dev-java/fastinfoset/fastinfoset-1.2.1.ebuild +++ b/dev-java/fastinfoset/fastinfoset-1.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fastinfoset/fastinfoset-1.2.1.ebuild,v 1.1 2007/05/01 19:11:13 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fastinfoset/fastinfoset-1.2.1.ebuild,v 1.2 2007/05/01 22:04:51 nelchael Exp $ JAVA_PKG_IUSE="source" @@ -15,12 +15,14 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" +COMMON_DEP="dev-java/jsr173" + RDEPEND=">=virtual/jre-1.5 - dev-java/jsr173" + ${COMMON_DEP}" DEPEND=">=virtual/jdk-1.5 - app-arch/unzip - ${RDEPEND}" + ${COMMON_DEP} + app-arch/unzip" S="${WORKDIR}" diff --git a/dev-java/rngom/ChangeLog b/dev-java/rngom/ChangeLog index eebd8ab1b047..cc3d5f36b6b8 100644 --- a/dev-java/rngom/ChangeLog +++ b/dev-java/rngom/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/rngom # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/rngom/ChangeLog,v 1.1 2007/05/01 18:41:46 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/rngom/ChangeLog,v 1.2 2007/05/01 22:01:58 nelchael Exp $ + + 01 May 2007; Krzysiek Pawlik rngom-20051226.ebuild: + Fix DEPEND. *rngom-20051226 (01 May 2007) diff --git a/dev-java/rngom/rngom-20051226.ebuild b/dev-java/rngom/rngom-20051226.ebuild index 600db85dba1b..d4ceb53e9f0b 100644 --- a/dev-java/rngom/rngom-20051226.ebuild +++ b/dev-java/rngom/rngom-20051226.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/rngom/rngom-20051226.ebuild,v 1.1 2007/05/01 18:41:46 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/rngom/rngom-20051226.ebuild,v 1.2 2007/05/01 22:01:58 nelchael Exp $ JAVA_PKG_IUSE="doc source" @@ -15,11 +15,14 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" +COMMON_DEP="dev-java/relaxng-datatype + dev-java/xsdlib" + DEPEND=">=virtual/jdk-1.5 - dev-java/relaxng-datatype - dev-java/xsdlib + ${COMMON_DEP} app-arch/unzip" -RDEPEND=">=virtual/jre-1.5" +RDEPEND=">=virtual/jre-1.5 + ${COMMON_DEP}" src_unpack() { -- 2.26.2