Update yakuake so it works with 4.2

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27-gentoo x86_64

4 files changed, 14 insertions, 35 deletions

diff --git a/kde-misc/yakuake/ChangeLog b/kde-misc/yakuake/ChangeLog
index b6e929a35bd0..1682d311f8a1 100644
--- a/kde-misc/yakuake/ChangeLog
+++ b/kde-misc/yakuake/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2008/11/15 21:42:11 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/ChangeLog,v 1.30 2009/01/12 18:26:10 scarabeus Exp $
+
+*yakuake-2.9.4-r2 (12 Jan 2009)
+
+  12 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org> -yakuake-2.9.4.ebuild,
+  -yakuake-2.9.4-r1.ebuild, +yakuake-2.9.4-r2.ebuild:
+  Update yakuake so it works with 4.2
 
   15 Nov 2008; Mike Frysinger <vapier@gentoo.org> yakuake-2.9.4-r1.ebuild:
   Add ppc/ppc64 love #244306.
diff --git a/kde-misc/yakuake/Manifest b/kde-misc/yakuake/Manifest
index 636d57974026..d403369df8cf 100644
--- a/kde-misc/yakuake/Manifest
+++ b/kde-misc/yakuake/Manifest
@@ -3,7 +3,6 @@ DIST yakuake-2.8.tar.bz2 513358 RMD160 39c883267ea0f89af6114433d8bd0d8dbb41c5cd
 DIST yakuake-2.9.4.tar.bz2 216489 RMD160 87885ead00c79ac46771d7b3099969154a72c162 SHA1 f3a9f617d2a655f17785d9fea718b2fb448d5012 SHA256 70c436e57fff180200fd03308e18bc8f9890b56cfc9f9e5e03dfce419f11a6bc
 EBUILD yakuake-2.8.1.ebuild 655 RMD160 cd689a049bbfddb2ca0efcd57bd5c69201a2a8b6 SHA1 b28ed6c39447a0c571d595245f4e58be5fb3502a SHA256 6999c3ce211c922c5c3b1675ab89854dc930452a647fddbc8f9487402f86e4c8
 EBUILD yakuake-2.8.ebuild 645 RMD160 b2c816ca92cae6b327ccee922c17d280d15b2ff3 SHA1 ec2740a8dc8042763d7fa91cffaf457359db935b SHA256 0d3bf57a352ec0745380e7b6432ff199c881e559b6168bfd98f4758fcf2fd889
-EBUILD yakuake-2.9.4-r1.ebuild 699 RMD160 6dbbfb37753bd010b3bac38c13917c14dcd0f1d7 SHA1 99a176d454e90d968ec6b24d8ba5a9648c59fd7b SHA256 65f1aadc3c6d7cc32d8c5e81ac97fe12fa01f67c499420dc311fe6f46edef459
-EBUILD yakuake-2.9.4.ebuild 735 RMD160 52c089dfbe4839911e019381117189ab8a111768 SHA1 b2e63b5f7a5f11efa428d412ca1d70c56bc9e9ea SHA256 5a6e803c2e1fe45b185ee560d9ef06fe71ae6f9b3625246ec6536c9a817808b5
-MISC ChangeLog 4090 RMD160 ce699e905746a5798a73e3248f0b04ae6752bfe0 SHA1 c222f8c4a544394398da372ff5a51d58543d76a8 SHA256 94995734a6f5f8c6f8680457f8f6b8533fc1c253fa71a08cba868bba852a052d
+EBUILD yakuake-2.9.4-r2.ebuild 711 RMD160 7ee8a5414c16956639a0cdfd90ee5af44243c726 SHA1 9e7506f8231851aa5d5cfbd400fe00cc0e2556f3 SHA256 7583501e92df062dbceab771fd586f5b6fa3f48bb2dbc4a6bfd3ebb2d752018a
+MISC ChangeLog 4294 RMD160 fc0b485c3669938c1306e455fa1b0eafad03b731 SHA1 cd4fe1c6094ef894453cbf7b54b8573e55da7ffd SHA256 e5fccc373feae59097ba1b3cc1c058896d0e814607bfd711d6f6eabdec7a4dde
 MISC metadata.xml 504 RMD160 843cf09ce114e456ca42494efdeab57cc693d8e9 SHA1 e13ee29f32bf5f2b08a64fc89b4caa819b672116 SHA256 70dc1c42183487b0454f7c885071fab0896808e12a43de5f9e16e8abc9ad5e79
diff --git a/kde-misc/yakuake/yakuake-2.9.4-r1.ebuild b/kde-misc/yakuake/yakuake-2.9.4-r2.ebuild
index 5f3472751062..2d9796066f97 100644
--- a/kde-misc/yakuake/yakuake-2.9.4-r1.ebuild
+++ b/kde-misc/yakuake/yakuake-2.9.4-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/yakuake-2.9.4-r1.ebuild,v 1.3 2008/12/10 12:30:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/yakuake-2.9.4-r2.ebuild,v 1.1 2009/01/12 18:26:10 scarabeus Exp $
 
 EAPI="2"
 
-NEED_KDE="4.1"
+KDE_MINIMAL="4.1"
 KDE_LINGUAS="ca cs da de el en_GB fr ga gl ja ko nds nl pt pt_BR ro ru sv tr uk"
 inherit kde4-base
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 SLOT="4.1"
 IUSE=""
 
-DEPEND="kde-base/konsole:${SLOT}
+DEPEND=">=kde-base/konsole-${KDE_MINIMAL}
 	!kdeprefix? ( !kde-misc/yakuake:0 )
 	sys-devel/gettext"
 RDEPEND="${DEPEND}"
diff --git a/kde-misc/yakuake/yakuake-2.9.4.ebuild b/kde-misc/yakuake/yakuake-2.9.4.ebuild
deleted file mode 100644
index 63324b98072f..000000000000
--- a/kde-misc/yakuake/yakuake-2.9.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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.9.4.ebuild,v 1.2 2008/12/10 12:30:37 scarabeus Exp $
-
-EAPI="2"
-
-NEED_KDE="4.1"
-KDE_LINGUAS="ca cs da de el en_GB fr ga gl ja ko nds nl pt pt_BR ro ru sv tr uk"
-inherit kde4-base
-
-DESCRIPTION="A quake-style terminal emulator based on KDE konsole technology"
-HOMEPAGE="http://yakuake.kde.org/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4.1"
-IUSE=""
-
-DEPEND="kde-base/konsole:${SLOT}
-	!kdeprefix? ( !kde-misc/yakuake:0 )
-	sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-# take care of wrong prefixing
-PREFIX="${KDEDIR}"