Revision bump; hibernate-scripts is trying to echo to an read-only file; metadata.xml touchup

Package-Manager: portage-2.1.1_pre2-r8

6 files changed, 137 insertions, 17 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index 6cf137629be2..1632256cd754 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,14 @@
 # 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.25 2006/07/13 17:00:51 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.26 2006/07/14 06:22:38 phreak Exp $
+
+*hibernate-script-1.93-r1 (14 Jul 2006)
+
+  14 Jul 2006; Christian Heim <phreak@gentoo.org>
+  +files/hibernate-script-1.93-last_result.patch, metadata.xml,
+  +hibernate-script-1.93-r1.ebuild:
+  Revision bump; hibernate-scripts is trying to echo to an read-only file;
+  metadata.xml touchup
 
 *hibernate-script-1.93 (13 Jul 2006)
 
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index bee960896c18..0b8b9bc311ce 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -17,6 +17,10 @@ AUX hibernate-script-1.93-gentoo.patch 973 RMD160 8528563d7494bbb1c123a109f1448d
 MD5 bf6cf40b2c9cb0bdfffdaa4876bae48a files/hibernate-script-1.93-gentoo.patch 973
 RMD160 8528563d7494bbb1c123a109f1448d124c9796a6 files/hibernate-script-1.93-gentoo.patch 973
 SHA256 b89aca9c110bbbe72bf982dc98b83ceab1ee70f2aacd80728094ede94ce9e570 files/hibernate-script-1.93-gentoo.patch 973
+AUX hibernate-script-1.93-last_result.patch 617 RMD160 f4e234cb46a13f517548abc4ca3ebf1ac59c2049 SHA1 a15377ad3cea602683d39a15348389c216f4c332 SHA256 1c34d09131f10b14b9c53e44c455a37df018b0ca5c1414db3aab3c13419c9657
+MD5 a448f61b3214198e602e2f420097af75 files/hibernate-script-1.93-last_result.patch 617
+RMD160 f4e234cb46a13f517548abc4ca3ebf1ac59c2049 files/hibernate-script-1.93-last_result.patch 617
+SHA256 1c34d09131f10b14b9c53e44c455a37df018b0ca5c1414db3aab3c13419c9657 files/hibernate-script-1.93-last_result.patch 617
 DIST hibernate-script-1.12.tar.gz 64752 RMD160 3c2811d633727afd63f12062730515c9f6b16c4c SHA1 ba572234e0189dd9a64e26f5bacd14610551aa45 SHA256 dd1c1bb297fc4bfdce73614322cb60d92d99db719e473b9cbb4c62e0ea444147
 DIST hibernate-script-1.91.tar.gz 67112 RMD160 f8ae4e45307610e536f464e3180919533080b50e SHA1 b81808f499068937a9696e977ef1cfd499d21eee SHA256 c942830773829037449ef88c697203e96f1e7511551ed3029570512700bf4d13
 DIST hibernate-script-1.93.tar.gz 68644 RMD160 bbb59d7ac5c7a26667cb00c5dd32224ad3eb8f01 SHA1 cea3ece2fdbe277c3e1878fd2acb9a728138c5f6 SHA256 8020d653cc09d1724f700e2b28cf5ce83eef3ffd287304141357eef2c22db366
@@ -28,18 +32,22 @@ EBUILD hibernate-script-1.91.ebuild 2114 RMD160 9128b1561b2685394b2df695400b008b
 MD5 9f8043f7a55fe38ebe5f1ad94c8dadd5 hibernate-script-1.91.ebuild 2114
 RMD160 9128b1561b2685394b2df695400b008b18638d4c hibernate-script-1.91.ebuild 2114
 SHA256 e70673b014e72d9dc3616e4ff234e575f927fda4529913539167e049463ce73c hibernate-script-1.91.ebuild 2114
