Switched to openrc style init script for old 0.2.1 branch

(Portage version: 2.1.10.11/cvs/Linux x86_64)

3 files changed, 9 insertions, 60 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 275c252e53d6..dc01e6ad02d4 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.296 2011/11/26 15:31:01 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.297 2011/11/26 15:44:00 blueness Exp $
+
+*tor-0.2.1.31-r1 (26 Nov 2011)
+
+  26 Nov 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.31.ebuild,
+  +tor-0.2.1.31-r1.ebuild, -files/tor.initd-r4:
+  Switched to openrc style init script for old 0.2.1 branch
 
   26 Nov 2011; Anthony G. Basile <blueness@gentoo.org> -tor-0.2.1.30.ebuild,
   -files/tor.conf:
diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4
deleted file mode 100644
index 597a9550e451..000000000000
--- a/net-misc/tor/files/tor.initd-r4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v 1.7 2011/08/23 12:26:36 blueness Exp $
-
-opts="${opts} checkconfig reload"
-PIDFILE=/var/run/tor/tor.pid
-CONFFILE=/etc/tor/torrc
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        # first check that it exists
-        if [ ! -f ${CONFFILE} ] ; then
-                eerror "You need to setup ${CONFFILE} first"
-                eerror "Example is in ${CONFFILE}.sample"
-                return 1
-	fi
-
-	# now verify whether the configuration is valid
-	/usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1
-	if [ $? -eq 0 ] ; then
-		einfo "Tor configuration (${CONFFILE}) is valid."
-		return 0
-	else
-		eerror "Tor configuration (${CONFFILE}) not valid."
-		/usr/bin/tor --verify-config -f ${CONFFILE}
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-        ebegin "Starting Tor"
-        HOME=/var/lib/tor
-	start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Tor"
-	start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
-        eend $?
-}
-
-reload() {
-	if [ ! -f ${PIDFILE} ]; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading Tor configuration"
-	start-stop-daemon --signal HUP --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-misc/tor/tor-0.2.1.31.ebuild b/net-misc/tor/tor-0.2.1.31-r1.ebuild
index 1e8f2ce8bdcd..a5048f9a67e3 100644
--- a/net-misc/tor/tor-0.2.1.31.ebuild
+++ b/net-misc/tor/tor-0.2.1.31-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-misc/tor/tor-0.2.1.31.ebuild,v 1.1 2011/10/28 18:20:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.31-r1.ebuild,v 1.1 2011/11/26 15:44:00 blueness Exp $
 
 EAPI=4
 
@@ -60,7 +60,7 @@ src_install() {
 	# allow the tor user more open files to avoid errors, see bug 251171
 	newconfd "${FILESDIR}"/tor.confd tor
 
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
 	emake DESTDIR="${D}" install
 	keepdir /var/{lib,log,run}/tor