Fix init.d script dependencies, bug#201485, thanks to David Durrleman, cleanup

Package-Manager: portage-2.1.4_rc8
RepoMan-Options: --force

13 files changed, 30 insertions, 354 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index db72a59fde96..54cb5fdb661e 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,15 @@
 # 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.72 2007/11/25 06:08:17 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.73 2007/12/08 07:58:04 alonbl Exp $
+
+*hibernate-script-1.97-r4 (08 Dec 2007)
+
+  08 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -hibernate-script-1.95-r3.ebuild, -hibernate-script-1.96.ebuild,
+  -hibernate-script-1.96-r1.ebuild, -hibernate-script-1.97-r2.ebuild,
+  -hibernate-script-1.97-r3.ebuild, +hibernate-script-1.97-r4.ebuild:
+  Fix init.d script dependencies, bug#201485, thanks to David Durrleman,
+  cleanup.
 
 *hibernate-script-1.97-r3 (25 Nov 2007)
 
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 2b40e05cabe2..88d4abd6ac94 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -1,40 +1,19 @@
 DIST hibernate-script-1.95-patches-2.tar.bz2 1609 RMD160 f98fc6514d2ba2a861e9146e0fe65e7f27572342 SHA1 ef1d45c2d2232a5ba4aaf0287281d607dcc5871f SHA256 5bdcfe74e91fa26d58102f95e15453c2df3a7ff66213c2d53aa265569a554e8f
-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
-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-patches-5.tar.bz2 3278 RMD160 5a2c7065a1fb40b37f1a122e1044cdbfa9e4afa3 SHA1 ca2668ec386b2a3da96746681c0a36b4b7e57127 SHA256 fc63a4d6ed82acd17e0c730b1a0a7ddba27b21576414bebdadd629889bbe7651
 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
 RMD160 fd4510492a6dfae501d5af788a09a6efd2f0aa98 hibernate-script-1.95-r2.ebuild 1992
 SHA256 27db8efa3f769c8fd5881d3875d6a1a22aa31acfdee77a2d07b283ddf22bc754 hibernate-script-1.95-r2.ebuild 1992
-EBUILD hibernate-script-1.95-r3.ebuild 1787 RMD160 c1062ebed15333fef7fd35608133c54751694f8b SHA1 21db72255deb5e391264f031d560abfcb06b5972 SHA256 b4fc9e3ee21c23f61efcb7029c62a6b6f9d3f2ff9fa6b52a91862fe6b5c9c28d
-MD5 d22dac30c0ef76bcf62e07a50876ce0b hibernate-script-1.95-r3.ebuild 1787
-RMD160 c1062ebed15333fef7fd35608133c54751694f8b hibernate-script-1.95-r3.ebuild 1787
-SHA256 b4fc9e3ee21c23f61efcb7029c62a6b6f9d3f2ff9fa6b52a91862fe6b5c9c28d hibernate-script-1.95-r3.ebuild 1787
-EBUILD hibernate-script-1.96-r1.ebuild 1816 RMD160 dfaee8db489259bb95c15811f97220522b982a7c SHA1 2c94654bf163df7659475e30e53b313e6d77ff9d SHA256 1687a0de7880a2975acc2374ddc266b99dfea3f126792dc563dbaaa18b3db298
-MD5 3acc53be77cd266024076a018203d474 hibernate-script-1.96-r1.ebuild 1816
-RMD160 dfaee8db489259bb95c15811f97220522b982a7c hibernate-script-1.96-r1.ebuild 1816
-SHA256 1687a0de7880a2975acc2374ddc266b99dfea3f126792dc563dbaaa18b3db298 hibernate-script-1.96-r1.ebuild 1816
-EBUILD hibernate-script-1.96.ebuild 1784 RMD160 8946cb6cc9ba60d69d9db4be2b7c8d89c544cb19 SHA1 f13f64aee075f3812606d4d67a71f2aea7717d6f SHA256 ca234d742bdca7c8cfaa5b193a4a64a9ed82d1a6f68c0de9c2ceab86eabd1ea8
-MD5 0b778815eaf3183e1ed15961c2a84508 hibernate-script-1.96.ebuild 1784
-RMD160 8946cb6cc9ba60d69d9db4be2b7c8d89c544cb19 hibernate-script-1.96.ebuild 1784
-SHA256 ca234d742bdca7c8cfaa5b193a4a64a9ed82d1a6f68c0de9c2ceab86eabd1ea8 hibernate-script-1.96.ebuild 1784
-EBUILD hibernate-script-1.97-r2.ebuild 1793 RMD160 be770b6198fe871ae81ae2ba746a211157baae1b SHA1 3bdaca4f8ed1b53c12a6b7b155f2ac98d1ab6072 SHA256 f55088afbf5c1c5e5bc6f4e7c9790dbbb493845ff0cc47e568fa8ee036eba17d
-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
-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
+EBUILD hibernate-script-1.97-r4.ebuild 1793 RMD160 2dc0b20350e4bf6448d286b2856635b8a1a17b4a SHA1 7f0f2a26a703fe331277a1a9d3bb9c52f45f997d SHA256 aa6e6ad311a7ae117c397b0aaca9b904cea325f8921e01f7d138fd4792809c52
+MD5 9a385afd9002f20cbe606b38faf53e71 hibernate-script-1.97-r4.ebuild 1793
+RMD160 2dc0b20350e4bf6448d286b2856635b8a1a17b4a hibernate-script-1.97-r4.ebuild 1793
+SHA256 aa6e6ad311a7ae117c397b0aaca9b904cea325f8921e01f7d138fd4792809c52 hibernate-script-1.97-r4.ebuild 1793
+MISC ChangeLog 15971 RMD160 e53cea89683e1dda66b53fea51c41ab2ee330fb7 SHA1 456700b22c6fb5c9bec3b238d587caf9d301fe07 SHA256 34be383078e9bf3f8b355c0a87ae454b7be8d8ad6dad76d83bb95d90259fc8d1
+MD5 0bf87ab525d8ae2c80232e6577f57566 ChangeLog 15971
+RMD160 e53cea89683e1dda66b53fea51c41ab2ee330fb7 ChangeLog 15971
+SHA256 34be383078e9bf3f8b355c0a87ae454b7be8d8ad6dad76d83bb95d90259fc8d1 ChangeLog 15971
 MISC metadata.xml 252 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc SHA1 470749f04141ca780f2be602666b266f755e338e SHA256 9a7aee2a060e353cb5db8caa34babf5dca6ee95233a0b52443f4d02e90c35b31
 MD5 bc8aba6f9d14b92e55fcc05e22ce4956 metadata.xml 252
 RMD160 3e6e3c4388b4a067f77b826dbebeefd432fddcbc metadata.xml 252
