summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2013-11-05 19:11:23 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2013-11-05 19:11:23 +0000
commit5246363046176619a80cb105abd14489eae50d66 (patch)
tree0463253b1926078e8477fe2f53987857e8325edb /app-misc/conmux
parentAdd (diff)
downloadgentoo-2-5246363046176619a80cb105abd14489eae50d66.tar.gz
gentoo-2-5246363046176619a80cb105abd14489eae50d66.tar.bz2
gentoo-2-5246363046176619a80cb105abd14489eae50d66.zip
Revbump. Fix typo. Make init script use SVCNAME for running multiple instances. Add missing 'depend' function
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)
Diffstat (limited to 'app-misc/conmux')
-rw-r--r--app-misc/conmux/ChangeLog9
-rw-r--r--app-misc/conmux/conmux-0.15.1-r3.ebuild (renamed from app-misc/conmux/conmux-0.15.1-r2.ebuild)2
-rwxr-xr-xapp-misc/conmux/files/conmux.initd11
3 files changed, 17 insertions, 5 deletions
diff --git a/app-misc/conmux/ChangeLog b/app-misc/conmux/ChangeLog
index 7e249951cc09..7ee62bda43e4 100644
--- a/app-misc/conmux/ChangeLog
+++ b/app-misc/conmux/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-misc/conmux
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/conmux/ChangeLog,v 1.4 2013/11/02 16:32:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/conmux/ChangeLog,v 1.5 2013/11/05 19:11:23 hwoarang Exp $
+
+*conmux-0.15.1-r3 (05 Nov 2013)
+
+ 05 Nov 2013; Markos Chandras <hwoarang@gentoo.org> +conmux-0.15.1-r3.ebuild,
+ -conmux-0.15.1-r2.ebuild, files/conmux.initd:
+ Revbump. Fix typo. Make init script use SVCNAME for running multiple
+ instances. Add missing 'depend' function
02 Nov 2013; Markos Chandras <hwoarang@gentoo.org> conmux-0.15.1-r2.ebuild:
Add ~mips
diff --git a/app-misc/conmux/conmux-0.15.1-r2.ebuild b/app-misc/conmux/conmux-0.15.1-r3.ebuild
index 49f142e6c1d1..f9bbe0b39239 100644
--- a/app-misc/conmux/conmux-0.15.1-r2.ebuild
+++ b/app-misc/conmux/conmux-0.15.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/conmux/conmux-0.15.1-r2.ebuild,v 1.2 2013/11/02 16:32:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/conmux/conmux-0.15.1-r3.ebuild,v 1.1 2013/11/05 19:11:23 hwoarang Exp $
EAPI=5
diff --git a/app-misc/conmux/files/conmux.initd b/app-misc/conmux/files/conmux.initd
index 23485b547658..d76858f9e52a 100755
--- a/app-misc/conmux/files/conmux.initd
+++ b/app-misc/conmux/files/conmux.initd
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+depend() {
+ use net
+ need conmux-registry
+}
+
checkconfig() {
if [[ ! -f ${CONMUX_CONFIG} ]]; then
eerror ""
@@ -22,13 +27,13 @@ start() {
# Make sure conmux finds everything
export PATH="${PATH}:/usr/share/conmux/drivers:/usr/share/conmux/helpers"
ebegin "Starting conmux daemon"
- start-stop-daemon -m b --start -1 ${CONMUX_LOG} \
- -2 ${CONMUX_LOG} -p /run/conmux.pid \
+ start-stop-daemon -m -b --start -1 ${CONMUX_LOG} \
+ -2 ${CONMUX_LOG} -p /run/${SVCNAME}.pid \
--exec /usr/sbin/conmux -- ${CONMUX_CONFIG}
}
stop() {
ebegin "Stopping conmux daemon"
- start-stop-daemon --stop --pidfile /run/conmux.pid
+ start-stop-daemon --stop --pidfile /run/${SVCNAME}.pid
eend $?
}