Get rid of dev-haskell/happy and dev-haskell/alex depends (reported by judu).

Package-Manager: portage-2.2.0_alpha91/cvs/Linux x86_64

4 files changed, 50 insertions, 11 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index a34d0b6db92c..0e3731dbfc42 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,10 @@
 # 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.89 2012/03/18 19:42:44 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.90 2012/03/25 14:25:09 slyfox Exp $
+
+  25 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/haddock-2.10.0-drop-tools.patch, haddock-2.10.0.ebuild:
+  Get rid of dev-haskell/happy and dev-haskell/alex depends (reported by judu).
 
   18 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
   +files/haddock-2.9.2-cabal-1.10.patch, haddock-2.9.2.ebuild:
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index fe5778e88598..401858d869c4 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX ghc-paths-1.0.5.0-GHC-Paths.hs 238 RMD160 e00a3771dc7e9b2b4dbf3e77cd12fa424f635198 SHA1 a147a60f803f63cf475e7ba5e7d24bbbe50feae3 SHA256 a86c668fba73a97e14aa58e7dbf9c9bdbcee0c4782bff185b4d905d048c47a9e
+AUX haddock-2.10.0-drop-tools.patch 744 RMD160 aab1668bceb4ea5a8584646c784db5c2b3063144 SHA1 686b9fed9d11a6405a234bf63ad5e56ea7a5453b SHA256 905de70488ee2ce800b541fe97b7f906b5a7d239f275aaf914a1b39483718b10
 AUX haddock-2.4.2-Setup.hs 3200 RMD160 11c340505daf3a7bf7bbac1abbebc279dabb1744 SHA1 8f0d5ef94365528586750062a77b06f064082a7b SHA256 a9dd6ebc855781897d0357450859202ce553574f9cec0c5cda381c343ce1eb09
 AUX haddock-2.6.1-cabal-1.8.patch 292 RMD160 bc2cfa1991403252a95386e1f45b3628bd43506c SHA1 854e2b1b8dd4c4d52434869cb8bd37e509eeb3d9 SHA256 a7bb8cf4c4b41e9be8efc0ad870cb29932ab7cfef6a1011d2c72d4f342b87fd8
 AUX haddock-2.9.2-cabal-1.10.patch 305 RMD160 c5a306bd0e52e5de37c54060ef599aa13c37e34c SHA1 5a20484c040ff104d4fce305cf9694255f77ae24 SHA256 31eaf2bbaf838ca8e8b98bc52c26282bb689fbbecab4d8064338aafc1b500f55
@@ -10,16 +11,16 @@ DIST haddock-2.10.0.tar.gz 159750 RMD160 8c718cd7c6a8ff5c6c5a058d6ff9cf5e48db0b7
 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.ebuild 1895 RMD160 8d8435a50e5c7b810f9afb915fdaff79bfac354e SHA1 ecd2cb1747b86388172ce76c81506822c6b3e1ac SHA256 7c7572b7b15c29349947d2751f4fde3e08078850f368b0311dbc145677ed03c7
+EBUILD haddock-2.10.0.ebuild 2013 RMD160 5df5bb06cb69f937dde5f62e38218a217d71eb6f SHA1 b4ae20f3df2fe25f9fe109fa1e6096e61433a66a SHA256 9fc83b88e44cbcb30ca731f59607107584c4cdc9974d663bd456af5c75955c12
 EBUILD haddock-2.4.2.ebuild 2425 RMD160 4bc2d79fe5a71cba14c06cf1c5a9d9e467db1379 SHA1 a65439584d366164200a16ab485841b4d12d7579 SHA256 d77ea400a62ccead9e4060c70b2c63d51ed04598d3c4c36ce861c1addc0b05d2
 EBUILD haddock-2.6.1.ebuild 2555 RMD160 84ce49c678c86da87c47d76de66e59c2fd044992 SHA1 a6e1922551434496fb7a4ef02580defc829d98ff SHA256 58fd3d1db6c906167871fbbe5e99b71d459d35c17b4e2c2a15dd259787dcf43c
 EBUILD haddock-2.9.2.ebuild 2731 RMD160 49fa32983c2c05faa18945645a3b038b16eabfc6 SHA1 09a777dfcd187571fa9a83f369ac793bfd4cdc74 SHA256 05f91f5e68313b5c101472615f85ae790be89837fc96a43ed13f91bdcae5e6d0
