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

diff --git a/app-editors/quanta/ChangeLog b/app-editors/quanta/ChangeLog
index 3c1dca818170b2f44521787aa3d0089ca47e47bf..e7cdeb9b9998935b5ee593d040c7640ec5060205 100644 (file)
--- 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/Manifest b/app-editors/quanta/Manifest
index 5439cc6cc96376d8b1bfcd5ff4627587c85ef59a..41b01d26b928baadd1e54ab5d72dcd7205e77eaa 100644 (file)
--- a/app-editors/quanta/Manifest
+++ b/app-editors/quanta/Manifest
@@ -1,12 +1,12 @@
-MD5 f97959752a8c2edf79c4cbec35e24565 ChangeLog 4668
+MD5 4d2b5c12d685cea6e85fbb1e365abd8b quanta-3.1.4.ebuild 911
+MD5 391c602a378d646204be442692220db3 quanta-3.2.2.ebuild 561
+MD5 6ac61f168a3f2ad86345a3eddba7f426 quanta-3.0.ebuild 905
+MD5 c7976b6ba0106fe5ab5c93c0f321f048 quanta-3.3_pre20040506.ebuild 614
+MD5 24761364fd4619a5776d73e7ca0e5202 quanta-3.2.3.ebuild 563
+MD5 1ea1bb406079654a92620ec03ea3fd6d ChangeLog 5032
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 b30c46a7841a90185ec0bd32cbf5ed20 quanta-3.0.ebuild 846
-MD5 4d77dae9da2c6446cc2f67af9ca69183 quanta-3.1.4.ebuild 853
-MD5 3ac0bddbf8225dab413b5cd129ba0062 quanta-3.2.2.ebuild 512
-MD5 6322d93ee2e567f2964e23dd59196b88 quanta-3.3_pre20040506.ebuild 564
-MD5 b74738bd709f2bc02589e604788615c0 quanta-3.2.3.ebuild 513
-MD5 2371efcd740cd4fc3553cecd6dd96d56 files/digest-quanta-3.0 295
 MD5 620038420bf2dc8c207cccb991e1010c files/digest-quanta-3.1.4 297
 MD5 d430fb500c360c53cabf837fe6969043 files/digest-quanta-3.2.2 66
-MD5 e5ccc09ac14ef0229bcc84340ddc71a8 files/digest-quanta-3.3_pre20040506 71
 MD5 97668c013e0fc0a801c1d366ce82dde0 files/digest-quanta-3.2.3 66
+MD5 e5ccc09ac14ef0229bcc84340ddc71a8 files/digest-quanta-3.3_pre20040506 71
+MD5 2371efcd740cd4fc3553cecd6dd96d56 files/digest-quanta-3.0 295

diff --git a/app-editors/quanta/quanta-3.0.ebuild b/app-editors/quanta/quanta-3.0.ebuild
index 666e0c2159b90c02c6d8563c61ded118a37c5523..cb7cf4c989a33515f7f5b417a2aba3095731d1e3 100644 (file)
--- 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 aeeb2c99152a483755855409a7b95854e89d93ee..5aadf2578eeb0e42f88ad38eaefcab167eea133b 100644 (file)
--- 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 b554cea807d6f5b3774c1e809faca50cd630e5ba..5e1a721bdf85a685ec470e25984d22b70dcee4bc 100644 (file)
--- 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 1cb854249620afb4d12975b7c65ce3f0e399c1ad..c89f068adcab9c21828b19f210c1d4ef47666618 100644 (file)
--- 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 2e5faa3c3d1ac6d288cd872d3f3c7ec922ab848e..9ce9c056a0d170f0ea8628901ba14c18c449f3f1 100644 (file)
--- 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