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 F076A1382C5 for ; Sat, 26 Dec 2020 20:18:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E5F9E0AC6; Sat, 26 Dec 2020 20:18:54 +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 23115E0AC6 for ; Sat, 26 Dec 2020 20:18:54 +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 48C54341208 for ; Sat, 26 Dec 2020 20:18:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03C17451 for ; Sat, 26 Dec 2020 20:18:52 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1608981216.92022b7fdc3c5de61fb93505d9c9befcec4ac307.asturm@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: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 92022b7fdc3c5de61fb93505d9c9befcec4ac307 X-VCS-Branch: master Date: Sat, 26 Dec 2020 20:18:52 +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: 02fd64d9-629a-4f4d-869e-7ad96f7834dd X-Archives-Hash: 83e92f628e2b797cedd11b329b206448 commit: 92022b7fdc3c5de61fb93505d9c9befcec4ac307 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Dec 25 17:14:11 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 26 11:13:36 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=92022b7f qmake-utils.eclass: Ban qmake-utils_find_pro_file() as well Always marked as @INTERNAL and no remaining users in gentoo.git. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qmake-utils.eclass | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 79dbc8c0..0d49eb94 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -22,7 +22,7 @@ case ${EAPI} in *) die "EAPI=${EAPI:-0} is not supported" ;; esac -inherit estack toolchain-funcs +inherit toolchain-funcs # @FUNCTION: _qmake-utils_banned_func # @INTERNAL @@ -109,38 +109,11 @@ qt5_get_plugindir() { } # @FUNCTION: qmake-utils_find_pro_file -# @RETURN: zero or one qmake .pro file names # @INTERNAL # @DESCRIPTION: -# Outputs a project file name that can be passed to eqmake. -# 0 *.pro files found --> outputs null string; -# 1 *.pro file found --> outputs its name; -# 2 or more *.pro files found --> if "${PN}.pro" or -# "$(basename ${S}).pro" are there, outputs one of them. +# Banned. qmake-utils_find_pro_file() { - local dir_name=$(basename "${S}") - - # set nullglob to avoid expanding *.pro to the literal - # string "*.pro" when there are no matching files - eshopts_push -s nullglob - local pro_files=(*.pro) - eshopts_pop - - case ${#pro_files[@]} in - 0) - : ;; - 1) - echo "${pro_files}" - ;; - *) - for pro_file in "${pro_files[@]}"; do - if [[ ${pro_file%.pro} == ${dir_name} || ${pro_file%.pro} == ${PN} ]]; then - echo "${pro_file}" - break - fi - done - ;; - esac + _qmake-utils_banned_func } # @FUNCTION: eqmake4