cleanup

22 files changed, 43 insertions, 406 deletions

diff --git a/sys-apps/xinetd/ChangeLog b/sys-apps/xinetd/ChangeLog
index a32bd1cb2372..b927044325d6 100644
--- a/sys-apps/xinetd/ChangeLog
+++ b/sys-apps/xinetd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/xinetd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.21 2003/05/19 08:48:38 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.22 2003/05/19 16:48:39 mholzer Exp $
+
+  19 May 2003; Martin Holzer <mholzer@gentoo.org> xinetd-2.3.10.ebuild,
+  xinetd-2.3.10.ebuild, xinetd-2.3.11.ebuild, xinetd-2.3.7.ebuild,
+  xinetd-2.3.7.ebuild, xinetd-2.3.9.ebuild, xinetd-2.3.9.ebuild,
+  files/xinetd.rc6, files/2.3.9/xinetd.conf, files/2.3.9/xinetd.confd,
+  files/2.3.9/xinetd.rc6, files/2.3.9/etc.xinetd.d/README.services,
+  files/2.3.9/etc.xinetd.d/chargen-tcp, files/2.3.9/etc.xinetd.d/chargen-udp,
+  files/2.3.9/etc.xinetd.d/daytime-tcp, files/2.3.9/etc.xinetd.d/daytime-udp,
+  files/2.3.9/etc.xinetd.d/echo-tcp, files/2.3.9/etc.xinetd.d/echo-udp,
+  files/2.3.9/etc.xinetd.d/time-tcp, files/2.3.9/etc.xinetd.d/time-udp:
+  Cleanup
 
   18 May 2003; Daniel Ahlberg <aliz@gentoo.org> xinetd-2.3.11.ebuild :
   Unmasked on all archs. Security update.
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index abb2a08b0418..fcdc8ffd9458 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -1,21 +1,12 @@
-MD5 b2333954a9bef1ee54c8f98bfca71022 ChangeLog 3138
-MD5 a170af6ab45e1e9d7ac75e42e09523dc xinetd-2.3.7.ebuild 1777
-MD5 b0733c48d522654c89d7eff07d491c5a xinetd-2.3.9.ebuild 2032
-MD5 cf8b3e9d572b075519ca2fa8d399186a xinetd-2.3.10.ebuild 2124
-MD5 0f3daba39b402d2c1bd744570cea5f8b xinetd-2.3.11.ebuild 2116
-MD5 29e7449ffc4ddaecf18694bf8863804e files/digest-xinetd-2.3.7 64
-MD5 606b483b66ae9a568747b4574f4f8e19 files/digest-xinetd-2.3.9 64
+MD5 890d6579167984ad9eb64a42273ff7e5 ChangeLog 3906
+MD5 b40a9b153e6a8a7b78618a93701cc553 xinetd-2.3.11.ebuild 2029
 MD5 41406ad0e85906703ed6e0def5b42bed files/svc-xinetd 827
 MD5 897e24c3c7cc5a08093dfcb3a71fc0ee files/xconv.pl 3030
 MD5 300b0b4bf4741ed50e7978d3361e5666 files/xinetd-run 463
 MD5 8d2e4c58ac55be113ffdeb972b8faaec files/xinetd.conf 241
 MD5 3f783283f84bcbd83ef6a5ea683c8752 files/xinetd.confd 70
-MD5 bf5bf13ee147b5f5f74f0648121a494c files/xinetd.rc6 546
-MD5 f57d25d67f98e2026980193bb748b38f files/digest-xinetd-2.3.10 65
+MD5 de447508d4452f2fa90a298cf6cdafe1 files/xinetd.rc6 850
 MD5 469ecc467df958570cae2caad4391dd1 files/digest-xinetd-2.3.11 65
-MD5 8d2e4c58ac55be113ffdeb972b8faaec files/2.3.9/xinetd.conf 241
-MD5 3f783283f84bcbd83ef6a5ea683c8752 files/2.3.9/xinetd.confd 70
-MD5 b4a8f4958ec5ae62d4d692d24c8484bc files/2.3.9/xinetd.rc6 854
 MD5 f9591814c08ab763ace5c8969ce6d457 files/etc.xinetd.d/README.services 643
 MD5 7d04f6175ae493c8aa988e3728e959b3 files/etc.xinetd.d/chargen-tcp 246
 MD5 a26dbc5cae6b20e71846bff26600eb89 files/etc.xinetd.d/chargen-udp 266
