4 files changed, 9 insertions, 62 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/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