Fix X environment issue, bug#199806, thanks to Daniel Schömer

Package-Manager: portage-2.1.3.19
RepoMan-Options: --force

4 files changed, 94 insertions, 5 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index 7f2efcfde22b..db72a59fde96 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,12 @@
 # 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.71 2007/11/17 07:39:03 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.72 2007/11/25 06:08:17 alonbl Exp $
+
+*hibernate-script-1.97-r3 (25 Nov 2007)
+
+  25 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +hibernate-script-1.97-r3.ebuild:
+  Fix X environment issue, bug#199806, thanks to Daniel Schömer
 
 *hibernate-script-1.97-r2 (17 Nov 2007)
 
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 7c6979997cf1..2b40e05cabe2 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -5,6 +5,7 @@ DIST hibernate-script-1.96-patches-1.tar.bz2 1225 RMD160 976b2509c35b1de79789190
 DIST hibernate-script-1.96-patches-2.tar.bz2 4254 RMD160 89493fde6655201da028bacbe73e8b0c9390167f SHA1 771f3a73618704c6563770ac07a5f12dc994314e SHA256 bef31573f00bd08330660b45f272409356abaab498abd34a4b48f868841d379d
 DIST hibernate-script-1.96.tar.gz 77958 RMD160 d0542e0f5e96a27d8b40ab64a72abe74a89f0419 SHA1 6cedc83f15e38fcf7a00216605792a1fd658ee59 SHA256 b5b155808864d0f8351d002c01805c1ec02f5573698efc49e91ad703fbe96f4b
 DIST hibernate-script-1.97-patches-3.tar.bz2 3018 RMD160 fb0f7ea094d8b89a08fda1ac6e1d99cb149118c3 SHA1 9ad4a429386fc459164276f5a7ecc27f903bfa43 SHA256 fc3ab4b64dd0d3d568a2c6d28b5c45d9be668f06d47b4d6bcf41ec5166c5a1b4
+DIST hibernate-script-1.97-patches-4.tar.bz2 3280 RMD160 b1c048ef4275b5f643a0da1049315746185b1982 SHA1 cdaaab783f9bea7a34d235ea6addffc6c408bbaf SHA256 fd220135f7c3920fa61fecb4a240bb51fd22a5b9a606e65f3b2439ef6ab177ec
 DIST hibernate-script-1.97.tar.gz 81504 RMD160 6346a098f0892e6cffd547b0b7d042a51f298bb2 SHA1 c695ded89845ce6fa14eb85bd0401ab1196baa93 SHA256 8374bedc80206a6708c10d9814b92bebed3d9e4966c01c2d086e9e5b5646827c
 EBUILD hibernate-script-1.95-r2.ebuild 1992 RMD160 fd4510492a6dfae501d5af788a09a6efd2f0aa98 SHA1 a8346a0e6649c6e75bee2bbe3c64a41ff33b1341 SHA256 27db8efa3f769c8fd5881d3875d6a1a22aa31acfdee77a2d07b283ddf22bc754
 MD5 ad817897555a59aa90a13c8347500316 hibernate-script-1.95-r2.ebuild 1992
@@ -26,10 +27,14 @@ EBUILD hibernate-script-1.97-r2.ebuild 1793 RMD160 be770b6198fe871ae81ae2ba746a2
 MD5 4011b8140b6b703eda5c5ef15c2e729f hibernate-script-1.97-r2.ebuild 1793
 RMD160 be770b6198fe871ae81ae2ba746a211157baae1b hibernate-script-1.97-r2.ebuild 1793
 SHA256 f55088afbf5c1c5e5bc6f4e7c9790dbbb493845ff0cc47e568fa8ee036eba17d hibernate-script-1.97-r2.ebuild 1793