@@ -25,12 +16,3 @@ MD5 6eb573e86ba7cad19ea240848a88767a files/etc.xinetd.d/echo-tcp 238
 MD5 15e73cb0db884334cef7ac44ced9fa6c files/etc.xinetd.d/echo-udp 263
 MD5 02bc3d5745432ee4b5b11b9c2e03c731 files/etc.xinetd.d/time-tcp 270
 MD5 70829ea9fe03a6e343efa635c9f263e0 files/etc.xinetd.d/time-udp 272
-MD5 f9591814c08ab763ace5c8969ce6d457 files/2.3.9/etc.xinetd.d/README.services 643
-MD5 7d04f6175ae493c8aa988e3728e959b3 files/2.3.9/etc.xinetd.d/chargen-tcp 246
-MD5 a26dbc5cae6b20e71846bff26600eb89 files/2.3.9/etc.xinetd.d/chargen-udp 266
-MD5 2444f1a969860075d1d7fe9974a62575 files/2.3.9/etc.xinetd.d/daytime-tcp 246
-MD5 79665fc4e88391cc1d5f8f0f4fd391d8 files/2.3.9/etc.xinetd.d/daytime-udp 272
-MD5 6eb573e86ba7cad19ea240848a88767a files/2.3.9/etc.xinetd.d/echo-tcp 238
-MD5 15e73cb0db884334cef7ac44ced9fa6c files/2.3.9/etc.xinetd.d/echo-udp 263
-MD5 02bc3d5745432ee4b5b11b9c2e03c731 files/2.3.9/etc.xinetd.d/time-tcp 270
-MD5 70829ea9fe03a6e343efa635c9f263e0 files/2.3.9/etc.xinetd.d/time-udp 272
diff --git a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/README.services b/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/README.services
deleted file mode 100644
index ba35afc106b4..000000000000
--- a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/README.services
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Extract from man 5 xinetd.conf:
-#
-Every file inside this directory, excluding files with names
-containing a dot ('.') or end-ing with a tilde ('~'), will be
-parsed as xinetd configuration files.  The files will be parsed
-in alphabetical order according to the C locale.  This allows
-you to specify services one per file.
-
-
-#
-# Considerations:
-#
-You can make packages install an example service configuration
-file into this directory to easily help users with integrating
-it with xinetd.  It would be nice if your package included the
-"disable = yes" directive by default.  Its probably wise to
-have the user decide upon enabling services.
diff --git a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/chargen-tcp b/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/chargen-tcp
deleted file mode 100644
index 04b0fbc32834..000000000000
--- a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/chargen-tcp
+++ /dev/null
@@ -1,13 +0,0 @@
-# default: off
-# description: A chargen server. This is the tcp version.
-
-service chargen
-{
-	type        = INTERNAL
-	id          = chargen-stream
-	socket_type = stream
-	protocol    = tcp
-	user        = root
-	wait        = no
-	disable	    = yes
-}
diff --git a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/chargen-udp b/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/chargen-udp
deleted file mode 100644
index 462ba78cd9cf..000000000000
--- a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/chargen-udp
+++ /dev/null
@@ -1,14 +0,0 @@
-# default: off
-# description: A chargen server. This is the udp version.
-
-service chargen
-{
-	type        = INTERNAL UNLISTED
-	id          = chargen-dgram
-	socket_type = dgram
-	protocol    = udp
-	user	    = root
-	wait	    = yes
-	port        = 19
-	disable	    = yes
-}
diff --git a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/daytime-tcp b/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/daytime-tcp
deleted file mode 100644
index 2c0cbfee46eb..000000000000
--- a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/daytime-tcp
+++ /dev/null
@@ -1,13 +0,0 @@
-# default: off
-# description: A daytime server. This is the tcp version.
-
-service daytime
-{
-	type        = INTERNAL
-	id          = daytime-stream
-	socket_type = stream
-	protocol    = tcp
-	user        = root
-	wait        = no
-	disable     = yes
-}
diff --git a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/daytime-udp b/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/daytime-udp
deleted file mode 100644
index f007611c7cd1..000000000000
--- a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/daytime-udp
+++ /dev/null
@@ -1,14 +0,0 @@
-# default: off
-# description: A daytime server. This is the udp version.
-
-service daytime
-{
-	type        = INTERNAL UNLISTED
-	id          = daytime-dgram
-	socket_type = dgram
-	protocol    = udp
-	user        = root
-	wait        = yes
-	port        = 13
-	disable     = yes
-}
diff --git a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/echo-tcp b/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/echo-tcp
deleted file mode 100644
index 73d13e7b9550..000000000000
--- a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/echo-tcp
+++ /dev/null
@@ -1,13 +0,0 @@
-# default: off
-# description: An echo server. This is the tcp version.
-
-service echo
-{
-	type        = INTERNAL
-	id          = echo-stream
-	socket_type = stream
-	protocol    = tcp
-	user        = root
-	wait        = no
-	disable     = yes
-}
diff --git a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/echo-udp b/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/echo-udp
deleted file mode 100644
index 2c29096d018a..000000000000
--- a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/echo-udp
+++ /dev/null
@@ -1,14 +0,0 @@
-# default: off
-# description: An echo server. This is the udp version.
-
-service echo
-{
-	type        = INTERNAL UNLISTED
-	id          = echo-dgram
-	socket_type = dgram
-	protocol    = udp
-	user        = root
-	wait        = yes
-	port        = 7
-	disable     = yes
-}
diff --git a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/time-tcp b/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/time-tcp
deleted file mode 100644
index 76e069ea7457..000000000000
--- a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/time-tcp
+++ /dev/null
@@ -1,13 +0,0 @@
-# default: off
-# description: An RFC 868 time server. This is the tcp version, which is used by rdate.
-
-service time
-{
-	type        = INTERNAL
-	id          = time-stream
-	socket_type = stream
-	protocol    = tcp
-	user        = root
-	wait        = no
-	disable     = yes
-}
diff --git a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/time-udp b/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/time-udp
deleted file mode 100644
index 1124655cd56e..000000000000
--- a/sys-apps/xinetd/files/2.3.9/etc.xinetd.d/time-udp
+++ /dev/null
@@ -1,14 +0,0 @@
-# default: off
-# description: An RFC 868 time server. This is the udp version.
-
-service time
-{
-	type        = INTERNAL UNLISTED
-	id          = time-dgram
-	socket_type = dgram
-	protocol    = udp
-	user        = root
-	wait        = yes
-	port        = 37
-	disable     = yes
-}
diff --git a/sys-apps/xinetd/files/2.3.9/xinetd.conf b/sys-apps/xinetd/files/2.3.9/xinetd.conf
deleted file mode 100644
index 31ca50077e56..000000000000
--- a/sys-apps/xinetd/files/2.3.9/xinetd.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Sample configuration file for xinetd
-
-defaults
-{
-	only_from      = localhost
-	instances      = 60
-	log_type       = SYSLOG authpriv info
-	log_on_success = HOST PID
-	log_on_failure = HOST
-	cps            = 25 30
-}
-
-includedir /etc/xinetd.d
diff --git a/sys-apps/xinetd/files/2.3.9/xinetd.confd b/sys-apps/xinetd/files/2.3.9/xinetd.confd
deleted file mode 100644
index dd6da7488ad2..000000000000
--- a/sys-apps/xinetd/files/2.3.9/xinetd.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Config file for /etc/init.d/xinetd
-
-XINETD_OPTS="-stayalive -reuse"
diff --git a/sys-apps/xinetd/files/2.3.9/xinetd.rc6 b/sys-apps/xinetd/files/2.3.9/xinetd.rc6
deleted file mode 100644
index 5e4308f49290..000000000000
--- a/sys-apps/xinetd/files/2.3.9/xinetd.rc6
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/2.3.9/xinetd.rc6,v 1.3 2003/02/14 23:27:15 vapier Exp $
-
-opts="start stop reload restart dump check"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting xinetd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/xinetd \
-		-- -pidfile /var/run/xinetd.pid ${XINETD_OPTS}
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping xinetd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/xinetd.pid
-	eend $?
-}
-
-reload(){
-	ebegin "Reloading configuration"
-	killall -HUP xinetd &>/dev/null
-	eend $?
-}
-
-dump(){
-	ebegin "Dumping configuration"
-	killall -USR1 xinetd &>/dev/null
-	eend $?
-}
-
-check(){
-	ebegin "Performing Consistency Check"
-	killall -IOT xinetd &>/dev/null
-	eend $?
-}
diff --git a/sys-apps/xinetd/files/digest-xinetd-2.3.10 b/sys-apps/xinetd/files/digest-xinetd-2.3.10
deleted file mode 100644
index e2cb6ed6b901..000000000000
--- a/sys-apps/xinetd/files/digest-xinetd-2.3.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5178a634c0e621d644119f24d274885 xinetd-2.3.10.tar.gz 284814
diff --git a/sys-apps/xinetd/files/digest-xinetd-2.3.7 b/sys-apps/xinetd/files/digest-xinetd-2.3.7
deleted file mode 100644
index cc30cbb44ffe..000000000000
--- a/sys-apps/xinetd/files/digest-xinetd-2.3.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9f6849a92ec7d48aa9f771fa2f94491 xinetd-2.3.7.tar.gz 284269
diff --git a/sys-apps/xinetd/files/digest-xinetd-2.3.9 b/sys-apps/xinetd/files/digest-xinetd-2.3.9
deleted file mode 100644
index 8ce91d6dda9b..000000000000
--- a/sys-apps/xinetd/files/digest-xinetd-2.3.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d879f6e19468f92abecf2cec7e21e246 xinetd-2.3.9.tar.gz 285611
diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6
index 39e24010271b..b46053b1b646 100644
--- a/sys-apps/xinetd/files/xinetd.rc6
+++ b/sys-apps/xinetd/files/xinetd.rc6
@@ -1,7 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2003 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.12 2003/02/14 23:27:20 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.13 2003/05/19 16:48:39 mholzer Exp $
+
+opts="start stop reload restart dump check"
 
 depend() {
 	need net
@@ -19,3 +21,21 @@ stop() {
 	start-stop-daemon --stop --quiet --pidfile /var/run/xinetd.pid
 	eend $?
 }
+
+reload(){
+	ebegin "Reloading configuration"
+	killall -HUP xinetd &>/dev/null
+	eend $?
+}
+
+dump(){
+	ebegin "Dumping configuration"
+	killall -USR1 xinetd &>/dev/null
+	eend $?
+}
+
+check(){
+	ebegin "Performing Consistency Check"
+	killall -IOT xinetd &>/dev/null
+	eend $?
+}
diff --git a/sys-apps/xinetd/xinetd-2.3.10.ebuild b/sys-apps/xinetd/xinetd-2.3.10.ebuild
deleted file mode 100644
index 14eaaf5702ac..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.10.ebuild,v 1.5 2003/05/19 12:13:11 aliz Exp $
-
-
-#SPV=the directory in files/ to grab the goodies from
-SPV=2.3.9
-
-DESCRIPTION="Xinetd is a powerful replacement for inetd, with advanced features"
-HOMEPAGE="http://www.xinetd.org"
-SRC_URI="http://www.xinetd.org/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~x86 ~hppa"
-
-DEPEND="virtual/glibc 
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
-RDEPEND="${DEPEND} dev-lang/perl"
-
-PROVIDE="virtual/inetd"
-
-src_compile() {
-	local myconf
-	use tcpd && myconf="--with-libwrap"
-
-	# the --with-inet6 is now obsolete. Services will default to IPv4 unless configured otherwise.
-
-	econf --with-loadavg ${myconf}
-
-	# Fix CFLAGS
-	sed "/^CFLAGS/s/+=/=/" < Makefile > makefile
-	mv --force makefile Makefile
-
-	emake || die "Failed to compile"
-}
-
-src_install() {
-	into /usr ; dosbin xinetd/xinetd xinetd/itox
-	exeinto /usr/sbin ; doexe xinetd/xconv.pl
-
-	newman xinetd/xinetd.conf.man xinetd.conf.5
-	newman xinetd/xinetd.log.man xinetd.log.8
-	newman xinetd/xinetd.man xinetd.8
-	doman xinetd/itox.8
-	
-	newdoc xinetd/sample.conf xinetd.conf.dist.sample
-	newdoc ${FILESDIR}/${SPV}/xinetd.conf xinetd.conf.default || die
-	dodoc AUDIT INSTALL README TODO xinetd/{CHANGELOG,COPYRIGHT}
-
-	insinto /etc/xinetd.d ; doins ${FILESDIR}/${SPV}/etc.xinetd.d/* || die
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${SPV}/xinetd.rc6 xinetd || die
-	insinto /etc/conf.d ; newins ${FILESDIR}/${SPV}/xinetd.confd xinetd || die
-	insinto /etc ; doins ${FILESDIR}/${SPV}/xinetd.conf || die
-}
-
-pkg_postinst(){
-	einfo "This ebuild introduces the /etc/xinetd.d includedir with a default"
-	einfo "/etc/xinetd.conf file. Check your config files if you're upgrading from an older"
-	einfo "ebuild version. You should browse /etc/xinetd.conf and the files in /etc/xinetd.d."
-	ewarn
-	ewarn "PLEASE NOTE: Everything is off by default with access restricted to localhost."
-	ewarn
-	einfo "Check /etc/conf.d/xinetd for the startup options."
-	echo ""
-}
diff --git a/sys-apps/xinetd/xinetd-2.3.11.ebuild b/sys-apps/xinetd/xinetd-2.3.11.ebuild
index 4e84a05c83f6..c927406cc389 100644
--- a/sys-apps/xinetd/xinetd-2.3.11.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.11.ebuild
@@ -1,10 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.11.ebuild,v 1.2 2003/05/19 12:13:11 aliz Exp $
-
-
-#SPV=the directory in files/ to grab the goodies from
-SPV=2.3.9
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.11.ebuild,v 1.3 2003/05/19 16:48:39 mholzer Exp $
 
 DESCRIPTION="Xinetd is a powerful replacement for inetd, with advanced features"
 HOMEPAGE="http://www.xinetd.org"
@@ -45,13 +41,13 @@ src_install() {
 	doman xinetd/itox.8
 	
 	newdoc xinetd/sample.conf xinetd.conf.dist.sample
-	newdoc ${FILESDIR}/${SPV}/xinetd.conf xinetd.conf.default || die
+	newdoc ${FILESDIR}/xinetd.conf xinetd.conf.default || die
 	dodoc AUDIT INSTALL README TODO CHANGELOG COPYRIGHT
 
-	insinto /etc/xinetd.d ; doins ${FILESDIR}/${SPV}/etc.xinetd.d/* || die
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${SPV}/xinetd.rc6 xinetd || die
-	insinto /etc/conf.d ; newins ${FILESDIR}/${SPV}/xinetd.confd xinetd || die
-	insinto /etc ; doins ${FILESDIR}/${SPV}/xinetd.conf || die
+	insinto /etc/xinetd.d ; doins ${FILESDIR}/etc.xinetd.d/* || die
+	exeinto /etc/init.d ; newexe ${FILESDIR}/xinetd.rc6 xinetd || die
+	insinto /etc/conf.d ; newins ${FILESDIR}/xinetd.confd xinetd || die
+	insinto /etc ; doins ${FILESDIR}/xinetd.conf || die
 }
 
 pkg_postinst(){
diff --git a/sys-apps/xinetd/xinetd-2.3.7.ebuild b/sys-apps/xinetd/xinetd-2.3.7.ebuild
deleted file mode 100644
index 3f245f552db7..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.7.ebuild,v 1.11 2003/03/27 07:19:54 seemant Exp $
-
-IUSE="ipv6 tcpd"
-
-# NB: This ebuild introduces the /etc/xinetd.d includedir with a default
-#     /etc/xinetd.conf file.  Check your config files if you're upgrading
-#     from an older ebuild version.  You should browse /etc/xinetd.conf
-#     and the files in /etc/xinetd.d.  Everything is off by default with
-#     access restricted to localhost.
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Xinetd is a powerful replacement for inetd, with advanced features"
-HOMEPAGE="http://www.xinetd.org"
-SRC_URI="http://www.xinetd.org/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ppc sparc"
-
-DEPEND="virtual/glibc 
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
-RDEPEND="${DEPEND} dev-lang/perl"
-
-PROVIDE="virtual/inetd"
-
-src_compile() {
-	local myconf
-	use tcpd && myconf="--with-libwrap"
-	use ipv6 && myconf="${myconf} --with-inet6"
-
-	econf --with-loadavg --host=${CHOST} ${myconf} || die
-
-	# Parallel make does not work
-	make || die
-}
-
-src_install() {
-
-	into /usr ; dosbin xinetd/xinetd xinetd/itox
-	exeinto /usr/sbin ; doexe ${FILESDIR}/xconv.pl
-
-	newman xinetd/xinetd.conf.man xinetd.conf.5
-	newman xinetd/xinetd.log.man xinetd.log.8
-	newman xinetd/xinetd.man xinetd.8
-	doman xinetd/itox.8
-	
-	newdoc xinetd/sample.conf xinetd.conf.dist.sample
-	newdoc ${FILESDIR}/xinetd.conf xinetd.conf.default
-	dodoc AUDIT CHANGELOG README COPYRIGHT
-
-	insinto /etc/xinetd.d ; doins ${FILESDIR}/etc.xinetd.d/*
-	exeinto /etc/init.d ; newexe ${FILESDIR}/xinetd.rc6 xinetd
-	insinto /etc/conf.d ; newins ${FILESDIR}/xinetd.confd xinetd
-	insinto /etc ; doins ${FILESDIR}/xinetd.conf
-}
-
diff --git a/sys-apps/xinetd/xinetd-2.3.9.ebuild b/sys-apps/xinetd/xinetd-2.3.9.ebuild
deleted file mode 100644
index 4349394b7bcf..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.9.ebuild,v 1.9 2003/04/06 20:15:30 gmsoft Exp $
-
-DESCRIPTION="Xinetd is a powerful replacement for inetd, with advanced features"
-HOMEPAGE="http://www.xinetd.org"
-SRC_URI="http://www.xinetd.org/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ~ppc sparc alpha hppa"
-
-DEPEND="virtual/glibc 
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
-RDEPEND="${DEPEND} dev-lang/perl"
-
-PROVIDE="virtual/inetd"
-
-src_compile() {
-	local myconf
-	use tcpd && myconf="--with-libwrap"
-
-	# the --with-inet6 is now obsolete. Services will default to IPv4 unless configured otherwise.
-
-	econf --with-loadavg ${myconf}
-
-	# Fix CFLAGS
-	sed "/^CFLAGS/s/+=/=/" < Makefile > makefile
-	mv --force makefile Makefile
-
-	emake || die "Failed to compile"
-}
-
-src_install() {
-	into /usr ; dosbin xinetd/xinetd xinetd/itox
-	exeinto /usr/sbin ; doexe xinetd/xconv.pl
-
-	newman xinetd/xinetd.conf.man xinetd.conf.5
-	newman xinetd/xinetd.log.man xinetd.log.8
-	newman xinetd/xinetd.man xinetd.8
-	doman xinetd/itox.8
-	
-	newdoc xinetd/sample.conf xinetd.conf.dist.sample
-	newdoc ${FILESDIR}/${PV}/xinetd.conf xinetd.conf.default
-	dodoc AUDIT INSTALL README TODO xinetd/{CHANGELOG,COPYRIGHT}
-
-	insinto /etc/xinetd.d ; doins ${FILESDIR}/${PV}/etc.xinetd.d/*
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PV}/xinetd.rc6 xinetd
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PV}/xinetd.confd xinetd
-	insinto /etc ; doins ${FILESDIR}/${PV}/xinetd.conf
-}
-
-pkg_postinst(){
-	einfo "This ebuild introduces the /etc/xinetd.d includedir with a default"
-	einfo "/etc/xinetd.conf file. Check your config files if you're upgrading from an older"
-	einfo "ebuild version. You should browse /etc/xinetd.conf and the files in /etc/xinetd.d."
-	ewarn
-	ewarn "PLEASE NOTE: Everything is off by default with access restricted to localhost."
-	ewarn
-	einfo "Check /etc/conf.d/xinetd for the startup options."
-	echo ""
-}