From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 727871384B4 for ; Thu, 19 Nov 2015 15:48:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A478E07A5; Thu, 19 Nov 2015 15:48:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 914E7E07A5 for ; Thu, 19 Nov 2015 15:48:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 398EA340634 for ; Thu, 19 Nov 2015 15:48:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1EE8FB6C for ; Thu, 19 Nov 2015 15:48:40 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1447948095.80b046cd0e1b639559e7344f9fdba75352f429f3.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 80b046cd0e1b639559e7344f9fdba75352f429f3 X-VCS-Branch: master Date: Thu, 19 Nov 2015 15:48:40 +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: 4a6f9a70-9732-4e8f-ae78-d5f2fe1a9a83 X-Archives-Hash: d9f11ad340b160268779b44b8e776ec3 commit: 80b046cd0e1b639559e7344f9fdba75352f429f3 Author: Michael Palimaka gentoo org> AuthorDate: Thu Nov 19 15:48:15 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Nov 19 15:48:15 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=80b046cd qt5-build.eclass: add initial EAPI 6 support eclass/qt5-build.eclass | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index c18dda5..85ac374 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -13,11 +13,15 @@ # Requires EAPI 5. case ${EAPI} in - 5) : ;; + 5|6) : ;; *) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;; esac -inherit eutils flag-o-matic multilib toolchain-funcs versionator virtualx +inherit eutils flag-o-matic toolchain-funcs versionator virtualx + +if [[ ${EAPI} == 5 ]] ; then + inherit multilib +fi HOMEPAGE="https://www.qt.io/" LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" @@ -199,9 +203,13 @@ qt5-build_src_prepare() { src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" fi - # apply patches - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" - epatch_user + if [[ ${EAPI} == 5 ]]; then + # apply patches + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + epatch_user + else + default_src_prepare + fi } # @FUNCTION: qt5-build_src_configure