Update kde-base/* dependencies so that KDE4 doesn't satisfy it. bug 206528.

Package-Manager: portage-2.1.4.4

5 files changed, 21 insertions, 69 deletions

diff --git a/kde-misc/yakuake/ChangeLog b/kde-misc/yakuake/ChangeLog
index 24de0e87973e..41de1b66b532 100644
--- a/kde-misc/yakuake/ChangeLog
+++ b/kde-misc/yakuake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/yakuake
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/ChangeLog,v 1.21 2008/01/31 11:47:29 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/ChangeLog,v 1.22 2008/02/18 23:08:03 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -yakuake-2.7.5.ebuild,
+  -yakuake-2.8_beta1.ebuild, yakuake-2.8.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
 *yakuake-2.9_beta1 (31 Jan 2008)
 
diff --git a/kde-misc/yakuake/Manifest b/kde-misc/yakuake/Manifest
index 93583c8af606..6d4334a39075 100644
--- a/kde-misc/yakuake/Manifest
+++ b/kde-misc/yakuake/Manifest
@@ -1,13 +1,18 @@
-DIST 29153-yakuake-2.7.5.tar.bz2 443073 RMD160 009ff603758ac78ccc0d59f4b76f350ba50d89fe SHA1 6bcb732877cda8747e5c874175e7627e8d642953 SHA256 7bac6bf093762ef9e4c9c6021de154a7fc004461a9ad2312cd24e5131978e06d
-DIST yakuake-2.8-beta1.tar.bz2 491035 RMD160 8c9723739d3e1fa671dfb86f00b5b18d4b196c74 SHA1 4f8b27c5b21986a28bd49a384e55c3da9a65588c SHA256 3b55b258368a125333a367c22b7bdd3edbfe855c81297ca5622a7a31956f05a5
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST yakuake-2.8.1.tar.bz2 535406 RMD160 00d4fc7d2b411c84882d7ee8d7907489ea8f5568 SHA1 05e5bc6179512c8c7913bc9346fdc05d8882b084 SHA256 4780a4e138ccd31e9788fc9723a33f1addfa4eb2678fd3bc612d6ab7bdcd5fc8
 DIST yakuake-2.8.tar.bz2 513358 RMD160 39c883267ea0f89af6114433d8bd0d8dbb41c5cd SHA1 4d9c0da7ba4fe20b05af9c97346805acd887c7a2 SHA256 801b86aad25aab86fec9ec4340119e8e63889fd902e9c256af0886a16e4508c4
 DIST yakuake-2.9-beta1.tar.bz2 97017 RMD160 9c73bb46a8c5c57a2dd4fccd3ce35de506cd0f79 SHA1 4d7191627c0a50989faf85d710a78bdda0018a30 SHA256 ad73fc66a4f6a5b8f17112095ee65282a216d829bdb68ba8a317041222e62fce
-EBUILD yakuake-2.7.5.ebuild 885 RMD160 bbe40942f1ed4a1fe256c00e4a9242c9c38a164d SHA1 07a3a3a6e054a50732596e0d4439c3f170ba8c57 SHA256 0ea087d6ce39462f6a5f2d8eca9c9cdaabff9a552e0067baa72077525f93f498
 EBUILD yakuake-2.8.1.ebuild 645 RMD160 027920f2f25bba49f1614f039814b4e05d8b67d0 SHA1 cc2abc44f4ec97e80c49c9de1304a22e21c8fb4e SHA256 c63275880982ae94993822c931aa39717c787413b3c2592b1760ec8376930dbf
-EBUILD yakuake-2.8.ebuild 622 RMD160 8b1ff7e902efb3526e250dbb769893cd24de77a2 SHA1 7cdb52401da5db11c25efa2c872d93ae43357f9d SHA256 d177bd2720ffb71e94674b87621ff939bb9e8a5ab803647851f6ad9234d8f52f
-EBUILD yakuake-2.8_beta1.ebuild 619 RMD160 e0a9bf2f4703814e89b1fda212696394e4f3657f SHA1 bd2a20fe496ed2853ca629c4a1f3643dd9b28215 SHA256 7612c2aaf339675cc472cf75171064fb41cbffe225fd55320b2e0ead340463c3
+EBUILD yakuake-2.8.ebuild 645 RMD160 b2c816ca92cae6b327ccee922c17d280d15b2ff3 SHA1 ec2740a8dc8042763d7fa91cffaf457359db935b SHA256 0d3bf57a352ec0745380e7b6432ff199c881e559b6168bfd98f4758fcf2fd889
 EBUILD yakuake-2.9_beta1.ebuild 1196 RMD160 f360bae00c41d4d0ff831146e473c85d911950e0 SHA1 8340358ea5419eb544703fe3f79b35126742724f SHA256 31069e71def2aec1b6d402e1788943bf2c15b7eb9da8311785b90b7eb995b649
-MISC .#Manifest.1.27 1976 RMD160 478cffe495a7cbe453a1439f5a8731d66e2e94cc SHA1 4f79ca92337784a7b017f08c55e84e97d09a5c52 SHA256 5662320fe0071cc539a761c7b19626c772cb0c08160e784206bb37a29f1fc4ad
-MISC ChangeLog 2907 RMD160 69417798dc211a1deff8bd0b41ce6051f3b6aae6 SHA1 849bcd71eb658c36445ef6c74d0f7d96cce6fa88 SHA256 613d49210d88878d92a6327441666c6171c1530dd5aa342f816432be2f29c072
+MISC ChangeLog 3111 RMD160 09f143f5961f5a3c18fbfd9cc2c79d4b8cc8bd64 SHA1 09d1d179b5fe11e5928efc7539587ca77f8f3335 SHA256 c3e07574cd050636db379506ff08020823405df84ef0f2abf0e63f6b32726108
 MISC metadata.xml 504 RMD160 843cf09ce114e456ca42494efdeab57cc693d8e9 SHA1 e13ee29f32bf5f2b08a64fc89b4caa819b672116 SHA256 70dc1c42183487b0454f7c885071fab0896808e12a43de5f9e16e8abc9ad5e79
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHug+eB18eXLOpYdkRAvQUAJ9EsI3BssiX60maFPYHdYPZwHBqQQCePKg0
+KCFyrkTo0DBibuSxfojx7aE=
+=+Di+
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/yakuake/yakuake-2.7.5.ebuild b/kde-misc/yakuake/yakuake-2.7.5.ebuild
deleted file mode 100644
index 7ccd64f582f3..000000000000
--- a/kde-misc/yakuake/yakuake-2.7.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/yakuake-2.7.5.ebuild,v 1.9 2007/01/19 18:16:13 flameeyes Exp $
-
-inherit kde
-
-DESCRIPTION="A quake-style terminal emulator based on KDE konsole technology"
-HOMEPAGE="http://extragear.kde.org/apps/yakuake/"
-SRC_URI="http://www.kde-apps.org/content/files/29153-${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="|| ( kde-base/konsole
-	kde-base/kdebase )"
-
-RDEPEND="${DEPEND}"
-
-need-kde 3.3
-
-src_install() {
-	kde_src_install
-	rm -rf "${D}/usr/share/applnk"
-
-	insinto /usr/share/applications
-	doins "${S}/yakuake/src/yakuake.desktop"
-
-	# From upstream, fix menu categorization
-	echo "Categories=Qt;KDE;System;TerminalEmulator;" \
-		>> "${D}/usr/share/applications/yakuake.desktop"
-}
diff --git a/kde-misc/yakuake/yakuake-2.8.ebuild b/kde-misc/yakuake/yakuake-2.8.ebuild
index e9f6f0a32abf..54a217139cd3 100644
--- a/kde-misc/yakuake/yakuake-2.8.ebuild
+++ b/kde-misc/yakuake/yakuake-2.8.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/yakuake/yakuake-2.8.ebuild,v 1.5 2008/01/11 17:22:48 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/yakuake-2.8.ebuild,v 1.6 2008/02/18 23:08:03 ingmar Exp $
 
 USE_KEG_PACKAGING=1
 
@@ -18,8 +18,9 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="|| ( kde-base/konsole
-	kde-base/kdebase )"
+DEPEND="|| ( =kde-base/konsole-3.5*
+	=kde-base/kdebase-3.5* )"
+RDEPEND=""
 
 RDEPEND="${DEPEND}"
 
diff --git a/kde-misc/yakuake/yakuake-2.8_beta1.ebuild b/kde-misc/yakuake/yakuake-2.8_beta1.ebuild
deleted file mode 100644
index 2e9ffe4787ff..000000000000
--- a/kde-misc/yakuake/yakuake-2.8_beta1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/yakuake-2.8_beta1.ebuild,v 1.1 2007/05/06 21:35:52 genstef Exp $
-
-inherit kde
-
-MY_P="${P/_/-}"
-DESCRIPTION="A quake-style terminal emulator based on KDE konsole technology"
-HOMEPAGE="http://extragear.kde.org/apps/yakuake/"
-SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="|| ( kde-base/konsole
-	kde-base/kdebase )"
-
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${MY_P}
-
-need-kde 3.3