diff options
| author |   Mark Wright <gienah@gentoo.org> | 2012-03-06 05:31:21 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2012-03-06 05:31:21 +0000 |
| commit | 270ef9b3afbea48a5d25d8c16bfc5cc68702055d (patch) | |
| tree | 44ebde72bcc90000645b12e98dfe24cf227ec9c5 /dev-haskell/haddock | |
| parent | Version bump. (diff) | |
| download | gentoo-2-270ef9b3afbea48a5d25d8c16bfc5cc68702055d.tar.gz gentoo-2-270ef9b3afbea48a5d25d8c16bfc5cc68702055d.tar.bz2 gentoo-2-270ef9b3afbea48a5d25d8c16bfc5cc68702055d.zip | |
Bump to 2.10.0, which is the same version included in ghc 7.4.1. Remove haddock-2.10.0_pre20120202, since the haddock 2.10.0 included in ghc 7.4.1 is now on hackage.
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/haddock')
| -rw-r--r-- | dev-haskell/haddock/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-2.10.0.ebuild (renamed from dev-haskell/haddock/haddock-2.10.0_pre20120202.ebuild) | 20 |
2 files changed, 14 insertions, 16 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index 7426d43af0d5..4439df9be94e 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-haskell/haddock # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.86 2012/03/04 03:24:53 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.87 2012/03/06 05:31:21 gienah Exp $ + +*haddock-2.10.0 (06 Mar 2012) + + 06 Mar 2012; Mark Wright <gienah@gentoo.org> + -haddock-2.10.0_pre20120202.ebuild, +haddock-2.10.0.ebuild: + Bump to 2.10.0, which is the same version included in ghc 7.4.1. Remove + haddock-2.10.0_pre20120202, since the haddock 2.10.0 included in ghc 7.4.1 is + now on hackage. *haddock-2.10.0_pre20120202 (04 Mar 2012) diff --git a/dev-haskell/haddock/haddock-2.10.0_pre20120202.ebuild b/dev-haskell/haddock/haddock-2.10.0.ebuild index 2e898f0148b9..1e1db8651e71 100644 --- a/dev-haskell/haddock/haddock-2.10.0_pre20120202.ebuild +++ b/dev-haskell/haddock/haddock-2.10.0.ebuild @@ -1,23 +1,15 @@ # Copyright 1999-2012 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_pre20120202.ebuild,v 1.1 2012/03/04 03:24:53 gienah Exp $ - -# haddock-2.9.4 on hackage does not work with ghc-7.4.1 -# this ebuild uses a tarball of what's distributed with ghc-7.4.1 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0.ebuild,v 1.1 2012/03/06 05:31:21 gienah Exp $ EAPI="4" -#CABAL_FEATURES="bin lib profile haddock hscolour" -CABAL_FEATURES="bin lib profile hscolour" -inherit haskell-cabal pax-utils versionator - -MY_PV=$(get_version_component_range '1-3') -MY_P="${MY_PN}-${PV}" +CABAL_FEATURES="bin lib profile haddock hscolour" +inherit haskell-cabal pax-utils DESCRIPTION="A documentation-generation tool for Haskell libraries" HOMEPAGE="http://www.haskell.org/haddock/" -#SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" -SRC_URI="http://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz" +SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -32,13 +24,11 @@ RDEPEND="dev-haskell/ghc-paths[profile?] DEPEND="${RDEPEND} >=dev-haskell/cabal-1.10" -S="${WORKDIR}/${PN}-${MY_PV}" - RESTRICT="test" # avoid depends on QC CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts" -# haddock is disabled as Cabal seems to be buggy about building docks with itself. +# haddock is disabled as Cabal seems to be buggy about building docs with itself. # however, other packages seem to work src_configure() { # create a fake haddock executable. it'll set the right version to cabal |