-MISC ChangeLog 15399 RMD160 c15582241defab99dc26754c31c8c78612230bad SHA1 1cade1eea2ab646e65bf03d46dd139644f28d976 SHA256 791a85f2c8c4d8bcad1f5cb1a591b16ed4c185e9839b077b48b2579f9da4f32b
-MD5 3684bd6b6e085a0d76288cd12f56a7cb ChangeLog 15399
-RMD160 c15582241defab99dc26754c31c8c78612230bad ChangeLog 15399
-SHA256 791a85f2c8c4d8bcad1f5cb1a591b16ed4c185e9839b077b48b2579f9da4f32b ChangeLog 15399
+EBUILD hibernate-script-1.97-r3.ebuild 1793 RMD160 9932f123330fbe113632efd26827ef37cda2eac2 SHA1 3079e2638bb9e6a96a9c1407ec23b3c02b422f59 SHA256 a633fba97f6057b553411b9f24eadec354025595bb01b24277eb651ddd891a87
+MD5 660751a430be61c20a5e55fac5c4b720 hibernate-script-1.97-r3.ebuild 1793
+RMD160 9932f123330fbe113632efd26827ef37cda2eac2 hibernate-script-1.97-r3.ebuild 1793
+SHA256 a633fba97f6057b553411b9f24eadec354025595bb01b24277eb651ddd891a87 hibernate-script-1.97-r3.ebuild 1793
+MISC ChangeLog 15590 RMD160 11d4924adaaff5fe9bbc916741d326b40ee344f4 SHA1 5f868f6db2f3e80825f3c4172e76c294fc195e83 SHA256 9fc79028e5ab9882ad1bd98b63badd3813e494b6bdffe387498732bf3b2447b3
+MD5 605de3fb6ff69f7b9209dd8c7926c85c ChangeLog 15590
+RMD160 11d4924adaaff5fe9bbc916741d326b40ee344f4 ChangeLog 15590
+SHA256 9fc79028e5ab9882ad1bd98b63badd3813e494b6bdffe387498732bf3b2447b3 ChangeLog 15590
 MISC metadata.xml 252 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc SHA1 470749f04141ca780f2be602666b266f755e338e SHA256 9a7aee2a060e353cb5db8caa34babf5dca6ee95233a0b52443f4d02e90c35b31
 MD5 bc8aba6f9d14b92e55fcc05e22ce4956 metadata.xml 252
 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc metadata.xml 252
@@ -49,3 +54,6 @@ SHA256 c0680db20d31494ae876d4d36c849d3ada1ff50278d5b1ebc28d141332a8e78f files/di
 MD5 4a5e0e03e789a3689f2912784f607f15 files/digest-hibernate-script-1.97-r2 554
 RMD160 8aecac8830884de58dcd782326f8955f26657a34 files/digest-hibernate-script-1.97-r2 554
 SHA256 8c2a7e8c9a31dc9a1f0ad5a88034d42e7c4a9b7a75f12c68f294d33583e160f6 files/digest-hibernate-script-1.97-r2 554
+MD5 46dc7ab155ba637ae7a80add37c65a15 files/digest-hibernate-script-1.97-r3 554
+RMD160 ba28ebc4cb004e6751f801d143d6320caa078153 files/digest-hibernate-script-1.97-r3 554
+SHA256 57719c77e6c35996c27a46bea25035069e0cfb7288d9d5d31a3560bfb4139d49 files/digest-hibernate-script-1.97-r3 554
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r3 b/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r3
new file mode 100644
index 000000000000..6dd3bfc300e4
--- /dev/null
+++ b/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r3
@@ -0,0 +1,6 @@
+MD5 a6155e1e3d145a35fa0e5c1485a7341e hibernate-script-1.97-patches-4.tar.bz2 3280
+RMD160 b1c048ef4275b5f643a0da1049315746185b1982 hibernate-script-1.97-patches-4.tar.bz2 3280
+SHA256 fd220135f7c3920fa61fecb4a240bb51fd22a5b9a606e65f3b2439ef6ab177ec hibernate-script-1.97-patches-4.tar.bz2 3280
+MD5 c3551238a2fe8bbe7b0e20322d8e02a5 hibernate-script-1.97.tar.gz 81504
+RMD160 6346a098f0892e6cffd547b0b7d042a51f298bb2 hibernate-script-1.97.tar.gz 81504
+SHA256 8374bedc80206a6708c10d9814b92bebed3d9e4966c01c2d086e9e5b5646827c hibernate-script-1.97.tar.gz 81504
diff --git a/sys-power/hibernate-script/hibernate-script-1.97-r3.ebuild b/sys-power/hibernate-script/hibernate-script-1.97-r3.ebuild
new file mode 100644
index 000000000000..207de08855a4
--- /dev/null
+++ b/sys-power/hibernate-script/hibernate-script-1.97-r3.ebuild
@@ -0,0 +1,69 @@
+# 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.97-r3.ebuild,v 1.1 2007/11/25 06:08:17 alonbl Exp $
+
+inherit eutils
+
+PATCH_VERSION="4"
+
+DESCRIPTION="Hibernate script supporting multiple suspend methods"
+HOMEPAGE="http://www.tuxonice.net/"
+SRC_URI="http://www.tuxonice.net/downloads/all/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+IUSE="vim-syntax"
+
+DEPEND=""
+RDEPEND="!<media-gfx/splashutils-1.5.2"
+
+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-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins hibernate.vim
+	fi
+
+	dodoc CHANGELOG README SCRIPTLET-API hibernate.vim
+
+	insinto /etc/logrotate.d
+	newins "${S}"/logrotate.d-hibernate-script hibernate-script
+}
+
+pkg_postinst() {
+	elog
+	elog "You should run the following command to invalidate suspend"
+	elog "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."
+}