Make shutdown work. Fixes bug #362555

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 77 insertions, 4 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 30235893acd1..1834de383b8d 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.239 2011/04/06 14:19:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.240 2011/04/08 19:33:28 scarabeus Exp $
+
+*kdm-4.6.2-r1 (08 Apr 2011)
+
+  08 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.6.2_fix_halt_p1.patch, +files/4.6.2_fix_halt_p2.patch,
+  -kdm-4.6.2.ebuild, +kdm-4.6.2-r1.ebuild:
+  Make shutdown work. Fixes bug #362555
 
 *kdm-4.6.2 (06 Apr 2011)
 
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index ce7a7edd86d1..451f3731450c 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,3 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 4.6.2_fix_halt_p1.patch 780 RMD160 227c029c717f1374a9a277f472df093fd8e01bd8 SHA1 6d1111f45f0c02871588e31f73c803821340dea5 SHA256 589bc27aac6c709e8c538d2f46df34128a726c927e7b35d483fb0e11ed3617b6
+AUX 4.6.2_fix_halt_p2.patch 741 RMD160 38c8f7ac2d865a9be91dff37503813719ad68f45 SHA1 9ba01cc7f40aac6098fe8150685ff4ebc319b8fd SHA256 090a9563cacfb847dfbe4842ab72f57c26a7c46fdbf6052cfaab8f4a84013ee0
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 AUX kdm-4-gentoo-xinitrc.d.patch 793 RMD160 1e22f23d7cbd4764b4a7675968e0a387de2fc09a SHA1 226db506807a31b565da598458faed4a3ce3ddb7 SHA256 7ddeaa5b5446ed9e4f94cfc474032ee7d450df3748b378a4803c5b7b2bdce684
 AUX kdm-4.3.5-xdm-restart.patch 1593 RMD160 f6bf916ec09049ba7c7a3c65ec86b59302b8f3be SHA1 f70ae3f876f3840364c698d33d60b15395a457c4 SHA256 0f2f2d9dfba1c0a8a82c6b92cb55ff5afe77fc8b5cbe280fb7fbba19f8327866
@@ -5,6 +10,13 @@ AUX kdm-logrotate 111 RMD160 dfdebb05a456a2a6a83faa86e47ff847618634dd SHA1 af020
 DIST kdebase-workspace-4.4.5.tar.bz2 77036766 RMD160 3f6e9ceb0df277b73ca6ec38de6c85f578077640 SHA1 d0defe431a760503f8fbb9ee2413b666b3c84cd7 SHA256 53475dacd95955ef01378d4de7e46602be13e81a1afac73fbed449bb367c20e6
 DIST kdebase-workspace-4.6.2.tar.bz2 69356153 RMD160 23856ab63e17e3971071f2ccd02bd78d546c71e0 SHA1 63efb68733f347d0b7d24a7a061c5a0e3f84dee7 SHA256 6a55a53282a0ec7dd61f16f87fb8d0097d945891504982eb5122c96238b711e1
 EBUILD kdm-4.4.5.ebuild 3159 RMD160 c5ad77d8c2684fc335125f37f046739dad22f509 SHA1 579aad408d7db94b93ae7acab2471ef8f49c3cf5 SHA256 68395306a459bf8d12bd5560febfaeb22fe205bcd67530ec34abfe12d5a7fd3d
-EBUILD kdm-4.6.2.ebuild 3412 RMD160 3e65f50ec186902a09f926f3d36598fdeea980f7 SHA1 9076c9a2ed1ad44943e4d18d4bc4dbe3880a70af SHA256 f4db4fe91de7a034a58edd4e1ad295df2b11028dccb4513cdbc65e2e68f1ce17
-MISC ChangeLog 31765 RMD160 bf1f37f8130036669d1ec7b56a6a5da74cd36fed SHA1 9da90739ca380d2c629d21ad57904d00cc0e40ce SHA256 ee3d65d50ee70e0242af88e3992c50c804a06509363c4d2117a083295b431824
+EBUILD kdm-4.6.2-r1.ebuild 3493 RMD160 eeba1fe62df29cecf30d91ba3a428526f8f9b017 SHA1 5acce9c3bae79fb2ad02255401121b456d3d7e25 SHA256 7abbdb6b3cd185ad3d9e49ee0087467e90c087c8abf32fa941c573af3b383335
+MISC ChangeLog 31999 RMD160 d78962241aaf3b726a84e4740bb7b442cee75b85 SHA1 066c599de5254f90eed11a81e93ae153e3912283 SHA256 08cc9cd0f9a2f861f0498498de7fb3e4d04b67fe6742344eeea6e6b18c8afe07
 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2fYw4ACgkQHB6c3gNBRYeDtgCcChvtZbcfecZSRTqzNzRWTwiI
