1. Forum
  2. Usenet
  3. LINUX.GENTOO.DEV

  • [gentoo-dev] [PATCH 1/2] ghc-package.eclass: Avoid reserved function na

    From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Wed May 18 11:30:01 2022
    Rename function ghc-extractportageversion to ghc-extract-pm-version.

    Closes: https://bugs.gentoo.org/843713
    Signed-off-by: Ulrich Müller <ulm@gentoo.org>
    ---
    eclass/ghc-package.eclass | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass
    index 303cf32d7ef5..8c77ad5bc3cb 100644
    --- a/eclass/ghc-package.eclass
    +++ b/eclass/ghc-package.eclass
    @@ -1,4 +1,4 @@
    -# Copyright 1999-2021 Gentoo Authors
    +# Copyright 1999-2022 Gentoo Authors
    # Distributed under the terms of the GNU General Public License v2

    # @ECLASS: ghc-package.eclass
    @@ -152,10 +152,10 @@ ghc-supports-parallel-make() {
    $(ghc-getghc) --info | grep "Support parallel --make" | grep -q "YES"
    }

    -# @FUNCTION: ghc-extractportageversion
    +# @FUNCTION: ghc-extract-pm-version
    # @DESCRIPTION:
    # extract the version of a portage-installed package -ghc-extractportageversion() {
    +ghc-extract-pm-version() {
    local pkg
    local version
    pkg="$(best_version $1)"
    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From =?UTF-8?q?Ulrich=20M=C3=BCller?=@21:1/5 to All on Wed May 18 11:30:01 2022
    ghc-extractportageversion was renamed to ghc-extract-pm-version.

    Bug: https://bugs.gentoo.org/843713
    Signed-off-by: Ulrich Müller <ulm@gentoo.org>
    ---
    eclass/haskell-cabal.eclass | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
    index 64dcabb852b1..541bb4a90ee5 100644
    --- a/eclass/haskell-cabal.eclass
    +++ b/eclass/haskell-cabal.eclass
    @@ -183,7 +183,7 @@ cabal-version() {
    else
    # We ask portage, not ghc, so that we only pick up
    # portage-installed cabal versions.
    - _CABAL_VERSION_CACHE="$(ghc-extractportageversion dev-haskell/cabal)"
    + _CABAL_VERSION_CACHE="$(ghc-extract-pm-version dev-haskell/cabal)"
    fi
    fi
    echo "${_CABAL_VERSION_CACHE}"
    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)