From 66d780f376eb602c0aad4a933db46da1122bfc1e Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Fri, 3 Apr 2015 16:50:50 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 conf.d/NetworkManager |  4 ---
 init.d/NetworkManager | 57 -------------------------------------------
 init.d/tor            |  4 ---
 3 files changed, 65 deletions(-)
 delete mode 100644 conf.d/NetworkManager
 delete mode 100755 init.d/NetworkManager

diff --git a/conf.d/NetworkManager b/conf.d/NetworkManager
deleted file mode 100644
index 4a99229..0000000
--- a/conf.d/NetworkManager
+++ /dev/null
@@ -1,4 +0,0 @@
-# If NetworkManager does not establish a connection within $INACTIVE_TIMEOUT
-# seconds after starting, the service will be marked as inactive, and it will
-# continue to wait for a connection in background mode.
-INACTIVE_TIMEOUT=1
diff --git a/init.d/NetworkManager b/init.d/NetworkManager
deleted file mode 100755
index 8465449..0000000
--- a/init.d/NetworkManager
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
-# Distributed under the terms of the GNU General Purpose License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/files/init.d.NetworkManager,v 1.1 2013/01/28 07:05:05 tetromino Exp $
-
-description="NetworkManager daemon. The service is marked as started only \
-when a network connection is established."
-
-depend() {
-	need dbus
-	provide net
-}
-
-start() {
-	# If we are re-called by a dispatcher event, we want to mark the service
-	# as started without starting the daemon again
-	yesno "${IN_BACKGROUND}" && return 0
-
-	[ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1"
-
-	ebegin "Starting NetworkManager"
-	start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \
-		--exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid
-	local _retval=$?
-	eend "${_retval}"
-	if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then
-		einfo "Marking NetworkManager as inactive. It will automatically be marked"
-		einfo "as started after a network connection has been established."
-		mark_service_inactive
-	fi
-	return "${_retval}"
-}
-
-stop() {
-	# If we are re-called by a dispatcher event, we want to mark the service
-	# as inactive without stopping the daemon
-	if yesno "${IN_BACKGROUND}"; then
-		mark_service_inactive "${SVCNAME}"
-		return 0
-	fi
-
-	ebegin "Stopping NetworkManager"
-	local pidfile=/run/NetworkManager/NetworkManager.pid
-	if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then 
-		# Try stopping the pid file used by <0.9.7
-		pidfile=/var/run/NetworkManager.pid
-		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
-		ret=$?
-		[ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}"
-		eend ${ret}
-	else
-		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
-		eend $?
-	fi
-}
-
-# vim: set ft=gentoo-init-d ts=4 :
diff --git a/init.d/tor b/init.d/tor
index 658b778..947575b 100755
--- a/init.d/tor
+++ b/init.d/tor
@@ -9,10 +9,6 @@ extra_started_commands="reload"
 PIDFILE=/var/run/tor/tor.pid
 CONFFILE=/etc/tor/torrc
 
-depend() {
-        need net
-}
-
 checkconfig() {
         # first check that it exists
         if [ ! -f ${CONFFILE} ] ; then