Revision bump. According to #140931 net-wireless/rt2500 (and to the rt2500 ticket #1472869) it should now work properly after resuming. Thanks to Colin Carle <colin.carle at gmail.com> for the patches!

Package-Manager: portage-2.1.1_pre3-r1

3 files changed, 18 insertions, 104 deletions

diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 85806351d04d..646dc0dfc6f4 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -25,20 +25,24 @@ AUX hibernate-script-1.93-return.patch 480 RMD160 f19aaa387bb1fb2ffa63a6d36e1178
 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.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-r2.ebuild 2383 RMD160 6526d7d03b6f103d2262825ef4a0a6a1b4a2a972 SHA1 72ff7e2066217d0f9f4ca47dbf1825c62e7b329c SHA256 cb6d16d05b915e0e1408872bc707527accd19923dd69f4516ac15ad3099098bc
-MD5 8a659e91b610827624816b218ffe0a6b hibernate-script-1.93-r2.ebuild 2383
-RMD160 6526d7d03b6f103d2262825ef4a0a6a1b4a2a972 hibernate-script-1.93-r2.ebuild 2383
-SHA256 cb6d16d05b915e0e1408872bc707527accd19923dd69f4516ac15ad3099098bc hibernate-script-1.93-r2.ebuild 2383
-MISC ChangeLog 7125 RMD160 85fc0e819f8220daf7b76e893ea3c44f8794b4b5 SHA1 a07e2e6199abc32775727cd67b435c8186e5337b SHA256 c1c7e6d35c18d8f8d82a86fb75491f3910476e9cd595e53aaee6a9c5cc54422e
-MD5 fb1337885ae540ed7c6d608fbef60342 ChangeLog 7125
-RMD160 85fc0e819f8220daf7b76e893ea3c44f8794b4b5 ChangeLog 7125
-SHA256 c1c7e6d35c18d8f8d82a86fb75491f3910476e9cd595e53aaee6a9c5cc54422e ChangeLog 7125
+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
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -46,13 +50,13 @@ 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-r2 262
-RMD160 ea48cd11767637391c710a50b80e13cfd49ad29a files/digest-hibernate-script-1.93-r2 262
-SHA256 9978a523acc1585caafd33a5cfe59cbbc184479cb65abef81141e8ae2e10ba37 files/digest-hibernate-script-1.93-r2 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)
 
-iD8DBQFEuU0JflZ8QqxhrsMRAkWtAJ0W/XLq9JLNdhil+n1wcaVFsPAKRwCaA/fj
-ejAHp92vjChq5eVvEojVZfQ=
-=7F5d
+iD8DBQFEvdOLflZ8QqxhrsMRAtufAJ9MDRQpDojF2y1i7BPXtqy2mT/NvACguNFK
+yBXTinrs2FH7iJGUOAY62OI=
+=+4ol
 -----END PGP SIGNATURE-----
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r2 b/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r2
deleted file mode 100644
index 422838b8f2d0..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r2
+++ /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/hibernate-script-1.93-r2.ebuild b/sys-power/hibernate-script/hibernate-script-1.93-r2.ebuild
deleted file mode 100644
index 11adabd7a340..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.93-r2.ebuild
+++ /dev/null
@@ -1,87 +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-r2.ebuild,v 1.2 2006/07/15 20:15:51 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
-	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
-}