Version bump by Manuel Rüger <gentoo@rueg.eu>. Restore ~ppc in newest no new deps compared to old. Remove old.

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

4 files changed, 11 insertions, 94 deletions

diff --git a/kde-misc/kshutdown/ChangeLog b/kde-misc/kshutdown/ChangeLog
index c04bff324583..283a3adb9e9d 100644
--- a/kde-misc/kshutdown/ChangeLog
+++ b/kde-misc/kshutdown/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-misc/kshutdown
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/ChangeLog,v 1.40 2013/05/12 13:36:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/ChangeLog,v 1.41 2013/06/29 16:44:26 johu Exp $
+
+*kshutdown-3.0_beta8 (29 Jun 2013)
+
+  29 Jun 2013; Johannes Huber <johu@gentoo.org> +kshutdown-3.0_beta8.ebuild,
+  -files/kshutdown-3.0_beta7-no-consolekit.patch, -kshutdown-2.0.ebuild,
+  -kshutdown-3.0_beta7.ebuild:
+  Version bump by Manuel Rüger <gentoo@rueg.eu>. Restore ~ppc in newest no new
+  deps compared to old. Remove old.
 
 *kshutdown-3.0_beta7 (12 May 2013)
 
diff --git a/kde-misc/kshutdown/files/kshutdown-3.0_beta7-no-consolekit.patch b/kde-misc/kshutdown/files/kshutdown-3.0_beta7-no-consolekit.patch
deleted file mode 100644
index dc9ab455350a..000000000000
--- a/kde-misc/kshutdown/files/kshutdown-3.0_beta7-no-consolekit.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/trunk/kshutdown2/src/kshutdown.cpp
-+++ b/trunk/kshutdown2/src/kshutdown.cpp
-@@ -1143,19 +1143,18 @@
- 			type,
- 			KWorkSpace::ShutdownModeForceNow
- 		);
--		
-+
- 		if (!m_kdeShutDownAvailable) {
- 			U_DEBUG << "No KDE ShutDown API available" U_END;
- 			
--			error = "Check \"Offer shutdown options\"<br>in the \"Session Management\" settings<br>(KDE System Settings).";
-+			if (error.isEmpty())
-+				error = "Check \"Offer shutdown options\"<br>in the \"Session Management\" settings<br>(KDE System Settings).";
- 		}
- 	}
- 	#endif // KS_NATIVE_KDE
- 
- 	#ifdef KS_DBUS
- 	if (!consoleKitName.isEmpty()) {
--		error = ""; // reset
--	
- 		if (!m_consoleKitInterface) {
- 			m_consoleKitInterface = new QDBusInterface(
- 				"org.freedesktop.ConsoleKit",
-@@ -1168,7 +1167,8 @@
- 			QDBusReply<bool> reply = m_consoleKitInterface->call(consoleKitName);
- 			if (!reply.isValid()) {
- 				U_ERROR << reply.error().message() U_END;
--				error = reply.error().name();
-+				if (error.isEmpty())
-+					error = reply.error().name();
- 			}
- 			else {
- 				available = reply.value();
-@@ -1177,7 +1177,8 @@
- 		else {
- // FIXME: this sometimes returns error (service timeout?)
- 			U_ERROR << "ConsoleKit Error:" << m_consoleKitInterface->lastError().message() U_END;
--			error = "No valid org.freedesktop.ConsoleKit interface found";
-+			if (error.isEmpty())
-+				error = "No valid org.freedesktop.ConsoleKit interface found";
- 		}
- 	}
- 
-@@ -1199,8 +1200,14 @@
- 	}
- 	#endif // KS_DBUS
- 
-+	#ifdef KS_NATIVE_KDE
-+	// BUG #19 - disable only if both ConsoleKit and native KDE API is unavailable
-+	if (!available && !m_kdeShutDownAvailable)
-+		disable(error);
-+	#else
- 	if (!available)
- 		disable(error);
-+	#endif // KS_NATIVE_KDE
- }
- 
- // LogoutAction
\ No newline at end of file
diff --git a/kde-misc/kshutdown/kshutdown-2.0.ebuild b/kde-misc/kshutdown/kshutdown-2.0.ebuild
deleted file mode 100644
index 1499fd56debf..000000000000
--- a/kde-misc/kshutdown/kshutdown-2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/kshutdown-2.0.ebuild,v 1.2 2012/08/03 08:45:14 johu Exp $
-
-EAPI=4
-
-KDE_LINGUAS="ar bg cs da de el es fr hu it nb nl pl pt_BR ru sk sr@ijekavian
-sr@ijekavianlatin sr@latin sr sv tr zh_CN"
-inherit kde4-base
-
-MY_P=${PN}-source-${PV/_}
-
-DESCRIPTION="A shutdown manager for KDE"
-HOMEPAGE="http://kshutdown.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep libkworkspace)
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S=${WORKDIR}/${P/_}
diff --git a/kde-misc/kshutdown/kshutdown-3.0_beta7.ebuild b/kde-misc/kshutdown/kshutdown-3.0_beta8.ebuild
index 7562aee0ab8d..0275aeba9d92 100644
--- a/kde-misc/kshutdown/kshutdown-3.0_beta7.ebuild
+++ b/kde-misc/kshutdown/kshutdown-3.0_beta8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/kshutdown-3.0_beta7.ebuild,v 1.1 2013/05/12 13:36:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/kshutdown-3.0_beta8.ebuild,v 1.1 2013/06/29 16:44:26 johu Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug"
 
 RDEPEND="
@@ -28,5 +28,3 @@ DEPEND="${RDEPEND}
 "
 
 S=${WORKDIR}/${P/_}
-
-PATCHES=( "${FILESDIR}/${P}-no-consolekit.patch" )