Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: williamh@g.o, chewi@g.o, Mike Gilbert <floppym@g.o>
Subject: [gentoo-dev] [PATCH 1/3] dev-util/meson: install meson-array script
Date: Fri, 11 Dec 2020 23:18:12
Message-Id: 20201211231744.1078574-1-floppym@gentoo.org
1 Bug: https://bugs.gentoo.org/759433
2 Signed-off-by: Mike Gilbert <floppym@g.o>
3 ---
4 dev-util/meson/files/meson-array | 18 ++++++++++++++++++
5 ...on-0.55.3.ebuild => meson-0.55.3-r1.ebuild} | 5 +++++
6 dev-util/meson/meson-9999.ebuild | 5 +++++
7 3 files changed, 28 insertions(+)
8 create mode 100644 dev-util/meson/files/meson-array
9 rename dev-util/meson/{meson-0.55.3.ebuild => meson-0.55.3-r1.ebuild} (96%)
10
11 diff --git a/dev-util/meson/files/meson-array b/dev-util/meson/files/meson-array
12 new file mode 100644
13 index 000000000000..0f4e8c7c6389
14 --- /dev/null
15 +++ b/dev-util/meson/files/meson-array
16 @@ -0,0 +1,18 @@
17 +#!/usr/bin/env python
18 +
19 +import itertools
20 +import shlex
21 +import sys
22 +
23 +def quote(s):
24 + return "'" + s.replace("\\", "\\\\").replace("'", "\\'") + "'"
25 +
26 +def main():
27 + args = sys.argv[1:]
28 + args = (shlex.split(x) for x in args)
29 + args = itertools.chain.from_iterable(args)
30 + args = (quote(x) for x in args)
31 + print("[" + ", ".join(args) + "]")
32 +
33 +if __name__ == "__main__":
34 + main()
35 diff --git a/dev-util/meson/meson-0.55.3.ebuild b/dev-util/meson/meson-0.55.3-r1.ebuild
36 similarity index 96%
37 rename from dev-util/meson/meson-0.55.3.ebuild
38 rename to dev-util/meson/meson-0.55.3-r1.ebuild
39 index ddf27ccdc725..4708a46b324f 100644
40 --- a/dev-util/meson/meson-0.55.3.ebuild
41 +++ b/dev-util/meson/meson-0.55.3-r1.ebuild
42 @@ -82,6 +82,11 @@ python_test() {
43 ) || die "Testing failed with ${EPYTHON}"
44 }
45
46 +python_install() {
47 + distutils-r1_python_install
48 + python_doscript "${FILESDIR}/meson-array"
49 +}
50 +
51 python_install_all() {
52 distutils-r1_python_install_all
53
54 diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
55 index 38ccf9179e21..1cdd142a3f79 100644
56 --- a/dev-util/meson/meson-9999.ebuild
57 +++ b/dev-util/meson/meson-9999.ebuild
58 @@ -82,6 +82,11 @@ python_test() {
59 ) || die "Testing failed with ${EPYTHON}"
60 }
61
62 +python_install() {
63 + distutils-r1_python_install
64 + python_doscript "${FILESDIR}/meson-array"
65 +}
66 +
67 python_install_all() {
68 distutils-r1_python_install_all
69
70 --
71 2.29.2

Replies