From 61e7ac42294e6e048d4937ca5658aedde6675c13 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 12 May 2016 10:30:20 +0100 Subject: [PATCH] dev-haskell/semigroups: fix build failure with USE=-*, bug #582744 Reported-by: Thomas Beutin Bug: https://bugs.gentoo.org/582744 Package-Manager: portage-2.2.28 --- .../files/semigroups-0.15.1-trust.patch | 32 +++++++++++++++++++ .../semigroups/semigroups-0.15.1.ebuild | 4 +++ 2 files changed, 36 insertions(+) create mode 100644 dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch diff --git a/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch b/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch new file mode 100644 index 0000000000000..ff66afa91a6e9 --- /dev/null +++ b/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch @@ -0,0 +1,32 @@ +commit 118b29f5404014d0a627767a4c7e8de4f00f9fce +Author: João Cristóvão +Date: Wed Jul 23 12:27:29 2014 +0100 + + If GHC >= 7.8 module is always Thrustworthy, never safe, due to GHC.Exts + +diff --git a/src/Data/List/NonEmpty.hs b/src/Data/List/NonEmpty.hs +index 8a28020..f3c2db5 100644 +--- a/src/Data/List/NonEmpty.hs ++++ b/src/Data/List/NonEmpty.hs +@@ -1,7 +1,7 @@ + {-# LANGUAGE CPP #-} + + #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702 +-#ifdef MIN_VERSION_hashable ++#if defined(MIN_VERSION_hashable) || __GLASGOW_HASKELL__ >= 708 + {-# LANGUAGE Trustworthy #-} + #else + {-# LANGUAGE Safe #-} +diff --git a/src/Data/Semigroup.hs b/src/Data/Semigroup.hs +index 7d41775..88fcbb0 100644 +--- a/src/Data/Semigroup.hs ++++ b/src/Data/Semigroup.hs +@@ -8,7 +8,7 @@ + #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702 + #define LANGUAGE_DefaultSignatures + {-# LANGUAGE DefaultSignatures #-} +-#ifdef MIN_VERSION_hashable ++#if defined(MIN_VERSION_hashable) || __GLASGOW_HASKELL__ >= 708 + {-# LANGUAGE Trustworthy #-} + #else + {-# LANGUAGE Safe #-} diff --git a/dev-haskell/semigroups/semigroups-0.15.1.ebuild b/dev-haskell/semigroups/semigroups-0.15.1.ebuild index 226146ddebaa2..64bdf83a2aeb9 100644 --- a/dev-haskell/semigroups/semigroups-0.15.1.ebuild +++ b/dev-haskell/semigroups/semigroups-0.15.1.ebuild @@ -28,6 +28,10 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.10 " +src_prepare() { + epatch "${FILESDIR}"/${P}-trust.patch +} + src_configure() { haskell-cabal_src_configure \ $(cabal_flag bytestring bytestring) \