Replaced deprecated opts variable in init scripts (bug #383641)

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

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index c1a225b51a4c92bc81d6918f0222f17bc4105eae..bd73a482ff1c342de1fa0129d15714584dc02023 100644 (file)
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.206 2011/10/02 20:18:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.207 2011/10/23 16:40:49 polynomial-c Exp $
+
+  23 Oct 2011; Lars Wendler <polynomial-c@gentoo.org>
+  +files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch,
+  avahi-0.6.29.ebuild, avahi-0.6.30.ebuild, avahi-0.6.30-r1.ebuild:
+  non-maintainer commit: Replaced deprecated opts variable in init scripts (bug
+  #383641).
 
   02 Oct 2011; Pacho Ramos <pacho@gentoo.org> avahi-0.6.30-r1.ebuild:
   Drop DEPRECATED flags, bug #384743

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index f68ef42ea26fcf30840658fac28596f650699be9..52ad2a7309b278f9279d66b2ae1d12f8110c7cda 100644 (file)
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,24 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX autoipd-openrc.sh 700 RMD160 00e259967279dc52ee99476dfb4d6c9672b77ee3 SHA1 1d9858b99f23688f6a0f4a6726400bbbe41df976 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 AUX avahi-0.6.28-CVE-2011-1002.patch 2076 RMD160 0b561a78e75099a14e7a3da5290cd1ffa6a75533 SHA1 6d298861d7c7b432cd350f3df277e43ed59b378b SHA256 bf8422b278c0c66eca063672c4836346a4d85cb16014882ca3003b0a79ba9f97
 AUX avahi-0.6.30-optional-gtk-utils.patch 2422 RMD160 75d049bc187c08b0ad2d76921064c087d57532ed SHA1 99a0ea57a461d0c0b3d4269adc9571d1bf85f31c SHA256 1233ba93af567117091094921e5ba76f205b1d984fd5a97153c2004f8f0509e3
+AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 RMD160 3b5cda1422345d0fb43842e27dd5b4579ebebd72 SHA1 06450b5cd37b0be3319328706a0329d767219bc5 SHA256 0bd4f2b2f720684b754698d86b6b1f106576473cead815e7b60b1c62171e4cdc
 AUX netlink-request-all-matches-when-requesting-interface.patch 1634 RMD160 3995e26dca6ec1cb4801159c479c0b591eff5da3 SHA1 e234d6bd96b7adaf543ef7583b6dd90538238608 SHA256 163db2141b278a07433e7d1b51227493555ca7ba1faf2d19c97e20aa51b947cd
 DIST avahi-0.6.28.tar.gz 1238660 RMD160 d61b370baa3f25d57efba43f2c34b54cab7e7e9e SHA1 5da3f7da2cff8ddf74f8746e4dcb2524e5047f67 SHA256 a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91
 DIST avahi-0.6.29.tar.gz 1244081 RMD160 a0a4e1019cafb53a683ceceaa44605873957b6cd SHA1 af13ae6fdb3cd61b2eafa25a108773156d88b362 SHA256 4eb1a6bdc93f1b245fc1b26ff6a79f5f958c1135c04bff60d36d374d98cc14d8
 DIST avahi-0.6.30.tar.gz 1243534 RMD160 99dbc4f5711fd2962ac657811bebdb63947bd2c1 SHA1 5b77443537600a00770e4c77e3c443eeb5861d06 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
 EBUILD avahi-0.6.28-r1.ebuild 4934 RMD160 7ebe1201b97f00f08a330211f8f81b07e3d17250 SHA1 4bc99179361a3a55234dbd6f646ce958bbe96e61 SHA256 fb564902531fd9e2059456b2e4659ac0f66ca6e8c1dc0911b9c7fc1cf6c1eed5
-EBUILD avahi-0.6.29.ebuild 4813 RMD160 b9f7a58b8fd051d9c6702d0e2ed01548d26d9edc SHA1 932b31e959caa23f2e58fb8c1beb4da9b8f9dbe8 SHA256 d260d87b5571792264b9ecaa6832bfec5694b40c3199978c4f3385101e6debac
-EBUILD avahi-0.6.30-r1.ebuild 5438 RMD160 c71b23f591507dd11cf216d83d784f3c779e77b5 SHA1 3b31a31fd3e4c924e0e5c65ca0741b44e6bf2ac7 SHA256 8d49d07c5864d958fa151264a80a8e2f99adafcf1344f0ebbef2dc5caaf2d6bf
-EBUILD avahi-0.6.30.ebuild 4838 RMD160 838bcfbe3a24b7aa662e63ab03bf78ae5e9f655f SHA1 934c4b6e8fb70815bc245ac8895f305ba4f68da2 SHA256 19793b5f8a709f9c22c93047eca9271bc83a20fe47f168d7823fc644e82fb747
-MISC ChangeLog 30796 RMD160 30d1d9b22f6daf41d41ea2a7235aead36fbd7c73 SHA1 3b8116aa30c75409551fec665b5cbbc60d6fe0f0 SHA256 dc98a90e19eee4c6cc8d3363b6a40113afb3a080b8504363fa0c35591d9a927e
+EBUILD avahi-0.6.29.ebuild 4943 RMD160 33f586f04be104586802412233744aa696c4a8e2 SHA1 31c5d9270f3e80db1b000f1ffabc47e1ef271ed2 SHA256 e08eb60cfabdc32bfbf15da89d1f0ab427d94e2cd5825f61c151023add8ef159
+EBUILD avahi-0.6.30-r1.ebuild 5571 RMD160 b54383ca67a688eaac3dd59395622e7ebdc00540 SHA1 95eff668dd260ec7e60a5f5edb179d3298ef9be9 SHA256 b23fd1f3a4bb3f8f8de64add948f753b02c03f0a0d0b74e4f2b9eec86c27296d
+EBUILD avahi-0.6.30.ebuild 4969 RMD160 faa2918121ae7936f19bbf4769e93b6690e2cd48 SHA1 0b30a56b729f637b5c0b2ca09762afe45dec01b2 SHA256 f3d6780b562aefdb54752dc373290006e13a76ecf17a975e249bb88d67ee9514
+MISC ChangeLog 31078 RMD160 ec84a1f5dae582fd59c5b31b45426e008e014eca SHA1 e1c5b97020f69e9973fabdc88c43f29d7b9410f7 SHA256 2f8ccfe24b447a8b78c3f62d354dfb1d1c1cbcd0b6c17ca2f8c86d14caf15042
 MISC metadata.xml 892 RMD160 9bca92d3dc0b1ca1ebb7de98fcb6c414028ce376 SHA1 4c2a8a417838011d8a8027fd097661ab262e7bbc SHA256 37689509fa8cae032b27236bf754a0060a21c79c03faa11630f606996e6062cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6IxxsACgkQCaWpQKGI+9RjnwCeK4YpQKRTSJbIK9MkeWtlTO+o
-ddQAn1S4xR70nJxlZE+xSZtYuiDuzbVl
-=Fq+d
+iQIcBAEBCgAGBQJOpEOWAAoJEPiazRVxLXTFJhUP/A2IVX3GkIx10M9qippqz9Qc
+UTlZh+MbwxPCO50jafy5tiyBWEYGOL7QbBpu5mODvx67SI9xtxjaVnrIVhUT9eAE
+7QVP0s9RyFjZWHMj9ZJHlRJ/ddu0hkBXUafqgf7etyX8ZcjJ1AE5iDdr18/eqYT0
+Sm1SXHL6QmvvhpXkrWtyoK+IFyO11gRqJgIJpDeuAqlFzIfY4ewKXoWX/KM3RRAy
+uVfbVdSJ81BPxZ1bHlJhzsvw3MRhHjCb1uzOzA55GiNnPnlUjStOEgx3M0qjTDAD
+BRSspn4BmE5P7AV0UhsrRzfnQytC6rhbbWbhcVDJ/Llyiwkruj8M5JRjEBf1adnd
+oDflmyMc/dzshdRWh3OU1Nvd+VOslBjofOQspbb35YVTMvkTx+qil3nHvUdMFv54
+FxX+P5+U1QgYN296wA562gou5ERBEu41hRnqQiZ8K4UpACtLLILj6dtnJ4WABWBs
+6hjH9QVCXKq0BU1yAHNITKNJejDxyRdBMaHOsHlHSg7/ijkCmK0QIjaY72aG71cY
+BpQkqhsKg7VbC9Sdo1VVKyJ7bkxC0POcbXbhT528p16qq2I1WTCGlD2THdp+D3p8
+WkdMUhnglr4RENeeGGFoG4+PR28Tks0hPag7bek1OmHNw2uNcHIl1SbfmOOeizpD
+iDo/QENCg2QzecDf5Y+i
+=wMBg
 -----END PGP SIGNATURE-----

diff --git a/net-dns/avahi/avahi-0.6.29.ebuild b/net-dns/avahi/avahi-0.6.29.ebuild
index 694860d81d06bd0c6154a184256cf47f91e18cca..81fcb73e207e9d32e2593c6e2fccde45da449b9f 100644 (file)
--- a/net-dns/avahi/avahi-0.6.29.ebuild
+++ b/net-dns/avahi/avahi-0.6.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.29.ebuild,v 1.1 2011/03/17 07:11:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.29.ebuild,v 1.2 2011/10/23 16:40:49 polynomial-c Exp $
 
 EAPI="3"
 
@@ -92,6 +92,9 @@ src_prepare() {
        sed -i\
                -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
                doxygen_to_devhelp.xsl || die
+
+       # Fix init scripts for >=openrc-0.9.0 (bug #383641)
+       epatch "${FILESDIR}/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch"
 }
 
 src_configure() {

diff --git a/net-dns/avahi/avahi-0.6.30-r1.ebuild b/net-dns/avahi/avahi-0.6.30-r1.ebuild
index a1a2bb625ae66f76d5d851cfbc8581d913e87353..779d7c236ca305335059b7da266747cf2da2a495 100644 (file)
--- a/net-dns/avahi/avahi-0.6.30-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.30-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r1.ebuild,v 1.2 2011/10/02 20:18:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r1.ebuild,v 1.3 2011/10/23 16:40:49 polynomial-c Exp $
 
 EAPI="3"
 
@@ -100,6 +100,9 @@ src_prepare() {
        # Make gtk utils optional
        epatch "${FILESDIR}/${PN}-0.6.30-optional-gtk-utils.patch"
 
+       # Fix init scripts for >=openrc-0.9.0 (bug #383641)
+       epatch "${FILESDIR}/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch"
+
        # Drop DEPRECATED flags, bug #384743
        sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
 

diff --git a/net-dns/avahi/avahi-0.6.30.ebuild b/net-dns/avahi/avahi-0.6.30.ebuild
index 5476c62699eaf2c640c97879c01f16af88e0fb1e..eff43ffd1278978987d6fec3de545243a43377da 100644 (file)
--- a/net-dns/avahi/avahi-0.6.30.ebuild
+++ b/net-dns/avahi/avahi-0.6.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30.ebuild,v 1.2 2011/08/06 09:41:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30.ebuild,v 1.3 2011/10/23 16:40:49 polynomial-c Exp $
 
 EAPI="3"
 
@@ -92,6 +92,9 @@ src_prepare() {
        sed -i\
                -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
                doxygen_to_devhelp.xsl || die
+
+       # Fix init scripts for >=openrc-0.9.0 (bug #383641)
+       epatch "${FILESDIR}/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch"
 }
 
 src_configure() {

diff --git a/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch b/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
new file mode 100644 (file)
index 0000000..394f6d3
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
@@ -0,0 +1,22 @@
+--- avahi-0.6.30/initscript/gentoo/avahi-daemon.in
++++ avahi-0.6.30/initscript/gentoo/avahi-daemon.in
+@@ -2,7 +2,7 @@
+ # Copyright 1999-2007 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+ 
+-opts="reload"
++extra_started_commands="reload"
+ 
+ depend() {
+       before netmount nfsmount
+--- avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in
++++ avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in
+@@ -2,7 +2,7 @@
+ # Copyright 1999-2007 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+ 
+-opts="reload"
++extra_started_commands="reload"
+ 
+ depend() {
+       need avahi-daemon