gentoo resync : 28.04.2021

3 files changed, 3 insertions, 41 deletions

diff --git a/net-misc/shmux/Manifest b/net-misc/shmux/Manifest
index 6911f55b666d..3da237a45978 100644
--- a/net-misc/shmux/Manifest
+++ b/net-misc/shmux/Manifest
@@ -1,5 +1,4 @@
 AUX shmux-1.0.2-tinfo.patch 317 BLAKE2B 9e1be87688701b1f980aae40ae500959179127ee03d099967fe8b1d0c64374cacf4fd6f46fe059c90a09e1d79e0814ec8fb8222eb9dde41604ea141709603b2d SHA512 9b94a75ca7ce2b6dce7f39dbbca47ffd6c90c6388623eb5e39ddffd4f9b2cf36f124031c4c50ea9ff46ad6174ff2c97804e2fdded5303c94088edd037f7275a3
 DIST shmux-1.0.2.tgz 110473 BLAKE2B 7dcd08c37d0d8d3ee2dfccc89ee9f2c187c97278ba7adfa8e30bd5b86981d3a4b3513dfc884926000cede0b813a922e121c49db75ca4e0ff4efde2b4b9e6480b SHA512 d114678827d4fc203f0d18b4a4e02f8b56efdf490df0aef32756a020c755b387468a88fea7266249445a862d7ed9374640432e5807fa57bca5a7d559d7e67a8a
-EBUILD shmux-1.0.2-r1.ebuild 685 BLAKE2B 26c273c9bd32f57bef34f3b1b67598f74863d3f868584d830a985ece9a1d9aa64281a2bc17e0350ce7c33c9a172cc63d439f1b5609a757216a193b76d026f481 SHA512 e4860d3ea08b44237177f8ec4164ce7486fb6d017eec96a678bcaa4d46c5ddbe267d150368af0e9bcb1b2ba8bcdc424f282563499f4f70fee03e4903ab824a78
-EBUILD shmux-1.0.2.ebuild 670 BLAKE2B 03db249286acd6ea82925bd62b52ada3b926bd837e0aa60794397f96ef61cf28a96c1a97bcc68854af95038b369de3ce5a1f5474322d5b1e7f5ddfb722bfb43f SHA512 3d43dcbc1a57e38ad72726cc3c4465c6265cad9aa53c6e75501fd704672d3ce94f2cef52d7b3f0174f6f8e6f2f744c58625a0b78c2cd830231985aaf035aec3c
+EBUILD shmux-1.0.2-r1.ebuild 680 BLAKE2B 0382e12a3fa37406a27336eb6847cc8817c8d975687f8ed41690e1033f618e6be5f2e8784b3b5ca451931cd2456f46e3ddad9cb6cc485c5f828d8eb7ea2ae057 SHA512 8cd2cec700ea3820d342eaa2ade571aaf168973ad22d6241d98e5feae9200ae340a84e8f74440bfc57e5c86f1bea8e4f8273d56c71f923d69a42e6c3b9e0a055
 MISC metadata.xml 746 BLAKE2B 39bc488911f39bdfe55dfcefc94bdac131cd0d1fcba0be0b20fae71b32df0033db63c10fedabbe1a6cda4753b14fa6fab1de9ec24ff90d0f0b9b1f3ada02269f SHA512 fbe14dee902994deaa7df5f5ff551f171437bea3cf1c772633023a534835e7c99bd714fed9bde6acaa5e6ba0321739323a0b6eb1579947be1f4eb4beec8f8915
diff --git a/net-misc/shmux/shmux-1.0.2-r1.ebuild b/net-misc/shmux/shmux-1.0.2-r1.ebuild
index 39ebd0040cc8..81f1b69d314e 100644
--- a/net-misc/shmux/shmux-1.0.2-r1.ebuild
+++ b/net-misc/shmux/shmux-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
 
 LICENSE="shmux"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="pcre"
 RESTRICT="test"
 
diff --git a/net-misc/shmux/shmux-1.0.2.ebuild b/net-misc/shmux/shmux-1.0.2.ebuild
deleted file mode 100644
index ec93d10109d4..000000000000
--- a/net-misc/shmux/shmux-1.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils
-
-DESCRIPTION="Program for executing the same command on many hosts in parallel"
-HOMEPAGE="http://web.taranis.org/shmux/"
-SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
-
-LICENSE="shmux"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="pcre"
-RESTRICT="test"
-
-RDEPEND="
-	pcre? ( dev-libs/libpcre )
-	sys-libs/ncurses
-"
-DEPEND="${RDEPEND}
-	virtual/awk"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with pcre)
-}
-
-src_install() {
-	dobin src/shmux
-	doman shmux.1
-	dodoc CHANGES
-}