@@ -42,18 +21,6 @@ SHA256 9a7aee2a060e353cb5db8caa34babf5dca6ee95233a0b52443f4d02e90c35b31 metadata
 MD5 1da8ce869a2834a1d69172e49df4bc16 files/digest-hibernate-script-1.95-r2 554
 RMD160 3ac29bd4a445535cb4e074e8c5271f7a72918c0a files/digest-hibernate-script-1.95-r2 554
 SHA256 ab4c298ca18c27f82cd1e348ed8470c716a8f7d59c957b614e5cbf6f1e3d59d6 files/digest-hibernate-script-1.95-r2 554
-MD5 f7db2f4e32e77242d2a8ed3a5a71d60a files/digest-hibernate-script-1.95-r3 554
-RMD160 eea49eb7404f3af872792df7fe880cee84f65286 files/digest-hibernate-script-1.95-r3 554
-SHA256 ee77a7e154efea3963561d998288bd2024d86a943d5677aeba92efbb2399d139 files/digest-hibernate-script-1.95-r3 554
-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
-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
+MD5 cc1b6b31c0dcbc6e3999ae3a8f2f1be9 files/digest-hibernate-script-1.97-r4 554
+RMD160 b77be5afb1123b9d0f6d2691b85f2bdea072069c files/digest-hibernate-script-1.97-r4 554
+SHA256 f9d96339dec741f342204f391a3384d5feede8b85429b003853c9a74fc13e64e files/digest-hibernate-script-1.97-r4 554
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r3 b/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r3
deleted file mode 100644
index d3d8c8c81a08..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.95-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 05043b8ab3b2b2651bb7c92926295244 hibernate-script-1.95-patches-3.tar.bz2 2111
-RMD160 5a78ac9187b179f13576cef781516a3f6f6d4e51 hibernate-script-1.95-patches-3.tar.bz2 2111
-SHA256 2363769ecd92dcfce1cda7dbc025058059f4cfd1b8f75751bf2e182691879c6b hibernate-script-1.95-patches-3.tar.bz2 2111
-MD5 026a7a8992da4fe56fb19530df998806 hibernate-script-1.95.tar.gz 74954
-RMD160 032cb97c355248640107e779f99ad5a86fb74846 hibernate-script-1.95.tar.gz 74954
-SHA256 e0c73cd1c3af2c0f409dba07e6fbd86c23150cfe77c4f9286ce239aedbe0a123 hibernate-script-1.95.tar.gz 74954
diff --git a/sys-power/hibernate-script/files/digest-hibernate-script-1.96 b/sys-power/hibernate-script/files/digest-hibernate-script-1.96
deleted file mode 100644
index fe9d240ba275..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.96
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6b52e730861e432f656651410eb79a5b hibernate-script-1.96-patches-1.tar.bz2 1225
-RMD160 976b2509c35b1de7978919075d59fd924d0584ae hibernate-script-1.96-patches-1.tar.bz2 1225
-SHA256 e2931874186396ea4b12c251952d2300cf3c96681fa486f178f2f23ba20620df hibernate-script-1.96-patches-1.tar.bz2 1225
-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/files/digest-hibernate-script-1.96-r1 b/sys-power/hibernate-script/files/digest-hibernate-script-1.96-r1
deleted file mode 100644
index 6cbe150b3d56..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.96-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/digest-hibernate-script-1.97-r2 b/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r2
deleted file mode 100644
index e7d778ec161a..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b7cce3ec7d96e01e0d25d0354b7f0fbe hibernate-script-1.97-patches-3.tar.bz2 3018
-RMD160 fb0f7ea094d8b89a08fda1ac6e1d99cb149118c3 hibernate-script-1.97-patches-3.tar.bz2 3018
-SHA256 fc3ab4b64dd0d3d568a2c6d28b5c45d9be668f06d47b4d6bcf41ec5166c5a1b4 hibernate-script-1.97-patches-3.tar.bz2 3018
-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/files/digest-hibernate-script-1.97-r3 b/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r3
deleted file mode 100644
index 6dd3bfc300e4..000000000000
--- a/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/digest-hibernate-script-1.97-r4 b/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r4
new file mode 100644
index 000000000000..21dcd3ff51ad
--- /dev/null
+++ b/sys-power/hibernate-script/files/digest-hibernate-script-1.97-r4
@@ -0,0 +1,6 @@
+MD5 b5c475ccb95a1ba7b9dc10e5dac5b76e hibernate-script-1.97-patches-5.tar.bz2 3278
+RMD160 5a2c7065a1fb40b37f1a122e1044cdbfa9e4afa3 hibernate-script-1.97-patches-5.tar.bz2 3278
+SHA256 fc63a4d6ed82acd17e0c730b1a0a7ddba27b21576414bebdadd629889bbe7651 hibernate-script-1.97-patches-5.tar.bz2 3278
+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.95-r3.ebuild b/sys-power/hibernate-script/hibernate-script-1.95-r3.ebuild
deleted file mode 100644
index 5abce8cd91d2..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.95-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.95-r3.ebuild,v 1.2 2007/11/12 10:44:17 alonbl Exp $
-
-inherit eutils
-
-PATCH_VERSION="3"
-
-DESCRIPTION="Hibernate script supporting multiple suspend methods"
-HOMEPAGE="http://www.suspend2.net/"
-SRC_URI="http://www.suspend2.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=""
-
-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 "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."
-}
diff --git a/sys-power/hibernate-script/hibernate-script-1.96-r1.ebuild b/sys-power/hibernate-script/hibernate-script-1.96-r1.ebuild
deleted file mode 100644
index d15530c2efaa..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.96-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.2 2007/11/12 10:44:17 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="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 "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."
-}
diff --git a/sys-power/hibernate-script/hibernate-script-1.96.ebuild b/sys-power/hibernate-script/hibernate-script-1.96.ebuild
deleted file mode 100644
index c70ea1b87d60..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.96.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.ebuild,v 1.2 2007/11/12 10:44:17 alonbl Exp $
-
-inherit eutils
-
-PATCH_VERSION="1"
-
-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=""
-
-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 "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."
-}
diff --git a/sys-power/hibernate-script/hibernate-script-1.97-r2.ebuild b/sys-power/hibernate-script/hibernate-script-1.97-r2.ebuild
deleted file mode 100644
index aa7ab1269322..000000000000
--- a/sys-power/hibernate-script/hibernate-script-1.97-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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-r2.ebuild,v 1.1 2007/11/17 07:39:03 alonbl Exp $
-
-inherit eutils
-
-PATCH_VERSION="3"
-
-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."
-}
diff --git a/sys-power/hibernate-script/hibernate-script-1.97-r3.ebuild b/sys-power/hibernate-script/hibernate-script-1.97-r4.ebuild
index 207de08855a4..956a01b8544c 100644
--- a/sys-power/hibernate-script/hibernate-script-1.97-r3.ebuild
+++ b/sys-power/hibernate-script/hibernate-script-1.97-r4.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-1.97-r4.ebuild,v 1.1 2007/12/08 07:58:04 alonbl Exp $
 
 inherit eutils
 
-PATCH_VERSION="4"
+PATCH_VERSION="5"
 
 DESCRIPTION="Hibernate script supporting multiple suspend methods"
 HOMEPAGE="http://www.tuxonice.net/"