Fix log issue which caused vbetool not to work, bug#164773, thanks to Bernard Blackham and Raymond Lewis Rebbeck, Nick Bolten for testing

Package-Manager: portage-2.1.2-r9

4 files changed, 99 insertions, 15 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index 255944fc1c00..d280d32a8a40 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/hibernate-script
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.48 2007/02/05 01:30:33 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.49 2007/02/10 10:09:43 alonbl Exp $
+
+*hibernate-script-1.94-r5 (10 Feb 2007)
+
+  10 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +hibernate-script-1.94-r5.ebuild:
+  Fix log issue which caused vbetool not to work, bug#164773, thanks to
+  Bernard Blackham and Raymond Lewis Rebbeck, Nick Bolten for testing
 
   05 Feb 2007; Joseph Jezak <josejx@gentoo.org>
   hibernate-script-1.94-r3.ebuild:
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 875ea925ab39..22112da08f68 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST hibernate-script-1.93-patches-0.7.tar.bz2 3069 RMD160 59c2cb44a88be47deaeaed4e6170c0f63b7d2464 SHA1 fd244eb9dada38c46fdf03326f43b2342591337e SHA256 e772a051785ac2b82ff736914169c35569e97e14845d581f446638327760fae6
 DIST hibernate-script-1.93.tar.gz 68644 RMD160 bbb59d7ac5c7a26667cb00c5dd32224ad3eb8f01 SHA1 cea3ece2fdbe277c3e1878fd2acb9a728138c5f6 SHA256 8020d653cc09d1724f700e2b28cf5ce83eef3ffd287304141357eef2c22db366
 DIST hibernate-script-1.94-patches-4.tar.bz2 2736 RMD160 087e7a241cecc600b76ddd8e142e5a3336d6da35 SHA1 e68879eaea190da19d93917e9fcc6742f418ad33 SHA256 80dd025a8427dea04f894dbaecf8ee113662591d3050b5c7107eee79cd097958
 DIST hibernate-script-1.94-patches-5.tar.bz2 3296 RMD160 a0fd307e462d59dfee0a21144c3f13bcae6bdee7 SHA1 0ef9b887e5eb8fd2d1911a902d5b2869340107af SHA256 0a8c6eff5bcf544dda6c1e3f0d83ad0737e6937366e7482da34b7af3beb0d63c
+DIST hibernate-script-1.94-patches-6.tar.bz2 3100 RMD160 d723c9eea1fe677f0ed20e38f6900f0ba1d23e26 SHA1 1ace35c29d3a13d10890762e012786cbea972235 SHA256 9756f80f962c444728c849e50aba96848f0ad6fea62a57f7b55de4b6f196b25a
 DIST hibernate-script-1.94.tar.gz 72928 RMD160 31d105c08bf183e3bc770543e0ae01678798859b SHA1 ebd6647c5859be9bffe0466f85eeaaeac81101be SHA256 57ad0de0cce263c76303a5c7116550f19aaec540c6743e0b5bcd5d0cb68d2fe2
 EBUILD hibernate-script-1.93-r6.ebuild 2046 RMD160 7ce144614e5e5acd01c88fe13f2c1baf0ac9ad24 SHA1 621608f7d6828cec8d3b893cafd95e57bf4cbd1e SHA256 c5efa3cf5f5e199f2228bc9b4260865d3d4d8072d814a32d0c489c64fa863e36
 MD5 a38d65b6c6c0efb008796f46588efc49 hibernate-script-1.93-r6.ebuild 2046
@@ -18,10 +16,14 @@ EBUILD hibernate-script-1.94-r4.ebuild 2048 RMD160 8faee43829d151a63c58eacdaf4de
 MD5 514f72c7a45e5729a42f9d30601bc7d4 hibernate-script-1.94-r4.ebuild 2048
 RMD160 8faee43829d151a63c58eacdaf4dee6f586a9227 hibernate-script-1.94-r4.ebuild 2048
 SHA256 8171509a1b2318da27cbdd47e380e28278994030d1eac855fdba570b859cb998 hibernate-script-1.94-r4.ebuild 2048
-MISC ChangeLog 11658 RMD160 c0a306f4d4ed384cf41eb8cf02b718572da7aa4c SHA1 af16496bd494983291ab2cdd2c41699f4f8a6c1c SHA256 aa4d3739c957b63e1417641dcb63eb3a8b7ca20057f49c6b7c2483fc9b66938e
-MD5 5e4b665f3a0694bd5c0b925a73011fd5 ChangeLog 11658
-RMD160 c0a306f4d4ed384cf41eb8cf02b718572da7aa4c ChangeLog 11658
-SHA256 aa4d3739c957b63e1417641dcb63eb3a8b7ca20057f49c6b7c2483fc9b66938e ChangeLog 11658
+EBUILD hibernate-script-1.94-r5.ebuild 2025 RMD160 7bc3ce4a8efb90c5fcded3a7cb7cffe9b714d2e7 SHA1 806a30ef0175aabb71ee6432b0126fced63e9a58 SHA256 54dc11d8b40a03ebf12b151853198d4cac0f793b60183450859b27e72c6766b5
+MD5 cd9fb598950be83635fd5550ccb0b3d4 hibernate-script-1.94-r5.ebuild 2025
+RMD160 7bc3ce4a8efb90c5fcded3a7cb7cffe9b714d2e7 hibernate-script-1.94-r5.ebuild 2025
+SHA256 54dc11d8b40a03ebf12b151853198d4cac0f793b60183450859b27e72c6766b5 hibernate-script-1.94-r5.ebuild 2025
+MISC ChangeLog 11926 RMD160 fb86c339cd76d0c06bde460a32b2dace62495dc7 SHA1 362c99973e6857cf7ec3422569c93cc2911de101 SHA256 c7747f731ed684bf0fb370056c0203b5d8573d93482f87c06aad526e8f8cfc2b
+MD5 7e96c55032de613fc38545e908b20ab9 ChangeLog 11926
+RMD160 fb86c339cd76d0c06bde460a32b2dace62495dc7 ChangeLog 11926
+SHA256 c7747f731ed684bf0fb370056c0203b5d8573d93482f87c06aad526e8f8cfc2b ChangeLog 11926
 MISC metadata.xml 252 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc SHA1 470749f04141ca780f2be602666b266f755e338e SHA256 9a7aee2a060e353cb5db8caa34babf5dca6ee95233a0b52443f4d02e90c35b31
 MD5 bc8aba6f9d14b92e55fcc05e22ce4956 metadata.xml 252
 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc metadata.xml 252
