Better integration of init script.

(Portage version: 2.0.51.20-r5)

5 files changed, 44 insertions, 23 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index e750a08a6dc0..ce89b998084b 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/hibernate-script
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.5 2005/04/30 13:50:42 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.6 2005/04/30 14:15:50 brix Exp $
+
+  30 Apr 2005; <brix@gentoo.org> +files/hibernate-script-1.07-gentoo.patch,
+  -files/hibernate-script-1.07-init.d, hibernate-script-1.07.ebuild:
+  Better integration of init script.
 
 *hibernate-script-1.07 (30 Apr 2005)
 
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index b0180deefa93..ff0d621b3bd5 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -1,9 +1,9 @@
 MD5 e22a54e346cb2d438249f7172597e8e2 hibernate-script-1.06.ebuild 1782
 MD5 72a509c2b28d748f0f9b3d20de6cf74a hibernate-script-1.05.ebuild 1796
-MD5 3c577a491d3b54ca9347a0404dea2324 hibernate-script-1.07.ebuild 1984
+MD5 bdc077749f40c1aff2bfd984599f2cd2 hibernate-script-1.07.ebuild 1889
 MD5 08fbc709d111b193479ef174ed6cd8a3 ChangeLog 2661
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 a20128474bbbcb3fb75b88a1c808e8f9 files/hibernate-script-1.07-init.d 409
+MD5 da0b44360bc5a0cc63a6e4f8eed2a719 files/hibernate-script-1.07-gentoo.patch 836
 MD5 51d8389f2aa4b5374d7d13b249924f09 files/digest-hibernate-script-1.05 72
 MD5 c77ea22cdce37884bb74d31ca6c478f3 files/digest-hibernate-script-1.06 72
 MD5 7e1e665c891b7f2de03da0ae07d8a82b files/digest-hibernate-script-1.07 72
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.07-gentoo.patch b/sys-power/hibernate-script/files/hibernate-script-1.07-gentoo.patch
new file mode 100644
index 000000000000..ca16eabd873d
--- /dev/null
+++ b/sys-power/hibernate-script/files/hibernate-script-1.07-gentoo.patch
@@ -0,0 +1,29 @@
+diff -urp hibernate-script-1.07/init.d/hibernate-cleanup.sh hibernate-script-1.07-gentoo/init.d/hibernate-cleanup.sh
+--- hibernate-script-1.07/init.d/hibernate-cleanup.sh	2005-04-21 15:17:28.000000000 +0200
++++ hibernate-script-1.07-gentoo/init.d/hibernate-cleanup.sh	2005-04-30 16:09:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/sbin/runscript
+ 
+ # This script invalidates any stale swsusp and Software Suspend 2 images. It
+ # searches all swap partitions on your machine, as well as Suspend2's
+@@ -57,9 +57,14 @@ check_filewriter_sig() {
+ 	esac
+ }
+ 
+-echo -n "Clearing Software Suspend 2 signatures... "
+-check_swap_sig
+-check_filewriter_sig
+-echo "done."
++depend() {
++	after localmount
++	before bootmisc
++}
+ 
+-exit 0
++start() {
++	ebegin "Clearing Software Suspend 2 signatures"
++	check_swap_sig
++	check_filewriter_sig
++	eend
++}
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.07-init.d b/sys-power/hibernate-script/files/hibernate-script-1.07-init.d
deleted file mode 100644
index f81c7c230fa8..000000000000
--- a/sys-power/hibernate-script/files/hibernate-script-1.07-init.d
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/files/hibernate-script-1.07-init.d,v 1.1 2005/04/30 13:50:42 brix Exp $
-
-depend() {
-	after localmount
-	before bootmisc
-}
-
-start() {
-	ebegin "Clearing Software Suspend 2 signatures"
-	/sbin/hibernate-cleanup.sh
-	eend ${?}
-}
diff --git a/sys-power/hibernate-script/hibernate-script-1.07.ebuild b/sys-power/hibernate-script/hibernate-script-1.07.ebuild
index 019e21275384..49aea5048cb0 100644
--- a/sys-power/hibernate-script/hibernate-script-1.07.ebuild
+++ b/sys-power/hibernate-script/hibernate-script-1.07.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-1.07.ebuild,v 1.1 2005/04/30 13:50:42 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-1.07.ebuild,v 1.2 2005/04/30 14:15:50 brix Exp $
+
+inherit eutils
 
 # The following works with both pre-releases and releases
 MY_P=${PN}-${PV/_/-}
@@ -23,6 +25,9 @@ RDEPEND=""
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
 	# use /sys/power/state instead of swsusp2
 	sed -i \
 		-e "s:^\(UseSwsusp2\):# \1:" \
@@ -45,12 +50,10 @@ src_install() {
 	BASE_DIR=${D} PREFIX=/usr MAN_DIR=${D}/usr/share/man \
 		${S}/install.sh
 
-	# hibernate-sleep will default to using sleep.conf
+	# hibernate-ram will default to using ram.conf
 	dosym /usr/sbin/hibernate /usr/sbin/hibernate-ram
 
-	into /
-	dosbin ${S}/init.d/hibernate-cleanup.sh
-	newinitd ${FILESDIR}/${P}-init.d hibernate-cleanup
+	newinitd ${S}/init.d/hibernate-cleanup.sh hibernate-cleanup
 
 	# other ebuilds can install scriplets to this dir
 	keepdir /etc/hibernate/scriptlets.d/