added blocking dep on the new split ebuild in kde-base from 3.4, and its mother package, kdewebdev.

6 files changed, 18 insertions, 12 deletions

diff --git a/app-editors/quanta/ChangeLog b/app-editors/quanta/ChangeLog
index 3c1dca818170..e7cdeb9b9998 100644
--- a/app-editors/quanta/ChangeLog
+++ b/app-editors/quanta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/quanta
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/ChangeLog,v 1.37 2005/01/01 13:33:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/ChangeLog,v 1.38 2005/01/14 23:22:59 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> quanta-3.0.ebuild,
+  quanta-3.1.4.ebuild, quanta-3.2.2.ebuild, quanta-3.2.3.ebuild,
+  quanta-3.3_pre20040506.ebuild:
+  Added blocking dep on new version in kde-base, which is the split package
+  from KDE 3.4, and on its mother package, kdewebdev. Eventually there'll be a
+  move instruction from this package to that.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   quanta-3.1.4.ebuild, quanta-3.2.2.ebuild, quanta-3.2.3.ebuild:
diff --git a/app-editors/quanta/quanta-3.0.ebuild b/app-editors/quanta/quanta-3.0.ebuild
index 666e0c2159b9..cb7cf4c989a3 100644
--- a/app-editors/quanta/quanta-3.0.ebuild
+++ b/app-editors/quanta/quanta-3.0.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/app-editors/quanta/quanta-3.0.ebuild,v 1.9 2005/01/01 13:33:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/quanta-3.0.ebuild,v 1.10 2005/01/14 23:22:59 danarmak Exp $
 
 inherit kde
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/quanta/quanta-3.0.tar.bz2
 	 mirror://sourceforge/quanta/javascript.tar.bz2
 	 mirror://sourceforge/quanta/php.tar.bz2"
 HOMEPAGE="http://quanta.sourceforge.net/"
-
+DEPEND="!kde-base/quanta !>=kde-base/kdewebdev-3.4.0_alpha1"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
diff --git a/app-editors/quanta/quanta-3.1.4.ebuild b/app-editors/quanta/quanta-3.1.4.ebuild
index aeeb2c99152a..5aadf2578eeb 100644
--- a/app-editors/quanta/quanta-3.1.4.ebuild
+++ b/app-editors/quanta/quanta-3.1.4.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/app-editors/quanta/quanta-3.1.4.ebuild,v 1.8 2005/01/01 13:33:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/quanta-3.1.4.ebuild,v 1.9 2005/01/14 23:22:59 danarmak Exp $
 
 inherit kde
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
 	 mirror://sourceforge/quanta/javascript.tar.bz2
 	 mirror://sourceforge/quanta/php.tar.bz2"
 HOMEPAGE="http://quanta.sourceforge.net/"
-
+DEPEND="!kde-base/quanta !>=kde-base/kdewebdev-3.4.0_alpha1"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~sparc"
 
diff --git a/app-editors/quanta/quanta-3.2.2.ebuild b/app-editors/quanta/quanta-3.2.2.ebuild
index b554cea807d6..5e1a721bdf85 100644
--- a/app-editors/quanta/quanta-3.2.2.ebuild
+++ b/app-editors/quanta/quanta-3.2.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/quanta-3.2.2.ebuild,v 1.8 2005/01/01 13:33:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/quanta-3.2.2.ebuild,v 1.9 2005/01/14 23:22:59 danarmak Exp $
 
 inherit kde
-DEPEND="doc? ( app-doc/quanta-docs )"
+DEPEND="doc? ( app-doc/quanta-docs ) !kde-base/quanta !>=kde-base/kdewebdev-3.4.0_alpha1"
 need-kde 3.2
 
 DESCRIPTION="A superb web development tool for KDE 3.x"
@@ -11,7 +11,6 @@ HOMEPAGE="http://quanta.sourceforge.net/"
 SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
 IUSE="doc"
 
-
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~amd64 sparc"
 
diff --git a/app-editors/quanta/quanta-3.2.3.ebuild b/app-editors/quanta/quanta-3.2.3.ebuild
index 1cb854249620..c89f068adcab 100644
--- a/app-editors/quanta/quanta-3.2.3.ebuild
+++ b/app-editors/quanta/quanta-3.2.3.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/app-editors/quanta/quanta-3.2.3.ebuild,v 1.6 2005/01/01 13:33:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/quanta-3.2.3.ebuild,v 1.7 2005/01/14 23:22:59 danarmak Exp $
 
 inherit kde
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~amd64 sparc"
 IUSE="doc"
 
-DEPEND="doc? ( app-doc/quanta-docs )"
+DEPEND="doc? ( app-doc/quanta-docs ) !kde-base/quanta !>=kde-base/kdewebdev-3.4.0_alpha1"
 
 need-kde 3.2
 
diff --git a/app-editors/quanta/quanta-3.3_pre20040506.ebuild b/app-editors/quanta/quanta-3.3_pre20040506.ebuild
index 2e5faa3c3d1a..9ce9c056a0d1 100644
--- a/app-editors/quanta/quanta-3.3_pre20040506.ebuild
+++ b/app-editors/quanta/quanta-3.3_pre20040506.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/quanta-3.3_pre20040506.ebuild,v 1.3 2005/01/01 13:33:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/quanta/quanta-3.3_pre20040506.ebuild,v 1.4 2005/01/14 23:22:59 danarmak Exp $
 
 inherit kde
-DEPEND="doc? ( app-doc/quanta-docs )"
+DEPEND="doc? ( app-doc/quanta-docs ) !kde-base/quanta !>=kde-base/kdewebdev-3.4.0_alpha1"
 need-kde 3.2
 
 PKG=kdewebdev-3.3-be2