summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2021-07-05 23:07:09 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2021-07-10 12:08:12 +0100
commitfa8928997d917f74894c7013708c7c177a7bfa23 (patch)
tree3a72e1c5a41901f0356e200252227f8574f8fd70 /eclass
parentghc-package.eclass: allow EAPI=8 (diff)
downloadgentoo-fa8928997d917f74894c7013708c7c177a7bfa23.tar.gz
gentoo-fa8928997d917f74894c7013708c7c177a7bfa23.tar.bz2
gentoo-fa8928997d917f74894c7013708c7c177a7bfa23.zip
haskell-cabal.eclass: allow EAPI=8
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/haskell-cabal.eclass20
1 files changed, 11 insertions, 9 deletions
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index f7a6d35e6102..a858ddea3ec2 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -4,7 +4,7 @@
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
# Haskell herd <haskell@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
# @AUTHOR:
# Original author: Andres Loeh <kosmikus@gentoo.org>
# Original author: Duncan Coutts <dcoutts@gentoo.org>
@@ -40,7 +40,16 @@
# FEATURE can be removed once https://github.com/haskell/cabal/issues/7213
# is fixed.
-inherit eutils ghc-package multilib toolchain-funcs
+case "${EAPI:-0}" in
+ # eutils is for eqawarn
+ 6|7) inherit eutils ;;
+ 8) ;;
+ *) die "EAPI ${EAPI} unsupported." ;;
+esac
+
+inherit ghc-package multilib toolchain-funcs
+
+EXPORT_FUNCTIONS pkg_setup src_configure src_compile src_test src_install pkg_postinst pkg_postrm
# @ECLASS-VARIABLE: CABAL_EXTRA_CONFIGURE_FLAGS
# @USER_VARIABLE
@@ -118,13 +127,6 @@ inherit eutils ghc-package multilib toolchain-funcs
# #515362, #515362
QA_CONFIGURE_OPTIONS+=" --with-compiler --with-hc --with-hc-pkg --with-gcc"
-case "${EAPI:-0}" in
- 6|7) ;;
- *) die "EAPI ${EAPI} unsupported." ;;
-esac
-
-EXPORT_FUNCTIONS pkg_setup src_configure src_compile src_test src_install pkg_postinst pkg_postrm
-
for feature in ${CABAL_FEATURES}; do
case ${feature} in
haddock) CABAL_USE_HADDOCK=yes;;