Remove deprecated opts variable as well as --oknodo.

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

3 files changed, 17 insertions, 14 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index dae4f31ef8e1..ea186cb5ddb9 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.353 2011/09/10 12:38:06 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.354 2011/09/14 15:48:50 idl0r Exp $
+
+  14 Sep 2011; Christian Ruppert <idl0r@gentoo.org> files/named.init-r11:
+  Remove deprecated opts variable as well as --oknodo.
 
   10 Sep 2011; Christian Ruppert <idl0r@gentoo.org> bind-9.8.1.ebuild,
   +files/bind-9.8.1-sdlz_helper.patch:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index caf6e5927795..72f476e5e6ba 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -11,7 +11,7 @@ AUX named.cache 2941 RMD160 c29f47291496e67e72c129db488d07172fe244e6 SHA1 b15754
 AUX named.conf-r5 4119 RMD160 d5447d9d6b368d18b4f67fe72014ce5b9149c571 SHA1 68ec3dad63621f8d079f0ec3d3c14f9d58be0978 SHA256 a5bcfe16562672e46550c2d84bfff63405998f512b639cc27a53f0b0fdf7f24e
 AUX named.confd-r6 1368 RMD160 8ea5c67af53a0986a09f1077a5dd722dd52c8b51 SHA1 64d5d6ead7fb5ba0ff8016b5fee2518fbde6f90c SHA256 704ac6954b2bad5d0bab19281dc703e86d9b4fe94d63dd00be1e525a3e64c492
 AUX named.init-r10 5925 RMD160 acd84047fe945bb146c676a673eca9782362f4ad SHA1 bf91dabc72f693222c935eada9a21f7dc7dc2c2a SHA256 e7604579ed45cafdf121a65c5847b56aecb42356a213f7bac17474823431b24d
-AUX named.init-r11 6250 RMD160 12de95defb4de776b4399640be5ae7b2c91388f8 SHA1 9e8ab623ce45cc362b156fed8ffdd67c3294f740 SHA256 5fec01c26a37a793a7c812b0e0c22bd0a0142d1ebfabd21b1bf4f11b73c5526b
+AUX named.init-r11 6134 RMD160 e006702b9c5bd7d63b32d4c8f2d2e53eaa5facde SHA1 95cef2357b7dedad435b267d3b47860cbf06c365 SHA256 8de85e03b2c1e8cc6e79a65e70a1c85a3d873d956425fef3291626c2db006884
 DIST bind-9.7.3-P3.tar.gz 7586748 RMD160 456aed6a9c6e87de43d38860eaef2ee5d67e1f8e SHA1 90c5340daa94517e3bc7be89feef5ea6918fc390 SHA256 464e9aeeaf8d6964205621ead02898e076ebcfcbeef8c651dc695891c5622c37
 DIST bind-9.7.4.tar.gz 8316839 RMD160 2da39514b7b79aa9a3c9ce10c239514dee610194 SHA1 a526bf9a7114988d895e7a9c5be175a8386c6904 SHA256 7cd5fbda1a7ea09914c8cdd04afbeb7d48617d02d9df0135cd9b0b7a1ca4a6bf
 DIST bind-9.8.0-P1-geoip-1.3.patch 54084 RMD160 d695b9aea249f308525d0938504ad61685e4d17c SHA1 4c4e40fc448e9effe7f1190728d3b623fae75b0e SHA256 988dadad30c54becc388c925ede32647419e34ee0fc689699e54d5c0843e233b
@@ -23,16 +23,16 @@ DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d S
 EBUILD bind-9.7.3_p3.ebuild 11547 RMD160 6e1ab2efcb184db200a53190b016a7d763499898 SHA1 dc534b640bb4ca05d7e3b700bc1c8a75b0d58ed9 SHA256 2e64fbe000308956c75c1edd324073f9cd377af1ad7320343a581ef03a719e27
 EBUILD bind-9.7.4.ebuild 11558 RMD160 85cd5fd33caabba8f60616e852a02318bf379282 SHA1 befc8aff7a07142a09809d45dc36695b0b21f45d SHA256 ff2b2094e3007cfce211f50253ebac91d1e9c0c1bcdfa38537920312a69b3bff
 EBUILD bind-9.8.1.ebuild 12006 RMD160 9d906a36f09a5aaf94e0b0f6b72b13b5258b9798 SHA1 18531bb8830130a4b8c5843a9f6e6569ea19d7c8 SHA256 06b2fd0993b51886c5d24dfe8009f9d837de6a339196dd8e9b99110465c797f4
