Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 02 Dec 2019 23:35:01
Message-Id: 1575329678.e24133b9a620b7e479f2107a1cfd5e9caf96b197.asturm@gentoo
1 commit: e24133b9a620b7e479f2107a1cfd5e9caf96b197
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 16 22:27:31 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 2 23:34:38 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24133b9
7
8 kde.org.eclass: Prefix internal functions as well
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 eclass/kde.org.eclass | 14 +++++++-------
13 1 file changed, 7 insertions(+), 7 deletions(-)
14
15 diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
16 index 8e13232bb9d..d1cdb1b15dc 100644
17 --- a/eclass/kde.org.eclass
18 +++ b/eclass/kde.org.eclass
19 @@ -77,7 +77,7 @@ case ${CATEGORY} in
20 *) ;;
21 esac
22
23 -_kde_is_unreleased() {
24 +_kde.org_is_unreleased() {
25 local pair
26 for pair in "${KDE_UNRELEASED[@]}" ; do
27 if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
28 @@ -89,7 +89,7 @@ _kde_is_unreleased() {
29 }
30
31 # Determine fetch location for released tarballs
32 -_calculate_src_uri() {
33 +_kde.org_calculate_src_uri() {
34 debug-print-function ${FUNCNAME} "$@"
35
36 local _src_uri="mirror://kde/"
37 @@ -144,13 +144,13 @@ _calculate_src_uri() {
38
39 SRC_URI="${_src_uri}${KDE_ORG_NAME}-${PV}.tar.xz"
40
41 - if _kde_is_unreleased ; then
42 + if _kde.org_is_unreleased ; then
43 RESTRICT+=" fetch"
44 fi
45 }
46
47 # Determine fetch location for live sources
48 -_calculate_live_repo() {
49 +_kde.org_calculate_live_repo() {
50 debug-print-function ${FUNCNAME} "$@"
51
52 SRC_URI=""
53 @@ -181,9 +181,9 @@ _calculate_live_repo() {
54 }
55
56 case ${KDE_BUILD_TYPE} in
57 - live) _calculate_live_repo ;;
58 + live) _kde.org_calculate_live_repo ;;
59 *)
60 - _calculate_src_uri
61 + _kde.org_calculate_src_uri
62 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
63 ;;
64 esac
65 @@ -199,7 +199,7 @@ fi
66 # KDE_UNRELEASED, display a giant warning that the package has not yet been
67 # released upstream and should not be used.
68 kde.org_pkg_nofetch() {
69 - if ! _kde_is_unreleased ; then
70 + if ! _kde.org_is_unreleased ; then
71 return
72 fi