CVS broke again while commiting .. (continuing the commit, removing the remaining patches)

(Portage version: 2.1.1_pre3-r3)

8 files changed, 12 insertions, 227 deletions

diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 646dc0dfc6f4..7af19513f6cf 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX hibernate-script-1.12-gentoo.patch 834 RMD160 3eef1a8651344191491b2687d472a860d4af5bbd SHA1 128ddf545adb0c93d3169406a0cebf8d0f67f55f SHA256 e54d9ea0a6664dbe51cb44c1802f63472e3d3b493e0b5c2730366922a02d5aee
 MD5 4771f1307f9d9d0d08fdfa6b4de5af48 files/hibernate-script-1.12-gentoo.patch 834
 RMD160 3eef1a8651344191491b2687d472a860d4af5bbd files/hibernate-script-1.12-gentoo.patch 834
@@ -9,40 +6,21 @@ AUX hibernate-script-1.12-misc.patch 522 RMD160 adcbb3512be0c9a77474ac8569a8d917
 MD5 296333753a66d9b42c6a1f25b2c432f3 files/hibernate-script-1.12-misc.patch 522
 RMD160 adcbb3512be0c9a77474ac8569a8d917ee0336f0 files/hibernate-script-1.12-misc.patch 522
 SHA256 37dc4bd19419c213ed69b541634cf9d4d3a74ba4ac073819a3a2771e2ca8913a files/hibernate-script-1.12-misc.patch 522
-AUX hibernate-script-1.93-gentoo.patch 969 RMD160 a8bf928cb05067eb1bb4083cebd94b2b2bf77140 SHA1 86561348752ae7d2c6844747894426c2b079d717 SHA256 bf310f22a0e8e26cb019304b2bb269e41d80ec1565b00a86019d56eb0e9669f8
-MD5 f90ea8652e5cacb6620f03984f2bc0f4 files/hibernate-script-1.93-gentoo.patch 969
-RMD160 a8bf928cb05067eb1bb4083cebd94b2b2bf77140 files/hibernate-script-1.93-gentoo.patch 969
-SHA256 bf310f22a0e8e26cb019304b2bb269e41d80ec1565b00a86019d56eb0e9669f8 files/hibernate-script-1.93-gentoo.patch 969
-AUX hibernate-script-1.93-kde-lock-session.patch 1012 RMD160 d3e08db2c00fbaccd1079d24466f304669d60b9b SHA1 7ba0369c629062987547bb11e73853bb1e56f6b8 SHA256 12970bdab6d105f19e169fa65b32cf74672d368b81c28a5446d3fc2f970a3350
-MD5 0baf228bac29d4d4e77c72f5904dda0e files/hibernate-script-1.93-kde-lock-session.patch 1012
-RMD160 d3e08db2c00fbaccd1079d24466f304669d60b9b files/hibernate-script-1.93-kde-lock-session.patch 1012
-SHA256 12970bdab6d105f19e169fa65b32cf74672d368b81c28a5446d3fc2f970a3350 files/hibernate-script-1.93-kde-lock-session.patch 1012
-AUX hibernate-script-1.93-last_result.patch 617 RMD160 f4e234cb46a13f517548abc4ca3ebf1ac59c2049 SHA1 a15377ad3cea602683d39a15348389c216f4c332 SHA256 1c34d09131f10b14b9c53e44c455a37df018b0ca5c1414db3aab3c13419c9657
-MD5 a448f61b3214198e602e2f420097af75 files/hibernate-script-1.93-last_result.patch 617
-RMD160 f4e234cb46a13f517548abc4ca3ebf1ac59c2049 files/hibernate-script-1.93-last_result.patch 617
-SHA256 1c34d09131f10b14b9c53e44c455a37df018b0ca5c1414db3aab3c13419c9657 files/hibernate-script-1.93-last_result.patch 617
-AUX hibernate-script-1.93-return.patch 480 RMD160 f19aaa387bb1fb2ffa63a6d36e11789bca71bffe SHA1 011a7ea253d41f164cfcbfab369eaf91cacbeec1 SHA256 cbc8d072300a26f01fc3991479d9957f8b93a890f58dd301dcc494114b188cd7
-MD5 8bc805abdb839daf8b699a861bb4ba2a files/hibernate-script-1.93-return.patch 480
-RMD160 f19aaa387bb1fb2ffa63a6d36e11789bca71bffe files/hibernate-script-1.93-return.patch 480
-SHA256 cbc8d072300a26f01fc3991479d9957f8b93a890f58dd301dcc494114b188cd7 files/hibernate-script-1.93-return.patch 480
-AUX hibernate-script-1.93-rt2500-blacklist.patch 311 RMD160 e9be8f7739695ac442e8b9893e3ea7f9036987b7 SHA1 4bc03c1771dea95096b4f1344671584db09845ed SHA256 15397cd22a0d5b352f2d3ef9941fd48029627328aba0be242e2abd306786551f
-MD5 04cb196908bc78d135f5ebb3d9ac1d58 files/hibernate-script-1.93-rt2500-blacklist.patch 311
-RMD160 e9be8f7739695ac442e8b9893e3ea7f9036987b7 files/hibernate-script-1.93-rt2500-blacklist.patch 311
-SHA256 15397cd22a0d5b352f2d3ef9941fd48029627328aba0be242e2abd306786551f files/hibernate-script-1.93-rt2500-blacklist.patch 311
 DIST hibernate-script-1.12.tar.gz 64752 RMD160 3c2811d633727afd63f12062730515c9f6b16c4c SHA1 ba572234e0189dd9a64e26f5bacd14610551aa45 SHA256 dd1c1bb297fc4bfdce73614322cb60d92d99db719e473b9cbb4c62e0ea444147
