Update kde-base/* dependencies so thatKDE 4 doesn't satisfy it. bug 206571.

Package-Manager: portage-2.1.4.4

diff --git a/kde-misc/ksplash-engine-moodin/ksplash-engine-moodin-0.4.2-r1.ebuild b/kde-misc/ksplash-engine-moodin/ksplash-engine-moodin-0.4.2-r1.ebuild
index b090e272f93a2501b9ac06e74321766b55e83d3b..8e4a39159e6ef0c441589505d205a727d0ec5db6 100644 (file)
--- a/kde-misc/ksplash-engine-moodin/ksplash-engine-moodin-0.4.2-r1.ebuild
+++ b/kde-misc/ksplash-engine-moodin/ksplash-engine-moodin-0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksplash-engine-moodin/ksplash-engine-moodin-0.4.2-r1.ebuild,v 1.1 2007/09/23 21:04:14 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksplash-engine-moodin/ksplash-engine-moodin-0.4.2-r1.ebuild,v 1.2 2008/02/18 22:52:43 ingmar Exp $
 
 inherit kde
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="arts"
 
-DEPEND="|| ( kde-base/kdebase kde-base/ksplashml )"
+DEPEND="|| ( =kde-base/kdebase-3.5* =kde-base/ksplashml-3.5* )"
 
 need-kde 3.5
 

diff --git a/kde-misc/tork/ChangeLog b/kde-misc/tork/ChangeLog
index 9b26ff60bccd60f8b6834d019a53582b369aebf1..208843d1fe0a9402c6604118252b73fa0a74c8ff 100644 (file)
--- a/kde-misc/tork/ChangeLog
+++ b/kde-misc/tork/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/tork
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.26 2008/02/18 22:55:17 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.27 2008/02/18 22:56:39 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> tork-0.23.ebuild,
+  tork-0.26.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206571.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -tork-0.24.ebuild:
   Old.

diff --git a/kde-misc/tork/Manifest b/kde-misc/tork/Manifest
index d66a6719c372a764be807e886f0bd3c7f81f9d93..3127d19689438f18306d278c7360cef7bc9531c9 100644 (file)
--- a/kde-misc/tork/Manifest
+++ b/kde-misc/tork/Manifest
@@ -5,14 +5,14 @@ AUX tork-0.20-ext_tsocks.patch 952 RMD160 a634072b7971a580f2b0f8ff18dbd3323d769a
 AUX tork-0.24-ext_tsocks.patch 950 RMD160 6eb23007d44545f56b53a609ac328a9618aef15c SHA1 73ceb316840b35c1c9b115a0aacc0b908f5b0ea0 SHA256 2278d9f33663ecb4092ccd41502a6cec732f2e0818a453efa8187e71caa20562
 DIST tork-0.23.tar.bz2 3193372 RMD160 1d1d8e6a38b75db97e402262b520e84f582fb319 SHA1 31f1e4e3da5dced0d1a4f1cfc9b7d71e5d288062 SHA256 16bf30c927822a76260777ada138d528de122680629cc61d7f2406456f9ebf47
 DIST tork-0.26.tar.bz2 2663154 RMD160 b90e6b71ff7f6a5bc43498848ea8153ef415641f SHA1 230ac2f46c78ee7653c105c418b063d44ed52437 SHA256 1e348e105c03badd009bdd003d057805c9a88246a830240d7c2058fe962da4d5
-EBUILD tork-0.23.ebuild 1230 RMD160 2d82604f6c06255a137091450ffb92c6277b1364 SHA1 dde15a3b14b3af941f4d1c43d588f95966d6909f SHA256 cb069523c07b13b068fe80c0ce5d3ba08134bf3b837bc540b04d7ccddea07d29
-EBUILD tork-0.26.ebuild 1237 RMD160 40e9f71bc5d31b531f1100bc4ccbbfa5e89694ab SHA1 0c80cd055323a84776896ab19b6eaab814aeddd8 SHA256 5a0dac878f20d29a9f7839afe3ab587bd298dd8812b94b97bd772896f05bcb5b
-MISC ChangeLog 4597 RMD160 d1f3406cb2be0f94e011958c855b12064edf2687 SHA1 bc8537cd1a028c81b49778c1627f2b8f67e0d279 SHA256 c15b88e24948cdad04f0bc35cc8c2e21eb32113dd837c38fdc80e3a87451e8bf
+EBUILD tork-0.23.ebuild 1242 RMD160 bace259d09d1ef3d5f363bf4f322e50b4f261e56 SHA1 1bf5440aa8b9354dd39db2672c2d00276144d7d3 SHA256 7f5238e3a106bd63aadb6e50f629f73e7f93723acea8c497363c312d6fc93670
+EBUILD tork-0.26.ebuild 1245 RMD160 554e3fbefcc115917ceff85fbf1c5e269f23fba4 SHA1 2468807de76f6e7f15c93c2993836a3de369a622 SHA256 c05da8ff42b72b646962384fde250a82702a762f3feeb2d08e038cd72e21f65c
+MISC ChangeLog 4767 RMD160 c857e040fa7692b315719de6bf7b9d39867d61be SHA1 5601c5c8eb3886b8a970b307008ab2afff78bd2e SHA256 9efddf787954ce7adb0816aaaa3c6a18526470e0d947728e6918fd7279d1c75b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHugybB18eXLOpYdkRAlsoAKCgwCIPLodhyLlj3Le3gXe8c6JVawCdGBuq
-qljsD3Xh6TJ1IfL1uhKbXno=
-=3rd1
+iD8DBQFHugz0B18eXLOpYdkRAhvWAJ94Hqt3+Xmu4Jd33Uk5aG99LJrE8QCgpwmg
+Pm0MlxBuu1EDTFeqp3Yb6BA=
+=1g6u
 -----END PGP SIGNATURE-----

diff --git a/kde-misc/tork/tork-0.23.ebuild b/kde-misc/tork/tork-0.23.ebuild
index 278df75e3145d0bb31cad5a359ddf1ba12f7af86..e4b597b6ea3dcac991823f48c80a51fe63f2f629 100644 (file)
--- a/kde-misc/tork/tork-0.23.ebuild
+++ b/kde-misc/tork/tork-0.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.23.ebuild,v 1.4 2007/12/16 14:40:27 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.23.ebuild,v 1.5 2008/02/18 22:56:39 ingmar Exp $
 
 inherit kde multilib
 
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND="dev-libs/openssl
        >=dev-libs/geoip-1.4.0
-       || ( kde-base/kdebase kde-base/libkonq )"
+       || ( =kde-base/kdebase-3.5* =kde-base/libkonq-3.5* )"
 
 RDEPEND="${DEPEND}
        >=net-misc/tor-0.1.2.14

diff --git a/kde-misc/tork/tork-0.26.ebuild b/kde-misc/tork/tork-0.26.ebuild
index 8b25859eff2a4f59f819d9ee9118253cd882fffb..46726553fe892165da6a4b53e54e871eb8e4e3a5 100644 (file)
--- a/kde-misc/tork/tork-0.26.ebuild
+++ b/kde-misc/tork/tork-0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.26.ebuild,v 1.1 2008/01/20 23:43:44 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.26.ebuild,v 1.2 2008/02/18 22:56:39 ingmar Exp $
 
 inherit kde multilib
 
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND="dev-libs/openssl
        >=dev-libs/geoip-1.4.0
-       || ( kde-base/kdebase kde-base/libkonq )"
+       || ( =kde-base/kdebase-3.5* =kde-base/libkonq-3.5* )"
 
 RDEPEND="${DEPEND}
        >=net-misc/tor-0.1.2.14