From b263aed46f928f416f20679d639a99889e9a4c6e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 6 Jan 2013 13:06:35 +0000 Subject: Added 'ghc-supports-threaded-runtime' function. Removed implicit RDEPEND on 'ghc'. --- eclass/haskell-cabal.eclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'eclass/haskell-cabal.eclass') diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 064e4b593589..0db7ec192535 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.37 2012/11/19 21:27:56 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.38 2013/01/06 13:06:35 slyfox Exp $ # @ECLASS: haskell-cabal.eclass # @MAINTAINER: @@ -134,11 +134,6 @@ if [[ -z "${CABAL_BOOTSTRAP}" && -z "${CABAL_FROM_GHC}" ]]; then DEPEND="${DEPEND} >=dev-haskell/cabal-${CABAL_MIN_VERSION}" fi -# Libraries require GHC to be installed. -if [[ -n "${CABAL_HAS_LIBRARIES}" ]]; then - RDEPEND="${RDEPEND} dev-lang/ghc" -fi - # returns the version of cabal currently in use _CABAL_VERSION_CACHE="" cabal-version() { @@ -384,6 +379,9 @@ cabal-is-dummy-lib() { # exported function: check if cabal is correctly installed for # the currently active ghc (we cannot guarantee this with portage) haskell-cabal_pkg_setup() { + if [[ -n ${CABAL_HAS_LIBRARIES} ]]; then + [[ ${RDEPEND} == *dev-lang/ghc* ]] || eqawarn "QA Notice: A library does not have runtime dependency on dev-lang/ghc." + fi if [[ -z "${CABAL_HAS_BINARIES}" ]] && [[ -z "${CABAL_HAS_LIBRARIES}" ]]; then eqawarn "QA Notice: Neither bin nor lib are in CABAL_FEATURES." fi @@ -514,6 +512,8 @@ haskell-cabal_src_install() { popd > /dev/null } +# @FUNCTION: cabal_flag +# @DESCRIPTION: # ebuild.sh:use_enable() taken as base # # Usage examples: -- cgit v1.2.3-65-gdbad