+EBUILD hibernate-script-1.93-r1.ebuild 2282 RMD160 5aba8b75f84e6d1dc2ca4830712fae2069a27559 SHA1 ee51a560b6609c2ace5d972e9c7ac4bb3b122649 SHA256 212d04b598aad6a0b8d00d893fa73137f224365f5f35c31823fdad687eae62f6
+MD5 49bc60b3acf8f376531ce627983d7ccf hibernate-script-1.93-r1.ebuild 2282
+RMD160 5aba8b75f84e6d1dc2ca4830712fae2069a27559 hibernate-script-1.93-r1.ebuild 2282
+SHA256 212d04b598aad6a0b8d00d893fa73137f224365f5f35c31823fdad687eae62f6 hibernate-script-1.93-r1.ebuild 2282
 EBUILD hibernate-script-1.93.ebuild 2234 RMD160 0279d9acc374c27d110b49fc8b0fe6b8f2b610a5 SHA1 bc3c15b6ea1dac0173343effc92b7ae5e1eea310 SHA256 8a215821de19a5d1f043ff194a83eccd1d6dd7ca6e637764299ee3e066c226aa
 MD5 aa8b4c69c0a0f1544f4b2bd8b149c95f hibernate-script-1.93.ebuild 2234
 RMD160 0279d9acc374c27d110b49fc8b0fe6b8f2b610a5 hibernate-script-1.93.ebuild 2234
 SHA256 8a215821de19a5d1f043ff194a83eccd1d6dd7ca6e637764299ee3e066c226aa hibernate-script-1.93.ebuild 2234
-MISC ChangeLog 5894 RMD160 f22f48563319dec0e887ac1c54abf7bf2ae876e0 SHA1 b4ff26bf665c40b1697e7b239b55f9c0ace14000 SHA256 fd86ce990769a13cfa6a21f57f18bc6e1a731a0c3c06ec1797f9b490ba411372
-MD5 e856b179487c40157df733808f85bd79 ChangeLog 5894
-RMD160 f22f48563319dec0e887ac1c54abf7bf2ae876e0 ChangeLog 5894
-SHA256 fd86ce990769a13cfa6a21f57f18bc6e1a731a0c3c06ec1797f9b490ba411372 ChangeLog 5894
-MISC metadata.xml 251 RMD160 0226ff71e891e912368bf90088fe0a0126b19e03 SHA1 efb434754f2a669e63b1c307a8e73666783244fb SHA256 bbd3bedb57926ce9632a7659dada60f3b2e40c2909859a40dcfce447e13a0c26
-MD5 c8e1f0c096787975a770bc93ef07cf2a metadata.xml 251
-RMD160 0226ff71e891e912368bf90088fe0a0126b19e03 metadata.xml 251
-SHA256 bbd3bedb57926ce9632a7659dada60f3b2e40c2909859a40dcfce447e13a0c26 metadata.xml 251
+MISC ChangeLog 6184 RMD160 ae6c12faae53bcc6b074f0aebda0d1be41f29b90 SHA1 772fa035d400d63e806a7462162847c3a16b42e7 SHA256 c34c917dfa3d669a292c74dc9a644d0ac6322c18199be0a4a97b1fefbd993f1b
+MD5 4abe613b060bfbea5917d58ca0518e06 ChangeLog 6184
+RMD160 ae6c12faae53bcc6b074f0aebda0d1be41f29b90 ChangeLog 6184
+SHA256 c34c917dfa3d669a292c74dc9a644d0ac6322c18199be0a4a97b1fefbd993f1b ChangeLog 6184
+MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
+MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
+RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
+SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb metadata.xml 254
 MD5 0c2af54d8ff3276d4ad0f267a4e034ca files/digest-hibernate-script-1.12-r1 262
 RMD160 021b4883dc2d937fd49b8baf01418704172ae599 files/digest-hibernate-script-1.12-r1 262
 SHA256 245468f631843dc85438ff9e62e91fbee4a39ce575f577bf8b536de5078a39b9 files/digest-hibernate-script-1.12-r1 262
