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 496EB13933E for ; Fri, 9 Jul 2021 02:18:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 854E2E0AFB; Fri, 9 Jul 2021 02:18:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 6D36AE0AFB for ; Fri, 9 Jul 2021 02:18:02 +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 5DCDF342AFA for ; Fri, 9 Jul 2021 02:18:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A984B744 for ; Fri, 9 Jul 2021 02:17:59 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1625796566.a9f1eb1145529b9dba6b2edf4cfaa7bf2baf0bb2.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: a9f1eb1145529b9dba6b2edf4cfaa7bf2baf0bb2 X-VCS-Branch: master Date: Fri, 9 Jul 2021 02:17:59 +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: bb0e2278-4d6c-4862-be36-82665753a175 X-Archives-Hash: 3b38dc1a81f4a2b4fa897bb94fc75b08 commit: a9f1eb1145529b9dba6b2edf4cfaa7bf2baf0bb2 Author: Davide Pesavento gentoo org> AuthorDate: Fri Jul 9 02:09:26 2021 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Jul 9 02:09:26 2021 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a9f1eb11 qmake-utils.eclass: sync with gentoo.git Signed-off-by: Davide Pesavento gentoo.org> eclass/qmake-utils.eclass | 78 +++++------------------------------------------ 1 file changed, 7 insertions(+), 71 deletions(-) diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 0d49eb94..1f09cbd9 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: qmake-utils.eclass @@ -6,7 +6,7 @@ # qt@gentoo.org # @AUTHOR: # Davide Pesavento -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Common functions for qmake-based packages. # @DESCRIPTION: # Utility eclass providing wrapper functions for Qt5 qmake. @@ -14,63 +14,15 @@ # This eclass does not set any metadata variables nor export any phase # functions. It can be inherited safely. -if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then -_QMAKE_UTILS_ECLASS=1 - case ${EAPI} in - 7) ;; - *) die "EAPI=${EAPI:-0} is not supported" ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -inherit toolchain-funcs - -# @FUNCTION: _qmake-utils_banned_func -# @INTERNAL -# @DESCRIPTION: -# Banned functions are banned. -_qmake-utils_banned_func() { - die "${FUNCNAME[1]} is banned in EAPI 7 and later" -} - -# @FUNCTION: qt4_get_bindir -# @INTERNAL -# @DESCRIPTION: -# Banned. -qt4_get_bindir() { - _qmake-utils_banned_func -} - -# @FUNCTION: qt4_get_headerdir -# @INTERNAL -# @DESCRIPTION: -# Banned. -qt4_get_headerdir() { - _qmake-utils_banned_func -} - -# @FUNCTION: qt4_get_libdir -# @INTERNAL -# @DESCRIPTION: -# Banned. -qt4_get_libdir() { - _qmake-utils_banned_func -} - -# @FUNCTION: qt4_get_mkspecsdir -# @INTERNAL -# @DESCRIPTION: -# Banned. -qt4_get_mkspecsdir() { - _qmake-utils_banned_func -} +if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then +_QMAKE_UTILS_ECLASS=1 -# @FUNCTION: qt4_get_plugindir -# @INTERNAL -# @DESCRIPTION: -# Banned. -qt4_get_plugindir() { - _qmake-utils_banned_func -} +inherit toolchain-funcs # @FUNCTION: qt5_get_bindir # @DESCRIPTION: @@ -108,22 +60,6 @@ qt5_get_plugindir() { echo $(qt5_get_libdir)/qt5/plugins } -# @FUNCTION: qmake-utils_find_pro_file -# @INTERNAL -# @DESCRIPTION: -# Banned. -qmake-utils_find_pro_file() { - _qmake-utils_banned_func -} - -# @FUNCTION: eqmake4 -# @INTERNAL -# @DESCRIPTION: -# Banned. -eqmake4() { - _qmake-utils_banned_func -} - # @FUNCTION: eqmake5 # @USAGE: [arguments for qmake] # @DESCRIPTION: