Further cleanup

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

3 files changed, 5 insertions, 54 deletions

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index f49f25c46044..16140c82fc88 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/thttpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.55 2012/12/29 14:50:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.56 2012/12/29 14:53:07 blueness Exp $
+
+  29 Dec 2012; Anthony G. Basile <blueness@gentoo.org> -files/thttpd.confd,
+  -files/thttpd.init:
+  Further cleanup
 
   29 Dec 2012; Anthony G. Basile <blueness@gentoo.org>
   -files/thttpd-2.25/additional-input-validation-httpd.c.diff,
diff --git a/www-servers/thttpd/files/thttpd.confd b/www-servers/thttpd/files/thttpd.confd
deleted file mode 100644
index 4e1f76f12885..000000000000
--- a/www-servers/thttpd/files/thttpd.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/files/thttpd.confd,v 1.3 2012/08/08 13:24:57 blueness Exp $
-
-## Config file for /etc/init.d/thttpd
-
-## the startup-dir of thttpd is the docroot, so we specify it here
-## and the init-script does a "cd" prior to startup:
-THTTPD_DOCROOT="/var/www/localhost/htdocs"
-
-## There are 2 ways to configure thttpd:
-##	1) specify all params on the cmd-line
-##	2) use a config-file (and start with "-C <conf-file>")
-## Note: 1) and 2) can be mixed.
-##
-## We choose 1) here -- if you have a more complicated setup read
-## thttpd(8) for details on 2).
-
-THTTPD_OPTS="-p 8080 -u thttpd -r -i /var/run/thttpd.pid -l /var/log/thttpd.log"
-
-## For a more complex setup (e.g. cgi-support) use an external configfile:
-## comment the THTTPD_OPTS line above und use the one below.
-#THTTPD_OPTS="-C /etc/thttpd/thttpd.conf"
-
-## If you know what you are doing you can add cgi-support with the line below;
-## but you _should_ use the extern-configfile version!
-#THTTPD_OPTS="$THTTPD_OPTS -c **.cgi|**.sh"
diff --git a/www-servers/thttpd/files/thttpd.init b/www-servers/thttpd/files/thttpd.init
deleted file mode 100644
index 6e1878f740fa..000000000000
--- a/www-servers/thttpd/files/thttpd.init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/files/thttpd.init,v 1.1 2012/03/24 02:59:02 blueness Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting thttpd"
-	if [ ! -d "$THTTPD_DOCROOT" ]; then
-		eend 1 "THTTPD_DOCROOT not set correctly in /etc/conf.d/thttpd"
-		exit 1
-	fi
-	start-stop-daemon --quiet --start --exec /usr/sbin/thttpd \
-		--pidfile /var/run/thttpd.pid --chdir "$THTTPD_DOCROOT" -- \
-			${THTTPD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping thttpd"
-	start-stop-daemon --quiet --stop --pidfile /var/run/thttpd.pid
-	eend $?
-}