+DIST hibernate-script-1.93-patches-0.1.tar.bz2 3184 RMD160 d9c0d4d4c5e55ca39b858ee5d2c1ec51b997071a SHA1 f929ed9540a2f28886a9db322d98db7588774e3a SHA256 c0b53f2398b4da55a25b4a7823cb7c93932dd2c118e272558e959a36a89ee6cb
 DIST hibernate-script-1.93.tar.gz 68644 RMD160 bbb59d7ac5c7a26667cb00c5dd32224ad3eb8f01 SHA1 cea3ece2fdbe277c3e1878fd2acb9a728138c5f6 SHA256 8020d653cc09d1724f700e2b28cf5ce83eef3ffd287304141357eef2c22db366
 EBUILD hibernate-script-1.12-r1.ebuild 1974 RMD160 ccc26a0d4ab187628a79b8c4312038615e74573d SHA1 e277b36a60dc3f66802bccc8a47151f0c1ab8e3b SHA256 9d3fa9cd0ca38f4ab75056d4dc470176c9f9bd2cf00045be58f77083655b789d
 MD5 53831bcba1472acf2c180f2e6e754a63 hibernate-script-1.12-r1.ebuild 1974
 RMD160 ccc26a0d4ab187628a79b8c4312038615e74573d hibernate-script-1.12-r1.ebuild 1974
 SHA256 9d3fa9cd0ca38f4ab75056d4dc470176c9f9bd2cf00045be58f77083655b789d hibernate-script-1.12-r1.ebuild 1974
