Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-fonts/intlfonts/
Date: Mon, 23 Dec 2019 23:41:14
Message-Id: 1577144458.ee322cebf2fc56ea56f6bbc25c7a5343a5dc3264.ulm@gentoo
1 commit: ee322cebf2fc56ea56f6bbc25c7a5343a5dc3264
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 23 23:40:02 2019 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 23 23:40:58 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee322ceb
7
8 media-fonts/intlfonts: Add "non-free" use flag.
9
10 This enables installation of non-free Tibetan fonts.
11
12 Bug: https://bugs.gentoo.org/698048
13 Package-Manager: Portage-2.3.82, Repoman-2.3.20
14 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
15
16 media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild | 10 ++++++++--
17 media-fonts/intlfonts/metadata.xml | 3 ++-
18 2 files changed, 10 insertions(+), 3 deletions(-)
19
20 diff --git a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
21 index f9eef1f9f50..350e486b4ae 100644
22 --- a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
23 +++ b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
24 @@ -9,16 +9,22 @@ DESCRIPTION="International X11 fixed fonts"
25 HOMEPAGE="https://www.gnu.org/directory/intlfonts.html"
26 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
27
28 -LICENSE="public-domain HPND free-noncomm"
29 +LICENSE="public-domain HPND non-free? ( free-noncomm )"
30 SLOT="0"
31 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
32 -IUSE="bdf"
33 +IUSE="bdf non-free"
34
35 DEPEND="x11-apps/bdftopcf
36 >=x11-apps/mkfontscale-1.2.0"
37
38 DOCS=( ChangeLog NEWS README Emacs.ap )
39
40 +src_prepare() {
41 + default
42 + # Tibetan fonts have a non-commercial restriction
43 + use non-free || rm Asian/tib*.bdf || die
44 +}
45 +
46 src_configure() {
47 local myconf=(
48 --with-fontdir=/usr/share/fonts/${PN}
49
50 diff --git a/media-fonts/intlfonts/metadata.xml b/media-fonts/intlfonts/metadata.xml
51 index 7d1842f83af..8fa31783a57 100644
52 --- a/media-fonts/intlfonts/metadata.xml
53 +++ b/media-fonts/intlfonts/metadata.xml
54 @@ -6,6 +6,7 @@
55 <name>Fonts</name>
56 </maintainer>
57 <use>
58 - <flag name="bdf">Installs BDF fonts in addition to PCF</flag>
59 + <flag name="bdf">Install BDF fonts in addition to PCF</flag>
60 + <flag name="non-free">Install non-free Tibetan fonts</flag>
61 </use>
62 </pkgmetadata>