gentoo resync : 22.05.2021

12 files changed, 3 insertions, 390 deletions

diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index d7b4dc89fad9..74584c15be34 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -1,17 +1,5 @@
-AUX xinetd-2.3.14-DESTDIR.patch 1725 BLAKE2B e6812de025a32c6adce24093753a4e44a345096ac8d2bd43d34e7472bf2deaea4c3b70abc9f0fbc98bf933b0d90166abcdaad9c829adbebe422dc51265306c6d SHA512 31976a84faf2f890a0fb33404c3e07d399be5eeaad49b00f52a459df38f12bb3ecd743577c5a7aa4f0fd90c025a262683307e736e97d51e35591756a7c69698b
-AUX xinetd-2.3.14-install-contrib.patch 728 BLAKE2B 4624096a41c3ce819f8976b561e761a65b7308dbaa7863e6c287f99a1ac206497c5ef9dc0222a0d81ab565d280394a44573b3ba7734879b24644a53efe6e5f77 SHA512 15b8b1649b02e2d8834eb057bef7345497d230a4b10600e9b3e2a83511f9c7df115009ba1f38b1c4907417735454cafbbc41a96266fbb4370c584ecf1aa1638b
-AUX xinetd-2.3.15-config.patch 437 BLAKE2B 50cf65153ee242dd0bc7ec587ee7f50de6d7385e1f6ffa213b11e70f2f584d42ee544f7be297b38275290338afaf689cb0aed9d1435a14bb3e0f0b25b6a42ba9 SHA512 58a9880ca154441c5cfc3ed978a0224601d406a4422435a430b885985a0fbe7ef0d750f54047cb0d7fc5c6ab7bc35433776bb5c6c2c61525e2a04b49d509ad66
-AUX xinetd-2.3.15-creds.patch 367 BLAKE2B d2ffeb2d83b1c604556e240177417d79e2d4ce499c4fdb0b431a414835a4e2eaa5b24e01ab4e698211bfd2e63d2872ebd9456af81faa2fb755342bfe2cdfa2fb SHA512 5d1d883620ed6c1ae0e391687a1a10769eb4c2436cf8bae60ddbbb7b8d1250272c2aa7068c308ee1f3540a41fcdf8ae890a7687ff0213553c59f6a91718f46c1
-AUX xinetd-2.3.15.3-no-rpc.patch 1290 BLAKE2B 8330913acccd865b4dff0c6a918936af8736854e90e5661633d5a91b551478e3ec87990f6ac6562c000328bd5ed57918359b1fdf214e297bee2376abdf1f589d SHA512 eb7e463a4f65cd5c7e271de46d9924ae6b96bc20ca7075e4c94caafb81ad03544eebe8a610313a1c402da10e010d3efd3fb2f52d0d117b9c406700831067c6aa
-AUX xinetd-2.3.15.3-rpc-configure.patch 1709 BLAKE2B 7a7d90a8f10d8b8a5274a63d38e38bd6c93a7a7d1ccf5171cbfa612828a22ff4f04045d0d44e321caee2fa8e37ff209d6b1b1df715e38c43a16792a9f4374676 SHA512 52fea8f4d95882966e31761d67c3991eb4f9bd853761f0b6a9acea8a72774176f98265f8260467cff4779c69c2bec6764a6a48d7c6c620bf31bc71c50287f229
 AUX xinetd.confd 90 BLAKE2B 4fd6cce15cffc6de5b59e83646cafbf52f61b203292ac4ecbbaed904d8387a4ac686f730e2f0ddf5ee90575bd0a7d73588a23b25ec4a6e9c73d48714f5770f5d SHA512 03bf05e544c0e52bc2bdeadf494dabd49ace985687b656baae869be99ef65a5f7129492c37e062bf6f196f70561d6239f2d3c4e8171fddc04729d3e266bfe2b2
 AUX xinetd.rc6 721 BLAKE2B d273c33bdd9df218f8dfdc765c0e3a788baaee0fbb3fd20e63be0f1d4b587b19550107c1818015077ce9fa194fca7180748b39089c51101f10ceeb6066a323af SHA512 bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604
