Modified i810 to be restart instead of start, closes bug#159399, thanks for Stefan Becker

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 91 deletions

diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 8b926bb0d5be..5b5410872bc2 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -1,19 +1,19 @@
 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-2.tar.bz2 3225 RMD160 c12154ac46444c521a6fd902cc9d80d455ee1641 SHA1 48ccbc371331dc1d9bf4b7ac670bef0fbdde7e85 SHA256 a784331f7438d93b9895630086c02fda90fea00b30d8bc2dafec3b5080c5bd28
+DIST hibernate-script-1.94-patches-3.tar.bz2 3229 RMD160 9b41f5adff15b5cfb988afb5b7f1e2c462f19c5b SHA1 ab6a59dc14de163970eaeb80668c331ebf143fc8 SHA256 08b991b9fbe2709acab9240d23107c82d99fc1b00ea204c411140e841c8c391e
 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
 RMD160 7ce144614e5e5acd01c88fe13f2c1baf0ac9ad24 hibernate-script-1.93-r6.ebuild 2046
 SHA256 c5efa3cf5f5e199f2228bc9b4260865d3d4d8072d814a32d0c489c64fa863e36 hibernate-script-1.93-r6.ebuild 2046
-EBUILD hibernate-script-1.94-r1.ebuild 2048 RMD160 c452cff4df3ba8895cfb3a839ef9832590756176 SHA1 ad9e72de6cbc13f745e3c27dacdd7b8f68ff40fb SHA256 c25b445a3f624b4f9c1d9e6c61f94021d729f9d9c5a4e961c3bdd96b8ee5c59f
-MD5 9b4cfa6a4cbd4d042ac0fb119c9e4449 hibernate-script-1.94-r1.ebuild 2048
-RMD160 c452cff4df3ba8895cfb3a839ef9832590756176 hibernate-script-1.94-r1.ebuild 2048
-SHA256 c25b445a3f624b4f9c1d9e6c61f94021d729f9d9c5a4e961c3bdd96b8ee5c59f hibernate-script-1.94-r1.ebuild 2048
-MISC ChangeLog 10657 RMD160 af0b658cae649b275c2ecc53c2d7692e2607823e SHA1 41073c0a349e6e96bf108b1b370fd7a213dbfa45 SHA256 1e32f1dd155cad8cffbae52d5ef94fbc96393fcf2cfd352aabee4d666c75a2e6
-MD5 d006f9d012aa8c087e8a4c466e104f33 ChangeLog 10657
-RMD160 af0b658cae649b275c2ecc53c2d7692e2607823e ChangeLog 10657
-SHA256 1e32f1dd155cad8cffbae52d5ef94fbc96393fcf2cfd352aabee4d666c75a2e6 ChangeLog 10657
+EBUILD hibernate-script-1.94-r2.ebuild 2048 RMD160 a15720c13bb2f8a131b89fc9cbafac1c9a94044f SHA1 18aa56fd91b93fec027da02fe2ca1c0ea90e54b8 SHA256 453d73d613f2c421b57c6e06888f535b2d19c756cf583fef60fca2a88358d8d6
+MD5 9f8ea7b5936c067ce7830168c2a099d6 hibernate-script-1.94-r2.ebuild 2048
+RMD160 a15720c13bb2f8a131b89fc9cbafac1c9a94044f hibernate-script-1.94-r2.ebuild 2048
+SHA256 453d73d613f2c421b57c6e06888f535b2d19c756cf583fef60fca2a88358d8d6 hibernate-script-1.94-r2.ebuild 2048
+MISC ChangeLog 10911 RMD160 29cf7bb82cdfe2b17b4e7074f12f1c9a19f113a3 SHA1 0c863c8f562003bb7d152d134174f52910c787db SHA256 cf1b5024739432be48b3a22505aec84ec235117fa0d8adbf4de72b9819b96941
+MD5 2848897d0376680c9ec2623a4c85c9af ChangeLog 10911
+RMD160 29cf7bb82cdfe2b17b4e7074f12f1c9a19f113a3 ChangeLog 10911
+SHA256 cf1b5024739432be48b3a22505aec84ec235117fa0d8adbf4de72b9819b96941 ChangeLog 10911
 MISC metadata.xml 252 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc SHA1 470749f04141ca780f2be602666b266f755e338e SHA256 9a7aee2a060e353cb5db8caa34babf5dca6ee95233a0b52443f4d02e90c35b31
 MD5 bc8aba6f9d14b92e55fcc05e22ce4956 metadata.xml 252
 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc metadata.xml 252
@@ -21,6 +21,6 @@ SHA256 9a7aee2a060e353cb5db8caa34babf5dca6ee95233a0b52443f4d02e90c35b31 metadata
 MD5 0a42973d8e71dbef4d2ad90de7a82867 files/digest-hibernate-script-1.93-r6 560
 RMD160 051b71990889408590851ea0e365cf471df3bbda files/digest-hibernate-script-1.93-r6 560
 SHA256 88b531327e6071d8c2234f3ed49023068494d0ddbc3817eda6d23160b1bfdb6b files/digest-hibernate-script-1.93-r6 560
-MD5 58e8ae7fb8326ee43c3e276c17d4c60e files/digest-hibernate-script-1.94-r1 554
-RMD160 bcac2ff6fe272289fe7365e9d7563bf29fcd520e files/digest-hibernate-script-1.94-r1 554
-SHA256 90b7c1db89d55121e20afe968f306fb76545aea68cb36bbaf6f126f883c98f24 files/digest-hibernate-script-1.94-r1 554
+MD5 2fa1298f13fdd82b5bade0d46f5dcaf6 files/digest-hibernate-script-1.94-r2 554
+RMD160 ce46c9d5c7531186ce71fff8b26b52c9bcd16be5 files/digest-hibernate-script-1.94-r2 554
+SHA256 209e8eb2856e558427fd7454b954a9df41bfb381c4c2eaed60e5ce437b81091e files/digest-hibernate-script-1.94-r2 554
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.94-r1 b/sys-power/hibernate-script/files/digest-hibernate-script-1.94-r1
deleted file mode 100644
index 8ee118044ad6..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.94-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 8f927bb983870516901aebd8718f08ee hibernate-script-1.94-patches-2.tar.bz2 3225
-RMD160 c12154ac46444c521a6fd902cc9d80d455ee1641 hibernate-script-1.94-patches-2.tar.bz2 3225
-SHA256 a784331f7438d93b9895630086c02fda90fea00b30d8bc2dafec3b5080c5bd28 hibernate-script-1.94-patches-2.tar.bz2 3225
-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-r1.ebuild b/sys-power/hibernate-script/hibernate-script-1.94-r1.ebuild
deleted file mode 100644
index cf99d0b1a283..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.94-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.94-r1.ebuild,v 1.1 2006/12/21 21:03:05 alonbl Exp $
-
-inherit eutils
-
-PATCH_VERSION="2"
-
-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}"
-
-	rm -f "${S}"/scriptlets.d/swsusp2_15
-	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
-}