Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 12 Sep 2022 19:14:40
Message-Id: 1663010070.a04d8578e36fdda4073eb947a37f251ed6d90a44.arthurzam@gentoo
1 commit: a04d8578e36fdda4073eb947a37f251ed6d90a44
2 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 3 11:46:29 2022 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 12 19:14:30 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04d8578
7
8 haskell-cabal.eclass: fix UnquotedVariable of EPREFIX
9
10 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
11
12 eclass/haskell-cabal.eclass | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
16 index 732ea83e653c..0f7f67a244d7 100644
17 --- a/eclass/haskell-cabal.eclass
18 +++ b/eclass/haskell-cabal.eclass
19 @@ -390,9 +390,9 @@ cabal-configure() {
20 # it generates for ghc's base and other packages.
21 local p=${EPREFIX}/usr/bin/haddock-ghc-$(ghc-version)
22 if [[ -f $p ]]; then
23 - cabalconf+=(--with-haddock="${p}")
24 + cabalconf+=( --with-haddock="${p}" )
25 else
26 - cabalconf+=(--with-haddock=${EPREFIX}/usr/bin/haddock)
27 + cabalconf+=( --with-haddock="${EPREFIX}"/usr/bin/haddock )
28 fi
29 fi
30 if [[ -n "${CABAL_USE_PROFILE}" ]] && use profile; then
31 @@ -702,7 +702,7 @@ cabal_src_install() {
32 # if it does not exist (dummy libraries and binaries w/o libraries)
33 local ghc_confdir_with_prefix="$(ghc-confdir)"
34 # remove EPREFIX
35 - dodir ${ghc_confdir_with_prefix#${EPREFIX}}
36 + dodir "${ghc_confdir_with_prefix#${EPREFIX}}"
37 local hint_db="${D}/$(ghc-confdir)"
38 local hint_file="${hint_db}/gentoo-empty-${CATEGORY}-${PF}.conf"
39 mkdir -p "${hint_db}" || die