Fix init.d script, see bug #265368.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 80 insertions, 7 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index c55db2223491..c1b8048866df 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/hibernate-script
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.82 2009/04/04 11:43:03 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.83 2009/05/01 22:07:29 nelchael Exp $
+
+*hibernate-script-2.0-r1 (01 May 2009)
+
+  01 May 2009; Krzysiek Pawlik <nelchael@gentoo.org>
+  -hibernate-script-2.0.ebuild, +hibernate-script-2.0-r1.ebuild,
+  +files/hibernate-script-2.0-init.d.patch:
+  Fix init.d script, see bug #265368.
 
 *hibernate-script-2.0 (04 Apr 2009)
 
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 308495b7b123..3d4fe83c60ce 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX hibernate-script-1.99-init.d.patch 938 RMD160 59f80a033cb374bc417734e7f3e2a2a6cda9e3f8 SHA1 ad5cd3d0ef30b82f33ac04a8eab838788998c958 SHA256 ea4675ab047c132a162d7fb50b18ce984a6f41891948c3f565c897ca3161f576
+AUX hibernate-script-2.0-init.d.patch 1059 RMD160 15e23a81fa4a0958385887dbf0138f988c7cb5af SHA1 1c24c4409b40a4785fcde47fc379db8ea5699b21 SHA256 759b1083cef2c4d844b23284c25e9ca08af0ddc13926315cc6f427a3550cd5bf
 DIST hibernate-script-1.97-patches-5.tar.bz2 3278 RMD160 5a2c7065a1fb40b37f1a122e1044cdbfa9e4afa3 SHA1 ca2668ec386b2a3da96746681c0a36b4b7e57127 SHA256 fc63a4d6ed82acd17e0c730b1a0a7ddba27b21576414bebdadd629889bbe7651
 DIST hibernate-script-1.97-patches-6.tar.bz2 3917 RMD160 046398338047e8764fb9a90ecd6f1b966b8e564e SHA1 68494e8300bebf1cdcc1b0c9630e3b7cb3e24fcb SHA256 b639c72f9a3d3d25c9ed08bf76e8fed9f7cc69ee1c1e3f743b728cd4baffe784
 DIST hibernate-script-1.97.tar.gz 81504 RMD160 6346a098f0892e6cffd547b0b7d042a51f298bb2 SHA1 c695ded89845ce6fa14eb85bd0401ab1196baa93 SHA256 8374bedc80206a6708c10d9814b92bebed3d9e4966c01c2d086e9e5b5646827c
@@ -14,13 +15,13 @@ EBUILD hibernate-script-1.97-r5.ebuild 1795 RMD160 712f56bd0f569e5ed9081f0df7430
 EBUILD hibernate-script-1.98.1.ebuild 1794 RMD160 f18ed08e82ff89220f480c7b53a8477f598fb8ad SHA1 b50904c410b2ed3dfcf22a68a05d2e263639b86e SHA256 8af818b545a8a8b4f180f90f048284e32613a02bdfabd1680efb86d29ffa57a6
 EBUILD hibernate-script-1.99-r1.ebuild 1917 RMD160 ecff949987d8e24209675be0131a52dc09c748db SHA1 8a09e96e5ab14b3af60f0c13eb7dc9898955ba33 SHA256 c29cd088c5dadff0ca32f63a0da7e225927bf554ab3b1b33087cdccc27b8a38f
 EBUILD hibernate-script-1.99.ebuild 1802 RMD160 7faabf5bd0e12a3a050cf6d6981fd5ad2456e721 SHA1 15dbebed3dd41070dbc4db65fc3aeb9fa492329a SHA256 144c917df1a3799ed1a80571f43c294b1ca4b25eeea298cc22b8894449b78871
