replace opts with extra_commands

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

5 files changed, 31 insertions, 14 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 06a2e96c60fc..89e34f4060e6 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.94 2011/11/07 23:28:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.95 2011/12/04 10:43:19 swegener Exp $
+
+  04 Dec 2011; Sven Wegener <swegener@gentoo.org> files/nut-2.2.2-init.d-upsd,
+  files/nut-2.2.2-init.d-upsdrv, files/nut-2.2.2-init.d-upsmon:
+  replace opts with extra_commands
 
 *nut-2.6.2 (07 Nov 2011)
 
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index d954877341c1..5593cd8ffce9 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -1,7 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lighttpd_nut.conf-2.2.0 971 RMD160 745f65fac2b33e0f2baef7213c2d745c4ebb3dd5 SHA1 62f0bc9d331728023382befb3fc395dc71db032d SHA256 f0b1b3e574766557dbf92704eb4cf81b166bb4db68ddecee581cb8b0b6638f65
-AUX nut-2.2.2-init.d-upsd 770 RMD160 339bdc9e9f338c6560155cb51986e5210693cfe2 SHA1 918b6955f2799eaedd08bf277b234c82e2b4cf7a SHA256 5cabebe42add66c88ec3f75b94faab21730c2828f7e2a390c90cc80cd765a0f6
-AUX nut-2.2.2-init.d-upsdrv 978 RMD160 249292e9338ae68b956c5858db7588447c3f41d7 SHA1 753bc85f2c521074bad8a2cec206a4c8bc50f68e SHA256 19d16a28347868e380a08c1d0aed542ac7c37afaf0afe85d6e5c974796dfc138
-AUX nut-2.2.2-init.d-upsmon 655 RMD160 04ba8bdc74c296f7126dcc06a748fbeac630ab64 SHA1 c69bd2d85fcf9e59d49b57fd5a3d51575bd688b0 SHA256 f8063853e446dc4012254ac6f81d4c1921f3e9f5c8dabe49bec3420bad98bc06
+AUX nut-2.2.2-init.d-upsd 790 RMD160 10e977b7dc2593ddef022397d2e0d8d69d899c38 SHA1 f6a7ebc55107e85c997b8c726488c44cb82430ab SHA256 81b0b82850d528d682544b452599159510dd93ba43e2c6133d0c9aab0b4c0210
+AUX nut-2.2.2-init.d-upsdrv 979 RMD160 a87cdd8779977d0affce5373fff57f0dd832e75f SHA1 97c1cb381f6de1fa6993caa6a93cad8dfc98adac SHA256 72f41864cef57aea0617f75cc6478c1c8cffc979e0e4136d179dcf665915fa0d
+AUX nut-2.2.2-init.d-upsmon 675 RMD160 bb8d89daeaf0f4ee7debf05756162a9c14663878 SHA1 daa18b2f0ac2b83adc2a61b705f277ebc3b3cc8a SHA256 9aa62b0275df64c29ddbb5e987d237c0bfa0b41a0fed1c6776a387fe6709fe0d
 AUX nut-2.4.1-no-libdummy.patch 791 RMD160 2a8ed4c000b3bd2a271e1e169486a0cd1cbdb809 SHA1 a48e71e06bb590cb296b7deead51b7b31420d68b SHA256 c9cf34980e79a4b9f07c338d10bc4ef4e90608ee7543cbc483898ee4f3f4f2a4
 AUX nut-2.4.3-lowspeed-buffer-size.patch 725 RMD160 ac7a5dbe8e65dc7fe1376eb8c695a66c260be68c SHA1 d71e49841f023812bf3c5934b65dad016aaa97ef SHA256 74ed963e039413472907ebdbba07dd59ebf8e721214f32ce0fabe169597dc9b7
 AUX nut-2.6.2-lowspeed-buffer-size.patch 534 RMD160 f9b61a7bd309d2516729cd060a39dc227893be7e SHA1 af3b47519f338a5d7a95e9d81ca932023d4ed490 SHA256 77bc0f996d2eb9c3d7d0cf68f5053108df54a6ce6baf2d7b3edfd1f2cfafd41b
