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 9AD991382C5 for ; Mon, 7 Dec 2020 13:56:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E10ACE0C26; Mon, 7 Dec 2020 13:56:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C8741E0C26 for ; Mon, 7 Dec 2020 13:56:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7FB2433BF1A for ; Mon, 7 Dec 2020 13:56:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 069CA46F for ; Mon, 7 Dec 2020 13:56:19 +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: <1607349376.ae568597e7fb80225d5ed48ae13cb32b383dd2bd.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: ae568597e7fb80225d5ed48ae13cb32b383dd2bd X-VCS-Branch: master Date: Mon, 7 Dec 2020 13:56:19 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e385b413-b964-4a26-a70e-6e806c33c4cc X-Archives-Hash: e1483188a6ee783e0564342394bacdfd commit: ae568597e7fb80225d5ed48ae13cb32b383dd2bd Author: Lars Wendler gentoo org> AuthorDate: Mon Dec 7 13:49:34 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 7 13:56:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae568597 media-libs/freetype: Fixed live ebuild to correctly use dlg submodule Reported-by: Oleh gmail.com> Closes: https://bugs.gentoo.org/758902 Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> media-libs/freetype/freetype-9999.ebuild | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index b8b52e17acc..a57a3403750 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -80,6 +80,16 @@ src_fetch() { src_unpack() { _egit_repo_handler ${EBUILD_PHASE} + + if [[ "${PV}" == 9999 ]] ; then + # Need to copy stuff from dlg submodule (#758902) + local dlg_inc_dir="${S}/submodules/dlg/include/dlg" + local dlg_src_dir="${S}/submodules/dlg/src/dlg" + local dlg_dest_dir="${S}/src/dlg" + mkdir -p "${dlg_dest_dir}/dlg" || die + cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die + cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die + fi } src_prepare() {