Add slot deps to java deps in order for new slot of istack-commons-runtime not to break things. Part of fixing bug #275049.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 36 insertions, 25 deletions

diff --git a/dev-java/jaxb-tools/ChangeLog b/dev-java/jaxb-tools/ChangeLog
index f3c6c52b31b5..1910b3783be5 100644
--- a/dev-java/jaxb-tools/ChangeLog
+++ b/dev-java/jaxb-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jaxb-tools
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxb-tools/ChangeLog,v 1.6 2008/03/28 18:13:10 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxb-tools/ChangeLog,v 1.7 2009/06/23 15:49:50 betelgeuse Exp $
+
+  23 Jun 2009; Petteri Räty <betelgeuse@gentoo.org>
+  jaxb-tools-2.1.2.ebuild:
+  Add slot deps to java deps in order for new slot of istack-commons-runtime
+  not to break things. Part of fixing bug #275049.
 
   28 Mar 2008; nixnut <nixnut@gentoo.org> jaxb-tools-2.1.2.ebuild:
   Stable on ppc wrt bug 214778
diff --git a/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild b/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild
index dd7330b13695..bf1d63a04f23 100644
--- a/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild
+++ b/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild,v 1.5 2008/03/28 18:13:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxb-tools/jaxb-tools-2.1.2.ebuild,v 1.6 2009/06/23 15:49:50 betelgeuse Exp $
 
+EAPI="1"
 JAVA_PKG_IUSE="source"
 
 inherit java-pkg-2 java-ant-2
@@ -15,21 +16,21 @@ SLOT="2"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE=""
 
-COMMON_DEP="=dev-java/codemodel-2*
-	dev-java/iso-relax
-	dev-java/istack-commons-runtime
-	dev-java/istack-commons-tools
-	=dev-java/jaxb-2*
-	dev-java/jsr173
-	dev-java/msv
-	dev-java/relaxng-datatype
-	dev-java/rngom
-	dev-java/sun-dtdparser
-	dev-java/sun-jaf
-	dev-java/txw2-runtime
-	dev-java/xml-commons-resolver
-	dev-java/xsdlib
-	dev-java/xsom"
+COMMON_DEP="dev-java/codemodel:2
+	dev-java/iso-relax:0
+	dev-java/istack-commons-runtime:0
+	dev-java/istack-commons-tools:0
+	dev-java/jaxb:2
+	dev-java/jsr173:0
+	dev-java/msv:0
+	dev-java/relaxng-datatype:0
+	dev-java/rngom:0
+	dev-java/sun-dtdparser:0
+	dev-java/sun-jaf:0
+	dev-java/txw2-runtime:0
+	dev-java/xml-commons-resolver:0
+	dev-java/xsdlib:0
+	dev-java/xsom:0"
 DEPEND=">=virtual/jdk-1.5
 	${COMMON_DEP}"
 RDEPEND=">=virtual/jre-1.5
diff --git a/dev-java/jaxb/ChangeLog b/dev-java/jaxb/ChangeLog
index 0deefed5e806..80e68fd018bc 100644
--- a/dev-java/jaxb/ChangeLog
+++ b/dev-java/jaxb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jaxb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxb/ChangeLog,v 1.10 2009/06/23 15:49:30 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxb/ChangeLog,v 1.11 2009/06/23 15:51:27 betelgeuse Exp $
+
+  23 Jun 2009; Petteri Räty <betelgeuse@gentoo.org> jaxb-2.1.2-r1.ebuild:
+  Add slot deps to java deps in order for new slot of istack-commons-runtime
+  not to break things. Part of fixing bug #275049.
 
   23 Jun 2009; Petteri Räty <betelgeuse@gentoo.org> -jaxb-2.1.2.ebuild:
   Remove old revision.
diff --git a/dev-java/jaxb/jaxb-2.1.2-r1.ebuild b/dev-java/jaxb/jaxb-2.1.2-r1.ebuild
index db9cd862bc8b..e80bea908fb4 100644
--- a/dev-java/jaxb/jaxb-2.1.2-r1.ebuild
+++ b/dev-java/jaxb/jaxb-2.1.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxb/jaxb-2.1.2-r1.ebuild,v 1.3 2008/10/25 17:09:34 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxb/jaxb-2.1.2-r1.ebuild,v 1.4 2009/06/23 15:51:27 betelgeuse Exp $
 
+EAPI="1"
 JAVA_PKG_IUSE="source"
 
 inherit java-pkg-2 java-ant-2
@@ -18,10 +19,10 @@ KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEP="
-	dev-java/istack-commons-runtime
-	dev-java/jsr173
+	dev-java/istack-commons-runtime:0
+	dev-java/jsr173:0
 	java-virtuals/jaf
-	dev-java/txw2-runtime"
+	dev-java/txw2-runtime:0"
 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
 	${COMMON_DEP}"