Version bump, bug #108304 and bug #104668.

(Portage version: 2.0.51.22-r3)

5 files changed, 118 insertions, 2 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index e60bf7267890..3c59b309f7c4 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.17 2005/08/26 10:34:04 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.18 2005/10/20 13:43:03 brix Exp $
+
+*hibernate-script-1.12 (20 Oct 2005)
+
+  20 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/hibernate-script-1.12-gentoo.patch, +hibernate-script-1.12.ebuild:
+  Version bump, bug #108304 and bug #104668.
 
   26 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
   hibernate-script-1.10-r1.ebuild:
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 8245d0e10760..a3470b8b18e4 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -1,9 +1,11 @@
 MD5 7e07438d9b8d512e72ffa80189fd6b8d hibernate-script-1.10.ebuild 1694
+MD5 4e7e562e719b549337dde90d985c7251 hibernate-script-1.12.ebuild 1821
 MD5 75a62b5a706a1ba62fe943ea60c69a6e hibernate-script-1.08.ebuild 1846
-MD5 8e38978b7da366ce20437ec44be497e1 ChangeLog 4354
+MD5 b5026769b2ac52739680f8ff0090b1d8 ChangeLog 4568
 MD5 0a991b349d084d0844a403a6886a1b3a hibernate-script-1.09.ebuild 1948
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 1557b14c7d2a0ccf59b492bb6a1bef50 hibernate-script-1.10-r1.ebuild 1827
+MD5 4771f1307f9d9d0d08fdfa6b4de5af48 files/hibernate-script-1.12-gentoo.patch 834
 MD5 b26c9213098780eba2f1005cf54ee270 files/hibernate-script-1.09-gentoo.patch 836
 MD5 3a748c4fedc6be95753e465baec60a79 files/digest-hibernate-script-1.10-r1 72
 MD5 26eee00879feba424f6a696d7204c100 files/hibernate-script-1.08-gentoo.patch 836
@@ -11,3 +13,4 @@ MD5 03bb82879e20ab60a6d5aec0e0b7905c files/hibernate-script-1.10-gentoo.patch 83
 MD5 3ea7912a4180fb618723d861d0286afd files/digest-hibernate-script-1.08 72
 MD5 916c1fcd7b2571c043ee122c075dd93b files/digest-hibernate-script-1.09 72
 MD5 3a748c4fedc6be95753e465baec60a79 files/digest-hibernate-script-1.10 72
+MD5 2875fd3dd88aa57c273a8227244675ef files/digest-hibernate-script-1.12 72
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.12 b/sys-power/hibernate-script/files/digest-hibernate-script-1.12
new file mode 100644
index 000000000000..4864c360ff78
--- /dev/null
+++ b/sys-power/hibernate-script/files/digest-hibernate-script-1.12
@@ -0,0 +1 @@
+MD5 0fb7c524a30daacf200f27de2e398646 hibernate-script-1.12.tar.gz 64752
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.12-gentoo.patch b/sys-power/hibernate-script/files/hibernate-script-1.12-gentoo.patch
new file mode 100644
index 000000000000..2816289dac1b
--- /dev/null
+++ b/sys-power/hibernate-script/files/hibernate-script-1.12-gentoo.patch
@@ -0,0 +1,29 @@
+diff -urp hibernate-script-1.12/init.d/hibernate-cleanup.sh hibernate-script-1.12-gentoo/init.d/hibernate-cleanup.sh
+--- hibernate-script-1.12/init.d/hibernate-cleanup.sh	2005-10-02 07:54:23.000000000 +0200
++++ hibernate-script-1.12-gentoo/init.d/hibernate-cleanup.sh	2005-10-20 15:31:33.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 signatures"
++	check_swap_sig
++	check_filewriter_sig
++	eend
++}
diff --git a/sys-power/hibernate-script/hibernate-script-1.12.ebuild b/sys-power/hibernate-script/hibernate-script-1.12.ebuild
new file mode 100644
index 000000000000..81c95293b270
--- /dev/null
+++ b/sys-power/hibernate-script/hibernate-script-1.12.ebuild
@@ -0,0 +1,77 @@
+# 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.12.ebuild,v 1.1 2005/10/20 13:43:03 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
+
+	sed -i \
+		-e "s:^# \(Distribution\).*:\1 gentoo:" \
+		-e "s:/usr/local::" \
+		${S}/hibernate.conf
+
+	sed -i \
+		-e "s:^# \(Distribution\).*:\1 gentoo:" \
+		${S}/ram.conf
+}
+
+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
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins logrotate.d-hibernate-script hibernate-script
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You should run the following command to invalidate"
+	einfo "suspend images on a clean boot."
+	einfo
+	einfo "  # rc-update add hibernate-cleanup boot"
+	einfo
+	einfo "See /usr/share/doc/${PF}/README.gz for further details."
+	einfo
+	einfo "Please note that you will need to manually emerge any utilities"
+	einfo "(radeontool, vbetool, ...) enabled in the configuration files,"
+	einfo "should you wish to use them."
+	einfo
+}