Fix bug#268820, bug#268133, cleanup old ebuilds

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64

4 files changed, 18 insertions, 42 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index 3ee065f9cb0d..e6915ed66b87 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/hibernate-script
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.94 2012/12/18 16:13:03 alonbl Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.95 2013/01/12 17:38:01 alonbl Exp $
+
+*hibernate-script-2.0-r6 (12 Jan 2013)
+
+  12 Jan 2013; Alon Bar-Lev <alonbl@gentoo.org> +hibernate-script-2.0-r6.ebuild,
+  -files/hibernate-script-baselayout2-clock.patch,
+  -hibernate-script-2.0-r5.ebuild:
+  Fix bug#268820, bug#268133, cleanup old ebuilds
 
   18 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> metadata.xml:
   Assign myself as maintainer
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 3fdb34f04676..8e5c43e0ef6b 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -1,12 +1,11 @@
 AUX hibernate-script-2.0-init.d.patch 1059 SHA256 759b1083cef2c4d844b23284c25e9ca08af0ddc13926315cc6f427a3550cd5bf SHA512 78fedf167046da4515edc121bd08f7b3131047653d44aa12c69f1e263f0561bb131f606c191b70bbbd2e662ad9ab4d5f2ce9238159b8ccd3c5bc507b256391ab WHIRLPOOL a3e872234948ede6767574f4e7bb887778afe420685bf2cf438a2e5c8ba8acc4fcab12f0dc8421093951b1a16c4bfaea835f45c4fa4439cd52027176df4c7750