+28gAoK56GeV12IVHgyNHP2/pzxR2qZ+y
+=UXP7
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/files/4.6.2_fix_halt_p1.patch b/kde-base/kdm/files/4.6.2_fix_halt_p1.patch
new file mode 100644
index 000000000000..8441ccda39d1
--- /dev/null
+++ b/kde-base/kdm/files/4.6.2_fix_halt_p1.patch
@@ -0,0 +1,27 @@
+From: Oswald Buddenhagen <ossi@kde.org>
+Date: Fri, 08 Apr 2011 17:02:01 +0000
+Subject: linux shutdown wants -P instead of -p
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=4b7ec7c9966df0c705bc0c9b9bff1010475347b6
+---
+linux shutdown wants -P instead of -p
+
+BUG: 270228
+FIXED-IN: 4.6.3
+---
+
+
+--- a/kdm/config.def
++++ b/kdm/config.def
+@@ -37,7 +37,10 @@
+ #ifdef _AIX
+ # define HALT_CMD	"/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
+-#elif defined(BSD) || defined(__linux__)
++#elif defined(__linux__)
++# define HALT_CMD	"/sbin/shutdown -P now"
++# define REBOOT_CMD	"/sbin/shutdown -r now"
++#elif defined(BSD)
+ # define HALT_CMD	"/sbin/shutdown -p now"
+ # define REBOOT_CMD	"/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+
diff --git a/kde-base/kdm/files/4.6.2_fix_halt_p2.patch b/kde-base/kdm/files/4.6.2_fix_halt_p2.patch
new file mode 100644
index 000000000000..44afbf763631
--- /dev/null
+++ b/kde-base/kdm/files/4.6.2_fix_halt_p2.patch
@@ -0,0 +1,25 @@
+From: Oswald Buddenhagen <ossi@kde.org>
+Date: Fri, 08 Apr 2011 18:58:29 +0000
+Subject: actually, it wants -h -P, because -P is just a modifier
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=28b79d8d04cce4d0a0899cadcc8fe6fd69d38e01
+---
+actually, it wants -h -P, because -P is just a modifier
+
+FAIL ...
+
+BUG: 270228 (take 2)
+---
+
+
+--- a/kdm/config.def
++++ b/kdm/config.def
+@@ -38,7 +38,7 @@
+ # define HALT_CMD	"/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
+ #elif defined(__linux__)
+-# define HALT_CMD	"/sbin/shutdown -P now"
++# define HALT_CMD	"/sbin/shutdown -h -P now"
+ # define REBOOT_CMD	"/sbin/shutdown -r now"
+ #elif defined(BSD)
+ # define HALT_CMD	"/sbin/shutdown -p now"
+
diff --git a/kde-base/kdm/kdm-4.6.2.ebuild b/kde-base/kdm/kdm-4.6.2-r1.ebuild
index b9edbb83652e..b960f805481f 100644
--- a/kde-base/kdm/kdm-4.6.2.ebuild
+++ b/kde-base/kdm/kdm-4.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.6.2.ebuild,v 1.1 2011/04/06 14:19:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.6.2-r1.ebuild,v 1.1 2011/04/08 19:33:28 scarabeus Exp $
 
 EAPI=3
 
@@ -42,6 +42,8 @@ KMEXTRA="
 PATCHES=(
 	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
 	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+	"${FILESDIR}/${PV}_fix_halt_p1.patch"
+	"${FILESDIR}/${PV}_fix_halt_p2.patch"
 )
 
 pkg_setup() {