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 E775E1385D2 for ; Thu, 20 Oct 2016 23:39:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34F3AE07D6; Thu, 20 Oct 2016 23:39:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1858AE07D6 for ; Thu, 20 Oct 2016 23:39:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9DBB9341652 for ; Thu, 20 Oct 2016 23:39:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C6882494 for ; Thu, 20 Oct 2016 23:39:36 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1477006757.8238093ef645e6b0f9e985a736c230aa2fec9af7.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mpv/mpv-9999.ebuild X-VCS-Directories: media-video/mpv/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8238093ef645e6b0f9e985a736c230aa2fec9af7 X-VCS-Branch: master Date: Thu, 20 Oct 2016 23:39:36 +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: 0cabe25c-a0de-4353-9517-769bbaf59fb8 X-Archives-Hash: 1414b8ecea7a628439b9d04daa2a9d3f commit: 8238093ef645e6b0f9e985a736c230aa2fec9af7 Author: Ilya Tumaykin gmail com> AuthorDate: Thu Oct 20 21:51:29 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Oct 20 23:39:17 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8238093e media-video/mpv: do compiler checks in pkg_setup() too Also reorder compiler check conditions for clarity. Signed-off-by: David Seifert gentoo.org> media-video/mpv/mpv-9999.ebuild | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 950092a..3e2347f 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -128,12 +128,21 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" ) -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then +mpv_check_compiler() { + if [[ ${MERGE_TYPE} != "binary" ]] && use vaapi && use egl && ! tc-has-tls; then die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3." fi } +pkg_pretend() { + mpv_check_compiler +} + +pkg_setup() { + mpv_check_compiler + python-any-r1_pkg_setup +} + src_prepare() { cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die chmod +x "${S}"/waf || die