Sync some patches from upstream

Package-Manager: portage-2.1.3.9

4 files changed, 97 insertions, 5 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index a7d3e73eda72..1adb4e8cb8fa 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.62 2007/07/17 03:58:38 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.63 2007/09/12 22:54:46 alonbl Exp $
+
+*hibernate-script-1.96-r1 (12 Sep 2007)
+
+  12 Sep 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +hibernate-script-1.96-r1.ebuild:
+  Sync some patches from upstream
 
 *hibernate-script-1.96 (17 Jul 2007)
 
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 8de7303f2305..acf6e1ea97d0 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -2,6 +2,7 @@ DIST hibernate-script-1.95-patches-2.tar.bz2 1609 RMD160 f98fc6514d2ba2a861e9146
 DIST hibernate-script-1.95-patches-3.tar.bz2 2111 RMD160 5a78ac9187b179f13576cef781516a3f6f6d4e51 SHA1 684684562cb8a1fa052109eea836f9345d4b7c83 SHA256 2363769ecd92dcfce1cda7dbc025058059f4cfd1b8f75751bf2e182691879c6b
 DIST hibernate-script-1.95.tar.gz 74954 RMD160 032cb97c355248640107e779f99ad5a86fb74846 SHA1 07aaf88db45a9f38ec794deed79cf6a05d63cb59 SHA256 e0c73cd1c3af2c0f409dba07e6fbd86c23150cfe77c4f9286ce239aedbe0a123
 DIST hibernate-script-1.96-patches-1.tar.bz2 1225 RMD160 976b2509c35b1de7978919075d59fd924d0584ae SHA1 b011bbf455cd8cd61ba36f9328640389fe220833 SHA256 e2931874186396ea4b12c251952d2300cf3c96681fa486f178f2f23ba20620df
+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
 EBUILD hibernate-script-1.95-r2.ebuild 2079 RMD160 f9ac65668ad7aae51ebac0f6152451abd4675741 SHA1 d57493b0b8e7345109af23e26703581ceaf51a75 SHA256 c3916a22c70ddc22383801f341e0b0155cf3451c86ddae63b344958d56f4e2c0
 MD5 bac29dcbabaff1acb457859ae4a87652 hibernate-script-1.95-r2.ebuild 2079
@@ -11,14 +12,18 @@ EBUILD hibernate-script-1.95-r3.ebuild 1873 RMD160 b68f6625eb0071acba645e58b0d38
 MD5 8941b6d3dae7990c88b1553a083a2e0c hibernate-script-1.95-r3.ebuild 1873
 RMD160 b68f6625eb0071acba645e58b0d38eb447462fef hibernate-script-1.95-r3.ebuild 1873
 SHA256 cf236e915c35ac325ccef6ed4e0014eb233577aee24c5d681392fbc94568c807 hibernate-script-1.95-r3.ebuild 1873
+EBUILD hibernate-script-1.96-r1.ebuild 1904 RMD160 cea4593b5fb25d2952d3f88adbdedd1fc73dac35 SHA1 425b545e33c83ce921d205fcfa01e7a3ee617463 SHA256 965db87de174c85ff156ab43b494758db70ce74fdffd98cf1941b6af93021858
+MD5 67d86820460da0d64f3fa1e7a9734c82 hibernate-script-1.96-r1.ebuild 1904
+RMD160 cea4593b5fb25d2952d3f88adbdedd1fc73dac35 hibernate-script-1.96-r1.ebuild 1904
+SHA256 965db87de174c85ff156ab43b494758db70ce74fdffd98cf1941b6af93021858 hibernate-script-1.96-r1.ebuild 1904
 EBUILD hibernate-script-1.96.ebuild 1870 RMD160 551a6e09c25e253a9d21e6fbfbfb8cf44f82dcd4 SHA1 c44bcfd45abf57d9c985399f49bd887416a52db0 SHA256 4286a0be24274ec938d3d306c2a71269bfdc9dbe8b6a11518640ce256e58e03a
 MD5 3da529df81cf2b92987e0fdf01b16fa2 hibernate-script-1.96.ebuild 1870
 RMD160 551a6e09c25e253a9d21e6fbfbfb8cf44f82dcd4 hibernate-script-1.96.ebuild 1870
 SHA256 4286a0be24274ec938d3d306c2a71269bfdc9dbe8b6a11518640ce256e58e03a hibernate-script-1.96.ebuild 1870