-AUX hibernate-script-baselayout2-clock.patch 888 SHA256 2740b5f3b46c32582ef7079f98eac8cff5afc11959433fa0ddc848b2e056d5a6 SHA512 a6b08dcb1ca0a224dfac5a643ccd1db17be935d43a7329002e2a6aa2fc62807bae5312863a3d3502b249bf6d84ff9aad300bb5efb27031c706222d68d7d1aeb2 WHIRLPOOL b521b57e06eaadbbdb1773d94c34a2ef425b7d823486780477d1bed8d73901a68c2023c42ef708c7ff64347a9f0464ba343347a4314eaebd433b89864ea483bd
-DIST hibernate-script-1.97-patches-5.tar.bz2 3278 SHA256 fc63a4d6ed82acd17e0c730b1a0a7ddba27b21576414bebdadd629889bbe7651
-DIST hibernate-script-1.97.tar.gz 81504 SHA256 8374bedc80206a6708c10d9814b92bebed3d9e4966c01c2d086e9e5b5646827c
-DIST hibernate-script-1.98.1-patches-1.tar.bz2 708 SHA256 920cfa1b77d9439ef7a3c64e686faed4b6b9d8800a0b381ba62e07b2e78b34c6
-DIST hibernate-script-2.0-patches-2.tar.bz2 1076 SHA256 7892b48d97a21f0b4434228871ce8e77e828e2bed195dfa18742785b02b4e889 SHA512 8a293f0db91aa6294902a2e6f67d9af2955d45fc5c8e71eec3b4ea7b6c76147fb71980d3786f275bdb8de87fd2e97cc964e0023000a917dbf1d3539d540380be WHIRLPOOL 8736225b8d7bbd94b59d816b021fbc0006fbf2f139721cd01a87eb6bc2dc7639fea4160a8e9477b61773d43f6c4d24b1e6943f1ad0b8827177cd1cfce51102f0
+DIST hibernate-script-1.97-patches-5.tar.bz2 3278 SHA256 fc63a4d6ed82acd17e0c730b1a0a7ddba27b21576414bebdadd629889bbe7651 SHA512 c20138b53f9dcd147af21bba8d225739df7a5518a68269125214ae1be820ced0d9f1451017897b70c5d87abfadee59c7576431a8345c16f7765a83c2ebbc1ab7 WHIRLPOOL 8c39760107447159fcd0b96cb4c9e4ff9ca14909802489778ef79d3fcd6a72c2bdf08d6c32b6650fdbfcec19f98ee6aa26684449173d445e30e59dbd68b3e3a9
+DIST hibernate-script-1.97.tar.gz 81504 SHA256 8374bedc80206a6708c10d9814b92bebed3d9e4966c01c2d086e9e5b5646827c SHA512 d66d88abee59d3935c812a7dbe38a40e4dc3eb66ea015e9cc04a7719b069b7af8afdedb6ebfd128c71ca5a73f2cf3412078b7660e43dc841b6c88c4e7f73c84d WHIRLPOOL aff40179a13d250d341803b6112bb233410c6032173bcc706cbcddac7bfa3fa16a06e1d7aaa289bbd0ad233e1893d1cf993a88e9d84669b2b05d1346e83da09c
+DIST hibernate-script-1.98.1-patches-1.tar.bz2 708 SHA256 920cfa1b77d9439ef7a3c64e686faed4b6b9d8800a0b381ba62e07b2e78b34c6 SHA512 5b8b7291554de5cefa1eec74669aab7ef7ce73e4da2b6acbbdf372d60f0d3654d8c320b006b3de2e52c1a21f7e5da9c2e2abff5e4906e536067524a6bf7a5a3b WHIRLPOOL b8e38d0ff803b48496e1854bedfae0b3d3c4d5776d1e09be54dc22e7bc1547368ed4f17af507bbd1a7743d2d8faeb67a6e1b32276a5bf46e2f69922028a60ddc
+DIST hibernate-script-2.0-patches-3.tar.bz2 4080 SHA256 e5e4950862e148a20121ceeebe27b83483ef7257fac866a16b067f7c83814b67 SHA512 17c8748f4b03871d2b02ed3c972c31c339bea041eda6ae836b5c50f5ec67f24426e56830bd038d577a89e1b1b195b3965445426a95a2f7844437a6b0d2a6d853 WHIRLPOOL 20e6c5e1c7b181c100bbe3497a1ebb585b08b9a88b475c6cb8a2ec8c0efcabe85421b5adee07f8eeb3ab5b59bbe37bab7fdc19504bdd301c25ac0f971d3e46a5
 DIST hibernate-script-2.0.tar.gz 84453 SHA256 d04597473a50c6ac072e3a4c22f173a7234a97bc2a39e460e56c5d3d985a6545 SHA512 625efdf8bd8561dd9ab93c09436f2fb93edef2fbb0fb2d259727bacffab0b7bd4a6c99d445131390883be75658f6dd28f329fdaf4f03a7d218c0021223ac1a1e WHIRLPOOL 8dab0108063b0d74d49fd075fdba7c96db7eeb8ebab5054329578b3dfe7adeb0d048db6cedfc238ba374bfa97d689eb8e08eb270ab72d861904487b7dc04dc21
 EBUILD hibernate-script-1.97-r4.ebuild 1792 SHA256 98ae2e4ddeebfb02d3cfc3205e49a9ac0bc4926b342dc046ffff06aeaa9a71f0 SHA512 b8b8c442f04a999040aa503353b280da4ed4f0734b6e06911c1027ba4ec3a9af3a8af3117ec87a5f1ac6acd85a3ec63bd467b4b32623ce519bcd39c230d57dc4 WHIRLPOOL 446f273ad7807b860d1fa7c7c4b368e86578cfe0b73e69645d03e1f6a08698eacbc815644a11dfc89c02fc0e741fa7a00c5ee0002fb86a4f5eb1d9d20154ff0e
 EBUILD hibernate-script-2.0-r1.ebuild 1785 SHA256 19b2f9045867b2814e3c8641273261e8002a2550cd2beba0ee1df4685450b765 SHA512 cfdc9172d554df3c66a8d9f51cdf860215638846f68d23e25d8fd26ee36dd2f72cdfb6a1af7e77188022a46623201dbad615ec95a7d17c7e00c5f46330954605 WHIRLPOOL df8357c4560fbf114d8eb3e6a1722cb24bd6e83545961ffeaf8ac1c54cc212e9e6aef628e46671e3c1e419c9cc944b7b77a4068a472ad754c572792c52e6a760