-EBUILD hibernate-script-1.93-r3.ebuild 2433 RMD160 0f9f0218f690eb3ec9504b0e41897f41a2942dff SHA1 3fef77471c682b354dec87a41cc97ecfdace3480 SHA256 8d0855b647bf8f550ac43eb19ace0331d1c2f5301a3a896f755c34f750f4c782
-MD5 22df6be3948c82e2cd69f0f4d295d2e6 hibernate-script-1.93-r3.ebuild 2433
-RMD160 0f9f0218f690eb3ec9504b0e41897f41a2942dff hibernate-script-1.93-r3.ebuild 2433
-SHA256 8d0855b647bf8f550ac43eb19ace0331d1c2f5301a3a896f755c34f750f4c782 hibernate-script-1.93-r3.ebuild 2433
-MISC ChangeLog 7550 RMD160 79751e786a3303dd3e80935a4c026e8e99bed879 SHA1 ae3f07cf7f5e7ff9679401697def1bd40781dbfc SHA256 5660d53712c784a58b994af541958e2c7f27032800f7b12b81c4c104dc74ae1a
-MD5 6dbe405ab3f56eafd993b289ef84f578 ChangeLog 7550
-RMD160 79751e786a3303dd3e80935a4c026e8e99bed879 ChangeLog 7550
-SHA256 5660d53712c784a58b994af541958e2c7f27032800f7b12b81c4c104dc74ae1a ChangeLog 7550
+EBUILD hibernate-script-1.93-r4.ebuild 2028 RMD160 7124e1fba3fb8ccc933feb93cf6bd0630610bfa1 SHA1 098b7e5d7321130345eea6f3a4dbc26a9af9fd49 SHA256 7facb94fa5cd5dc94364f777d337e3959a75a623c81bb51cae7a177becf13d39
+MD5 b321d0593d0a0f57600d7fe620eeae5b hibernate-script-1.93-r4.ebuild 2028
+RMD160 7124e1fba3fb8ccc933feb93cf6bd0630610bfa1 hibernate-script-1.93-r4.ebuild 2028
+SHA256 7facb94fa5cd5dc94364f777d337e3959a75a623c81bb51cae7a177becf13d39 hibernate-script-1.93-r4.ebuild 2028
+MISC ChangeLog 8248 RMD160 14f829a7fcfceee3c25cef4ff90e396189ed9e32 SHA1 df2ed9f283512794e21fc0f98773813cd926ac8d SHA256 b98ba78a1da51e8d03d35928b39207983b34cebb7b2b0349fd96c0140eecac73
+MD5 76d2f391c718b342d840b765554f30bd ChangeLog 8248
+RMD160 14f829a7fcfceee3c25cef4ff90e396189ed9e32 ChangeLog 8248
+SHA256 b98ba78a1da51e8d03d35928b39207983b34cebb7b2b0349fd96c0140eecac73 ChangeLog 8248
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -50,13 +28,6 @@ SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb metadata
 MD5 0c2af54d8ff3276d4ad0f267a4e034ca files/digest-hibernate-script-1.12-r1 262
 RMD160 021b4883dc2d937fd49b8baf01418704172ae599 files/digest-hibernate-script-1.12-r1 262
 SHA256 245468f631843dc85438ff9e62e91fbee4a39ce575f577bf8b536de5078a39b9 files/digest-hibernate-script-1.12-r1 262
