[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass

2015-07-20 Thread Sergei Trofimovich (slyfox) 
slyfox  15/07/20 15:05:49

  Modified: ChangeLog haskell-cabal.eclass
  Log:
  Workaround upstream cabal tests hangup bug #537500 by Michael Orlitzky; use 
ghc's haddock for doc generation.

Revision  ChangesPath
1.1723   eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1723view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1723content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1722r2=1.1723

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1722
retrieving revision 1.1723
diff -u -r1.1722 -r1.1723
--- ChangeLog   19 Jul 2015 15:46:03 -  1.1722
+++ ChangeLog   20 Jul 2015 15:05:49 -  1.1723
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1722 2015/07/19 
15:46:03 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1723 2015/07/20 
15:05:49 slyfox Exp $
+
+  20 Jul 2015; Sergei Trofimovich sly...@gentoo.org haskell-cabal.eclass:
+  Workaround upstream cabal tests hangup bug #537500 by Michael Orlitzky; use
+  ghc's haddock for doc generation.
 
   19 Jul 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
   Change kernel upgrade http link and remove reference to deblob in elog



1.52 eclass/haskell-cabal.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.52view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.52content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.51r2=1.52

Index: haskell-cabal.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- haskell-cabal.eclass4 Apr 2015 20:33:05 -   1.51
+++ haskell-cabal.eclass20 Jul 2015 15:05:49 -  1.52
@@ -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/eclass/haskell-cabal.eclass,v 1.51 
2015/04/04 20:33:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.52 
2015/07/20 15:05:49 slyfox Exp $
 
 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
@@ -172,6 +172,8 @@
 cabal-bootstrap() {
local setupmodule
local cabalpackage
+   local setup_bootstrap_args=()
+
if [[ -f ${S}/Setup.lhs ]]; then
setupmodule=${S}/Setup.lhs
elif [[ -f ${S}/Setup.hs ]]; then
@@ -192,8 +194,16 @@
cabalpackage=Cabal-$(cabal-version)
einfo Using cabal-$(cabal-version).
 
+   if $(ghc-supports-threaded-runtime); then
+   # Cabal has a bug that deadlocks non-threaded RTS:
+   # https://bugs.gentoo.org/537500
+   # https://github.com/haskell/cabal/issues/2398
+   setup_bootstrap_args+=(-threaded)
+   fi
+
make_setup() {
set -- -package ${cabalpackage} --make ${setupmodule} \
+   ${setup_bootstrap_args} \
${HCFLAGS} \
${GHC_BOOTSTRAP_FLAGS} \
$@ \
@@ -311,7 +321,15 @@
has ${EAPI:-0} 0 1 2  ! use prefix  EPREFIX=
 
if [[ -n ${CABAL_USE_HADDOCK} ]]  use doc; then
-   cabalconf+=(--with-haddock=${EPREFIX}/usr/bin/haddock)
+   # We use the bundled with GHC version if exists
+   # Haddock is very picky about index files
+   # it generates for ghc's base and other packages.
+   local p=${EPREFIX}/usr/bin/haddock-ghc-$(ghc-version)
+   if [[ -f $p ]]; then
+   cabalconf+=(--with-haddock=${p})
+   else
+   cabalconf+=(--with-haddock=${EPREFIX}/usr/bin/haddock)
+   fi
fi
if [[ -n ${CABAL_USE_PROFILE} ]]  use profile; then
cabalconf+=(--enable-library-profiling)

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass

2015-04-04 Thread Sergei Trofimovich (slyfox) 
slyfox  15/04/04 20:33:05

  Modified: ChangeLog haskell-cabal.eclass
  Log:
  Disable building dynamic libraris by default before-ghc-7.10 (was 
accidentally enabled in a previous revision). Fixes bug #545174 by Toralf 
Förster.

Revision  ChangesPath
1.1583   eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1583view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1583content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1582r2=1.1583

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1582
retrieving revision 1.1583
diff -u -r1.1582 -r1.1583
--- ChangeLog   4 Apr 2015 17:11:35 -   1.1582
+++ ChangeLog   4 Apr 2015 20:33:05 -   1.1583
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1582 2015/04/04 
17:11:35 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1583 2015/04/04 
20:33:05 slyfox Exp $
+
+  04 Apr 2015; Sergei Trofimovich sly...@gentoo.org haskell-cabal.eclass:
+  Disable building dynamic libraris by default before-ghc-7.10 (was
+  accidentally enabled in a previous revision). Fixes bug #545174 by Toralf
+  Förster.
 
   04 Apr 2015; ja...@gentoo.org selinux-policy-2.eclass:
   Drop EAPI5 from selinux-policy-2.eclass



1.51 eclass/haskell-cabal.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.51view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.51content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.50r2=1.51

Index: haskell-cabal.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- haskell-cabal.eclass28 Mar 2015 13:32:40 -  1.50
+++ haskell-cabal.eclass4 Apr 2015 20:33:05 -   1.51
@@ -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/eclass/haskell-cabal.eclass,v 1.50 
2015/03/28 13:32:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.51 
2015/04/04 20:33:05 slyfox Exp $
 
 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
@@ -387,12 +387,11 @@
cabalconf+=(--enable-shared)
 
if $(ghc-supports-shared-libraries); then
-   # maybe a bit lower
-   cabalconf+=(--enable-shared)
-
# Experimental support for dynamically linked binaries.
# We are enabling it since 7.10.1_rc3
if version_is_at_least 7.10.0.20150316 $(ghc-version); then
+   # we didn't enable it before as it was not stable on 
all arches
+   cabalconf+=(--enable-shared)
# Known to break on ghc-7.8/Cabal-1.18
# https://ghc.haskell.org/trac/ghc/ticket/9625
cabalconf+=(--enable-executable-dynamic)

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass

2015-03-15 Thread Sergei Trofimovich (slyfox) 
slyfox  15/03/15 17:03:27

  Modified: ChangeLog haskell-cabal.eclass
  Log:
  Respect CFLAGS. New syntax for revisions 
CABAL_CORE_LIB_GHC_PV=PM:${ghc_PVR}.

Revision  ChangesPath
1.1564   eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1564view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1564content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1563r2=1.1564

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1563
retrieving revision 1.1564
diff -u -r1.1563 -r1.1564
--- ChangeLog   15 Mar 2015 01:25:19 -  1.1563
+++ ChangeLog   15 Mar 2015 17:03:27 -  1.1564
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1563 2015/03/15 
01:25:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1564 2015/03/15 
17:03:27 slyfox Exp $
+
+  15 Mar 2015; Sergei Trofimovich sly...@gentoo.org haskell-cabal.eclass:
+  Respect CFLAGS. New syntax for revisions
+  CABAL_CORE_LIB_GHC_PV=PM:${ghc_PVR}.
 
   15 Mar 2015; Davide Pesavento p...@gentoo.org qt4-build.eclass,
   qt4-build-multilib.eclass:



1.49 eclass/haskell-cabal.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.49view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.49content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.48r2=1.49

Index: haskell-cabal.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- haskell-cabal.eclass2 Jan 2015 09:35:02 -   1.48
+++ haskell-cabal.eclass15 Mar 2015 17:03:27 -  1.49
@@ -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/eclass/haskell-cabal.eclass,v 1.48 
2015/01/02 09:35:02 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.49 
2015/03/15 17:03:27 slyfox Exp $
 
 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
@@ -41,7 +41,8 @@
 # @ECLASS-VARIABLE: CABAL_EXTRA_CONFIGURE_FLAGS
 # @DESCRIPTION:
 # User-specified additional parameters passed to 'setup configure'.
-# example: /etc/portage/make.conf: CABAL_EXTRA_CONFIGURE_FLAGS=--enable-shared
+# example: /etc/portage/make.conf:
+#CABAL_EXTRA_CONFIGURE_FLAGS=--enable-shared --enable-executable-dynamic
 : ${CABAL_EXTRA_CONFIGURE_FLAGS:=}
 
 # @ECLASS-VARIABLE: CABAL_EXTRA_BUILD_FLAGS
@@ -111,7 +112,7 @@
 fi
 
 if [[ -n ${CABAL_USE_HOOGLE} ]]; then
-   # enabled only in ::gentoo-haskell
+   # enabled only in ::haskell
CABAL_USE_HOOGLE=
 fi
 
@@ -148,8 +149,9 @@
DEPEND=${DEPEND} =dev-haskell/cabal-${CABAL_MIN_VERSION}
 fi
 
-# returns the version of cabal currently in use
-_CABAL_VERSION_CACHE=
+# returns the version of cabal currently in use.
+# Rarely it's handy to pin cabal version from outside.
+: ${_CABAL_VERSION_CACHE:=}
 cabal-version() {
if [[ -z ${_CABAL_VERSION_CACHE} ]]; then
if [[ ${CABAL_BOOTSTRAP} ]]; then
@@ -362,7 +364,8 @@
# currently cabal does not respect CFLAGS and LDFLAGS on it's own (bug 
#333217)
# so translate LDFLAGS to ghc parameters (without filtering)
local flag
-   for flag in $LDFLAGS; do cabalconf+=(--ghc-option=-optl$flag); done
+   for flag in   $CFLAGS; do cabalconf+=(--ghc-option=-optc$flag); done
+   for flag in  $LDFLAGS; do cabalconf+=(--ghc-option=-optl$flag); done
 
# disable executable stripping for the executables, as portage will
# strip by itself, and pre-stripping gives a QA warning.
@@ -456,10 +459,21 @@
 # However portage still records the dependency and we can upgrade the package
 # to a later one that's not included with ghc.
 # You can also put a space separated list, eg CABAL_CORE_LIB_GHC_PV=6.6 
6.6.1.
+# Those versions are taken as-is from ghc `--numeric-version`.
+# Package manager versions are also supported:
+# CABAL_CORE_LIB_GHC_PV=7.10.* PM:7.8.4-r1.
 cabal-is-dummy-lib() {
+   local bin_ghc_version=$(ghc-version)
+   local pm_ghc_p=$(best_version dev-lang/ghc)
+   local pm_ghc_version version
+
+   pm_ghc_version=PM:${pm_ghc_p#dev-lang/ghc-}
+
for version in ${CABAL_CORE_LIB_GHC_PV[*]}; do
-   [[ $(ghc-version) == ${version} ]]  return 0
+   [[ ${bin_ghc_version} == ${version} ]]  return 0
+   [[ ${pm_ghc_version}  == ${version} ]]

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass

2015-01-02 Thread Sergei Trofimovich (slyfox) 
slyfox  15/01/02 09:35:02

  Modified: ChangeLog haskell-cabal.eclass
  Log:
  Properly disable USE=hoogle.

Revision  ChangesPath
1.1495   eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1495view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1495content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1494r2=1.1495

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1494
retrieving revision 1.1495
diff -u -r1.1494 -r1.1495
--- ChangeLog   2 Jan 2015 00:15:15 -   1.1494
+++ ChangeLog   2 Jan 2015 09:35:02 -   1.1495
@@ -1,6 +1,6 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1494 2015/01/02 
00:15:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1495 2015/01/02 
09:35:02 slyfox Exp $
 
   02 Jan 2015; Michał Górny mgo...@gentoo.org python-utils-r1.eclass:
   Make python.eclass commands/variables fatal once again since all in-tree
@@ -10,6 +10,9 @@
   Add progress overlay-specific commands and variables to the invalid
   command/variable lists.
 
+  02 Jan 2015; Sergei Trofimovich sly...@gentoo.org haskell-cabal.eclass:
+  Properly disable USE=hoogle.
+
   01 Jan 2015; Sergei Trofimovich sly...@gentoo.org ghc-package.eclass,
   haskell-cabal.eclass:
   Add support for ghc-7.10 registration. User visible changes: ghc-package



1.48 eclass/haskell-cabal.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.48view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.48content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.47r2=1.48

Index: haskell-cabal.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- haskell-cabal.eclass1 Jan 2015 21:23:03 -   1.47
+++ haskell-cabal.eclass2 Jan 2015 09:35:02 -   1.48
@@ -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/eclass/haskell-cabal.eclass,v 1.47 
2015/01/01 21:23:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.48 
2015/01/02 09:35:02 slyfox Exp $
 
 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
@@ -112,7 +112,7 @@
 
 if [[ -n ${CABAL_USE_HOOGLE} ]]; then
# enabled only in ::gentoo-haskell
-   :
+   CABAL_USE_HOOGLE=
 fi
 
 if [[ -n ${CABAL_USE_ALEX} ]]; then

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass

2014-06-27 Thread Sergei Trofimovich (slyfox) 
slyfox  14/06/27 07:16:47

  Modified: ChangeLog haskell-cabal.eclass
  Log:
  Disable QA warning on '--with-hc --with-hc-pkg --with-gcc' flags passed by 
'dev-haskell/cabal' to every configure-based haskell package. Don't unset 
LANG/LC_ALL/LC_MESSAGES anymore.

Revision  ChangesPath
1.1301   eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1301view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1301content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1300r2=1.1301

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1300
retrieving revision 1.1301
diff -u -r1.1300 -r1.1301
--- ChangeLog   26 Jun 2014 07:01:13 -  1.1300
+++ ChangeLog   27 Jun 2014 07:16:47 -  1.1301
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1300 2014/06/26 
07:01:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1301 2014/06/27 
07:16:47 slyfox Exp $
+
+  27 Jun 2014; Sergei Trofimovich sly...@gentoo.org haskell-cabal.eclass:
+  Disable QA warning on '--with-hc --with-hc-pkg --with-gcc' flags passed by
+  'dev-haskell/cabal' to every configure-based haskell package. Don't unset
+  LANG/LC_ALL/LC_MESSAGES anymore.
 
   26 Jun 2014; Justin Lecher j...@gentoo.org readme.gentoo.eclass,
   waf-utils.eclass:



1.45 eclass/haskell-cabal.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.45view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.45content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.44r2=1.45

Index: haskell-cabal.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- haskell-cabal.eclass22 May 2014 16:35:11 -  1.44
+++ haskell-cabal.eclass27 Jun 2014 07:16:47 -  1.45
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.44 
2014/05/22 16:35:11 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.45 
2014/06/27 07:16:47 slyfox Exp $
 
 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
@@ -63,6 +63,10 @@
 
 HASKELL_CABAL_EXPF=pkg_setup src_compile src_test src_install
 
+# 'dev-haskell/cabal' passes those options with ./configure-based
+# configuration, but most packages don't need/don't accept it
+QA_CONFIGURE_OPTIONS+= --with-hc --with-hc-pkg --with-gcc
+
 case ${EAPI:-0} in
2|3|4|5) HASKELL_CABAL_EXPF+= src_configure ;;
*) ;;
@@ -382,7 +386,6 @@
 }
 
 cabal-build() {
-   unset LANG LC_ALL LC_MESSAGES
set --  build ${CABAL_EXTRA_BUILD_FLAGS} $@
echo ./setup $@
./setup $@ \

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass

2014-06-27 Thread Sergei Trofimovich (slyfox) 
slyfox  14/06/27 07:26:18

  Modified: ChangeLog haskell-cabal.eclass
  Log:
  Disable QA warning on '--with-compiler' passed by 'dev-haskell/cabal' (bug 
#515360 by Patrick Lauer).

Revision  ChangesPath
1.1302   eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1302view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1302content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1301r2=1.1302

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1301
retrieving revision 1.1302
diff -u -r1.1301 -r1.1302
--- ChangeLog   27 Jun 2014 07:16:47 -  1.1301
+++ ChangeLog   27 Jun 2014 07:26:18 -  1.1302
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1301 2014/06/27 
07:16:47 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1302 2014/06/27 
07:26:18 slyfox Exp $
+
+  27 Jun 2014; Sergei Trofimovich sly...@gentoo.org haskell-cabal.eclass:
+  Disable QA warning on '--with-compiler' passed by 'dev-haskell/cabal' (bug
+  #515360 by Patrick Lauer).
 
   27 Jun 2014; Sergei Trofimovich sly...@gentoo.org haskell-cabal.eclass:
   Disable QA warning on '--with-hc --with-hc-pkg --with-gcc' flags passed by



1.46 eclass/haskell-cabal.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.46view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.46content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.45r2=1.46

Index: haskell-cabal.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- haskell-cabal.eclass27 Jun 2014 07:16:47 -  1.45
+++ haskell-cabal.eclass27 Jun 2014 07:26:18 -  1.46
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.45 
2014/06/27 07:16:47 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.46 
2014/06/27 07:26:18 slyfox Exp $
 
 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
@@ -64,8 +64,9 @@
 HASKELL_CABAL_EXPF=pkg_setup src_compile src_test src_install
 
 # 'dev-haskell/cabal' passes those options with ./configure-based
-# configuration, but most packages don't need/don't accept it
-QA_CONFIGURE_OPTIONS+= --with-hc --with-hc-pkg --with-gcc
+# configuration, but most packages don't need/don't accept it:
+# #515362, #515362
+QA_CONFIGURE_OPTIONS+= --with-compiler --with-hc --with-hc-pkg --with-gcc
 
 case ${EAPI:-0} in
2|3|4|5) HASKELL_CABAL_EXPF+= src_configure ;;