CLean up after cvs.gentoo.org meltdown.

Delete old versions.
Tweak initscript, no message about conffile, we install one by default.

4 files changed, 1 insertions, 51 deletions

diff --git a/sys-apps/xinetd/files/digest-xinetd-2.3.3 b/sys-apps/xinetd/files/digest-xinetd-2.3.3
deleted file mode 100644
index c7af1620b36c..000000000000
--- a/sys-apps/xinetd/files/digest-xinetd-2.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6bbf329e3c101fbd25b68fa933250d74 xinetd-2.3.3.tar.gz 274432
diff --git a/sys-apps/xinetd/files/digest-xinetd-2.3.3-r6 b/sys-apps/xinetd/files/digest-xinetd-2.3.3-r6
deleted file mode 100644
index c7af1620b36c..000000000000
--- a/sys-apps/xinetd/files/digest-xinetd-2.3.3-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6bbf329e3c101fbd25b68fa933250d74 xinetd-2.3.3.tar.gz 274432
diff --git a/sys-apps/xinetd/files/xinetd.rc5 b/sys-apps/xinetd/files/xinetd.rc5
deleted file mode 100644
index 6d540811568a..000000000000
--- a/sys-apps/xinetd/files/xinetd.rc5
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#RCUPDATE:3 4:72:This line is required for script management
-
-. /etc/rc.d/config/functions
-
-SERVICE=xinetd
-EXE="/usr/sbin/xinetd"
-opts="start stop"
-
-autoconfig() {
-if [ ! -e /etc/xinetd.conf ] ; then
-	if [ ! -e /etc/inetd.conf ] ; then
-		eerror "You need an /etc/xinetd.conf file to run xinetd"
-		eerror "There is a sample one in /usr/share/docs/xinetd"
-		return 1
-	else
-		einfo "Auto-creating xinetd.conf from your inetd.conf"
-		/usr/sbin/xconv.pl < /etc/inetd.conf > /etc/xinetd.conf
-	fi
-fi
-}
-
-start() {
-	autoconfig || return 1
-	ebegin "Starting ${SERVICE}"
-	start-stop-daemon --start --quiet --exec $EXE 1>&2
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping ${SERVICE}"
-	start-stop-daemon --stop --quiet -u root -n $SERVICE 1>&2
-	eend $? 
-}
-
-doservice ${@}
diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6
index 9a81951f790c..5fad4d7fe924 100644
--- a/sys-apps/xinetd/files/xinetd.rc6
+++ b/sys-apps/xinetd/files/xinetd.rc6
@@ -1,25 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.10 2001/12/23 23:25:19 azarah Exp $
-
-# NB: Config is in /etc/conf.d/xinetd
-
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.11 2002/01/23 04:40:29 woodchip Exp $
 
 depend() {
 	need net
 }
 
-checkconfig() {
-	if [ ! -e /etc/xinetd.conf ] ; then
-		eerror "You need an /etc/xinetd.conf file to run xinetd"
-		eerror "There is a sample file in /usr/share/doc/xinetd"
-		return 1
-	fi
-}
-
 start() {
-	checkconfig || return 1
 	ebegin "Starting xinetd"
 	start-stop-daemon --start --quiet --exec /usr/sbin/xinetd \
 		-- -pidfile /var/run/xinetd.pid ${XINETD_OPTS}