Version bump, hibernate-script now defaults to using Software Suspend 2.

(Portage version: 2.0.51.22-r1)

5 files changed, 110 insertions, 5 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index bb049d7808cf..d7e8201c517d 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2005/06/28 07:47:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.14 2005/07/13 17:03:01 brix Exp $
+
+*hibernate-script-1.10 (13 Jul 2005)
+
+  13 Jul 2005; <brix@gentoo.org> +files/hibernate-script-1.10-gentoo.patch,
+  +hibernate-script-1.10.ebuild:
+  Version bump, hibernate-script now defaults to using Software Suspend 2.
 
   28 Jun 2005; David Holm <dholm@gentoo.org> hibernate-script-1.09.ebuild:
   Added to ~ppc.
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 95ad2f8e53ea..574dc2764879 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -1,8 +1,11 @@
-MD5 8f8ea2e1d1440f759351bb9978b3e367 ChangeLog 3706
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 2abd556351d3d04fbd4accacce0571ec hibernate-script-1.10.ebuild 1579
 MD5 75a62b5a706a1ba62fe943ea60c69a6e hibernate-script-1.08.ebuild 1846
+MD5 3ebb30744fd1b4b6750e304e87bd03ff ChangeLog 3929
 MD5 8453c3e3f441de73bd2f17aa06d0e478 hibernate-script-1.09.ebuild 1950
-MD5 3ea7912a4180fb618723d861d0286afd files/digest-hibernate-script-1.08 72
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 b26c9213098780eba2f1005cf54ee270 files/hibernate-script-1.09-gentoo.patch 836
 MD5 26eee00879feba424f6a696d7204c100 files/hibernate-script-1.08-gentoo.patch 836
+MD5 03bb82879e20ab60a6d5aec0e0b7905c files/hibernate-script-1.10-gentoo.patch 836
+MD5 3ea7912a4180fb618723d861d0286afd files/digest-hibernate-script-1.08 72
 MD5 916c1fcd7b2571c043ee122c075dd93b files/digest-hibernate-script-1.09 72
-MD5 b26c9213098780eba2f1005cf54ee270 files/hibernate-script-1.09-gentoo.patch 836
+MD5 3a748c4fedc6be95753e465baec60a79 files/digest-hibernate-script-1.10 72
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.10 b/sys-power/hibernate-script/files/digest-hibernate-script-1.10
new file mode 100644
index 000000000000..1d5fbfdf2692
--- /dev/null
+++ b/sys-power/hibernate-script/files/digest-hibernate-script-1.10
@@ -0,0 +1 @@
+MD5 cbd8320a2a458d1cfad5420c6fa6a823 hibernate-script-1.10.tar.gz 63598
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.10-gentoo.patch b/sys-power/hibernate-script/files/hibernate-script-1.10-gentoo.patch
new file mode 100644
index 000000000000..e59454403f9c
--- /dev/null
+++ b/sys-power/hibernate-script/files/hibernate-script-1.10-gentoo.patch
@@ -0,0 +1,29 @@
+diff -urp hibernate-script-1.10/init.d/hibernate-cleanup.sh hibernate-script-1.10-gentoo/init.d/hibernate-cleanup.sh
+--- hibernate-script-1.10/init.d/hibernate-cleanup.sh	2005-07-13 16:08:28.000000000 +0200
++++ hibernate-script-1.10-gentoo/init.d/hibernate-cleanup.sh	2005-07-13 18:54:11.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
+@@ -66,9 +66,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/hibernate-script-1.10.ebuild b/sys-power/hibernate-script/hibernate-script-1.10.ebuild
new file mode 100644
index 000000000000..00d4ec1eb672
--- /dev/null
+++ b/sys-power/hibernate-script/hibernate-script-1.10.ebuild
@@ -0,0 +1,66 @@
+# 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.10.ebuild,v 1.1 2005/07/13 17:03:01 brix Exp $
+
+inherit eutils
+
+# The following works with both pre-releases and releases
+MY_P=${PN}-${PV/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Hibernate script supporting multiple suspend methods"
+
+HOMEPAGE="http://www.suspend2.net"
+SRC_URI="http://www.suspend2.net/downloads/all/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="logrotate"
+
+DEPEND="sys-apps/sed"
+RDEPEND="logrotate? ( app-admin/logrotate )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	# remove obsolete swsusp2_15 scriptlet
+	rm -f ${S}/scriptlets.d/swsusp2_15
+}
+
+src_install() {
+	BASE_DIR=${D} PREFIX=/usr MAN_DIR=${D}/usr/share/man \
+		${S}/install.sh
+
+	# hibernate-ram will default to using ram.conf
+	dosym /usr/sbin/hibernate /usr/sbin/hibernate-ram
+
+	newinitd ${S}/init.d/hibernate-cleanup.sh hibernate-cleanup
+
+	# other ebuilds can install scriplets to this dir
+	keepdir /etc/hibernate/scriptlets.d/
+
+	dodoc CHANGELOG README SCRIPTLET-API TODO
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins logrotate.d-hibernate-script hibernate-script
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If you use Software Suspend 2 you should run"
+	einfo "  # rc-update add hibernate-cleanup boot"
+	einfo "to invalidate suspend images on a clean boot."
+	einfo
+	einfo "See /usr/share/doc/${PF}/README.gz for further details."
+	einfo
+	einfo "Please note that /etc/hibernate/hibernate.conf now defaults"
+	einfo "to using Software Suspend 2."
+	einfo
+}