ghc-package.eclass, haskell-cabal.eclass: remove ghc-host-root.

Bug: 534194

diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass
index ccc6d6ffd84bebecc9bf37e95c04dbea685973d2..5466c0b5b20db676c44004b8f15d2a582f36ff5f 100644 (file)
--- a/eclass/ghc-package.eclass
+++ b/eclass/ghc-package.eclass
@@ -62,16 +62,6 @@ ghc-getghcpkgbin() {
        fi
 }
 
-# @FUNCTION: ghc-host-prefix
-# @DESCRIPTION:
-# Returns root of installed ghc.
-# Some helpers (like best_version) require reference
-# host system as they are tied to compiler bing executed.
-ghc-host-root() {
-       has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-       echo "${EPREFIX}/"
-}
-
 # @FUNCTION: ghc-version
 # @DESCRIPTION:
 # returns upstream version of ghc
@@ -95,7 +85,7 @@ ghc-pm-version() {
        local pm_ghc_p
 
        if [[ -z "${_GHC_PM_VERSION_CACHE}" ]]; then
-               pm_ghc_p=$(ROOT=$(ghc-host-root) best_version dev-lang/ghc)
+               pm_ghc_p=$(best_version dev-lang/ghc)
                _GHC_PM_VERSION_CACHE="PM:${pm_ghc_p#dev-lang/ghc-}"
        fi
        echo "${_GHC_PM_VERSION_CACHE}"

diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 7732711ea90a8dc5b51f589646adf6f0e417d663..c1a13300abb0c051a782299f2f8206120441559b 100644 (file)
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -177,7 +177,7 @@ cabal-version() {
                else
                        # We ask portage, not ghc, so that we only pick up
                        # portage-installed cabal versions.
-                       _CABAL_VERSION_CACHE="$(ROOT=$(ghc-host-root) ghc-extractportageversion dev-haskell/cabal)"
+                       _CABAL_VERSION_CACHE="$(ghc-extractportageversion dev-haskell/cabal)"
                fi
        fi
        echo "${_CABAL_VERSION_CACHE}"