Revision bump. According to #140931 net-wireless/rt2500 (and to the rt2500 ticket #1472869) it should now work properly after resuming. Thanks to Colin Carle <colin.carle at gmail.com> for the patches!

(Portage version: 2.1.1_pre3-r1)

4 files changed, 112 insertions, 1 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index c26453c50c59..ee39b6c5e1bd 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-power/hibernate-script
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.29 2006/07/15 20:15:51 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.30 2006/07/19 06:39:03 phreak Exp $
+
+*hibernate-script-1.93-r3 (19 Jul 2006)
+
+  19 Jul 2006; Christian Heim <phreak@gentoo.org>
+  +files/hibernate-script-1.93-rt2500-blacklist.patch,
+  -hibernate-script-1.93-r2.ebuild, +hibernate-script-1.93-r3.ebuild:
+  Revision bump. According to #140931 net-wireless/rt2500 (and to the rt2500
+  ticket #1472869) it should now work properly after resuming. Thanks to Colin
+  Carle <colin.carle at gmail.com> for the patches!
 
   15 Jul 2006; Christian Heim <phreak@gentoo.org>
   files/hibernate-script-1.93-gentoo.patch,
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r3 b/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r3
new file mode 100644
index 000000000000..422838b8f2d0
--- /dev/null
+++ b/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r3
@@ -0,0 +1,3 @@
+MD5 903e30d67bcdf728f245a71b9ec412e2 hibernate-script-1.93.tar.gz 68644
+RMD160 bbb59d7ac5c7a26667cb00c5dd32224ad3eb8f01 hibernate-script-1.93.tar.gz 68644
+SHA256 8020d653cc09d1724f700e2b28cf5ce83eef3ffd287304141357eef2c22db366 hibernate-script-1.93.tar.gz 68644
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.93-rt2500-blacklist.patch b/sys-power/hibernate-script/files/hibernate-script-1.93-rt2500-blacklist.patch
new file mode 100644
index 000000000000..38c72d2d74bd
--- /dev/null
+++ b/sys-power/hibernate-script/files/hibernate-script-1.93-rt2500-blacklist.patch
@@ -0,0 +1,11 @@
+Index: hibernate-script-1.93/scriptlets.d/lock
+--- hibernate-script-1.93.orig/blacklisted-modules
++++ hibernate-script-1.93/blacklisted-modules
+@@ -52,7 +52,6 @@
+ via_rhine	2.6.0	2.6.99
+ i8042		2.6.10	2.6.99
+ intel_mch_agp	2.6.0	2.6.99
+-rt2500		2.6.0	2.6.99
+ 
+ button		2.6.9	2.6.99
+ speedstep_smi	2.6.12	2.6.99
diff --git a/sys-power/hibernate-script/hibernate-script-1.93-r3.ebuild b/sys-power/hibernate-script/hibernate-script-1.93-r3.ebuild
new file mode 100644
index 000000000000..68bd0e4fb7e2
--- /dev/null
+++ b/sys-power/hibernate-script/hibernate-script-1.93-r3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2006 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.93-r3.ebuild,v 1.1 2006/07/19 06:39:03 phreak Exp $
+
+inherit eutils
+
+DESCRIPTION="Hibernate script supporting multiple suspend methods"
+HOMEPAGE="http://www.suspend2.net/"
+SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="logrotate vim"
+
+DEPEND="sys-apps/sed"
+RDEPEND="logrotate? ( app-admin/logrotate )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# remove obsolete swsusp2_15 scriptlet
+	rm -f "${S}"/scriptlets.d/swsusp2_15
+
+	epatch "${FILESDIR}"/${P}-last_result.patch
+	epatch "${FILESDIR}"/${P}-kde-lock-session.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-return.patch
+	epatch "${FILESDIR}"/${P}-rt2500-blacklist.patch
+	ebegin "Applying ${P}-common.conf.patch"
+	sed -i \
+		-e "s:^# \(Distribution\).*:\1 gentoo:" \
+		"${S}"/common.conf
+	eend $?
+
+	ebegin "Applying ${P}-suspend2.conf.patch"
+	sed -i \
+		-e "s:/usr/local::" \
+		"${S}"/suspend2.conf
+	eend $?
+}
+
+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/
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles
+		doins hibernate.vim
+	fi
+
+	dodoc CHANGELOG README SCRIPTLET-API hibernate.vim
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${S}"/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
+	einfo "Starting with hibernate-script-1.90 the configuration files have"
+	einfo "been reordered and split into method specific files. Make sure you"
+	einfo "update your /etc/hibernate/ configuration files accordingly."
+	einfo
+}