-MD5 6df4f13730ccce8b2c2c007a366e32d3 files/digest-hibernate-script-1.93-r3 262
-RMD160 ea48cd11767637391c710a50b80e13cfd49ad29a files/digest-hibernate-script-1.93-r3 262
-SHA256 9978a523acc1585caafd33a5cfe59cbbc184479cb65abef81141e8ae2e10ba37 files/digest-hibernate-script-1.93-r3 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEvdOLflZ8QqxhrsMRAtufAJ9MDRQpDojF2y1i7BPXtqy2mT/NvACguNFK
-yBXTinrs2FH7iJGUOAY62OI=
-=+4ol
------END PGP SIGNATURE-----
+MD5 c08cbd333e65548e8748e3badf6b256e files/digest-hibernate-script-1.93-r4 560
+RMD160 5d9b38025f31dd14db02a98af21c60f80a3c2c13 files/digest-hibernate-script-1.93-r4 560
+SHA256 e085f4442e842de51e2ae93343f72d990747342993b8508f5a3a04dfc1c12827 files/digest-hibernate-script-1.93-r4 560
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r3 b/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r3
deleted file mode 100644
index 422838b8f2d0..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 903e30d67bcdf728f245a71b9ec412e2 hibernate-script-1.93.tar.gz 68644
-RMD160 bbb59d7ac5c7a26667cb00c5dd32224ad3eb8f01 hibernate-script-1.93.tar.gz 68644
-SHA256 8020d653cc09d1724f700e2b28cf5ce83eef3ffd287304141357eef2c22db366 hibernate-script-1.93.tar.gz 68644
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch b/sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch
deleted file mode 100644
index b1cdec0de1a5..000000000000
--- a/sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: hibernate-script-1.93/init.d/hibernate-cleanup.sh
-===================================================================
---- hibernate-script-1.93.orig/init.d/hibernate-cleanup.sh
-+++ hibernate-script-1.93/init.d/hibernate-cleanup.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/sbin/runscript
- 
- # This script invalidates any stale swsusp and Software Suspend 2 images. It
- # searches all swap partitions on your machine, as well as Suspend2's
-@@ -66,17 +66,14 @@ check_filewriter_sig() {
- 	esac
- }
- 
--case "$1" in
--start)
--        echo -n "Clearing Software Suspend 2 signatures... "
--        check_swap_sig
--        check_filewriter_sig
--        echo "done."
--        ;;
--stop|restart|force-reload)
--        ;;
--*)
--        echo "Usage: /etc/init.d/hibernate {start|stop|restart|force-reload}"
--esac
-+depend() {
-+	after localmount
-+	before bootmisc
-+}
- 
--exit 0
-+start() {
-+	ebegin "Clearing Software Suspend 2 signatures"
-+	check_swap_sig
-+	check_filewriter_sig
-+	eend $?
-+}
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.93-kde-lock-session.patch b/sys-power/hibernate-script/files/hibernate-script-1.93-kde-lock-session.patch
deleted file mode 100644
index b674335c98c4..000000000000
--- a/sys-power/hibernate-script/files/hibernate-script-1.93-kde-lock-session.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: hibernate-script-1.93/scriptlets.d/lock
-===================================================================
---- hibernate-script-1.93.orig/scriptlets.d/lock
-+++ hibernate-script-1.93/scriptlets.d/lock
-@@ -45,9 +45,14 @@ LockKDE() {
- 
-     # send the lock command to all sessions
-     for session in $avail_sessions; do
--	vecho 1 "Locking $session"
--	# dev/null because dcop warns if it can't connect to X (this is normal!)
--	dcop --session "$session" --all-users kdesktop KScreensaverIface lock > /dev/null 2>&1
-+	locked=`dcop --session "$session" --all-users kdesktop KScreensaverIface isBlanked 2>/dev/null`
-+	if [ x"$locked" = "xtrue" ] ; then
-+		vecho 1 "Session $session is already locked!"
-+	else
-+		vecho 1 "Locking session $session"
-+		# dev/null because dcop warns if it can't connect to X (this is normal!)
-+		dcop --session "$session" --all-users kdesktop KScreensaverIface lock > /dev/null 2>&1
-+	fi
-     done
- 
-     # returning 0 because dcop warns if it can't connect to X (this is normal!)
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.93-last_result.patch b/sys-power/hibernate-script/files/hibernate-script-1.93-last_result.patch
deleted file mode 100644
index 7c7ca3e5cec5..000000000000
--- a/sys-power/hibernate-script/files/hibernate-script-1.93-last_result.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: hibernate-script-1.93/scriptlets.d/suspend2
-===================================================================
---- hibernate-script-1.93.orig/scriptlets.d/suspend2
-+++ hibernate-script-1.93/scriptlets.d/suspend2
-@@ -525,7 +525,7 @@ CleanupDmesg() {
- # PrintErrors. We can't just return it, because error codes may be > 255
- DoSuspend() {
-     # Some versions of Software Suspend didn't clear this in certain cases:
--    echo 0 > $SWSUSP_ROOT/last_result
-+    [ -w $SWSUSP_ROOT/last_result ] && echo 0 > $SWSUSP_ROOT/last_result
- 
-     if [ -f $SWSUSP_ROOT/do_suspend ] ; then
- 	echo > $SWSUSP_ROOT/do_suspend
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.93-return.patch b/sys-power/hibernate-script/files/hibernate-script-1.93-return.patch
deleted file mode 100644
index 655b10fab352..000000000000
--- a/sys-power/hibernate-script/files/hibernate-script-1.93-return.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hibernate-script-1.93/init.d/hibernate-cleanup.sh	2006-07-12 06:15:43.000000000 -0400
-+++ hibernate-script-1.93-fwreturn/init.d/hibernate-cleanup.sh	2006-07-15 12:17:41.000000000 -0400
-@@ -55,7 +55,7 @@
- 
- check_filewriter_sig() {
- 	local target
--	[ -f "$HIBERNATE_FILEWRITER_TRAIL" ] || return
-+	[ -f "$HIBERNATE_FILEWRITER_TRAIL" ] || return 0
- 	read target < $HIBERNATE_FILEWRITER_TRAIL
- 	[ -f "$target" ] || return
- 	case "`dd \"if=$target\" bs=8 count=1 2>/dev/null`" in
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.93-rt2500-blacklist.patch b/sys-power/hibernate-script/files/hibernate-script-1.93-rt2500-blacklist.patch
deleted file mode 100644
index 38c72d2d74bd..000000000000
--- a/sys-power/hibernate-script/files/hibernate-script-1.93-rt2500-blacklist.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: hibernate-script-1.93/scriptlets.d/lock
---- hibernate-script-1.93.orig/blacklisted-modules
-+++ hibernate-script-1.93/blacklisted-modules
-@@ -52,7 +52,6 @@
- via_rhine	2.6.0	2.6.99
- i8042		2.6.10	2.6.99
- intel_mch_agp	2.6.0	2.6.99
--rt2500		2.6.0	2.6.99
- 
- button		2.6.9	2.6.99
- speedstep_smi	2.6.12	2.6.99
diff --git a/sys-power/hibernate-script/hibernate-script-1.93-r3.ebuild b/sys-power/hibernate-script/hibernate-script-1.93-r3.ebuild
deleted file mode 100644
index 68bd0e4fb7e2..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.93-r3.ebuild
+++ /dev/null
@@ -1,88 +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.93-r3.ebuild,v 1.1 2006/07/19 06:39:03 phreak Exp $
-
-inherit eutils
-
-DESCRIPTION="Hibernate script supporting multiple suspend methods"
-HOMEPAGE="http://www.suspend2.net/"
-SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz"
-
-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}"
-
-	# remove obsolete swsusp2_15 scriptlet
-	rm -f "${S}"/scriptlets.d/swsusp2_15
-
-	epatch "${FILESDIR}"/${P}-last_result.patch
-	epatch "${FILESDIR}"/${P}-kde-lock-session.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-return.patch
-	epatch "${FILESDIR}"/${P}-rt2500-blacklist.patch
-	ebegin "Applying ${P}-common.conf.patch"
-	sed -i \
-		-e "s:^# \(Distribution\).*:\1 gentoo:" \
-		"${S}"/common.conf
-	eend $?
-
-	ebegin "Applying ${P}-suspend2.conf.patch"
-	sed -i \
-		-e "s:/usr/local::" \
-		"${S}"/suspend2.conf
-	eend $?
-}
-
-src_install() {
-	BASE_DIR="${D}" PREFIX=/usr MAN_DIR="${D}"/usr/share/man \
-		"${S}"/install.sh
-
-	# 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() {
-	einfo
-	einfo "You should run the following command to invalidate"
-	einfo "suspend images on a clean boot."
-	einfo
-	einfo "  # rc-update add hibernate-cleanup boot"
-	einfo
-	einfo "See /usr/share/doc/${PF}/README.gz for further details."
-	einfo
-	einfo "Please note that you will need to manually emerge any utilities"
-	einfo "(radeontool, vbetool, ...) enabled in the configuration files,"
-	einfo "should you wish to use them."
-	einfo
-	einfo "Starting with hibernate-script-1.90 the configuration files have"
-	einfo "been reordered and split into method specific files. Make sure you"
-	einfo "update your /etc/hibernate/ configuration files accordingly."
-	einfo
-}