Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-fonts/encodings/
Date: Fri, 21 Sep 2018 11:22:03
Message-Id: 1537528876.76860aa860c8656ca8d14b81b6327d4116324eff.sping@gentoo
1 commit: 76860aa860c8656ca8d14b81b6327d4116324eff
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 21 11:18:12 2018 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 21 11:21:16 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76860aa8
7
8 media-fonts/encodings: Fix xorg-2_src_install shadowing regression
9
10 xorg-2_pkg_post* are called to be future proof, only.
11
12 Closes: https://bugs.gentoo.org/665008
13 Package-Manager: Portage-2.3.49, Repoman-2.3.10
14
15 ...ncodings-1.0.4-r2.ebuild => encodings-1.0.4-r3.ebuild} | 15 ++++++++++++++-
16 1 file changed, 14 insertions(+), 1 deletion(-)
17
18 diff --git a/media-fonts/encodings/encodings-1.0.4-r2.ebuild b/media-fonts/encodings/encodings-1.0.4-r3.ebuild
19 similarity index 64%
20 rename from media-fonts/encodings/encodings-1.0.4-r2.ebuild
21 rename to media-fonts/encodings/encodings-1.0.4-r3.ebuild
22 index 0d23578cb78..af7bb67275f 100644
23 --- a/media-fonts/encodings/encodings-1.0.4-r2.ebuild
24 +++ b/media-fonts/encodings/encodings-1.0.4-r3.ebuild
25 @@ -2,7 +2,10 @@
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=5
29 -inherit xorg-2 font # since media-fonts/encodings does not match media-fonts/font*
30 +
31 +# font eclass is needed since "media-fonts/encodings" does not match
32 +# check for pattern media-fonts/font* in xorg-2 eclass
33 +inherit font xorg-2
34
35 DESCRIPTION="X.Org font encodings"
36
37 @@ -13,3 +16,13 @@ DEPEND="x11-apps/mkfontscale
38 >=media-fonts/font-util-1.1.1-r1"
39
40 ECONF_SOURCE="${S}"
41 +
42 +pkg_postinst() {
43 + xorg-2_pkg_postinst
44 + font_pkg_postinst
45 +}
46 +
47 +pkg_postrm() {
48 + xorg-2_pkg_postrm
49 + font_pkg_postrm
50 +}