slyfox 15/08/01 21:42:46
Modified: haddock-2.10.0-r2.ebuild haddock-2.13.1-r2.ebuild
haddock-2.13.2-r1.ebuild ChangeLog
Log:
Put upper bound on ghc version for older packages.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
611FF3AA)
Revision Changes Path
1.11 dev-haskell/haddock/haddock-2.10.0-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild?rev=1.11&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild?rev=1.11&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild?r1=1.10&r2=1.11
Index: haddock-2.10.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- haddock-2.10.0-r2.ebuild 2 Jan 2015 23:16:40 -0000 1.10
+++ haddock-2.10.0-r2.ebuild 1 Aug 2015 21:42:46 -0000 1.11
@@ -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/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v 1.10
2015/01/02 23:16:40 slyfox Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v 1.11
2015/08/01 21:42:46 slyfox Exp $
EAPI="4"
@@ -13,19 +13,20 @@
LICENSE="BSD"
SLOT="0"
+# ia64 lost as we don't have ghc-7 there yet
# ppc64 needs to be rekeyworded due to xhtml not being keyworded
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd
~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="dev-haskell/ghc-paths[profile?]
=dev-haskell/xhtml-3000.2*[profile?]
- >=dev-lang/ghc-7.4 <dev-lang/ghc-7.6"
+ >=dev-lang/ghc-7.4"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.14"
RESTRICT="test" # avoid depends on QC
-CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
+CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
src_prepare() {
# we would like to avoid happy and alex depends
1.2 dev-haskell/haddock/haddock-2.13.1-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild?r1=1.1&r2=1.2
Index: haddock-2.13.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- haddock-2.13.1-r2.ebuild 10 Feb 2013 14:23:03 -0000 1.1
+++ haddock-2.13.1-r2.ebuild 1 Aug 2015 21:42:46 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild,v 1.1
2013/02/10 14:23:03 slyfox Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild,v 1.2
2015/08/01 21:42:46 slyfox Exp $
EAPI=5
@@ -15,18 +15,18 @@
SLOT="0/${PV}"
# ia64 lost as we don't have ghc-7 there yet
# ppc64 needs to be rekeyworded due to xhtml not being keyworded
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE=""
RDEPEND="dev-haskell/ghc-paths:=[profile?]
=dev-haskell/xhtml-3000.2*:=[profile?]
- >=dev-lang/ghc-7.6.1:="
+ >=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:="
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.14"
RESTRICT="test" # avoid depends on QC
-CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
+CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
src_prepare() {
# we would like to avoid happy and alex depends
1.6 dev-haskell/haddock/haddock-2.13.2-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild?r1=1.5&r2=1.6
Index: haddock-2.13.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- haddock-2.13.2-r1.ebuild 22 Sep 2013 06:44:28 -0000 1.5
+++ haddock-2.13.2-r1.ebuild 1 Aug 2015 21:42:46 -0000 1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild,v 1.5
2013/09/22 06:44:28 ago Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild,v 1.6
2015/08/01 21:42:46 slyfox Exp $
EAPI=5
@@ -23,13 +23,13 @@
RDEPEND="dev-haskell/ghc-paths:=[profile?]
=dev-haskell/xhtml-3000.2*:=[profile?]
- >=dev-lang/ghc-7.6.1:="
+ >=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:="
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.14"
RESTRICT="test" # avoid depends on QC
-CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
+CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
src_prepare() {
# we would like to avoid happy and alex depends
1.118 dev-haskell/haddock/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.118&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.118&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.117&r2=1.118
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ChangeLog 1 Aug 2015 21:23:32 -0000 1.117
+++ ChangeLog 1 Aug 2015 21:42:46 -0000 1.118
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/haddock
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.117
2015/08/01 21:23:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.118
2015/08/01 21:42:46 slyfox Exp $
+
+ 01 Aug 2015; Sergei Trofimovich <[email protected]> haddock-2.10.0-r2.ebuild,
+ haddock-2.13.1-r2.ebuild, haddock-2.13.2-r1.ebuild:
+ Put upper bound on ghc version for older packages.
*haddock-2.16.1 (01 Aug 2015)
