Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/
Date: Mon, 29 Mar 2021 08:06:51
Message-Id: 1617005175.20eb0f81df1625322f4a2a8e9ac3a12af03a99fe.polynomial-c@gentoo
1 commit: 20eb0f81df1625322f4a2a8e9ac3a12af03a99fe
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 27 13:46:53 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 29 08:06:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20eb0f81
7
8 media-libs/freetype: Drop IUSE=bindist and bindist restriction
9
10 Bug: https://bugs.gentoo.org/691052
11 Package-Manager: Portage-3.0.17, Repoman-3.0.2
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
14
15 media-libs/freetype/freetype-9999.ebuild | 12 ++++--------
16 1 file changed, 4 insertions(+), 8 deletions(-)
17
18 diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
19 index 10ef7635e9d..505575341da 100644
20 --- a/media-libs/freetype/freetype-9999.ebuild
21 +++ b/media-libs/freetype/freetype-9999.ebuild
22 @@ -5,9 +5,9 @@ EAPI=7
23
24 inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
25
26 -DESCRIPTION="A high-quality and portable font engine"
27 +DESCRIPTION="High-quality and portable font engine"
28 HOMEPAGE="https://www.freetype.org/"
29 -IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality +png static-libs utils"
30 +IUSE="X +adobe-cff brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality +png static-libs utils"
31
32 if [[ "${PV}" != 9999 ]] ; then
33 SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
34 @@ -24,7 +24,6 @@ fi
35
36 LICENSE="|| ( FTL GPL-2+ )"
37 SLOT="2"
38 -RESTRICT="!bindist? ( bindist )" # bug 541408
39
40 RDEPEND="
41 >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
42 @@ -137,11 +136,8 @@ src_prepare() {
43 # via environment (new since v2.8)
44 enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
45
46 - if ! use bindist; then
47 - # See http://freetype.org/patents.html
48 - # ClearType is covered by several Microsoft patents in the US
49 - enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
50 - fi
51 + # See https://freetype.org/patents.html (expired!)
52 + enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
53
54 if ! use adobe-cff; then
55 enable_option CFF_CONFIG_OPTION_OLD_ENGINE