-MISC ChangeLog 13996 RMD160 ea6115dab8500779d7540d364c00dac0679ab5f1 SHA1 231a2beea70b3676439e03ba2f69643e6a59580d SHA256 6d6b73fada2d6cb71cc128e211d63e177dc5b2f7c8c9e4bee4b63754720a3704
-MD5 e3662d999c1331ca64b7785d2837e70f ChangeLog 13996
-RMD160 ea6115dab8500779d7540d364c00dac0679ab5f1 ChangeLog 13996
-SHA256 6d6b73fada2d6cb71cc128e211d63e177dc5b2f7c8c9e4bee4b63754720a3704 ChangeLog 13996
+MISC ChangeLog 14156 RMD160 0b229f5c3eea27eea25b0654124ef879ed9a2c9c SHA1 012c3675b5d6577d69760350c0df2cab6f964cec SHA256 924cce84d4812ac5e925d70704979c42edb99c0848fc05302198908480551b3c
+MD5 19a80590213e1b8ece31f2ba2055c512 ChangeLog 14156
+RMD160 0b229f5c3eea27eea25b0654124ef879ed9a2c9c ChangeLog 14156
+SHA256 924cce84d4812ac5e925d70704979c42edb99c0848fc05302198908480551b3c ChangeLog 14156
 MISC metadata.xml 252 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc SHA1 470749f04141ca780f2be602666b266f755e338e SHA256 9a7aee2a060e353cb5db8caa34babf5dca6ee95233a0b52443f4d02e90c35b31
 MD5 bc8aba6f9d14b92e55fcc05e22ce4956 metadata.xml 252
 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc metadata.xml 252
@@ -32,3 +37,6 @@ SHA256 ee77a7e154efea3963561d998288bd2024d86a943d5677aeba92efbb2399d139 files/di
 MD5 912aa28a0c5135189fa704e2427c67c1 files/digest-hibernate-script-1.96 554
 RMD160 6f863af5a5b2730bdb8ed26de285d965e0c09f71 files/digest-hibernate-script-1.96 554
 SHA256 7aaa441621a8d00f7dc7b90ad5ca9b65f12577f54a0b62df11e2bfb262c3704b files/digest-hibernate-script-1.96 554
+MD5 ad29ab60d1b4763775c1fbfd89108c7c files/digest-hibernate-script-1.96-r1 554
+RMD160 344a25442e3d27b79367994d2dfe2c2e2a4c296f files/digest-hibernate-script-1.96-r1 554
+SHA256 c0680db20d31494ae876d4d36c849d3ada1ff50278d5b1ebc28d141332a8e78f files/digest-hibernate-script-1.96-r1 554
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.96-r1 b/sys-power/hibernate-script/files/digest-hibernate-script-1.96-r1
new file mode 100644
index 000000000000..6cbe150b3d56
--- /dev/null
+++ b/sys-power/hibernate-script/files/digest-hibernate-script-1.96-r1
@@ -0,0 +1,6 @@
+MD5 acb6efbcac82d00ea757f67ae3a7e993 hibernate-script-1.96-patches-2.tar.bz2 4254
+RMD160 89493fde6655201da028bacbe73e8b0c9390167f hibernate-script-1.96-patches-2.tar.bz2 4254
+SHA256 bef31573f00bd08330660b45f272409356abaab498abd34a4b48f868841d379d hibernate-script-1.96-patches-2.tar.bz2 4254
+MD5 1ca5fc5505131c0fa08cfcc1caf39b0f hibernate-script-1.96.tar.gz 77958
+RMD160 d0542e0f5e96a27d8b40ab64a72abe74a89f0419 hibernate-script-1.96.tar.gz 77958
+SHA256 b5b155808864d0f8351d002c01805c1ec02f5573698efc49e91ad703fbe96f4b hibernate-script-1.96.tar.gz 77958
diff --git a/sys-power/hibernate-script/hibernate-script-1.96-r1.ebuild b/sys-power/hibernate-script/hibernate-script-1.96-r1.ebuild
new file mode 100644
index 000000000000..ee8cb153808e
--- /dev/null
+++ b/sys-power/hibernate-script/hibernate-script-1.96-r1.ebuild
@@ -0,0 +1,72 @@
+# 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.96-r1.ebuild,v 1.1 2007/09/12 22:54:46 alonbl Exp $
+
+inherit eutils
+
+PATCH_VERSION="2"
+
+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="logrotate vim-syntax"
+
+DEPEND="sys-apps/sed"
+RDEPEND="logrotate? ( app-admin/logrotate )
+	!<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
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${S}"/logrotate.d-hibernate-script hibernate-script
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "If you run suspend2, you should run the following command to"
+	elog "invalidate 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."
+}