-MISC ChangeLog 60181 RMD160 0e7b0a219fc7c5a9052980378c2068bf402dc263 SHA1 6c77227cc55072cb55f14203aa922b3103bba5bc SHA256 12d2deca8f2d0e7ad249913cc0945394cd4ad52737995bf7313f786b1cd0f6bd
+MISC ChangeLog 60311 RMD160 9d2b57428194c56ea71f56fcf50bd87b921be44f SHA1 3926804023dac75c1fb6328c447d338be6b5624a SHA256 fd9d9f59d35cce92923fea762c2b23ebc16a8c2fccfa4a8448c2821d8d59123f
 MISC metadata.xml 887 RMD160 3c0fdcaacc812fc3e558afbbdb91dd6efbf377f9 SHA1 73e55d5772ca66d165643bf389847234c32593d7 SHA256 c0a53163775c42b68ed319c68f18234d8e6d908b318066a0d533bf7bcd40ce7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJOa1ozAAoJEMOx0zmdw4Z1uGUH/iFAXaU9v1rqgL5TZlzKfE+O
-BDMXi7VUg4E8oN3gYrLbB7uQceMkRY14a28oeiSVgI0P8Ne83pJs6mx7oYzoITQm
-TzI2hxPwKSFGanjUkiIg0Y1l7tZJ8sWNsCbRy0aKYR3Au34w43g6R/YRAuoUQSGe
-4tCFkCVb17USYDXfL0suA8e5s8Ik5+Kdz0lY236wrNHBWyqHLr0Wf4lDAJ2ZUbXT
-Qgfdec+Egg7bMPgXMthg/lHXrscJlNONWwOpx7P8+ikrCQWnMZr+i71IkQfVj5BW
-8hGc03Ayfdq6xq9ij+XGe3NPTDfOUnbzWoqPSLhUlq40jA04EECn8eEKN24hURQ=
-=eUB4
+iQEcBAEBCAAGBQJOcMznAAoJEMOx0zmdw4Z1sS0IAJkc5lHVihSoHfaO9d/X6cHq
+UGDp3Z7NC/Eis61KeU4ZfoG55B9C3i2nSNHmBynu0ZPQAAKLxdXKVa9V0JBcg0AM
+WRa45NlUp0idJnEMGRPP+Y9CObNIXKeop0tnyjPOIQcIggxz5gbB3y9Ez2LKUMoe
+YXNOq7eNxOfWYj2N/5Jgml8rn11vG4bibwMqttKoaeZrzgx6amaQsjxCC9WRpGmJ
+GY8GiTZwmgWb4uW1hEVXOGYItR9lY0GfIKjAmId9F3mqYtcP8J9NPzJm4dY4L17z
+eCUUBcoQN4n/Jcq9puW2RCp8G4SsU7YaLpt5WNfDqy3Y7BeqXZKPmL3y8LUI7LE=
+=tvtF
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/files/named.init-r11 b/net-dns/bind/files/named.init-r11
index 15f744e84b08..8432ff00e107 100644
--- a/net-dns/bind/files/named.init-r11
+++ b/net-dns/bind/files/named.init-r11
@@ -1,9 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r11,v 1.2 2011/06/16 18:56:09 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r11,v 1.3 2011/09/14 15:48:50 idl0r Exp $
 
-opts="start stop reload restart checkconfig checkzones"
+extra_commands="checkconfig checkzones"
+extra_started_commands="reload"
 
 depend() {
 	need net
@@ -235,8 +236,7 @@ reload() {
 
 	_get_pidfile
 	if [ -n "${PIDFILE}" ]; then
-		# FIXME: Remove --stop and --oknodo as soon as baselayout-1 has been removed... finally...
-		start-stop-daemon --stop --oknodo --pidfile $PIDFILE --signal HUP --exec /usr/sbin/named
+		start-stop-daemon --pidfile $PIDFILE --signal HUP
 		ret=$?
 	else
 		ewarn "Unable to determine the pidfile... this is"