Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/pax-utils/, app-misc/pax-utils/files/
Date: Thu, 08 Sep 2022 00:23:26
Message-Id: 1662596559.7328940e2833ec9478d81745c609423b4c251b28.floppym@gentoo
1 commit: 7328940e2833ec9478d81745c609423b4c251b28
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 8 00:20:45 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 8 00:22:39 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7328940e
7
8 app-misc/pax-utils: apply patch to reorder xmlto arguments
9
10 Closes: https://bugs.gentoo.org/869110
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 ...x-utils-1.3.5-man-reorder-xmlto-arguments.patch | 30 ++++++++++++++++++++++
14 app-misc/pax-utils/pax-utils-1.3.5.ebuild | 4 +++
15 2 files changed, 34 insertions(+)
16
17 diff --git a/app-misc/pax-utils/files/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch b/app-misc/pax-utils/files/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch
18 new file mode 100644
19 index 000000000000..909c69e096c6
20 --- /dev/null
21 +++ b/app-misc/pax-utils/files/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch
22 @@ -0,0 +1,30 @@
23 +From 2d981305b117b669c60bede076557c2d765cf198 Mon Sep 17 00:00:00 2001
24 +From: Mike Gilbert <floppym@g.o>
25 +Date: Wed, 7 Sep 2022 20:13:00 -0400
26 +Subject: [PATCH] man: reorder xmlto arguments
27 +
28 +Bug: https://bugs.gentoo.org/869110
29 +Thanks-to: Fabian Groffen <grobian@g.o>
30 +Signed-off-by: Mike Gilbert <floppym@g.o>
31 +---
32 + man/meson.build | 4 ++--
33 + 1 file changed, 2 insertions(+), 2 deletions(-)
34 +
35 +diff --git a/man/meson.build b/man/meson.build
36 +index fc8d183..2e346ec 100644
37 +--- a/man/meson.build
38 ++++ b/man/meson.build
39 +@@ -25,8 +25,8 @@ endforeach
40 +
41 + custom_target('docbook_to_man',
42 + command : [
43 +- xmlto, 'man', '-x', files('custom.xsl'), '--skip-validation', book,
44 +- '-o', meson.current_build_dir()
45 ++ xmlto, '-x', files('custom.xsl'), '--skip-validation',
46 ++ '-o', meson.current_build_dir(), 'man', book
47 + ],
48 + input : [
49 + 'pax-utils.docbook.in', 'custom.xsl', 'fragment/reftail',
50 +--
51 +2.37.3
52 +
53
54 diff --git a/app-misc/pax-utils/pax-utils-1.3.5.ebuild b/app-misc/pax-utils/pax-utils-1.3.5.ebuild
55 index 1b90ea8c3bf9..c0464ce0aa15 100644
56 --- a/app-misc/pax-utils/pax-utils-1.3.5.ebuild
57 +++ b/app-misc/pax-utils/pax-utils-1.3.5.ebuild
58 @@ -51,6 +51,10 @@ RESTRICT="
59 !test? ( test )
60 "
61
62 +PATCHES=(
63 + "${FILESDIR}/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch"
64 +)
65 +
66 pkg_setup() {
67 if use test || use python; then
68 python-single-r1_pkg_setup