CLean up after cvs.gentoo.org meltdown.

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

7 files changed, 4 insertions, 118 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}
diff --git a/sys-apps/xinetd/xinetd-2.3.3-r6.ebuild b/sys-apps/xinetd/xinetd-2.3.3-r6.ebuild
deleted file mode 100644
index 2c0903a5be63..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.3-r6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.3-r6.ebuild,v 1.1 2001/09/03 10:30:34 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Replacement for inetd."
-HOMEPAGE="http://www.xinetd.org"
-SRC_URI="http://www.xinetd.org/${P}.tar.gz"
-
-DEPEND="virtual/glibc tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
-RDEPEND="virtual/glibc sys-devel/perl"
-
-src_compile() {
-	local myconf
-	use tcpd && myconf="$myconf--with-libwrap"
-	use ipv6 && myconf="$myconf --with-inet6"
-
-	./configure --with-loadavg --prefix=/usr --mandir=/usr/share/man \
-		--host=${CHOST} $myconf || die
-	# Parallel make does not work
-	make || die
-}
-
-src_install() {
-	make prefix=${D}/usr MANDIR=${D}/usr/share/man install
-	dodoc AUDIT CHANGELOG README COPYRIGHT xinetd/sample.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/xinetd.rc6 xinetd
-	exeinto /usr/sbin
-	doexe ${FILESDIR}/xconv.pl
-}
diff --git a/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild b/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild
index a9d0c6f7ca96..97ac51a5d458 100644
--- a/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer System Team <system@gentoo.org>
-# Author Achim Gottinger <achim@gentoo.org>, Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild,v 1.2 2001/12/23 23:25:19 azarah Exp $
+# Maintainer: System Team <system@gentoo.org>
+# Author: Donny Davies <woodchip@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild,v 1.3 2002/01/23 04:40:29 woodchip Exp $
 
 # NB: This ebuild introduces the /etc/xinetd.d includedir with a default
 #     /etc/xinetd.conf file.  Check your config files if you're upgrading
diff --git a/sys-apps/xinetd/xinetd-2.3.3.ebuild b/sys-apps/xinetd/xinetd-2.3.3.ebuild
deleted file mode 100644
index e4644af8ec99..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.3.ebuild,v 1.7 2001/09/03 10:30:34 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Replacement for inetd."
-HOMEPAGE="http://www.xinetd.org"
-SRC_URI="http://www.xinetd.org/${P}.tar.gz"
-
-DEPEND="virtual/glibc tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
-RDEPEND="virtual/glibc sys-devel/perl"
-
-src_compile() {
-	local myconf
-	use tcpd && myconf="$myconf--with-libwrap"
-	use ipv6 && myconf="$myconf --with-inet6"
-
-	./configure --with-loadavg --prefix=/usr --mandir=/usr/share/man \
-		--host=${CHOST} $myconf || die
-	# Parallel make does not work
-	make || die
-}
-
-src_install() {
-	make prefix=${D}/usr MANDIR=${D}/usr/share/man install
-	dodoc AUDIT CHANGELOG README COPYRIGHT xinetd/sample.conf
-	exeinto /etc/rc.d/init.d
-	newexe ${FILESDIR}/xinetd.rc5 xinetd
-	exeinto /usr/sbin
-	doexe ${FILESDIR}/xconv.pl
-}