Fix ususpend issue, bug#179743, thanks to Petric Frank for reporting

(Portage version: 2.1.2.7)

6 files changed, 16 insertions, 91 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index 3eba7801aa1a..0d0bc4bc58f3 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.55 2007/05/18 20:07:03 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.56 2007/05/25 19:54:06 alonbl Exp $
+
+*hibernate-script-1.95-r2 (25 May 2007)
+
+  25 May 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -hibernate-script-1.95.ebuild, -hibernate-script-1.95-r1.ebuild,
+  +hibernate-script-1.95-r2.ebuild:
+  Fix ususpend issue, bug#179743, thanks to Petric Frank for reporting
 
 *hibernate-script-1.95 (18 May 2007)
 
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.95 b/sys-power/hibernate-script/files/digest-hibernate-script-1.95
deleted file mode 100644
index d538ac93172e..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.95
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 55898e9265e077467eaad99599a47e5a hibernate-script-1.95-patches-1.tar.bz2 1374
-RMD160 23d3035090df8331175165eae69e7fae1e742ae9 hibernate-script-1.95-patches-1.tar.bz2 1374
-SHA256 5f5996c2b8bab58e1b26eb4c56e1d392fbf2509c6e2b9b523e644d68664188fb hibernate-script-1.95-patches-1.tar.bz2 1374
-MD5 026a7a8992da4fe56fb19530df998806 hibernate-script-1.95.tar.gz 74954
-RMD160 032cb97c355248640107e779f99ad5a86fb74846 hibernate-script-1.95.tar.gz 74954
-SHA256 e0c73cd1c3af2c0f409dba07e6fbd86c23150cfe77c4f9286ce239aedbe0a123 hibernate-script-1.95.tar.gz 74954
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r1 b/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r1
deleted file mode 100644
index d538ac93172e..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 55898e9265e077467eaad99599a47e5a hibernate-script-1.95-patches-1.tar.bz2 1374
-RMD160 23d3035090df8331175165eae69e7fae1e742ae9 hibernate-script-1.95-patches-1.tar.bz2 1374
-SHA256 5f5996c2b8bab58e1b26eb4c56e1d392fbf2509c6e2b9b523e644d68664188fb hibernate-script-1.95-patches-1.tar.bz2 1374
-MD5 026a7a8992da4fe56fb19530df998806 hibernate-script-1.95.tar.gz 74954
-RMD160 032cb97c355248640107e779f99ad5a86fb74846 hibernate-script-1.95.tar.gz 74954
-SHA256 e0c73cd1c3af2c0f409dba07e6fbd86c23150cfe77c4f9286ce239aedbe0a123 hibernate-script-1.95.tar.gz 74954
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r2 b/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r2
new file mode 100644
index 000000000000..e1140fc1b55a
--- /dev/null
+++ b/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r2
@@ -0,0 +1,6 @@
+MD5 003b374a04106c36915ac61a1e2ccf0c hibernate-script-1.95-patches-2.tar.bz2 1609
+RMD160 f98fc6514d2ba2a861e9146e0fe65e7f27572342 hibernate-script-1.95-patches-2.tar.bz2 1609
+SHA256 5bdcfe74e91fa26d58102f95e15453c2df3a7ff66213c2d53aa265569a554e8f hibernate-script-1.95-patches-2.tar.bz2 1609
+MD5 026a7a8992da4fe56fb19530df998806 hibernate-script-1.95.tar.gz 74954
+RMD160 032cb97c355248640107e779f99ad5a86fb74846 hibernate-script-1.95.tar.gz 74954
+SHA256 e0c73cd1c3af2c0f409dba07e6fbd86c23150cfe77c4f9286ce239aedbe0a123 hibernate-script-1.95.tar.gz 74954
diff --git a/sys-power/hibernate-script/hibernate-script-1.95-r1.ebuild b/sys-power/hibernate-script/hibernate-script-1.95-r2.ebuild
index 9f6f2afd390f..e2941e48ddc0 100644
--- a/sys-power/hibernate-script/hibernate-script-1.95-r1.ebuild
+++ b/sys-power/hibernate-script/hibernate-script-1.95-r2.ebuild
@@ -1,10 +1,10 @@
 # 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.95-r1.ebuild,v 1.1 2007/05/19 18:44:38 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-1.95-r2.ebuild,v 1.1 2007/05/25 19:54:06 alonbl Exp $
 
 inherit eutils
 
-PATCH_VERSION="1"
+PATCH_VERSION="2"
 
 DESCRIPTION="Hibernate script supporting multiple suspend methods"
 HOMEPAGE="http://www.suspend2.net/"
diff --git a/sys-power/hibernate-script/hibernate-script-1.95.ebuild b/sys-power/hibernate-script/hibernate-script-1.95.ebuild
deleted file mode 100644
index b85eebed5187..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.95.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.95.ebuild,v 1.1 2007/05/18 20:07:03 alonbl Exp $
-
-inherit eutils
-
-PATCH_VERSION="1"
-
-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}" \
-		DISTRIBUTION="gentoo" \
-		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.* 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
-}