-EBUILD hibernate-script-2.0.ebuild 1690 RMD160 49601e3c604b6b456d32abb3a6b0a8fb35864078 SHA1 7e0a2d985b3ebd460d4341b5440b9d5d7730689d SHA256 9591cdfc586b71c298598b37b8bae791973ce8c43f216e8c9861c4f36175ca76
-MISC ChangeLog 17304 RMD160 fcbf2f74806867bbca3152b30753a791a1d0c35c SHA1 218bff7599b34c218cb253b0348786dbb44b880f SHA256 13c70756fc2e42c81aa7c894db48669865668efa974fe529ee9eb49ee2813696
+EBUILD hibernate-script-2.0-r1.ebuild 1792 RMD160 0bccc1958531488d3e7282c0a85fd5018f32a8f8 SHA1 55d294bc1861cb32176f881b17cee501c319558c SHA256 af0c3cf7aa3ce48c314942d57d7099de6ac74e0ce07e046bd3b382a07b55c65d
+MISC ChangeLog 17545 RMD160 688f84d56ec32d962ca84e6278f829741fcb7846 SHA1 fe66953395bebf0066b31668268ad10377ca177f SHA256 e8f06850f99866900397165d9520b1f92be3a92c9be6d99dc7fdaa0dc15b4371
 MISC metadata.xml 257 RMD160 e5389141a508dda0b9a79eb4d99418ce4c318c76 SHA1 aaf26e5367b94012f204cb0a3f25fe1b433a4a46 SHA256 15da7c7a3a70ae3d280eed2b72019df5a14a20ecbc7697d3c4a17b0e732fd72e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknXR8wACgkQgo/w9rxVVVElYgCeKV2+7FhfxCAYbs/xMu9iP4B3
-OmUAoKWZgEkrTJDLrFQJoSkGrL4ZQyKg
-=UrxE
+iEYEARECAAYFAkn7cqQACgkQgo/w9rxVVVE7yACdF69jAwWLNafxR0Ra98JdUhoM
+bBgAnAzbadpJN33p7/A3H0hE5a8TNcdi
+=aMQj
 -----END PGP SIGNATURE-----
diff --git a/sys-power/hibernate-script/files/hibernate-script-2.0-init.d.patch b/sys-power/hibernate-script/files/hibernate-script-2.0-init.d.patch
new file mode 100644
index 000000000000..bd82587336c1
--- /dev/null
+++ b/sys-power/hibernate-script/files/hibernate-script-2.0-init.d.patch
@@ -0,0 +1,56 @@
+diff -Nru hibernate-script-2.0.vanilla/init.d/hibernate-cleanup.sh hibernate-script-2.0/init.d/hibernate-cleanup.sh
+--- hibernate-script-2.0.vanilla/init.d/hibernate-cleanup.sh	2009-05-01 23:03:41.000000000 +0100
++++ hibernate-script-2.0/init.d/hibernate-cleanup.sh	2009-05-01 23:03:55.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/sbin/runscript
+ 
+ # This script invalidates any stale swsusp and TuxOnIce images. It
+ # searches all swap partitions on your machine, as well as TuxOnIce's
+@@ -91,27 +91,30 @@
+ 
+ 
+ msg_status() {
+-	echo -n "$1"
++	einfon "$1"
+ }
+ 
+ msg() {
+-	echo "$1"
++	einfo "$1"
+ }
+ 
+-case "$1" in
+-start)
+-	msg_status "Invalidating stale software suspend images... "
++opts="reload"
++
++depend() {
++	after modules
++	before localmount
++}
++
++start() {
++	ebegin "Invalidating stale software suspend images"
+ 	do_start
+-	msg "done."
+-	;;
+-stop)
++	eend $?
++}
++
++stop() {
+ 	do_stop
+-	;;
+-restart|force-reload)
+-	do_reload
+-	;;
+-*)
+-	msg "Usage: /etc/init.d/hibernate {start|stop|restart|force-reload}"
+-esac
++}
+ 
+-exit 0
++reload() {
++	do_reload
++}
diff --git a/sys-power/hibernate-script/hibernate-script-2.0.ebuild b/sys-power/hibernate-script/hibernate-script-2.0-r1.ebuild
index 1ad383e88266..f484e5f1f706 100644
--- a/sys-power/hibernate-script/hibernate-script-2.0.ebuild
+++ b/sys-power/hibernate-script/hibernate-script-2.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-2.0.ebuild,v 1.1 2009/04/04 11:43:03 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-2.0-r1.ebuild,v 1.1 2009/05/01 22:07:29 nelchael Exp $
+
+inherit eutils
 
 PATCH_VERSION="1"
 
@@ -18,6 +20,13 @@ IUSE="vim-syntax"
 DEPEND=""
 RDEPEND="!<media-gfx/splashutils-1.5.2"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-init.d.patch"
+}
+
 src_install() {
 	BASE_DIR="${D}" \
 		DISTRIBUTION="gentoo" \