From 32b06eaf45c0582a1b819669e853130999203cca Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Wed, 3 Jan 2007 14:28:08 +0000 Subject: [PATCH] Correct jakarta-regexp dependency to hit the right slot. Package-Manager: portage-2.1.2_rc4-r5 --- dev-java/ant-tasks/ChangeLog | 8 ++++++-- dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild | 6 +++--- dev-java/ant-tasks/ant-tasks-1.6.5-r3.ebuild | 6 +++--- dev-java/xalan/ChangeLog | 7 ++++++- dev-java/xalan/xalan-2.6.0-r2.ebuild | 6 +++--- dev-java/xalan/xalan-2.6.0-r3.ebuild | 6 +++--- dev-java/xalan/xalan-2.7.0-r1.ebuild | 6 +++--- dev-java/xalan/xalan-2.7.0-r2.ebuild | 4 ++-- dev-java/xalan/xalan-2.7.0-r3.ebuild | 6 +++--- 9 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog index 0e8244671f94..76d2fd4ba174 100644 --- a/dev-java/ant-tasks/ChangeLog +++ b/dev-java/ant-tasks/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/ant-tasks -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.44 2006/12/17 18:08:34 wltjr Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.45 2007/01/03 14:24:07 caster Exp $ + + 03 Jan 2007; Vlastimil Babka + ant-tasks-1.6.5-r2.ebuild, ant-tasks-1.6.5-r3.ebuild: + Correct jakarta-regexp dependency to hit the right slot. *ant-tasks-1.6.5-r3 (17 Dec 2006) diff --git a/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild index 7743580ef2c2..41641d495590 100644 --- a/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild +++ b/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild,v 1.13 2006/12/09 12:57:15 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r2.ebuild,v 1.14 2007/01/03 14:24:07 caster Exp $ inherit java-pkg-2 eutils @@ -33,7 +33,7 @@ CDEPEND="=dev-java/ant-core-${PV}* !norhino? ( =dev-java/rhino-1.5* ) !nojdepend? ( >=dev-java/jdepend-2.6 ) !nojsch? ( >=dev-java/jsch-0.1.12 ) - !noregexp? ( >=dev-java/jakarta-regexp-1.3-r2 ) + !noregexp? ( =dev-java/jakarta-regexp-1.3* ) !nojython? ( >=dev-java/jython-2.1-r5 ) javamail? ( >=dev-java/sun-javamail-bin-1.3.1-r1 )" RDEPEND=">=virtual/jre-1.4 diff --git a/dev-java/ant-tasks/ant-tasks-1.6.5-r3.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.5-r3.ebuild index 04be630fc2e6..a682b22afcc6 100644 --- a/dev-java/ant-tasks/ant-tasks-1.6.5-r3.ebuild +++ b/dev-java/ant-tasks/ant-tasks-1.6.5-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r3.ebuild,v 1.1 2006/12/17 18:08:35 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5-r3.ebuild,v 1.2 2007/01/03 14:24:07 caster Exp $ inherit java-pkg-2 eutils @@ -33,7 +33,7 @@ CDEPEND="=dev-java/ant-core-${PV}* !norhino? ( =dev-java/rhino-1.5* ) !nojdepend? ( >=dev-java/jdepend-2.6 ) !nojsch? ( >=dev-java/jsch-0.1.12 ) - !noregexp? ( >=dev-java/jakarta-regexp-1.3-r2 ) + !noregexp? ( =dev-java/jakarta-regexp-1.3* ) !nojython? ( >=dev-java/jython-2.1-r5 ) javamail? ( dev-java/sun-javamail )" RDEPEND=">=virtual/jre-1.4 diff --git a/dev-java/xalan/ChangeLog b/dev-java/xalan/ChangeLog index ee664816b6a0..dfe8ce4aa272 100644 --- a/dev-java/xalan/ChangeLog +++ b/dev-java/xalan/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/xalan # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.60 2007/01/02 02:43:20 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.61 2007/01/03 14:28:08 caster Exp $ + + 03 Jan 2007; Vlastimil Babka xalan-2.6.0-r2.ebuild, + xalan-2.6.0-r3.ebuild, xalan-2.7.0-r1.ebuild, xalan-2.7.0-r2.ebuild, + xalan-2.7.0-r3.ebuild: + Correct jakarta-regexp dependency to hit the right slot. 02 Jan 2007; Andrej Kacian xalan-2.7.0-r2.ebuild: Stable on x86, bug #159156. diff --git a/dev-java/xalan/xalan-2.6.0-r2.ebuild b/dev-java/xalan/xalan-2.6.0-r2.ebuild index 92f137f95c11..addfeb7e5cba 100644 --- a/dev-java/xalan/xalan-2.6.0-r2.ebuild +++ b/dev-java/xalan/xalan-2.6.0-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0-r2.ebuild,v 1.11 2006/10/05 17:04:15 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0-r2.ebuild,v 1.12 2007/01/03 14:28:08 caster Exp $ inherit java-pkg eutils @@ -16,7 +16,7 @@ IUSE="doc jikes source" RDEPEND="=virtual/jdk-1.4* dev-java/javacup dev-java/bcel - >=dev-java/jakarta-regexp-1.3-r2 + =dev-java/jakarta-regexp-1.3* =dev-java/bsf-2.3* >=dev-java/xerces-2.6.2-r1" DEPEND="=virtual/jdk-1.4* diff --git a/dev-java/xalan/xalan-2.6.0-r3.ebuild b/dev-java/xalan/xalan-2.6.0-r3.ebuild index 378fbd137ef8..e786e65c25a4 100644 --- a/dev-java/xalan/xalan-2.6.0-r3.ebuild +++ b/dev-java/xalan/xalan-2.6.0-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0-r3.ebuild,v 1.4 2006/10/05 17:04:15 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0-r3.ebuild,v 1.5 2007/01/03 14:28:08 caster Exp $ inherit java-pkg eutils @@ -16,7 +16,7 @@ IUSE="doc jikes source" RDEPEND="=virtual/jdk-1.4* dev-java/javacup dev-java/bcel - >=dev-java/jakarta-regexp-1.3-r2 + =dev-java/jakarta-regexp-1.3* =dev-java/bsf-2.3* >=dev-java/xerces-2.6.2-r1" DEPEND="=virtual/jdk-1.4* diff --git a/dev-java/xalan/xalan-2.7.0-r1.ebuild b/dev-java/xalan/xalan-2.7.0-r1.ebuild index d8d7e9f26ce3..52055a5dcad9 100644 --- a/dev-java/xalan/xalan-2.7.0-r1.ebuild +++ b/dev-java/xalan/xalan-2.7.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.0-r1.ebuild,v 1.6 2006/11/30 15:59:11 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.0-r1.ebuild,v 1.7 2007/01/03 14:28:08 caster Exp $ inherit java-pkg eutils versionator @@ -17,7 +17,7 @@ IUSE="doc jikes source" RDEPEND=">=virtual/jre-1.4 dev-java/javacup dev-java/bcel - >=dev-java/jakarta-regexp-1.3-r2 + =dev-java/jakarta-regexp-1.3* =dev-java/bsf-2.3* >=dev-java/xerces-2.7 =dev-java/xml-commons-external-1.3*" diff --git a/dev-java/xalan/xalan-2.7.0-r2.ebuild b/dev-java/xalan/xalan-2.7.0-r2.ebuild index 9a3cbf208eb8..07f2606ff5d3 100644 --- a/dev-java/xalan/xalan-2.7.0-r2.ebuild +++ b/dev-java/xalan/xalan-2.7.0-r2.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/xalan/xalan-2.7.0-r2.ebuild,v 1.9 2007/01/02 02:43:20 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.0-r2.ebuild,v 1.10 2007/01/03 14:28:08 caster Exp $ inherit java-pkg-2 java-ant-2 eutils versionator @@ -17,7 +17,7 @@ IUSE="doc source" COMMON_DEP=" dev-java/javacup dev-java/bcel - >=dev-java/jakarta-regexp-1.3-r2 + =dev-java/jakarta-regexp-1.3* =dev-java/bsf-2.3* >=dev-java/xerces-2.7 =dev-java/xml-commons-external-1.3*" diff --git a/dev-java/xalan/xalan-2.7.0-r3.ebuild b/dev-java/xalan/xalan-2.7.0-r3.ebuild index d876bad23dbb..87a731b07794 100644 --- a/dev-java/xalan/xalan-2.7.0-r3.ebuild +++ b/dev-java/xalan/xalan-2.7.0-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.0-r3.ebuild,v 1.1 2006/12/26 20:15:05 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.0-r3.ebuild,v 1.2 2007/01/03 14:28:08 caster Exp $ inherit java-pkg-2 java-ant-2 eutils versionator @@ -17,7 +17,7 @@ IUSE="doc source" COMMON_DEP=" dev-java/javacup dev-java/bcel - >=dev-java/jakarta-regexp-1.3-r2 + =dev-java/jakarta-regexp-1.3* =dev-java/bsf-2.3* >=dev-java/xerces-2.7 =dev-java/xml-commons-external-1.3*" -- 2.26.2