@@ -10,5 +13,12 @@ DIST nut-2.6.0.tar.gz 1703273 RMD160 d42ef82eec3ee40fa841d92bf400c7f76eb9cdfe SH
 DIST nut-2.6.2.tar.gz 1897691 RMD160 68acb21b0671d753fb0c5d5cc3d5c86376f36fed SHA1 f6ebf1a1835b1ad5a0e5de498451d22e48479943 SHA256 343554add0713348f8b09bca8d83eee2eb2ae8bad9cdad9a39e0f0e2d0f5d375
 EBUILD nut-2.6.0-r1.ebuild 6860 RMD160 94015422dcb4c093098f5eada6a3df79f9cd37fb SHA1 2f656c9d528f99437a873127dcb0fdcc08682911 SHA256 9b401f332eb31281237da085b2123de6177300a4229ca5fde3e5c936793e66e9
 EBUILD nut-2.6.2.ebuild 6863 RMD160 c2c96da3afcd20fd99fba579c8528d8866029bc0 SHA1 cb43a282b1ff73ffb0defc93e2c306eab1581bcc SHA256 9f4a7e45bb2fb89b07af89daf7c1de7ae49ea6e230ce5b78498d83e1e5c312cc
-MISC ChangeLog 20795 RMD160 0997cb84af59d03ee8fb2646fffbe7cc5a6165b1 SHA1 7fdeb34db043276b21f5a7dc8ee343271be09d03 SHA256 3a5170a4905066d7f66cd7f8e792a82cda45c4aa85fd04aae3647dc8120bd583
+MISC ChangeLog 20975 RMD160 a66efc29239d6f314e3c6864893b9f80fec864ee SHA1 79c4e358a7b0e66e3ac75e0c0845f28b48f865aa SHA256 64d823601435d4c19f0e71d5259066518c3043443a344ccbe612605f85c76d45
 MISC metadata.xml 242 RMD160 a29da25198f8b2a4ab073a371a3562c331c1fe56 SHA1 45059b47e69d8b5313ccfede532e6729fb6d428a SHA256 e82b2cc8fc830e2925c899d4b88c444b0b52e2de9f1bc28d5e08b545a195854f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk7bTswACgkQI1lqEGTUzyTcxgCePhZYtWZI3VH3eaKT2kvZNd2D
+vyIAoLEAN0DZ28XwHD44kLon15azkmIM
+=cMK1
+-----END PGP SIGNATURE-----
diff --git a/sys-power/nut/files/nut-2.2.2-init.d-upsd b/sys-power/nut/files/nut-2.2.2-init.d-upsd
index 4678b3e2cf33..8f8953993288 100755
--- a/sys-power/nut/files/nut-2.2.2-init.d-upsd
+++ b/sys-power/nut/files/nut-2.2.2-init.d-upsd
@@ -1,9 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/nut-2.2.2-init.d-upsd,v 1.1 2008/06/25 02:29:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/nut-2.2.2-init.d-upsd,v 1.2 2011/12/04 10:43:19 swegener Exp $
+
+extra_started_commands="reload"
 
-opts="reload"
 pidfile=/var/lib/nut/upsd.pid
 bin=/usr/sbin/upsd
 
diff --git a/sys-power/nut/files/nut-2.2.2-init.d-upsdrv b/sys-power/nut/files/nut-2.2.2-init.d-upsdrv
index 3d18e5bc3db6..5cbae7fa9b46 100755
--- a/sys-power/nut/files/nut-2.2.2-init.d-upsdrv
+++ b/sys-power/nut/files/nut-2.2.2-init.d-upsdrv
@@ -1,9 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/nut-2.2.2-init.d-upsdrv,v 1.1 2008/06/25 02:29:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/nut-2.2.2-init.d-upsdrv,v 1.2 2011/12/04 10:43:19 swegener Exp $
+
+extra_commands="stopall startall"
 
-opts="start stop stopall startall"
 UPSNAME=${SVCNAME#*.}
 msgtext="drivers"
 [ "${UPSNAME}" == "${SVCNAME}" ] && UPSNAME=''
diff --git a/sys-power/nut/files/nut-2.2.2-init.d-upsmon b/sys-power/nut/files/nut-2.2.2-init.d-upsmon
index 9ccf173db028..4aefba0714cd 100755
--- a/sys-power/nut/files/nut-2.2.2-init.d-upsmon
+++ b/sys-power/nut/files/nut-2.2.2-init.d-upsmon
@@ -1,9 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/nut-2.2.2-init.d-upsmon,v 1.2 2008/06/25 02:53:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/nut-2.2.2-init.d-upsmon,v 1.3 2011/12/04 10:43:19 swegener Exp $
+
+extra_started_commands="reload"
 
-opts="reload"
 pidfile=/var/run/upsmon.pid
 bin=/usr/sbin/upsmon