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, 19 Nov 2018 10:50:22
Message-Id: 1542624597.3ab134be298c122ab86b0c743e47d151c48185f8.polynomial-c@gentoo
1 commit: 3ab134be298c122ab86b0c743e47d151c48185f8
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 19 10:47:32 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 19 10:49:57 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab134be
7
8 media-libs/freetype: Replaced failing patch with sed statement.
9
10 Closes: https://bugs.gentoo.org/658492
11 Package-Manager: Portage-2.3.51, Repoman-2.3.12
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 media-libs/freetype/freetype-9999.ebuild | 10 +++++-----
15 1 file changed, 5 insertions(+), 5 deletions(-)
16
17 diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
18 index 62dcbc70637..e9f895c9ce0 100644
19 --- a/media-libs/freetype/freetype-9999.ebuild
20 +++ b/media-libs/freetype/freetype-9999.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2018 Gentoo Foundation
23 +# Copyright 1999-2018 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -42,9 +42,6 @@ DEPEND="${RDEPEND}
28 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
29
30 PATCHES=(
31 - # This is the same as the 01 patch from infinality
32 - "${FILESDIR}"/${PN}-2.7-enable-valid.patch
33 -
34 "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
35 )
36
37 @@ -97,6 +94,9 @@ src_prepare() {
38
39 default
40
41 + # This is the same as the 01 patch from infinality
42 + sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
43 +
44 enable_option() {
45 sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
46 include/${PN}/config/ftoption.h \
47 @@ -150,7 +150,7 @@ src_prepare() {
48
49 # we need non-/bin/sh to run configure
50 if [[ -n ${CONFIG_SHELL} ]] ; then
51 - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
52 + sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
53 "${S}"/builds/unix/configure || die
54 fi