Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/conmux/, app-misc/conmux/files/
Date: Tue, 23 Nov 2021 00:19:44
Message-Id: 1637626211.d35e0487268e17c3ea079e3b20e379039ca323c2.marecki@gentoo
1 commit: d35e0487268e17c3ea079e3b20e379039ca323c2
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 23 00:10:07 2021 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 23 00:10:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d35e0487
7
8 app-misc/conmux: add 0.16.4
9
10 Disclaimer : do not expect quality ebuild code here, this has been the
11 path-of-least-resistance adaptation of the original EAPI-5 ebuild to one
12 which both uses a modern EAPI, does not try to install /usr/{etc,log}
13 and does not require generating a custom distfile (yes, 15 MB is much
14 more than 50 kB; no, I don't think such a size difference is now worth
15 the trouble of maintaining custom distfiles for a m-n package). No idea
16 if we really need that empty directory in vendor_perl, for one.
17
18 DIST_TEST has been set to "skip" because leaving it at default causes
19 src_test() to fail owing to the fact the upstream makefile has no target
20 "test".
21
22 Closes: https://bugs.gentoo.org/800605
23 Bug: https://bugs.gentoo.org/826422
24 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
25
26 app-misc/conmux/Manifest | 1 +
27 app-misc/conmux/conmux-0.16.4.ebuild | 70 ++++++++++++++++++++++
28 .../files/conmux-0.16.4_unexpected-paths.patch | 11 ++++
29 3 files changed, 82 insertions(+)
30
31 diff --git a/app-misc/conmux/Manifest b/app-misc/conmux/Manifest
32 index f2af53d8cd28..f5e8eca99c8c 100644
33 --- a/app-misc/conmux/Manifest
34 +++ b/app-misc/conmux/Manifest
35 @@ -1 +1,2 @@
36 +DIST autotest-0.16.4.tar.gz 14699617 BLAKE2B faae9fe2472ef6cde5868368d81eeb6b855af7684b407b307d14dbd7e8800506c4234b38b254a58b4d915290dcd61e6c9f2eb4d04cd3b929462b0a6d8ffc52cf SHA512 e209d008d7987610f20b7f0c932f8909a82bdde4c13f0362f54f5872464c76f1e3da5760d8eb0f42567249dee4db5f7802478be5c9798b46e2b421f31aa1cbdd
37 DIST conmux-0.15.1.tar.gz 50713 BLAKE2B d764d63f03318614ad0d7088911dee02fbd36d24da7dc988bb3db03cda3e60c5b185f50b5545b086e2a3a7b278aa47af7bfd211c39c88f7ada32e83666eea0c5 SHA512 8138d6d10b4382709828277503d1c23c52fd43109ebad79073be9003c39a9e62c2b7d9d6e78a9e81797c22871985e50a58df0d538ff63e3f580c9a229b520107
38
39 diff --git a/app-misc/conmux/conmux-0.16.4.ebuild b/app-misc/conmux/conmux-0.16.4.ebuild
40 new file mode 100644
41 index 000000000000..cd2a1cf087d5
42 --- /dev/null
43 +++ b/app-misc/conmux/conmux-0.16.4.ebuild
44 @@ -0,0 +1,70 @@
45 +# Copyright 1999-2021 Gentoo Authors
46 +# Distributed under the terms of the GNU General Public License v2
47 +
48 +EAPI=8
49 +
50 +inherit perl-module
51 +
52 +DIST_TEST="skip"
53 +
54 +MY_PN="autotest"
55 +MY_P="${MY_PN}-${PV}"
56 +
57 +DESCRIPTION="A console multiplexor"
58 +HOMEPAGE="https://github.com/autotest/autotest"
59 +SRC_URI="https://github.com/autotest/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${MY_P}.tar.gz"
60 +
61 +LICENSE="GPL-2"
62 +SLOT="0"
63 +KEYWORDS="~amd64 ~mips ~x86"
64 +
65 +RDEPEND="dev-perl/IO-Multiplex
66 + dev-perl/URI"
67 +
68 +PATCHES=(
69 + "${FILESDIR}"/${PN}-0.16.4_unexpected-paths.patch
70 +)
71 +
72 +S="${WORKDIR}"/${MY_P}/conmux
73 +
74 +src_prepare() {
75 + default
76 + # manual installation of drivers and helpers
77 + sed -i -e "/include/d" Makefile || die "Failed to fix Makefile"
78 +}
79 +
80 +src_install() {
81 + perl_set_version
82 + emake BASE="${ED}/usr" install
83 + # helpers and drivers have been removed in src_prepare
84 + insinto /usr/share/${PN}/
85 + doins -r drivers/ helpers/
86 + fperms -R 0750 /usr/share/${PN}/{drivers,helpers}/
87 + keepdir /etc/${PN}
88 + # no need to have the init script in /sbin
89 + rm "${ED}"/usr/sbin/start || die "failed to remove init script"
90 + # console is too generic. Make it conmux-console instead
91 + mv "${ED}"/usr/bin/console "${ED}"/usr/bin/${PN}-console || \
92 + die "failed to rename console to conmux-console"
93 + # Fix up directory for the module
94 + perl_set_version
95 + keepdir ${VENDOR_LIB}/${PN}
96 + mv "${ED}"/usr/lib/Conmux.pm "${ED}"/${VENDOR_LIB}/. || \
97 + die "failed to move the Conmux.pm module"
98 + newinitd "${FILESDIR}"/${PN}.initd ${PN}
99 + newinitd "${FILESDIR}"/${PN}-registry.initd ${PN}-registry
100 + newconfd "${FILESDIR}"/${PN}.confd ${PN}
101 + newconfd "${FILESDIR}"/${PN}-registry.confd ${PN}-registry
102 + dodoc README
103 +}
104 +
105 +pkg_postinst() {
106 + elog
107 + elog "If you have more than one serial ports and you want to use all"
108 + elog "of them with conmux, copy and paste the 'conmux' init.d and conf.d"
109 + elog "files as many times as you want, pointing each conf.d file to the"
110 + elog "device's configuration file."
111 + elog
112 + elog "See /etc/conf.d/conmux for more information"
113 + elog
114 +}
115
116 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
117 new file mode 100644
118 index 000000000000..7b330158fdc4
119 --- /dev/null
120 +++ b/app-misc/conmux/files/conmux-0.16.4_unexpected-paths.patch
121 @@ -0,0 +1,11 @@
122 +--- a/Makefile
123 ++++ b/Makefile
124 +@@ -18,8 +18,6 @@
125 + @[ -d $(BASE)/bin ] || mkdir $(BASE)/bin
126 + @[ -d $(BASE)/lib ] || mkdir $(BASE)/lib
127 + @[ -d $(BASE)/sbin ] || mkdir $(BASE)/sbin
128 +- @[ -d $(BASE)/log ] || mkdir $(BASE)/log
129 +- @[ -d $(BASE)/etc ] || mkdir $(BASE)/etc
130 + for f in $(BINS); do \
131 + rm -f $(BASE)/bin/$$f; \
132 + cp -p $$f $(BASE)/bin/$$f; \