@@ -49,10 +57,13 @@ SHA256 8fad1f0c3eb94816b472129104f3a1d5b6bd0bb40251647d6838a047943dd09a files/di
 MD5 6df4f13730ccce8b2c2c007a366e32d3 files/digest-hibernate-script-1.93 262
 RMD160 ea48cd11767637391c710a50b80e13cfd49ad29a files/digest-hibernate-script-1.93 262
 SHA256 9978a523acc1585caafd33a5cfe59cbbc184479cb65abef81141e8ae2e10ba37 files/digest-hibernate-script-1.93 262
+MD5 6df4f13730ccce8b2c2c007a366e32d3 files/digest-hibernate-script-1.93-r1 262
+RMD160 ea48cd11767637391c710a50b80e13cfd49ad29a files/digest-hibernate-script-1.93-r1 262
+SHA256 9978a523acc1585caafd33a5cfe59cbbc184479cb65abef81141e8ae2e10ba37 files/digest-hibernate-script-1.93-r1 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEtnxTflZ8QqxhrsMRAgOhAJ4kb6ywejqwtR5SMM//sJOKpMqkdACfclTm
-VsjwfjIpESZRzVYA0BSlb9Y=
-=knko
+iD8DBQFEtzg/flZ8QqxhrsMRAi6WAJ9qou9ON0U+JAS0J0ruVGlgqb2sWQCbB9at
+99w0z/dXy1YrvkhQB2vdZ0Y=
+=Spwc
 -----END PGP SIGNATURE-----
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r1 b/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r1
new file mode 100644
index 000000000000..422838b8f2d0
--- /dev/null
+++ b/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r1
@@ -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-last_result.patch b/sys-power/hibernate-script/files/hibernate-script-1.93-last_result.patch
new file mode 100644
index 000000000000..7c7ca3e5cec5
--- /dev/null
+++ b/sys-power/hibernate-script/files/hibernate-script-1.93-last_result.patch
@@ -0,0 +1,13 @@
+Index: hibernate-script-1.93/scriptlets.d/suspend2
+===================================================================
+--- hibernate-script-1.93.orig/scriptlets.d/suspend2
++++ hibernate-script-1.93/scriptlets.d/suspend2
+@@ -525,7 +525,7 @@ CleanupDmesg() {
+ # PrintErrors. We can't just return it, because error codes may be > 255
+ DoSuspend() {
+     # Some versions of Software Suspend didn't clear this in certain cases:
+-    echo 0 > $SWSUSP_ROOT/last_result
++    [ -w $SWSUSP_ROOT/last_result ] && echo 0 > $SWSUSP_ROOT/last_result
+ 
+     if [ -f $SWSUSP_ROOT/do_suspend ] ; then
+ 	echo > $SWSUSP_ROOT/do_suspend
diff --git a/sys-power/hibernate-script/hibernate-script-1.93-r1.ebuild b/sys-power/hibernate-script/hibernate-script-1.93-r1.ebuild
new file mode 100644
index 000000000000..05b6582f944e
--- /dev/null
+++ b/sys-power/hibernate-script/hibernate-script-1.93-r1.ebuild
@@ -0,0 +1,85 @@
+# 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-r1.ebuild,v 1.1 2006/07/14 06:22:38 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}-gentoo.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 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
+}
diff --git a/sys-power/hibernate-script/metadata.xml b/sys-power/hibernate-script/metadata.xml
index 1321b92451f6..a257f6a97993 100644
--- a/sys-power/hibernate-script/metadata.xml
+++ b/sys-power/hibernate-script/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mobile</herd>
-<maintainer>
-  <email>phreak@gentoo.org</email>
-  <name>Christian Heim</name>
-</maintainer>
+	<herd>mobile</herd>
+	<maintainer>
+		<email>phreak@gentoo.org</email>
+		<name>Christian Heim</name>
+	</maintainer>
 </pkgmetadata>