@@ -35,10 +37,6 @@ SHA256 61d8385289ded3c2bea28d93da54c52f90a31a4153f311bd0c4968f02c945a67 files/di
 MD5 c6554ab2e08ab9cf601c819173d53701 files/digest-hibernate-script-1.94-r4 554
 RMD160 ed5710fb4ccb5bda98126db62ea234fe247c68dd files/digest-hibernate-script-1.94-r4 554
 SHA256 98d6c1f9e6a31cc21ec1eaf87e83c6edf47566b66384d209ba0f5fbb06d85874 files/digest-hibernate-script-1.94-r4 554
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFxogRcsIHjyDViGQRAjwiAJ9SJ1IXiPTemXdzV0b48XfD5xa7PgCgp537
-6ou5bTsV9M9yyJDAnVhqVms=
-=SpdZ
------END PGP SIGNATURE-----
+MD5 caab54b04a1de176b6afc04d6004e8c5 files/digest-hibernate-script-1.94-r5 554
+RMD160 037899e5f70c77ef10175c11c73926de583766b6 files/digest-hibernate-script-1.94-r5 554
+SHA256 f1d8eff3fc5ec2e58550e58ff0fdd515c81c191eefb1c1beccca6904f8b72201 files/digest-hibernate-script-1.94-r5 554
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.94-r5 b/sys-power/hibernate-script/files/digest-hibernate-script-1.94-r5
new file mode 100644
index 000000000000..f91b4234d13f
--- /dev/null
+++ b/sys-power/hibernate-script/files/digest-hibernate-script-1.94-r5
@@ -0,0 +1,6 @@
+MD5 dd06fc82f46bf5267c19eedf72c17df9 hibernate-script-1.94-patches-6.tar.bz2 3100
+RMD160 d723c9eea1fe677f0ed20e38f6900f0ba1d23e26 hibernate-script-1.94-patches-6.tar.bz2 3100
+SHA256 9756f80f962c444728c849e50aba96848f0ad6fea62a57f7b55de4b6f196b25a hibernate-script-1.94-patches-6.tar.bz2 3100
+MD5 f8826d4c96e320902382f29c91694c04 hibernate-script-1.94.tar.gz 72928
+RMD160 31d105c08bf183e3bc770543e0ae01678798859b hibernate-script-1.94.tar.gz 72928
+SHA256 57ad0de0cce263c76303a5c7116550f19aaec540c6743e0b5bcd5d0cb68d2fe2 hibernate-script-1.94.tar.gz 72928
diff --git a/sys-power/hibernate-script/hibernate-script-1.94-r5.ebuild b/sys-power/hibernate-script/hibernate-script-1.94-r5.ebuild
new file mode 100644
index 000000000000..83702c560a02
--- /dev/null
+++ b/sys-power/hibernate-script/hibernate-script-1.94-r5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 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.94-r5.ebuild,v 1.1 2007/02/10 10:09:43 alonbl Exp $
+
+inherit eutils
+
+PATCH_VERSION="6"
+
+DESCRIPTION="Hibernate script supporting multiple suspend methods"
+HOMEPAGE="http://www.suspend2.net/"
+SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2"
+
+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}"
+
+	# Our patches
+	epatch "${WORKDIR}"/patches/*.patch
+}
+
+src_install() {
+	BASE_DIR="${D}" PREFIX=/usr MAN_DIR="${D}"/usr/share/man \
+		"${S}"/install.sh || die "Install failed"
+
+	# 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() {
+	elog
+	elog "You should run the following command to invalidate"
+	elog "suspend images on a clean boot."
+	elog
+	elog "  # rc-update add hibernate-cleanup boot"
+	elog
+	elog "See /usr/share/doc/${PF}/README.gz for further details."
+	elog
+	elog "Please note that you will need to manually emerge any utilities"
+	elog "(radeontool, vbetool, ...) enabled in the configuration files,"
+	elog "should you wish to use them."
+	elog
+	elog "Starting with hibernate-script-1.90 the configuration files have"
+	elog "been reordered and split into method specific files. Make sure you"
+	elog "update your /etc/hibernate/ configuration files accordingly."
+	elog
+}