gentoo resync : 22.12.2021

3 files changed, 2 insertions, 67 deletions

diff --git a/app-misc/conmux/Manifest b/app-misc/conmux/Manifest
index acda100de36e..daac9afb2080 100644
--- a/app-misc/conmux/Manifest
+++ b/app-misc/conmux/Manifest
@@ -4,7 +4,5 @@ AUX conmux-registry.initd 886 BLAKE2B 8d895a7743faa2868ec0ae301c9b727e9b1d4f02cb
 AUX conmux.confd 432 BLAKE2B 6dd0169032c849f1c131cfa0409430689249919cd8015f7f59c2fbadaf3da3ec92ca67c7b0a738a8d243911e06909d831da711c5fc46f1725638c208afcdc30f SHA512 50c6640f231e878817f31f399e8345d82c26bacbc8648d78b444eb572e7fad4c19d1f5b517474c412031dc65345723bffe95358542a6dd4af99a3007d12a7bc0
 AUX conmux.initd 892 BLAKE2B 3a724a77e47f4e0b8ac77581fdcd8f2be0aedbe6a71557f19eaba1517948736263fa36192dd3fbd8a2eb3db4ec5ad90c964b94fa01b1a3c00a12152b14edad8a SHA512 68a15b73bef6ee90504fe5a910d587ae6aad5735082af3dda3f390b66d87ac121fc8b1a846d7fce0432b6d4f06a9c355d881303f9586ea6497c64c0080798098
 DIST autotest-0.16.4.tar.gz 14699617 BLAKE2B faae9fe2472ef6cde5868368d81eeb6b855af7684b407b307d14dbd7e8800506c4234b38b254a58b4d915290dcd61e6c9f2eb4d04cd3b929462b0a6d8ffc52cf SHA512 e209d008d7987610f20b7f0c932f8909a82bdde4c13f0362f54f5872464c76f1e3da5760d8eb0f42567249dee4db5f7802478be5c9798b46e2b421f31aa1cbdd
-DIST conmux-0.15.1.tar.gz 50713 BLAKE2B d764d63f03318614ad0d7088911dee02fbd36d24da7dc988bb3db03cda3e60c5b185f50b5545b086e2a3a7b278aa47af7bfd211c39c88f7ada32e83666eea0c5 SHA512 8138d6d10b4382709828277503d1c23c52fd43109ebad79073be9003c39a9e62c2b7d9d6e78a9e81797c22871985e50a58df0d538ff63e3f580c9a229b520107
-EBUILD conmux-0.15.1-r3.ebuild 1993 BLAKE2B 7c291575b489396038573dffbe566b1d901fc0376fd70636466410f729c9cf23557d834d03bcbcecc5b2e4389da8fb282af4a815c46c87dd163243f9a10c1d56 SHA512 e400f8f46f8a78c01d9bf90959351d5e681efde1398970bfc1d906c62c6584255c3bcb678f48d5caba32737988933fe434309f06f1fb9f8d48ba8f579a5d0643
-EBUILD conmux-0.16.4.ebuild 1992 BLAKE2B 994ba04d92fb2d65fb8f1c4650f38ef2abc30ce2788f49aa195f723f803f9d76787b409889c4e40c42fb6bd36abec9917eb0a610d499ea181e5d5ea3414923af SHA512 f4f5ec5e3569914c06c2d997abe24f9957db4f63a95423a1fc111136977ddb89111e363a728bad8c04ad47230e47a7ba51ae2107fde521a4838cc37142877528
+EBUILD conmux-0.16.4.ebuild 1990 BLAKE2B addf6c85d52dd741eeea83d95a5868d912f96220537d7c72e37a163b5ee886a5e1984189695c7b7ad720587a6d8934155b2de38bf9db0562ab19f898ca074db0 SHA512 0e4d38ed15082872f5736ee7f62fb474547d486b5ce8c5563621b0c0f48d13f0a614298cf61a7b89fbb3820ec397d1f7c0c1beb8c3efd8b036672182cf108617
 MISC metadata.xml 523 BLAKE2B 6dd2d358b9ce96e6f778d4af303be91b7e263d96642adfd4eb06e899556da99219c9a648a5f60bb4ebee232429791fc6126c7a75ead0618ce0bbc740d7d093b7 SHA512 f92c8a5595035b0ef1ef303ff612dd9674cf4c92de453b960887afcc37ce49f86cb50d71aa5fdfc9beabcf2d05eb6287ddd3b0af3b8020ba3877bcd472fe60a5
diff --git a/app-misc/conmux/conmux-0.15.1-r3.ebuild b/app-misc/conmux/conmux-0.15.1-r3.ebuild
deleted file mode 100644
index e77e2b81776c..000000000000
--- a/app-misc/conmux/conmux-0.15.1-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="A console multiplexor"
-HOMEPAGE="https://github.com/autotest/autotest"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE=""
-
-RDEPEND="dev-perl/IO-Multiplex
-	dev-perl/URI"
-DEPEND=""
-
-src_prepare() {
-	# manual installation of drivers and helpers
-	sed -i -e "/include/d" Makefile || die "Failed to fix Makefile"
-}
-
-src_install() {
-		perl_set_version
-		emake BASE="${D}/usr" install
-		# helpers and drivers have been removed in src_prepare
-		insinto /usr/share/${PN}/
-		doins -r drivers/  helpers/
-		fperms -R 0750 /usr/share/${PN}/{drivers,helpers}/
-		dodir /etc/${PN}
-		# no need to have the init script in /sbin
-		rm "${D}"/usr/sbin/start || die "failed to remove init script"
-		# console is too generic. Make it conmux-console instead
-		mv "${D}"/usr/bin/console "${D}"/usr/bin/${PN}-console || \
-			die "failed to rename console to conmux-console"
-		# Fix up directory for the module
-		perl_set_version
-		dodir ${VENDOR_LIB}/${PN}
-		mv "${D}"/usr/lib/Conmux.pm "${D}"/${VENDOR_LIB}/. || \
-			die "failed to move the Conmux.pm module"
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		newinitd "${FILESDIR}"/${PN}-registry.initd ${PN}-registry
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newconfd "${FILESDIR}"/${PN}-registry.confd ${PN}-registry
-		dodoc README
-}
-
-pkg_postinst() {
-	elog ""
-	elog "If you have more than one serial ports and you want to use all"
-	elog "of them with conmux, copy and paste the 'conmux' init.d and conf.d"
-	elog "files as many times as you want, pointing each conf.d file to the"
-	elog "device's configuration file."
-	elog ""
-	elog "See /etc/conf.d/conmux and"
-	elog "https://github.com/autotest/autotest/wiki/Conmux-OriginalDocumentation"
-	elog "https://github.com/autotest/autotest/wiki/Conmux-Howto"
-	elog "for more information"
-	elog ""
-}
diff --git a/app-misc/conmux/conmux-0.16.4.ebuild b/app-misc/conmux/conmux-0.16.4.ebuild
index cd2a1cf087d5..54e0c89796dc 100644
--- a/app-misc/conmux/conmux-0.16.4.ebuild
+++ b/app-misc/conmux/conmux-0.16.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/autotest/${MY_PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 
 RDEPEND="dev-perl/IO-Multiplex
 	dev-perl/URI"