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 9A8D7138334 for ; Sat, 16 Nov 2019 23:18:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9FCCE081B; Sat, 16 Nov 2019 23:18:08 +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 9D856E081B for ; Sat, 16 Nov 2019 23:18:08 +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 705EE34CEDD for ; Sat, 16 Nov 2019 23:18:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4B658B4 for ; Sat, 16 Nov 2019 23:18:05 +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: <1573943251.47b1cff3b25aa7f4b408361006bae4404d96f387.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde.org.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 47b1cff3b25aa7f4b408361006bae4404d96f387 X-VCS-Branch: master Date: Sat, 16 Nov 2019 23:18:05 +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: e27d9013-3017-417b-971b-43eab19eae67 X-Archives-Hash: fc61bd0d031dfc42c066a857cb6ca200 commit: 47b1cff3b25aa7f4b408361006bae4404d96f387 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 16 22:27:31 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 16 22:27:31 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=47b1cff3 kde.org.eclass: Prefix internal functions as well Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde.org.eclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass index 8e13232bb9..d1cdb1b15d 100644 --- a/eclass/kde.org.eclass +++ b/eclass/kde.org.eclass @@ -77,7 +77,7 @@ case ${CATEGORY} in *) ;; esac -_kde_is_unreleased() { +_kde.org_is_unreleased() { local pair for pair in "${KDE_UNRELEASED[@]}" ; do if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then @@ -89,7 +89,7 @@ _kde_is_unreleased() { } # Determine fetch location for released tarballs -_calculate_src_uri() { +_kde.org_calculate_src_uri() { debug-print-function ${FUNCNAME} "$@" local _src_uri="mirror://kde/" @@ -144,13 +144,13 @@ _calculate_src_uri() { SRC_URI="${_src_uri}${KDE_ORG_NAME}-${PV}.tar.xz" - if _kde_is_unreleased ; then + if _kde.org_is_unreleased ; then RESTRICT+=" fetch" fi } # Determine fetch location for live sources -_calculate_live_repo() { +_kde.org_calculate_live_repo() { debug-print-function ${FUNCNAME} "$@" SRC_URI="" @@ -181,9 +181,9 @@ _calculate_live_repo() { } case ${KDE_BUILD_TYPE} in - live) _calculate_live_repo ;; + live) _kde.org_calculate_live_repo ;; *) - _calculate_src_uri + _kde.org_calculate_src_uri debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" ;; esac @@ -199,7 +199,7 @@ fi # KDE_UNRELEASED, display a giant warning that the package has not yet been # released upstream and should not be used. kde.org_pkg_nofetch() { - if ! _kde_is_unreleased ; then + if ! _kde.org_is_unreleased ; then return fi