gentoo resync : 05.12.2021

3 files changed, 84 insertions, 0 deletions

diff --git a/app-misc/conmux/Manifest b/app-misc/conmux/Manifest
index 4ba93cf84224..acda100de36e 100644
--- a/app-misc/conmux/Manifest
+++ b/app-misc/conmux/Manifest
@@ -1,7 +1,10 @@
+AUX conmux-0.16.4_unexpected-paths.patch 356 BLAKE2B c7c100ffa9c7a2a54780dd45b917bb72216c56c55bc8d1f2af8b60cdfd2650f06e027e288b51002726398f3b2365c27cb2dfa280825e18a56e6bab7aab3bc5ac SHA512 d84070dafc0a4cfdd3b4ddef2d2abac9b348044da595a974a81e55ad9624e6275e263e95f45bc04882e156ba3f92b442320df84de4569c4280253299ad25bd2b
 AUX conmux-registry.confd 120 BLAKE2B ee736a35e4b05a71030a1119b9fefd1c2e206234547cecc9f378d614788bb1faf5d555c54a8681b230374aaa75c11c1092c263daf75a624deece5b6b9313c429 SHA512 aeae7f7d127d67e5ae96a63fbd694624d599fd329698ea72bd0fb5a4a0d29df3d60c5bdd750431acf13a36f53960af477b483a48324540eda5a4b55b266c081c
 AUX conmux-registry.initd 886 BLAKE2B 8d895a7743faa2868ec0ae301c9b727e9b1d4f02cb222dff71dedb12b169f1416af89494fd6cf4c80e9ac8a02234a657eeca52f0ab0f9919f6c2941a4a1a1b7e SHA512 cbe93f419d244eef30e5662d34de9afb683ba9e69107fb3d5a78e2c6f31b5868ec6e4b35ab23597650d9593ad60c91d9c839e85c6589ebf5e17a70129dd2b3a3
 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
 MISC metadata.xml 523 BLAKE2B 6dd2d358b9ce96e6f778d4af303be91b7e263d96642adfd4eb06e899556da99219c9a648a5f60bb4ebee232429791fc6126c7a75ead0618ce0bbc740d7d093b7 SHA512 f92c8a5595035b0ef1ef303ff612dd9674cf4c92de453b960887afcc37ce49f86cb50d71aa5fdfc9beabcf2d05eb6287ddd3b0af3b8020ba3877bcd472fe60a5
diff --git a/app-misc/conmux/conmux-0.16.4.ebuild b/app-misc/conmux/conmux-0.16.4.ebuild
new file mode 100644
index 000000000000..cd2a1cf087d5
--- /dev/null
+++ b/app-misc/conmux/conmux-0.16.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DIST_TEST="skip"
+
+MY_PN="autotest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A console multiplexor"
+HOMEPAGE="https://github.com/autotest/autotest"
+SRC_URI="https://github.com/autotest/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+
+RDEPEND="dev-perl/IO-Multiplex
+	dev-perl/URI"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.16.4_unexpected-paths.patch
+)
+
+S="${WORKDIR}"/${MY_P}/conmux
+
+src_prepare() {
+	default
+	# manual installation of drivers and helpers
+	sed -i -e "/include/d" Makefile || die "Failed to fix Makefile"
+}
+
+src_install() {
+	perl_set_version
+	emake BASE="${ED}/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}/
+	keepdir /etc/${PN}
+	# no need to have the init script in /sbin
+	rm "${ED}"/usr/sbin/start || die "failed to remove init script"
+	# console is too generic. Make it conmux-console instead
+	mv "${ED}"/usr/bin/console "${ED}"/usr/bin/${PN}-console || \
+		die "failed to rename console to conmux-console"
+	# Fix up directory for the module
+	perl_set_version
+	keepdir ${VENDOR_LIB}/${PN}
+	mv "${ED}"/usr/lib/Conmux.pm "${ED}"/${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 for more information"
+	elog
+}
diff --git a/app-misc/conmux/files/conmux-0.16.4_unexpected-paths.patch b/app-misc/conmux/files/conmux-0.16.4_unexpected-paths.patch
new file mode 100644
index 000000000000..7b330158fdc4
--- /dev/null
+++ b/app-misc/conmux/files/conmux-0.16.4_unexpected-paths.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,8 +18,6 @@
+ 	@[ -d $(BASE)/bin ] || mkdir $(BASE)/bin
+ 	@[ -d $(BASE)/lib ] || mkdir $(BASE)/lib
+ 	@[ -d $(BASE)/sbin ] || mkdir $(BASE)/sbin
+-	@[ -d $(BASE)/log ] || mkdir $(BASE)/log
+-	@[ -d $(BASE)/etc ] || mkdir $(BASE)/etc
+ 	for f in $(BINS); do \
+ 	    rm -f $(BASE)/bin/$$f; \
+ 	    cp -p $$f $(BASE)/bin/$$f; \