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 8B059138335 for ; Sat, 21 Jul 2018 20:20:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64514E07EF; Sat, 21 Jul 2018 20:20:44 +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 35BD0E07EE for ; Sat, 21 Jul 2018 20:20:44 +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 CCED2335D1F for ; Sat, 21 Jul 2018 20:20:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34FD1377 for ; Sat, 21 Jul 2018 20:20:40 +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: <1532204418.2430d61f6f838448a63f8ab87b3243e8fab95acb.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: 2430d61f6f838448a63f8ab87b3243e8fab95acb X-VCS-Branch: master Date: Sat, 21 Jul 2018 20:20: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: 761d9f03-f2ca-409a-83fd-24d8010a4d9c X-Archives-Hash: 629d9c0eb1d43f0134bebcb83f7e7ca9 commit: 2430d61f6f838448a63f8ab87b3243e8fab95acb Author: Davide Pesavento gentoo org> AuthorDate: Sat Jul 21 20:20:18 2018 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Jul 21 20:20:18 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2430d61f qmake-utils.eclass: sync with gentoo repo eclass/qmake-utils.eclass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 916fcc92..f8981c75 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -27,6 +27,8 @@ inherit estack toolchain-funcs # Echoes the directory where Qt4 binaries are installed. # EPREFIX is already prepended to the returned path. qt4_get_bindir() { + [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" + local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin if [[ -d ${qtbindir} ]]; then echo ${qtbindir} @@ -39,6 +41,7 @@ qt4_get_bindir() { # @DESCRIPTION: # Echoes the directory where Qt4 headers are installed. qt4_get_headerdir() { + [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" echo /usr/include/qt4 } @@ -46,6 +49,7 @@ qt4_get_headerdir() { # @DESCRIPTION: # Echoes the directory where Qt4 libraries are installed. qt4_get_libdir() { + [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" echo /usr/$(get_libdir)/qt4 } @@ -53,6 +57,7 @@ qt4_get_libdir() { # @DESCRIPTION: # Echoes the directory where Qt4 mkspecs are installed. qt4_get_mkspecsdir() { + [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" echo /usr/share/qt4/mkspecs } @@ -60,6 +65,7 @@ qt4_get_mkspecsdir() { # @DESCRIPTION: # Echoes the directory where Qt4 plugins are installed. qt4_get_plugindir() { + [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" echo $(qt4_get_libdir)/plugins } @@ -159,6 +165,7 @@ qmake-utils_find_pro_file() { # specified inside the top-level project file. eqmake4() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later" ebegin "Running qmake"