Revision bump, fixing #147832. Moving the scriptlets.d/swsusp2_15 out of the gentoo.patch as it is causing rejects too often (just rm'ing it now within the ebuild). Removing old revisions.

Package-Manager: portage-2.1.2_pre1

5 files changed, 15 insertions, 179 deletions

diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index dd2c9fc30a40..b60455741509 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -10,25 +10,20 @@ 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
 DIST hibernate-script-1.12.tar.gz 64752 RMD160 3c2811d633727afd63f12062730515c9f6b16c4c SHA1 ba572234e0189dd9a64e26f5bacd14610551aa45 SHA256 dd1c1bb297fc4bfdce73614322cb60d92d99db719e473b9cbb4c62e0ea444147
-DIST hibernate-script-1.93-patches-0.2.tar.bz2 2954 RMD160 eb2fece800f6e0c09ffe34075d4b3f3d72fd91a8 SHA1 46b2fa612d395283dcebaa38aa5ff9512b7aeae8 SHA256 b7089ea3cf722d745175c2e3f52238836a5c4abc3ed9dcf3438f3c3c604b1101
-DIST hibernate-script-1.93-patches-0.3.tar.bz2 2923 RMD160 cc342709f2f677863c7cd4d117cb311bd33e1909 SHA1 d4d015e1a6a4b56f16b9a9f043ac8dac85c179f2 SHA256 cde72215832cd5a834b21d84003ae07dedafab8dfec571d956c83ee393cf6f16
+DIST hibernate-script-1.93-patches-0.4.tar.bz2 2763 RMD160 020e18249722507947b2fa37ff8350cfad4f6b14 SHA1 f0c2df16a4b8e2468a4e451b77594dbb24bda2be SHA256 fe021036d479500818a4e5586df50fc0af05489165b43d38625d76bbbab7533e
 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-r4.ebuild 2028 RMD160 f37dce5f2b8d45000a438ab2edda07d65a7dea6a SHA1 083cff55b245648e5f324ca475255a0d815459f5 SHA256 b9967a90515f1d13976626234fa46f7f48c427d5478aafa51c3fc2aab264348d
-MD5 77fa8912ce3e4644c82f18f969227f51 hibernate-script-1.93-r4.ebuild 2028
-RMD160 f37dce5f2b8d45000a438ab2edda07d65a7dea6a hibernate-script-1.93-r4.ebuild 2028
-SHA256 b9967a90515f1d13976626234fa46f7f48c427d5478aafa51c3fc2aab264348d hibernate-script-1.93-r4.ebuild 2028
-EBUILD hibernate-script-1.93-r5.ebuild 2028 RMD160 79863761347ff8c192b66d543e9057dce508dff7 SHA1 f66b07efaf497993b4589ff4d033a05b86e6194d SHA256 187cd5c8671dfc80167253e3defcf0fe2e040690bcff5d399701c72bae635581
-MD5 a66034fa25b24c9eb5796ac5923fee77 hibernate-script-1.93-r5.ebuild 2028
-RMD160 79863761347ff8c192b66d543e9057dce508dff7 hibernate-script-1.93-r5.ebuild 2028
-SHA256 187cd5c8671dfc80167253e3defcf0fe2e040690bcff5d399701c72bae635581 hibernate-script-1.93-r5.ebuild 2028
-MISC ChangeLog 8574 RMD160 50154039eec6e013ef79fdebf35f041312db1514 SHA1 792dbea518dbb246324634b13ba8a34f4542adb6 SHA256 b54b345c58daa704af3d6b444d44a2eb89e128a4da92e750288bacc8e9be5865
-MD5 be07cbca3c2b1eebe724f4fb54c1bf0f ChangeLog 8574
-RMD160 50154039eec6e013ef79fdebf35f041312db1514 ChangeLog 8574
-SHA256 b54b345c58daa704af3d6b444d44a2eb89e128a4da92e750288bacc8e9be5865 ChangeLog 8574
+EBUILD hibernate-script-1.93-r6.ebuild 2066 RMD160 2a75954413a47d1810f8fc0495fa385572732a9d SHA1 252cb169d82cd5f4f280e72cf8f4a0177aa05807 SHA256 defd306a6d79b0cb0214f127739a63a9f03f28f75e362238fe7cb7d1912b72e9
+MD5 057b79b6b9cf559d23e475d955218d40 hibernate-script-1.93-r6.ebuild 2066
+RMD160 2a75954413a47d1810f8fc0495fa385572732a9d hibernate-script-1.93-r6.ebuild 2066
+SHA256 defd306a6d79b0cb0214f127739a63a9f03f28f75e362238fe7cb7d1912b72e9 hibernate-script-1.93-r6.ebuild 2066
+MISC ChangeLog 8967 RMD160 896be07a3bd42a3ec03edd37d600748aa8d4efae SHA1 c19f2c0a6cff4befe25a2aeb10f37935f95f72de SHA256 49958f9ad18d1f709e5c700d6d692500ac2758f21f7d41975f971a4004415a47
+MD5 a4865bcfd2b1cc054a225f30e055f61f ChangeLog 8967
+RMD160 896be07a3bd42a3ec03edd37d600748aa8d4efae ChangeLog 8967
+SHA256 49958f9ad18d1f709e5c700d6d692500ac2758f21f7d41975f971a4004415a47 ChangeLog 8967
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -36,16 +31,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 dc35bd5bc6ff3524cf395ae67ab3509d files/digest-hibernate-script-1.93-r4 560
-RMD160 2cdf297e5dc38cec0765e15ad13ed6b8ada26184 files/digest-hibernate-script-1.93-r4 560
-SHA256 6fe4d2792bbb48a70dbf27b1cb5c3105822169bdb8044ac24e9cf370fafc4c1c files/digest-hibernate-script-1.93-r4 560
-MD5 57bc3d6bd997f087e806e7ecef2c72d4 files/digest-hibernate-script-1.93-r5 560
-RMD160 e20152c706a7491cd49dfe2e6d7bc389ac0ee1cf files/digest-hibernate-script-1.93-r5 560
-SHA256 c113ca04821f42cae10d8651e009a99eeebf76a1269eb1975b953e52a5e91809 files/digest-hibernate-script-1.93-r5 560
+MD5 93a2e7684ebf8e9629594a683ff9de2c files/digest-hibernate-script-1.93-r6 560
+RMD160 7ba7596281133aa00c3c3f714d557d99eb9b71e5 files/digest-hibernate-script-1.93-r6 560
+SHA256 845a015924d5ff96c6f3c47b1a6adab9dfc8cfac92d9497de4fc37b48054d551 files/digest-hibernate-script-1.93-r6 560
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFDAJUyuNVb5qfaOYRAtM+AKCyBRHju+12elCK0F080fCoezFH4gCgnLuU
-HrmkltxhFYQ6BRNOUSW3he4=
-=2UvC
+iD8DBQFFDOCwyuNVb5qfaOYRAoGqAKCOYzgesnHGyF5tcKFOwjASyFfNMwCfTled
+I4e83s6gYaQd7lSuf975rEI=
+=ogeV
 -----END PGP SIGNATURE-----
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r4 b/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r4
deleted file mode 100644
index 3022ef48c429..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b0f804f3234ddd47a8a25de2d0b63ba2 hibernate-script-1.93-patches-0.2.tar.bz2 2954
-RMD160 eb2fece800f6e0c09ffe34075d4b3f3d72fd91a8 hibernate-script-1.93-patches-0.2.tar.bz2 2954
-SHA256 b7089ea3cf722d745175c2e3f52238836a5c4abc3ed9dcf3438f3c3c604b1101 hibernate-script-1.93-patches-0.2.tar.bz2 2954
-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/digest-hibernate-script-1.93-r5 b/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r5
deleted file mode 100644
index 58defe983722..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.93-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0d97dc4b945833f60679c3848cf7581e hibernate-script-1.93-patches-0.3.tar.bz2 2923
-RMD160 cc342709f2f677863c7cd4d117cb311bd33e1909 hibernate-script-1.93-patches-0.3.tar.bz2 2923
-SHA256 cde72215832cd5a834b21d84003ae07dedafab8dfec571d956c83ee393cf6f16 hibernate-script-1.93-patches-0.3.tar.bz2 2923
-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-r4.ebuild b/sys-power/hibernate-script/hibernate-script-1.93-r4.ebuild
deleted file mode 100644
index c44f4a63f322..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.93-r4.ebuild
+++ /dev/null
@@ -1,72 +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-r4.ebuild,v 1.2 2006/07/22 00:48:05 phreak Exp $
-
-inherit eutils
-
-PATCH_VERSION="0.2"
-
-DESCRIPTION="Hibernate script supporting multiple suspend methods"
-HOMEPAGE="http://www.suspend2.net/"
-SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz
-	http://dev.gentoo.org/~phreak/distfiles/${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}"
-
-	epatch "${WORKDIR}"/patches/*.patch
-}
-
-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
-}
diff --git a/sys-power/hibernate-script/hibernate-script-1.93-r5.ebuild b/sys-power/hibernate-script/hibernate-script-1.93-r5.ebuild
deleted file mode 100644
index 787a060da491..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.93-r5.ebuild
+++ /dev/null
@@ -1,72 +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-r5.ebuild,v 1.1 2006/09/16 13:55:26 phreak Exp $
-
-inherit eutils
-
-PATCH_VERSION="0.3"
-
-DESCRIPTION="Hibernate script supporting multiple suspend methods"
-HOMEPAGE="http://www.suspend2.net/"
-SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz
-	http://dev.gentoo.org/~phreak/distfiles/${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}"
-
-	epatch "${WORKDIR}"/patches/*.patch
-}
-
-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
-}