-MISC ChangeLog 12726 RMD160 3fb933b7b27a8b8bdf89b8cd68e9c2f8d1a7c571 SHA1 993b0fa9e41bbc71c37b412ae9c9e8df19ca12bb SHA256 983185ce9822b64b8148c417ad215723fd857e4649400dc5738ab6c96dac305f
+MISC ChangeLog 12926 RMD160 12c9e2969b5bffb8cbf13bf89ab289845862a6d3 SHA1 bc58c6fa6cfa78e63e30e0c89c541c4357a1782c SHA256 3df4985805fcf4fe1c3be944de7d1359e534b9f81e241366627d6783d9e5cf16
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9mO+IACgkQcaHudmEf86pTJACfeFPiSibFUQP2LTzu2gFTmFre
-1YUAn0WbCxYNP/23MDx/K9sVNLwmHo1k
-=ZZ/n
+iEYEARECAAYFAk9vK+kACgkQcaHudmEf86qB4gCcDKjoLajR1eqKqJx8q0nIIABE
+SEQAnjxsmUGOP2f/di/OFB9NX4GvUxzV
+=28TR
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/files/haddock-2.10.0-drop-tools.patch b/dev-haskell/haddock/files/haddock-2.10.0-drop-tools.patch
new file mode 100644
index 000000000000..f7f7f4a3ee1e
--- /dev/null
+++ b/dev-haskell/haddock/files/haddock-2.10.0-drop-tools.patch
@@ -0,0 +1,26 @@
+diff --git a/haddock.cabal b/haddock.cabal
+index 84d3c2a..9587450 100644
+--- a/haddock.cabal
++++ b/haddock.cabal
+@@ -78,10 +78,6 @@ flag test
+ 
+ executable haddock
+   default-language:     Haskell2010
+-  -- In a GHC tree - in particular, in a source tarball - we don't
+-  -- require alex or happy
+-  if !flag(in-ghc-tree)
+-    build-tools: alex >= 2.3, happy >= 1.18
+   build-depends:
+     base >= 4.3 && < 4.6,
+     filepath,
+@@ -140,10 +136,6 @@ executable haddock
+    
+ library
+   default-language:     Haskell2010
+-  -- In a GHC tree - in particular, in a source tarball - we don't
+-  -- require alex or happy
+-  if !flag(in-ghc-tree)
+-    build-tools: alex >= 2.3, happy >= 1.18
+   build-depends:
+     base >= 4.3 && < 4.6,
+     filepath,
diff --git a/dev-haskell/haddock/haddock-2.10.0.ebuild b/dev-haskell/haddock/haddock-2.10.0.ebuild
index 1e1db8651e71..3b186138d788 100644
--- a/dev-haskell/haddock/haddock-2.10.0.ebuild
+++ b/dev-haskell/haddock/haddock-2.10.0.ebuild
@@ -1,11 +1,11 @@
 # 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.ebuild,v 1.1 2012/03/06 05:31:21 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0.ebuild,v 1.2 2012/03/25 14:25:09 slyfox Exp $
 
 EAPI="4"
 
 CABAL_FEATURES="bin lib profile haddock hscolour"
-inherit haskell-cabal pax-utils
+inherit eutils haskell-cabal pax-utils
 
 DESCRIPTION="A documentation-generation tool for Haskell libraries"
 HOMEPAGE="http://www.haskell.org/haddock/"
@@ -22,14 +22,22 @@ RDEPEND="dev-haskell/ghc-paths[profile?]
 		=dev-haskell/xhtml-3000.2*[profile?]
 		>=dev-lang/ghc-7.4"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
+		>=dev-haskell/cabal-1.14"
 
 RESTRICT="test" # avoid depends on QC
 
 CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
 
-# haddock is disabled as Cabal seems to be buggy about building docs with itself.
-# however, other packages seem to work
+src_prepare() {
+	# we would like to avoid happy and alex depends
+	epatch "${FILESDIR}"/${P}-drop-tools.patch
+
+	for f in Lex Parse; do
+		rm "src/Haddock/$f."*
+		mv "dist/build/haddock/haddock-tmp/Haddock/$f.hs" src/Haddock/
+	done
+}
+
 src_configure() {
 	# create a fake haddock executable. it'll set the right version to cabal
 	# configure, but will eventually get overwritten in src_compile by