Fix init scripts (opts / --oknodo / /var/run) by Torbjörn Lönnemark (bug #514452).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 36 insertions, 134 deletions

diff --git a/net-analyzer/symon/ChangeLog b/net-analyzer/symon/ChangeLog
index 2bb6618c4d73..329160f36203 100644
--- a/net-analyzer/symon/ChangeLog
+++ b/net-analyzer/symon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/symon
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/ChangeLog,v 1.14 2013/02/20 13:38:59 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/ChangeLog,v 1.15 2014/06/24 01:31:06 jer Exp $
+
+*symon-2.86-r1 (24 Jun 2014)
+
+  24 Jun 2014; Jeroen Roovers <jer@gentoo.org> -symon-2.85.ebuild,
+  -symon-2.86.ebuild, +symon-2.86-r1.ebuild, files/symon-init.d,
+  files/symux-init.d:
+  Fix init scripts (opts / --oknodo / /var/run) by Torbjörn Lönnemark (bug
+  #514452).
 
 *symon-2.86 (20 Feb 2013)
 
diff --git a/net-analyzer/symon/Manifest b/net-analyzer/symon/Manifest
index 80b63830b2b5..ffc0c647a1d1 100644
--- a/net-analyzer/symon/Manifest
+++ b/net-analyzer/symon/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX symon-init.d 673 SHA256 e2e50267b404749745aed3e35de96b79548bdebb0179980cda733ca7c5a678b5 SHA512 209f6c7401aa248bf6840b95092c9e86a2bf12d3d9ee30e8cd079fb6e2b40518224e33d86777dcb5e17f94626f1040621326fb30e3edb0db488700b120f46f24 WHIRLPOOL 22fbe0bc78d8ee1da31a909911ca0c04933b4b51389d6b647996f80d706fb7b3f729ef823f89e365ce87f63e4677b7fdba36cd864e4c23443d102e3ed81a44cd
+AUX symon-init.d 662 SHA256 c13b1b58df24452308ae347df5f9b8eea6b8a07f3daa30d5cdbca7908762b7cf SHA512 4f59a1635c40aac84038d21fddce12dbd41e7823725e9b51a38a0d7bb87b8d70c57743fb859ed643d4bdec1a728303b067b112131bdab315c5d8fa15d3354114 WHIRLPOOL ec5e93ebb0b8588d95a4811455e6f3adcf9550d8c60834c122ccd79434622a5f3eb2824ef54db22978c1f4d5ae2f9c5f700660747fac38da8a2ef5a06e6c72de
 AUX symon.conf 313 SHA256 3f4914f65fa4456de5ee70da3c6f40f416d6452fac8a439648cc565c791cec73 SHA512 9d83d316a5024c0fc5a9c487113088548e6ba193360d684b162d39e0373bc478ebdb40b7ce508c0de2287de6684c75cfcf2f312e34e9def1dcaaeb0036ecab56 WHIRLPOOL f782d8fb717c3de1bec7e5dfab0591bb51e1770605fc6060b2b5537eae31b3b3afcde9964a23b410c69388c3d32d94193894f8369a1865be887423f53d283d2f
-AUX symux-init.d 667 SHA256 5986c80b893c490e5adf9393ec0f789b6ef4ce1529630ba4c0fc8d603bade3e8 SHA512 83555993df5df8872710b91c02c995b079163470090371f653d40e124e7e61995e0658878e27ac2178e39c852fdf269c68decdfb81fdd22a04a762cf5a0d30f0 WHIRLPOOL fd085e7dbe79430d734607bf3a09a6b014d2f0be2e5e6f6fe18b0a5a494e313bc16e7e4e857c7f4b3481b66b7ad65b4d9d7ad95ec9e162b8e65799c5037a787b
+AUX symux-init.d 656 SHA256 64719f1df500fa43cfd1eb0e3bd7159c98380884c6bdbf01724882fecf266dc5 SHA512 e203fe2a3fe7ee862e7541ffc5a0c8de7d174830c7ff969dc231ebf01172d0a0f913caa1713abbe9becb78b55a832a6290d4217ee3da198d435c86700c245b51 WHIRLPOOL fb4d99927e32959c7da7d03e3e999dc17c2106820a7d25fdac7166c77cdcec82bcc84e86e84afd3146b8ebcf08abe53d9421884e68da44c89f9c21e51e4fe96e
 AUX symux.conf 952 SHA256 20f915f55f084c1f9b55410c097c8165e2d621924e3496c9e3add7c1de655126 SHA512 5f7aa2d069ed6cb58dfc6ce7ab192f1486256551c1315b86b0216c56d4ee93d84101168c5ee8c1507729136dcd05c7a09cc9c901f132c5fc8015b2502bc15272 WHIRLPOOL 919d2bf8d56b52dccc10b0899993ff839578d16760243d2c204706d17662c34b33a1cf3dee4aae10728afc4191045d6c641396416fe61ff697209f68e64f7b8c
-DIST symon-2.85.tar.gz 106011 SHA256 547329a1efbc2408298256d31a005db23869117ccf6249c052ef662b3ee12d35 SHA512 e018950834620a581a9208727b3a8b70f714a4e8f8108ef261f8063e37b4491b0c9b1c174bedfd7402a9751c911275cca0d31e8773ededb0af90185e019d6db4 WHIRLPOOL 2516fc5160675aba707680b76f9a253d251b0501d89fe7b7ae5cd039762ed5a8f9c73be1e8c4909fa0232e66af78c129a339ee4d8a75d9bb86bccd0128665b75
 DIST symon-2.86.tar.gz 106791 SHA256 c36457e53e91cbb478cb57d96bf40c718a8582e0b19bd4cba247002b7a6068b3 SHA512 13f96654ee4569ac0a92fd601962d2610e83d03a59b0772c385788586ee7bcc2639012388b8c123dd6f12368e21e834c5a12c32152fc73e9e87553889962ee46 WHIRLPOOL bc94567f1c7ca36d30afd74f2747cbb239e86b8b7255541ff5ca4e2adafaed794249f455339a04c8291260430279840395e02e3733619f0e3595da2fdbfd7d21
-EBUILD symon-2.85.ebuild 2626 SHA256 d65d4da50c153096318d32d5a7c4bf20c150c78057b1e3a9d406130565eb02a8 SHA512 6ebb4feb05ca13c88e6cb891dfed6b215452dbcc2f8bb2e25f4194347b5979e700e74ef0fbe587fc8eb189f4ea2a567c05cbd04d377a039cccfe9462b30157d9 WHIRLPOOL 3a4d67f7c38a9e10e71b0d37a2b89a312505cf1fdae8f77a5a7ed411e2c17b97426ca416c50a298e97d21525b5e9fb62c8c2d0fe8d1b6e84c01f42bd0bcbae3e
-EBUILD symon-2.86.ebuild 2594 SHA256 af22b8cebb8956f8a5ab38a3b67734fa32d2fc2fbaa861c618b0f2ebfd2e8487 SHA512 6d52c8fd8d1660abedf10c8e88f8a167c945922a07e0487b2757ca808bd139545e8cec34b7ea1e1ec004093fc720e6c807e25006fb618d6c74c03a11f22f7277 WHIRLPOOL fd8a28d05bb7b45ad30f2527154044c934990d0aae806c087efff5f3866c952e80ca49ccf35460a38033d529fa79ad8ed91a0949ae7f27d154f75a9dfe0663b2
-MISC ChangeLog 2868 SHA256 58dfc729979e6d5f363123cb2857d485eebfc771690d964d6ceaf55107c88ba1 SHA512 aa710d1e77faece3fc3e723aa00bb1f118268fe628da4604b64bf35f448b6a5693e3bb15c20301c0722aa115395664b6e9760502388fc12a8d1d13f731f2599a WHIRLPOOL f5b06019af77158a4ffbeac27dc9fa06202ba7a1dfe1b6cd57a1380f5f31c07852361a5606316b3c93999256c14594727b7406d50b303ea3e1c86be04c648630
+EBUILD symon-2.86-r1.ebuild 2597 SHA256 b759184464e30f07fe7b7a33087f377df69d6261bf744931348473fa911dc9c4 SHA512 6cede92fcbe88efbbb2aca9b93c35cf774d513c4e61e270c9416f22f6cf2474dad93ca6290a17a3e3a8ff7e3a4d6d7a097de5f7293a4e192d7301300ad2c328c WHIRLPOOL 9f85585bb4d2f1fc4029bbd66f86db6c3038123bbb2a38e6dfb5c39ec68b07ffd82e50ed60d38e41c1a0df26c7f1579e1c1a5aa5a98cf2e128ff4ce48da828a3
+MISC ChangeLog 3142 SHA256 ea081c826c352e91febef235ddd05f976ea5a84760a55128c530ac2c7699e3c9 SHA512 d1db72a9b881150b59601429c11b19340f4212c2cfcbaa134b21b5dd6c653bfc4d25a98952286ca383fbd05fc78907c565e00988b377470273d0c28261382a73 WHIRLPOOL 77b9308824a5a065fb5542d53864e0fccb96a80763c834e91a7b1ccea3de3798fdb8c114dad9d07edb3e603533b7812d6f3cd2d76898eb71741944dafbfd2653
 MISC metadata.xml 512 SHA256 c95f7e3719ea159f70b49b972150f6fb2f366f2373636a0a6167a6efe36b4631 SHA512 bd2d6ed4269a7e6a0d537c6a400247ba4683a07c66f19b158e9005fc9210cea9d9ef40904cf2971f636759456986764d432239984159cbe098771cefa49c813a WHIRLPOOL c96b89c04a12acd9805b3a241515fa8f0c69f2321239c9981a36d6384daac402c00ecb8b881dd0884754cb0793f796b919749b385f99d4fc1985746636b4e689
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlEk0fQACgkQVWmRsqeSphPnEwCeNHuOVlARejo7/iGzSNVMOsq1
-V5gAnj4edfTsEf367nODtu/pAEEuqHTl
-=n7Ng
+iEYEAREIAAYFAlOo1NwACgkQVWmRsqeSphOCpwCfaz3otSQ+GkcvORdnXjvCTxuQ
+U2wAn25RfDh+MJzlW0+Cwdas8YMEfqqF
+=clEb
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/symon/files/symon-init.d b/net-analyzer/symon/files/symon-init.d
index 6b6ac1384567..5120c6a33c23 100644
--- a/net-analyzer/symon/files/symon-init.d
+++ b/net-analyzer/symon/files/symon-init.d
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the 2-clause BSD license
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/files/symon-init.d,v 1.3 2012/09/13 07:07:53 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/files/symon-init.d,v 1.4 2014/06/24 01:31:06 jer Exp $
 
-opts="${opts} reload"
+extra_started_commands="reload"
 
 depend() {
 	after bootmisc
@@ -13,8 +13,10 @@ depend() {
 
 reload() {
 	ebegin "Reloading symon"
-	start-stop-daemon --stop --pidfile /var/run/symon.pid \
-		--exec /usr/sbin/symon --oknodo --signal HUP
+	start-stop-daemon \
+		--pidfile /run/symon.pid \
+		--exec /usr/sbin/symon \
+		--signal HUP
 	eend $?
 }
 
@@ -26,6 +28,6 @@ start() {
 
 stop() {
 	ebegin "Stopping symon"
-	start-stop-daemon --stop --pidfile /var/run/symon.pid
+	start-stop-daemon --stop --pidfile /run/symon.pid
 	eend $?
 }
diff --git a/net-analyzer/symon/files/symux-init.d b/net-analyzer/symon/files/symux-init.d
index b96e2ff5345c..14b8f4ce4124 100644
--- a/net-analyzer/symon/files/symux-init.d
+++ b/net-analyzer/symon/files/symux-init.d
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the 2-clause BSD license
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/files/symux-init.d,v 1.3 2012/09/13 07:07:53 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/files/symux-init.d,v 1.4 2014/06/24 01:31:06 jer Exp $
 
-opts="${opts} reload"
+extra_started_commands="reload"
 
 depend() {
 	after bootmisc
@@ -13,8 +13,10 @@ depend() {
 
 reload() {
 	ebegin "Reloading symux"
-	start-stop-daemon --stop --pidfile /var/run/symux.pid \
-		--exec /usr/sbin/symux --oknodo --signal HUP
+	start-stop-daemon \
+		--pidfile /run/symux.pid \
+		--exec /usr/sbin/symux \
+		--signal HUP
 	eend $?
 }
 
@@ -26,6 +28,6 @@ start() {
 
 stop() {
 	ebegin "Stopping symux"
-	start-stop-daemon --stop --pidfile /var/run/symux.pid
+	start-stop-daemon --stop --pidfile /run/symux.pid
 	eend $?
 }
diff --git a/net-analyzer/symon/symon-2.85.ebuild b/net-analyzer/symon/symon-2.85.ebuild
deleted file mode 100644
index 5e0e41de6f59..000000000000
--- a/net-analyzer/symon/symon-2.85.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.85.ebuild,v 1.1 2012/04/17 16:39:50 jer Exp $
-
-EAPI=4
-
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="Performance and information monitoring tool"
-HOMEPAGE="http://www.xs4all.nl/~wpd/symon/"
-SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="perl +symon symux"
-
-RDEPEND="perl? ( dev-lang/perl )
-	symux? ( net-analyzer/rrdtool )"
-DEPEND="${RDEPEND}
-	virtual/pmake"
-
-S=${WORKDIR}/${PN}
-
-# Deletes the directory passed as an argument from the internal pmake
-# variable SUBDIR.
-zap_subdir() {
-	sed -i "/^SUBDIR/s/$1//" Makefile || die
-}
-
-pkg_setup() {
-	use symon && USE_SYMON=1 && return
-
-	if ! use perl && ! use symon && ! use symux; then
-		ewarn "You have all available USE flags disabled. Therefore, only the"
-		ewarn "system monitor will be emerged. Please, enable at least one USE"
-		ewarn "flag to avoid this message."
-		USE_SYMON=1
-	fi
-}
-
-src_prepare() {
-	# Respect LDFLAGS.
-	sed -i "/^[ \t]*\${CC}.*\${LIBS}/s/\${CC}/& \${LDFLAGS}/" sym*/Makefile \
-		|| die "sed ldflags failed"
-
-	# Do some sed magic in accordance with the USE flags.
-	use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib
-	! use perl && zap_subdir client
-	! use symux && zap_subdir symux
-	[[ -z ${USE_SYMON} ]] && zap_subdir symon
-}
-
-src_compile() {
-	pmake CC="$(tc-getCC)" CFLAGS+="${CFLAGS}" STRIP=true || die "pmake failed"
-}
-
-src_install() {
-	if [[ -n ${USE_SYMON} ]]; then
-		insinto /etc
-		doins "${FILESDIR}"/symon.conf
-
-		newinitd "${FILESDIR}"/symon-init.d symon
-
-		dodoc CHANGELOG HACKERS TODO
-
-		doman symon/symon.8
-		dosbin symon/symon
-	fi
-
-	if use perl; then
-		dobin client/getsymonitem.pl
-
-		perlinfo
-		insinto ${VENDOR_LIB}
-		doins client/SymuxClient.pm
-	fi
-
-	if use symux; then
-		insinto /etc
-		doins "${FILESDIR}"/symux.conf
-
-		newinitd "${FILESDIR}"/symux-init.d symux
-
-		doman symux/symux.8
-		dosbin symux/symux
-
-		dodir /usr/share/symon
-		insinto /usr/share/symon
-		doins symux/c_smrrds.sh
-		fperms a+x /usr/share/symon/c_smrrds.sh
-
-		dodir /var/lib/symon/rrds/localhost
-	fi
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-
-	if use symux; then
-		elog "The RRDs files can be obtained by running"
-		elog "/usr/share/symon/c_smrrds.sh all."
-		elog "For information about migrating RRDs from a previous"
-		elog "symux version read the LEGACY FORMATS section of symux(8)."
-		elog "To view the rrdtool pictures of the stored data, emerge"
-		elog "net-analyzer/syweb."
-	fi
-}
diff --git a/net-analyzer/symon/symon-2.86.ebuild b/net-analyzer/symon/symon-2.86-r1.ebuild
index 405da6242e23..b4c824856c86 100644
--- a/net-analyzer/symon/symon-2.86.ebuild
+++ b/net-analyzer/symon/symon-2.86-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.86.ebuild,v 1.1 2013/02/20 13:38:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild,v 1.1 2014/06/24 01:31:06 jer Exp $
 
 EAPI=5