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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 28 insertions, 124 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/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