diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-05-20 17:33:24 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-05-20 17:33:24 +0000 |
| commit | 04de66f2e6efcc64c5aa6c1bc24f4afd90d360f3 (patch) | |
| tree | 42fded99e80b25dc4564a09eb7f9595c72c3dda0 | |
| parent | 2022-05-20 17:18:22 UTC (diff) | |
| parent | haskell-cabal.eclass: Update function call (diff) | |
| download | gentoo-04de66f2e6efcc64c5aa6c1bc24f4afd90d360f3.tar.gz gentoo-04de66f2e6efcc64c5aa6c1bc24f4afd90d360f3.tar.bz2 gentoo-04de66f2e6efcc64c5aa6c1bc24f4afd90d360f3.zip | |
Merge updates from master
| -rw-r--r-- | eclass/ghc-package.eclass | 6 | ||||
| -rw-r--r-- | eclass/haskell-cabal.eclass | 2 |
2 files changed, 4 insertions, 4 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)" 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}" |