commit: fa8928997d917f74894c7013708c7c177a7bfa23 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Mon Jul 5 22:07:09 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Jul 10 11:08:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa892899
haskell-cabal.eclass: allow EAPI=8 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> eclass/haskell-cabal.eclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index f7a6d35e610..a858ddea3ec 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -4,7 +4,7 @@ # @ECLASS: haskell-cabal.eclass # @MAINTAINER: # Haskell herd <[email protected]> -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @AUTHOR: # Original author: Andres Loeh <[email protected]> # Original author: Duncan Coutts <[email protected]> @@ -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;;