-EBUILD hibernate-script-2.0-r5.ebuild 2057 SHA256 5b9c77286a680642e048699dd73312c018fca17a6f574b261169c08c378e1a0b SHA512 2eca093ab51073aacaf28df582da6f2b45216c4f51417cc1eaf32d341896e30140edf7babf7694cd6b0b048740ad9c6d304e587eb4a37a2a1df9418ce67e981b WHIRLPOOL c912d13227c159e6bc9c56fba967bc68530f0df28cbea246a8ab02032839b2cae7be2d383539b227bf26b8fecc42d85db2cc8f4177ffe5958271c16dcebecef5
-MISC ChangeLog 19389 SHA256 b649b63da6985d963104613077a7aad4dd8a18e8475b6fb8bb6d7dc273af13ca SHA512 807e51a566f32bd8de8089793583f49e9301bee0fa3e5a0a2daea783aeb442d5df4f3f493e9178e18400a50b2cc6414baa715d27d943e66cf7dfda08d3de4316 WHIRLPOOL 2478678fb708e896b2b33c10b042b4e1e9006d6308205ca6ceea3bde6e1100301ac1a92cf7fb882b15737e72cf8f53675d372514a892c1157ba78886bc57680f
+EBUILD hibernate-script-2.0-r6.ebuild 1981 SHA256 7a07c2e2900f7820d95b60afa42e4cf84299fa800aa079f20afaaccdec4c038f SHA512 326d86f487618c6d94893e0acc1da92ccf158d8263a943076a43ea56412b9cd4b3825edf904151855e88e4f91ef10454b0813d8494c36448cf341a5aaacea0bd WHIRLPOOL 89bfa531834a57678c2bfd8610ba5f14e8cc89a005adcff5d9b650961feddef6d94916790041bd70e3d4b4c077cef19fff970b828635ed45790ecddd2a9f7547
+MISC ChangeLog 19647 SHA256 b3792b54b5b78897ec22357773caf99a84a0cf99ef14219d4c4f8dda36510281 SHA512 0a27de95d25ca5df63ba1684b00ee649bc394815188e03be224a3b7ea46b48b733c5543454fad7b44f517a77906d758fb9361039d6451a39d0fc740c083188ff WHIRLPOOL 7d8eb80724f7dd60572d8e95d47fe5f385474f44d9591b9430aba6db6c5af97060608d65e5161ae1e196a0805cccf848a71c6e5df3a5b28dfe5533be590629b1
 MISC metadata.xml 203 SHA256 6457ca6309badbd279e3ab106f60275f4b83ed47897af823830ecfde8dd40c96 SHA512 023202f99e1bf2ae94b35f80fa43d998b583f0eaf52ae2a090e6894e141008065f996c03e004cd6d0cfc124171a1a7f93c9a5ab03043bf04b88e52b0b04a3a74 WHIRLPOOL 21ec04c789baef31a21ac62e83901befa770e65252c1e27151df5b5253184371a948cce4bcf9f9375f87a5c2c88565ff36cdd5cc7f10d848d25024b75b59a162
diff --git a/sys-power/hibernate-script/files/hibernate-script-baselayout2-clock.patch b/sys-power/hibernate-script/files/hibernate-script-baselayout2-clock.patch
deleted file mode 100644
index eb5e7d03daed..000000000000
--- a/sys-power/hibernate-script/files/hibernate-script-baselayout2-clock.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- scriptlets.d/clock.orig	2012-12-17 13:23:43.102996405 +0400
-+++ scriptlets.d/clock	2012-12-17 13:24:17.623996147 +0400
-@@ -10,7 +10,7 @@
- 	    /etc/init.d/hwclock.sh stop > /dev/null 2>&1
- 	    ;;
- 	gentoo)
--	    /etc/init.d/clock.sh stop > /dev/null 2>&1
-+	    /etc/init.d/hwclock stop > /dev/null 2>&1
- 	    ;;
- 	*)
- 	    if ! /sbin/hwclock $DIRECTISA --systohc ; then
-@@ -27,7 +27,7 @@
- 	    /etc/init.d/hwclock.sh start > /dev/null 2>&1
- 	    ;;
- 	gentoo)
--	    /etc/init.d/clock.sh start > /dev/null 2>&1
-+	    /etc/init.d/hwclock start > /dev/null 2>&1
- 	    ;;
- 	*)
- 	    if ! /sbin/hwclock $DIRECTISA --hctosys ; then
-@@ -44,7 +44,7 @@
- 	directisa)
-     		case "$DISTRIBUTION" in
- 		gentoo)
--			echo "$EXE: Options for hwclock should be set in /etc/init.d/clock.sh"
-+			echo "$EXE: Options for hwclock should be set in /etc/conf.d/hwclock"
- 			exit 1
- 			;;
- 		debian|ubuntu)
diff --git a/sys-power/hibernate-script/hibernate-script-2.0-r5.ebuild b/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
index 814324c8c1f8..710708b94136 100644
--- a/sys-power/hibernate-script/hibernate-script-2.0-r5.ebuild
+++ b/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-2.0-r5.ebuild,v 1.1 2012/12/17 09:28:23 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild,v 1.1 2013/01/12 17:38:01 alonbl Exp $
 
 EAPI=5
 
 inherit eutils
 
-PATCH_VERSION="2"
+PATCH_VERSION="3"
 
 DESCRIPTION="Hibernate script supporting multiple suspend methods"
 HOMEPAGE="http://www.tuxonice.net/"
@@ -26,7 +26,6 @@ DOCS=( CHANGELOG README SCRIPTLET-API hibernate.vim )
 
 src_prepare() {
 	epatch "${WORKDIR}/${PV}/"*.patch
-	epatch "${FILESDIR}/${PN}-baselayout2-clock.patch" # fix for bug #406065
 }
 
 src_install() {