Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
Date: Mon, 06 Dec 2021 22:45:59
Message-Id: 1638830743.9110a9e30beca811f3e1cba5e232bb803e11407b.sam@gentoo
1 commit: 9110a9e30beca811f3e1cba5e232bb803e11407b
2 Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
3 AuthorDate: Mon Dec 6 00:26:07 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 6 22:45:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9110a9e3
7
8 app-text/mupdf: Added messages to die calls
9
10 As pointed out in PR #23174 calls to die didn't have meaningful error
11 messages attached.
12
13 Package-Manager: Portage-3.0.28, Repoman-3.0.3
14 Signed-off-by: Philipp Roesner <rndxelement <AT> protonmail.com>
15 Closes: https://github.com/gentoo/gentoo/pull/23193
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 app-text/mupdf/metadata.xml | 9 ++++++++-
19 app-text/mupdf/mupdf-1.19.0.ebuild | 8 ++++----
20 2 files changed, 12 insertions(+), 5 deletions(-)
21
22 diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
23 index 115e9d64a669..5d2f87cc3174 100644
24 --- a/app-text/mupdf/metadata.xml
25 +++ b/app-text/mupdf/metadata.xml
26 @@ -1,5 +1,12 @@
27 <?xml version="1.0" encoding="UTF-8"?>
28 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
29 <pkgmetadata>
30 - <!-- maintainer-needed -->
31 + <maintainer type="person" proxied="yes">
32 + <email>rndxelement@××××××××××.com</email>
33 + <name>Philipp Rösner</name>
34 + </maintainer>
35 + <maintainer type="project" proxied="proxy">
36 + <email>proxy-maint@g.o</email>
37 + <name>Proxy Maintainers</name>
38 + </maintainer>
39 </pkgmetadata>
40
41 diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild
42 index 88ff8063033b..9d1dae31213a 100644
43 --- a/app-text/mupdf/mupdf-1.19.0.ebuild
44 +++ b/app-text/mupdf/mupdf-1.19.0.ebuild
45 @@ -67,7 +67,7 @@ src_prepare() {
46 -e "1iAR = $(tc-getAR)" \
47 -e "1iverbose = yes" \
48 -e "1ibuild = debug" \
49 - -i Makerules || die
50 + -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
51 }
52
53 _emake() {
54 @@ -122,14 +122,14 @@ src_install() {
55 domenu platform/debian/${PN}.desktop
56 doicon platform/debian/${PN}.xpm
57 else
58 - rm docs/man/${PN}.1 || die
59 + rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
60 fi
61
62 sed -i \
63 -e "1iprefix = ${ED}/usr" \
64 -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
65 -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
66 - -i Makerules || die
67 + -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
68
69 _emake install
70
71 @@ -144,7 +144,7 @@ src_install() {
72 fi
73
74 # Respect libdir (bug #734898)
75 - sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die
76 + sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()"
77
78 insinto /usr/$(get_libdir)/pkgconfig
79 doins platform/debian/${PN}.pc