summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2015-08-01 14:40:24 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2015-08-01 14:40:24 +0000
commit48466b9dbe02ce744738cda88df66a3af2b9b9c0 (patch)
tree93048b260b8a112a058f35e8621ec539bc789424 /x11-wm
parentVersion bump. (diff)
downloadgentoo-2-48466b9dbe02ce744738cda88df66a3af2b9b9c0.tar.gz
gentoo-2-48466b9dbe02ce744738cda88df66a3af2b9b9c0.tar.bz2
gentoo-2-48466b9dbe02ce744738cda88df66a3af2b9b9c0.zip
Disable debugging info.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/xmonad-contrib/ChangeLog6
-rw-r--r--x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild16
2 files changed, 16 insertions, 6 deletions
diff --git a/x11-wm/xmonad-contrib/ChangeLog b/x11-wm/xmonad-contrib/ChangeLog
index 33cf8a6f453b..951647f99566 100644
--- a/x11-wm/xmonad-contrib/ChangeLog
+++ b/x11-wm/xmonad-contrib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-wm/xmonad-contrib
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/ChangeLog,v 1.28 2015/04/03 04:45:25 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/ChangeLog,v 1.29 2015/08/01 14:40:24 slyfox Exp $
+
+ 01 Aug 2015; Sergei Trofimovich <slyfox@gentoo.org>
+ xmonad-contrib-0.11.4.ebuild:
+ Disable debugging info.
*xmonad-contrib-0.11.4 (03 Apr 2015)
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
index 7d12b7d0a407..73be660dbc29 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild,v 1.1 2015/04/03 04:45:25 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild,v 1.2 2015/08/01 14:40:24 slyfox Exp $
EAPI=5
@@ -8,7 +8,7 @@ EAPI=5
#hackport: flags: -testing,use_xft:xft
CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
+inherit eutils haskell-cabal
DESCRIPTION="Third party extensions for xmonad"
HOMEPAGE="http://xmonad.org/"
@@ -32,9 +32,15 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6
"
-# Upstream bug 597 xmonad-contrib-0.11.4 does not compile
-# https://code.google.com/p/xmonad/issues/detail?id=597
-PATCHES=("${FILESDIR}/${P}-import-Applicative.patch")
+src_prepare() {
+ # Upstream bug 597 xmonad-contrib-0.11.4 does not compile
+ # https://code.google.com/p/xmonad/issues/detail?id=597
+ epatch "${FILESDIR}"/${P}-import-Applicative.patch
+
+ # https://ghc.haskell.org/trac/ghc/ticket/10667
+ [[ $(ghc-version) == 7.10.1.20150630 ]] && replace-hcflags -g ''
+ [[ $(ghc-version) == 7.10.2 ]] && replace-hcflags -g ''
+}
src_configure() {
haskell-cabal_src_configure \