-AUX xinetd.service 192 BLAKE2B e13bdc35380da5805e9fbec1a1d05f7290bc154b1adea73b23468f909eea22c411be11cf3e2c68757e8120db73ccc8ca624c808c6563859a29c095b94c10bbf9 SHA512 c2b324c1116485996c414543f67c5dae89de3f82ac85634009da4dc04ea720a860626f6bb0ece0bb734616c6e4394e31ca00a71f697dc93e38b05fbad06dedc0
-DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195fc043a2fe8b1b61a1d9e597a5a10feda8d6692e665af1f1690870e619098a9a2367df3a73f7821a91777532f1fa SHA512 3a744d5ce66da46743eec28d5b95a44709b1828187078984e59d7220ac325abce1198927e9156f343a4e16a9dc63e8846f1dcb0facbf05ea44c73aecbe7e504f
 DIST xinetd-2.3.15.4.tar.xz 384504 BLAKE2B e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d SHA512 1d9bbf5f60b299746adf3e57a669bf1a554b50066563b65cdb7584f00dcab2d3d331df705eefb56b51c52a16b5ed6b109cd832c27df87c7f262bb304e17ddc0e
-DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
-EBUILD xinetd-2.3.15-r3.ebuild 1557 BLAKE2B e5befba5bea664705ccade9f99cf44ffd4c1efdc5ac3bc6a1fce6a8e55a8e8972ebe585b509c7a493882773087e3a278b1c6416c809b1aae875cee684047f60f SHA512 91d64d436c5c48e3fe2c0fa692211f7720ebf630d9443bddc1b9f68b74a310f5a3b4a8fd225c8bb5c3c475ba7e747a6fa3d6780914b1f92ebb8cae5f633d361b
-EBUILD xinetd-2.3.15.3-r2.ebuild 1374 BLAKE2B 3ff01d397797dbb3e3db0ccfe78eb74951c68ba9d597ed57d6175f780343e7e16ed79799a89bb8f45dda7a758ac44ad116ac45ba0b3b2b7c8513d1a9a127b1dd SHA512 97c3358a713966208b9e862216434b459c8725fd9d471b64b5de14c69e7481a26187ecfd9721333d2cab43c33286a10a0d2dbea202bdc260df14f84839701f48
-EBUILD xinetd-2.3.15.3.ebuild 1064 BLAKE2B 1fcdf000aa09791d386141985248e9ce25908eaaec4f40ca05f0ddac6c7288d462f7e49b14cbb67f1432d36982d71d076795ceefca354be15bfe8cbf189b95c8 SHA512 cb722070e1aa372ccb001934e1fccdd6bc66e3a926b1ffeb30811b222d3ec9965d0249f2dff7d89062e04e43b02b7dd2091d36dbf0eb223a5cbe7c7c364a40e1
-EBUILD xinetd-2.3.15.4.ebuild 1272 BLAKE2B 5b4dcb90820d53586246ee4cefbebd6e29a9ed6c3728fb03f6ede34751bdf7e85863068b31a3d9c0bebf6aa47b1bd198638d801d81b9916e92c6ea2c82b37405 SHA512 4af494a22e0168fda89c358f4e60e9bd2bb583812a5100f2c70a985b28d3e859517243d39798700f1cb4d65400c190ea994d02079b2c369b192c96eacb249afa
+EBUILD xinetd-2.3.15.4.ebuild 1264 BLAKE2B 7f84671131911d6b2a633ee5526207308cd2741b967324c2cb04f55b7a9ead38a86fab70752a0586c895ee69fcfde09c6db4d44be55b3f82c2763c12f388db1a SHA512 f0f810b9d44a0e95141e56211cbff4fa2a50d773546c8631f4843b396458c5677882cbadf51e21a7b18bd9a18abdd32dbb6094e342f49bb3c4cdf43ab3ed32d5
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch b/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch
deleted file mode 100644
index 2ebdf4c4f1b0..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.in.orig	2005-10-29 22:08:54.000000000 -0400
-+++ Makefile.in	2005-10-29 22:09:32.000000000 -0400
-@@ -75,15 +75,15 @@
- 
- install: build
- 	for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
--	   test -d $$i || mkdir -p $$i ; done
--	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR)
--	$(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR)
--	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR)
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8
-+	   test -d $(DESTDIR)$$i || mkdir -p $(DESTDIR)$$i ; done
-+	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DESTDIR)$(DAEMONDIR)
-+	$(INSTALL_CMD) -m 755 xinetd/itox $(DESTDIR)$(DAEMONDIR)
-+	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DESTDIR)$(DAEMONDIR)
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(DESTDIR)$(MANDIR)/man5/xinetd.conf.5
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(DESTDIR)$(MANDIR)/man8/xinetd.log.8
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(DESTDIR)$(MANDIR)/man8/xinetd.8
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(DESTDIR)$(MANDIR)/man8/itox.8
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(DESTDIR)$(MANDIR)/man8/xconv.pl.8
- 	@echo "You must put your xinetd.conf in /etc/xinetd.conf"
- 	@echo "There is a sample config file in xinetd/sample.conf and you can"
- 	@echo "use xconv.pl to convert your old inetd.conf file to an xinetd format"
diff --git a/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch b/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch
deleted file mode 100644
index c1717e43902f..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- xinetd-2.3.14/Makefile.in
-+++ xinetd-2.3.14/Makefile.in
-@@ -9,6 +9,7 @@
- DESTDIR = 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-+ETCDIR = @sysconfdir@
- DAEMONDIR = @sbindir@
- MANDIR = @mandir@
- topdir = @top_srcdir@
-@@ -97,7 +98,12 @@
- 	rm -f $(MANDIR)/man8/xinetd.log.8
- 	rm -f $(MANDIR)/man8/xinetd.8
- 	rm -f $(MANDIR)/man8/itox.8
-- 
-+
-+install-contrib:
-+	test -d $(DESTDIR)$(ETCDIR)/xinetd.d || mkdir -p $(DESTDIR)$(ETCDIR)/xinetd.d
-+	$(INSTALL_CMD) -m 644 contrib/xinetd.conf $(DESTDIR)$(ETCDIR)
-+	$(INSTALL_CMD) -m 644 contrib/xinetd.d/* $(DESTDIR)$(ETCDIR)/xinetd.d
-+
- distclean: clean
- 	rm -f config.cache config.log Makefile config.status xinetd/itox
- 	rm -f config.h @srcdir@/libs/include/* @srcdir@/libs/man/*
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-config.patch b/sys-apps/xinetd/files/xinetd-2.3.15-config.patch
deleted file mode 100644
index b362a97dbe82..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.15-config.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-set up some secure defaults:
- - services can only be accessed from localhost
- - sanitize the runtime environment (so root's shell vars don't bleed through)
-
---- contrib/xinetd.conf
-+++ contrib/xinetd.conf
-@@ -22,5 +22,5 @@
- #
- #	no_access	=
--#	only_from	=
-+	only_from	= localhost
- #	max_load	= 0
- 	cps		= 50 10
-@@ -35,7 +35,7 @@ defaults
- 
- # setup environmental attributes
- #
--#	passenv		=
-+	passenv		=
- 	groups		= yes
- 	umask		= 002
- 
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch b/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch
deleted file mode 100644
index 39df3caf1156..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/488158
-
-taken from Fedora
-
-Patch by Thomas Swan <thomas.swan@gmail.com>
-
---- a/xinetd/builtins.c
-+++ b/xinetd/builtins.c
-@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp )
-    if( SC_IS_INTERNAL( scp ) ) {
-       SC_INTERNAL(scp, nserp);
-    } else {
--      exec_server(nserp);
-+      child_process(nserp);
-    }
- }
- 
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch b/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch
deleted file mode 100644
index 3bd995a0892d..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/openSUSE/xinetd/pull/8
-
-From 4278495b1858b5b1ce94d72bd619eb79aab8ca04 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 18 Jun 2018 18:49:38 -0400
-Subject: [PATCH] fix no-rpc builds
-
-The code base already has support for -DNO_RPC, so fix the breakage
-introduced by commit 56520dcc88c35113877c8f4f52bd98ad95b44653.
----
- src/confparse.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/confparse.c b/src/confparse.c
-index 5b149dd03808..7965cc405f24 100644
---- a/src/confparse.c
-+++ b/src/confparse.c
-@@ -13,10 +13,12 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifndef NO_RPC
- #include <rpc/rpc.h>
- #ifdef HAVE_RPCENT_H
- #include <rpc/rpcent.h>
- #endif
-+#endif
- #include <netdb.h>
- 
- #include "str.h"
-@@ -730,7 +732,7 @@ static status_e check_entry( struct service_config *scp,
- 	   }
-    }
- 
--/* #ifndef NO_RPC */
-+#ifndef NO_RPC
-    if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) )
-    {
-       struct rpcent *rep = (struct rpcent *)getrpcbyname( SC_NAME(scp) ) ;
-@@ -743,6 +745,7 @@ static status_e check_entry( struct service_config *scp,
-       SC_RPCDATA( scp )->rd_program_number = rep->r_number ;
-    }
-    else
-+#endif
-    {
-        if ( !SC_IS_UNLISTED( scp ) ) 
-        { 
--- 
-2.16.1
-
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch b/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch
deleted file mode 100644
index 682dece1b2b6..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 928d69309592704892d124b1f8de9111164c3793 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 18 Jun 2018 22:11:21 -0400
-Subject: [PATCH] configure: add a --without-rpc flag
-
-The build already supports NO_RPC to disable all RPC logic.  Turn it
-into a proper configure flag so people don't have to hack it up.
----
- configure.ac | 25 ++++++++++++++++++++-----
- 1 file changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8d0b562ddaac..75ae7fb472dc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,11 +37,6 @@ AC_CHECK_LIB([m], [log10], [
- 	AC_MSG_ERROR([Unable to find working libm.so])
- ])
- AC_SUBST([LIBM_LIBS])
--PKG_CHECK_MODULES([TIRPC],[libtirpc], [
--	AC_DEFINE([HAVE_RPCENT_H], [1], [Have <rpc/rpcent.h>.])
--], [
--	AC_MSG_WARN([Libtirpc not found, will not use <rpc/rpcent.h>])
--])
- 
- # ======================================
- # Check for various headers and settings
-@@ -112,6 +107,26 @@ AS_IF([test x"$with_labeled_networking" != "xno"], [
-     ])
- ])
- 
-+AC_ARG_WITH([rpc],
-+    [AS_HELP_STRING([--without-rpc], [Do not include RPC support])],
-+    [with_rpc="$withval"],
-+    [with_rpc="auto"]
-+)
-+AS_IF([test x"$with_rpc" != "xno"], [
-+    PKG_CHECK_MODULES([TIRPC],[libtirpc], [
-+        AC_DEFINE([HAVE_RPCENT_H], [1], [Have <rpc/rpcent.h>.])
-+    ], [
-+        AS_IF([test x"$with_rpc" = "xyes"], [
-+            AC_MSG_ERROR([RPC support requested but not found])
-+        ])
-+        with_rpc="no"
-+        AC_MSG_WARN([Libtirpc not found, will not use <rpc/rpcent.h>])
-+    ])
-+])
-+AS_IF([test x"$with_rpc" = "xno"], [
-+    AC_DEFINE([NO_RPC], [1], [Omit RPC support.])
-+])
-+
- # =========
- # Hardening
- # =========
--- 
-2.16.1
-
diff --git a/sys-apps/xinetd/files/xinetd.service b/sys-apps/xinetd/files/xinetd.service
deleted file mode 100644
index c6f6271fd97b..000000000000
--- a/sys-apps/xinetd/files/xinetd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=A secure replacement for inetd
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/xinetd -dontfork
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
deleted file mode 100644
index 4dad4fcdcb20..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="powerful replacement for inetd"
-HOMEPAGE="http://www.xinetd.org/ https://github.com/xinetd-org/xinetd"
-SRC_URI="http://www.xinetd.org/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="perl rpc tcpd"
-
-DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
-	rpc? ( net-libs/libtirpc:= )"
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.3.14-DESTDIR.patch
-	epatch "${FILESDIR}"/${PN}-2.3.14-install-contrib.patch
-	epatch "${FILESDIR}"/${PN}-2.3.15-config.patch
-	epatch "${FILESDIR}"/${PN}-2.3.15-creds.patch #488158
-	find -name Makefile.in -exec sed -i 's:\<ar\>:$(AR):' {} +
-}
-
-src_configure() {
-	tc-export AR PKG_CONFIG
-	if use rpc ; then
-		append-cflags $(${PKG_CONFIG} --cflags libtirpc)
-	else
-		append-cppflags -DNO_RPC
-		export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no
-	fi
-	LIBS=$(${PKG_CONFIG} --libs libtirpc) \
-	econf \
-		$(use_with tcpd libwrap) \
-		--with-loadavg
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install-contrib
-	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
-
-	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
-	newconfd "${FILESDIR}"/xinetd.confd xinetd
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
-	dodoc AUDIT INSTALL README TODO CHANGELOG
-}
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
deleted file mode 100644
index d5c268f31bbf..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic systemd toolchain-funcs autotools
-
-DESCRIPTION="powerful replacement for inetd"
-HOMEPAGE="https://github.com/xinetd-org/xinetd https://github.com/openSUSE/xinetd"
-SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="perl rpc selinux tcpd"
-
-DEPEND="
-	rpc? ( net-libs/libtirpc:= )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
-"
-RDEPEND="
-	${DEPEND}
-	perl? ( dev-lang/perl )
-"
-DEPEND="
-	${DEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-rpc.patch #651838
-	"${FILESDIR}"/${P}-rpc-configure.patch #651838
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -i \
-		-e 's:/usr/bin/kill:/bin/kill:' \
-		"contrib/${PN}.service" || die
-}
-
-src_configure() {
-	econf \
-		$(use_with tcpd libwrap) \
-		$(use_with selinux labeled-networking) \
-		$(use_with rpc) \
-		--with-loadavg
-}
-
-src_install() {
-	default
-
-	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
-
-	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
-	newconfd "${FILESDIR}"/xinetd.confd xinetd
-	systemd_dounit "contrib/${PN}.service"
-
-	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
-	dodoc README.md CHANGELOG
-}
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
deleted file mode 100644
index 7a903b612a35..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="powerful replacement for inetd"
-HOMEPAGE="https://github.com/openSUSE/xinetd"
-SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="perl selinux tcpd"
-
-DEPEND="
-	selinux? ( sys-libs/libselinux )
-	net-libs/libtirpc:=
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
-"
-RDEPEND="
-	${DEPEND}
-	perl? ( dev-lang/perl )
-"
-DEPEND="
-	${DEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		$(use_with tcpd libwrap) \
-		$(use_with selinux labeled-networking) \
-		--with-loadavg
-}
-
-src_install() {
-	default
-
-	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
-
-	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
-	newconfd "${FILESDIR}"/xinetd.confd xinetd
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
-	dodoc README.md CHANGELOG
-}
diff --git a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
index 5cac335e332f..98f924c040b0 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="perl rpc selinux tcpd"
 
 DEPEND="