Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Fri, 20 May 2022 17:15:42
Message-Id: 1653066904.5c8a87ee8b208cccf1ff94a7b4a7f28c45a9f13f.ulm@gentoo
1 commit: 5c8a87ee8b208cccf1ff94a7b4a7f28c45a9f13f
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 16 06:24:59 2022 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Fri May 20 17:15:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c8a87ee
7
8 ghc-package.eclass: Avoid reserved function name
9
10 Rename function ghc-extractportageversion to ghc-extract-pm-version.
11
12 Closes: https://bugs.gentoo.org/843713
13 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
14
15 eclass/ghc-package.eclass | 6 +++---
16 1 file changed, 3 insertions(+), 3 deletions(-)
17
18 diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass
19 index 303cf32d7ef5..8c77ad5bc3cb 100644
20 --- a/eclass/ghc-package.eclass
21 +++ b/eclass/ghc-package.eclass
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2021 Gentoo Authors
24 +# Copyright 1999-2022 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 # @ECLASS: ghc-package.eclass
28 @@ -152,10 +152,10 @@ ghc-supports-parallel-make() {
29 $(ghc-getghc) --info | grep "Support parallel --make" | grep -q "YES"
30 }
31
32 -# @FUNCTION: ghc-extractportageversion
33 +# @FUNCTION: ghc-extract-pm-version
34 # @DESCRIPTION:
35 # extract the version of a portage-installed package
36 -ghc-extractportageversion() {
37 +ghc-extract-pm-version() {
38 local pkg
39 local version
40 pkg="$(best_version $1)"