Revision bump: EAPI 5, fix incorrect clock script name wrt bug #406065, drop old revision

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

4 files changed, 51 insertions, 20 deletions

diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog
index c2f9db59fc5a..844a52d8e5b0 100644
--- a/sys-power/hibernate-script/ChangeLog
+++ b/sys-power/hibernate-script/ChangeLog
@@ -1,6 +1,14 @@
 # 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.92 2012/12/16 14:20:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.93 2012/12/17 09:28:23 pinkbyte Exp $
+
+*hibernate-script-2.0-r5 (17 Dec 2012)
+
+  17 Dec 2012; Sergey Popov <pinkbyte@gentoo.org>
+  +files/hibernate-script-baselayout2-clock.patch,
+  -hibernate-script-2.0-r4.ebuild, +hibernate-script-2.0-r5.ebuild:
+  Revision bump: EAPI 5, fix incorrect clock script name wrt bug #406065, drop
+  old revision
 
   16 Dec 2012; Pacho Ramos <pacho@gentoo.org> -hibernate-script-2.0-r2.ebuild,
   -hibernate-script-2.0-r3.ebuild, metadata.xml:
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index 34bb1621ed89..b3f6aa2fbaa6 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
-DIST hibernate-script-2.0.tar.gz 84453 SHA256 d04597473a50c6ac072e3a4c22f173a7234a97bc2a39e460e56c5d3d985a6545
+DIST hibernate-script-2.0-patches-2.tar.bz2 1076 SHA256 7892b48d97a21f0b4434228871ce8e77e828e2bed195dfa18742785b02b4e889 SHA512 8a293f0db91aa6294902a2e6f67d9af2955d45fc5c8e71eec3b4ea7b6c76147fb71980d3786f275bdb8de87fd2e97cc964e0023000a917dbf1d3539d540380be WHIRLPOOL 8736225b8d7bbd94b59d816b021fbc0006fbf2f139721cd01a87eb6bc2dc7639fea4160a8e9477b61773d43f6c4d24b1e6943f1ad0b8827177cd1cfce51102f0
+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-r4.ebuild 1969 SHA256 d4208b29dce0ccdaa926f93b884acaf19077d6e53f8de9ebd49b602144bfead2 SHA512 31efec6abc47461cd4799e8ab779970694e150ab96c58131d3646bd4fb737d7f00dad2f3b6f1dc74f89c5bc8402d2aa11a4ec1986bc208d077a306a813e2ec18 WHIRLPOOL b334af35f01ae2a607e86401f7a28bc9ce6bbeb2ff95257f1ccc21c39dab448badfb91302f928757946068321e127864baaf824a94eb79ee9af300b8df58b64b
-MISC ChangeLog 18991 SHA256 a1c6fe72133008ede1242f9bfa715db51f4aa9ba172d7eb5996e17798edca18e SHA512 a201582be0a375cc97fa254bf4cf64a5e1ae16d903f470ebed63c200320b31fecf90cc5e55fc9990761bcc93df1d10129b78f06915e5f2612a6534843ba5eea2 WHIRLPOOL a44be9a163502695499f7f90b7d82a5ee718b6f7624518d6cc81cc35aab96d3b6b131bb840ebe79e0c214644af08c348850b77c0aea199fb2e19bccd662a6aff
+EBUILD hibernate-script-2.0-r5.ebuild 2057 SHA256 5b9c77286a680642e048699dd73312c018fca17a6f574b261169c08c378e1a0b SHA512 2eca093ab51073aacaf28df582da6f2b45216c4f51417cc1eaf32d341896e30140edf7babf7694cd6b0b048740ad9c6d304e587eb4a37a2a1df9418ce67e981b WHIRLPOOL c912d13227c159e6bc9c56fba967bc68530f0df28cbea246a8ab02032839b2cae7be2d383539b227bf26b8fecc42d85db2cc8f4177ffe5958271c16dcebecef5
+MISC ChangeLog 19298 SHA256 3ed923c0d2c949750aab34aa44fcd5c8ef85bc9347f25684380bf8b7b1165001 SHA512 262fd786a1a0d12a9fb5c8f8848ea78bbb336313c8928b624bcd08ffa52cceb9c1044325aa03592e2dd756d8922b9774cc2937d4c2bf83c61000c5225e044fff WHIRLPOOL c3234f7ec017561e05beaa7dec893c5b0f9c0b5e2a0a8e8a9cffacebf7327aa0b14f669c288db8a78ad890f972fb27d06aca20ebd9aad6e3b2f0065b609be191
 MISC metadata.xml 213 SHA256 e32377b4003bbaf839ddaf27c4ecf23297be6196fbba4a68e3adbfa3e79be164 SHA512 acaee2768564d8584b96b96f48e5009ab7279ae73e447bb363b1344d055c8ea05881f49ba611f69d6c275bdcc88e7d889c50f7b905acbb17f54b7e3893fecb5b WHIRLPOOL 542641939359d644d884c1f5c1e411ec4ed98472b80934fe0ef94c8b94b9f74f3b945ba8054c1db17b6afc4ce9ebd062bb3e0b150a7a11ba8380965118f0b014
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlDN2LUACgkQCaWpQKGI+9RbzgCeNkBq6CGowHME0SiDSS2OYW4N
-yh4AmQHLpjSyLtrDvPaivioyxMNRuAm3
-=m+jY
------END PGP SIGNATURE-----
diff --git a/sys-power/hibernate-script/files/hibernate-script-baselayout2-clock.patch b/sys-power/hibernate-script/files/hibernate-script-baselayout2-clock.patch
new file mode 100644
index 000000000000..eb5e7d03daed
--- /dev/null
+++ b/sys-power/hibernate-script/files/hibernate-script-baselayout2-clock.patch
@@ -0,0 +1,29 @@
+--- 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-r4.ebuild b/sys-power/hibernate-script/hibernate-script-2.0-r5.ebuild
index 9b40356e2f08..814324c8c1f8 100644
--- a/sys-power/hibernate-script/hibernate-script-2.0-r4.ebuild
+++ b/sys-power/hibernate-script/hibernate-script-2.0-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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-r4.ebuild,v 1.1 2011/11/30 19:22:25 nelchael Exp $
+# $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 $
 
-EAPI=2
+EAPI=5
 
 inherit eutils
 
@@ -22,8 +22,11 @@ IUSE="vim-syntax"
 DEPEND=""
 RDEPEND="!<media-gfx/splashutils-1.5.2"
 
+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() {
@@ -36,7 +39,7 @@ src_install() {
 	# 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
+	newinitd init.d/hibernate-cleanup.sh hibernate-cleanup
 
 	# other ebuilds can install scriplets to this dir
 	keepdir /etc/hibernate/scriptlets.d/
@@ -46,7 +49,7 @@ src_install() {
 		doins hibernate.vim
 	fi
 
-	dodoc CHANGELOG README SCRIPTLET-API hibernate.vim
+	dodoc ${DOCS[@]}
 
 	insinto /etc/logrotate.d
 	newins "${S}"/logrotate.d-hibernate-script hibernate-script