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.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 17 insertions, 19 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/Manifest b/dev-haskell/haddock/Manifest
index b2577a6d1202..e48836ef4b0b 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,13 +1,13 @@
 AUX ghc-paths-1.0.5.0-GHC-Paths.hs 238 RMD160 e00a3771dc7e9b2b4dbf3e77cd12fa424f635198 SHA1 a147a60f803f63cf475e7ba5e7d24bbbe50feae3 SHA256 a86c668fba73a97e14aa58e7dbf9c9bdbcee0c4782bff185b4d905d048c47a9e
 AUX haddock-2.4.2-Setup.hs 3200 RMD160 11c340505daf3a7bf7bbac1abbebc279dabb1744 SHA1 8f0d5ef94365528586750062a77b06f064082a7b SHA256 a9dd6ebc855781897d0357450859202ce553574f9cec0c5cda381c343ce1eb09
 DIST ghc-paths-0.1.0.5.tar.gz 2304 RMD160 098804e5a48ce9381174245601b3896304464219 SHA1 f9a70a8564be268e4aa88436ea18fc84a1ce303a SHA256 ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10
-DIST haddock-2.10.0_pre20120202.tar.gz 182196 RMD160 74db4cae1c97cdf9feb19d8b3da72b97a09fb068 SHA1 8cbeb879ed77c57284d6fdac4894dd57c1b2f3df SHA256 d52476789da279388c23589c02c82595a778da82b39a8c1239dab39bab13fafa
+DIST haddock-2.10.0.tar.gz 159750 RMD160 8c718cd7c6a8ff5c6c5a058d6ff9cf5e48db0b72 SHA1 2ecf6350f2389ff88309a31ce608d68b710bf9e5 SHA256 d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410
 DIST haddock-2.4.2.tar.gz 103033 RMD160 18317b3ffd60f2b0925d635ce1ea2ab35825860c SHA1 cd1de409029bcabdf79b05b4c00c7702c836c765 SHA256 dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
 DIST haddock-2.6.1.tar.gz 128158 RMD160 32be5206f0caab3e6aa7582b9ad23a22581082ab SHA1 f088795826a155f0a207219a45ad643dcaeccf65 SHA256 626bfbc51f33ada003fbbfe1b40f3147039369e9898f8e8d2f5c1c863436ea6a
 DIST haddock-2.9.2.tar.gz 154040 RMD160 5d7fe09d61bf089794e753969db4a259117df41b SHA1 2a61f178a0ce9e126442821ab95052e748b865b0 SHA256 e8498520a4b8c8a03330141ba4c31d81e90dfd361de3ff7e320cdf71c2dd3ba1
-EBUILD haddock-2.10.0_pre20120202.ebuild 2246 RMD160 b33799c91c846ae1fc7d83046df44cb1e74bb6dd SHA1 87b07675a94e277b133661e229239a085dff6de8 SHA256 161facb1f4db8b9ff7ccd6e01415e40f81d1bf90b4f7ffcc1469c0440d0a3951
+EBUILD haddock-2.10.0.ebuild 1895 RMD160 8d8435a50e5c7b810f9afb915fdaff79bfac354e SHA1 ecd2cb1747b86388172ce76c81506822c6b3e1ac SHA256 7c7572b7b15c29349947d2751f4fde3e08078850f368b0311dbc145677ed03c7
 EBUILD haddock-2.4.2.ebuild 2425 RMD160 4bc2d79fe5a71cba14c06cf1c5a9d9e467db1379 SHA1 a65439584d366164200a16ab485841b4d12d7579 SHA256 d77ea400a62ccead9e4060c70b2c63d51ed04598d3c4c36ce861c1addc0b05d2
 EBUILD haddock-2.6.1.ebuild 2493 RMD160 a9bbabaa61c2accd4c5212849b5fc4a309ca8888 SHA1 4975c694400b02363ba845aea035b22886f86cc3 SHA256 c430761c0b3e1109c320b7227d9d629da76c6ba8354744e72b1288a83e6d3c18
 EBUILD haddock-2.9.2.ebuild 2663 RMD160 a4cb37332f1f4c16665d440d554e1597b8c75f3f SHA1 020bad68c7199e1af4d57d13993e64f20e907eee SHA256 95abb0be4f5726586234f88156f5a1555059df5d477c1c4569f32f36271002f9
-MISC ChangeLog 11971 RMD160 b2676b103908f74c763aee2ddffd711c0737b9c4 SHA1 d19855698d4ddc1609c7280da82d4bd68cd6aec5 SHA256 e4d5d2b827683a7984ccbc99726202a8fbfa2b6c6649a28d9b260a6543f45949
+MISC ChangeLog 12284 RMD160 f6e1601e090d377cb68a98145f710f64d6ab23b1 SHA1 06e763b8989073692f7d65a46f049f2d326503ba SHA256 370a118d53744ccd2a44e09356b91b6c0476faf86ae2eb1e647b464e49bc93b8
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
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