From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65D31138334 for ; Mon, 19 Nov 2018 10:50:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29AA7E0887; Mon, 19 Nov 2018 10:50:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0D94E0887 for ; Mon, 19 Nov 2018 10:50:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16434335C6F for ; Mon, 19 Nov 2018 10:50:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6B9F3CF for ; Mon, 19 Nov 2018 10:50:06 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1542624597.3ab134be298c122ab86b0c743e47d151c48185f8.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freetype/freetype-9999.ebuild X-VCS-Directories: media-libs/freetype/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 3ab134be298c122ab86b0c743e47d151c48185f8 X-VCS-Branch: master Date: Mon, 19 Nov 2018 10:50:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cd8c99a9-6111-4cb9-9bea-a65e7340cf64 X-Archives-Hash: 00ca5da39a97963d12b9975f0249440d commit: 3ab134be298c122ab86b0c743e47d151c48185f8 Author: Lars Wendler gentoo org> AuthorDate: Mon Nov 19 10:47:32 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Nov 19 10:49:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab134be media-libs/freetype: Replaced failing patch with sed statement. Closes: https://bugs.gentoo.org/658492 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> media-libs/freetype/freetype-9999.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index 62dcbc70637..e9f895c9ce0 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -42,9 +42,6 @@ DEPEND="${RDEPEND} PDEPEND="infinality? ( media-libs/fontconfig-infinality )" PATCHES=( - # This is the same as the 01 patch from infinality - "${FILESDIR}"/${PN}-2.7-enable-valid.patch - "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 ) @@ -97,6 +94,9 @@ src_prepare() { default + # This is the same as the 01 patch from infinality + sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die + enable_option() { sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ include/${PN}/config/ftoption.h \ @@ -150,7 +150,7 @@ src_prepare() { # we need non-/bin/sh to run configure if [[ -n ${CONFIG_SHELL} ]] ; then - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \ + sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \ "${S}"/builds/unix/configure || die fi