Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/
Date: Wed, 29 Aug 2018 21:57:30
Message-Id: 1535579807.9ab0fc5ae434b63d3577d12ce9dc9e90cb78177a.leio@gentoo
1 commit: 9ab0fc5ae434b63d3577d12ce9dc9e90cb78177a
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 29 21:49:15 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 29 21:56:47 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab0fc5a
7
8 x11-libs/pango: fix src_prepare chaining for correct env cleanup
9
10 Properly call up to eclass exported src_prepare functions with the
11 pango-view.1.in copy necessitated custom src_prepare, so that
12 xdg_environment_reset gets called.
13 This fixes build for people who for some reason use `su` instead
14 of more conceptually correct `su -` (former leaks users env vars
15 to root session). But this is one of the reasons xdg_environment_reset
16 exists for correct use instead of my foolish mistakes :)
17
18 Closes: https://bugs.gentoo.org/664736
19 Package-Manager: Portage-2.3.48, Repoman-2.3.10
20
21 x11-libs/pango/pango-1.42.4.ebuild | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24 diff --git a/x11-libs/pango/pango-1.42.4.ebuild b/x11-libs/pango/pango-1.42.4.ebuild
25 index f0ca0b10e1a..86f894866ac 100644
26 --- a/x11-libs/pango/pango-1.42.4.ebuild
27 +++ b/x11-libs/pango/pango-1.42.4.ebuild
28 @@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
29 "
30
31 src_prepare() {
32 - default
33 + gnome2_src_prepare
34 # This should be updated if next release fails to pre-generate the manpage as well, or src_prepare removed if is properly generated
35 # https://gitlab.gnome.org/GNOME/pango/issues/270
36 cp -v "${FILESDIR}"/${PV}-pango-view.1.in "${S}/utils/pango-view.1.in" || die