From 520f6845fcd99ebb1ec93a81901117145c93f119 Mon Sep 17 00:00:00 2001 From: Lennart Kolmodin Date: Tue, 30 Mar 2010 22:22:53 +0000 Subject: Patched dev-haskell/haddock-2.4.2 to work with both dev-haskell/cabal-1.6* and cabal-1.8*. Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- dev-haskell/haddock/ChangeLog | 10 ++++++++-- dev-haskell/haddock/Manifest | 14 +++++++------- dev-haskell/haddock/files/haddock-2.4.2-Setup.hs | 12 ++++++++++-- dev-haskell/haddock/haddock-2.4.1.ebuild | 6 +++--- dev-haskell/haddock/haddock-2.4.2.ebuild | 4 ++-- 5 files changed, 30 insertions(+), 16 deletions(-) (limited to 'dev-haskell') diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index 34d327037c85..83899df4e773 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,9 +1,15 @@ # ChangeLog for dev-haskell/haddock # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.69 2010/03/30 21:46:56 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.70 2010/03/30 22:22:52 kolmodin Exp $ + + 30 Mar 2010; Lennart Kolmodin haddock-2.4.1.ebuild, + haddock-2.4.2.ebuild, files/haddock-2.4.2-Setup.hs: + Change deps of 2.4.1 to only work with cabal-1.6*. + For 2.4.2 we've patched so it workes with both cabal-1.6 and cabal-1.8. + See bug #302489. 30 Mar 2010; Lennart Kolmodin haddock-2.4.2.ebuild: - Change deps of 2.4.2, it only builds with cabal-1.6* + Change deps of 2.4.2, it only builds with cabal-1.6*. See bug #302489. 28 Mar 2010; Lennart Kolmodin haddock-2.6.0.ebuild: Add dependencies alex and happy, see bug #302397. diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest index 3f3919de1343..abe1b6a41f35 100644 --- a/dev-haskell/haddock/Manifest +++ b/dev-haskell/haddock/Manifest @@ -2,7 +2,7 @@ Hash: SHA1 AUX ghc-paths-1.0.5.0-GHC-Paths.hs 238 RMD160 e00a3771dc7e9b2b4dbf3e77cd12fa424f635198 SHA1 a147a60f803f63cf475e7ba5e7d24bbbe50feae3 SHA256 a86c668fba73a97e14aa58e7dbf9c9bdbcee0c4782bff185b4d905d048c47a9e -AUX haddock-2.4.2-Setup.hs 2888 RMD160 6c2a45c69cc4f36cd379a7e94e135b602429ac55 SHA1 4c67796d23bdc72fe829a5cc4a07a2da26ec3c74 SHA256 0b91b924c87a7cd1f430deb47a651af830959fcc7bdae5ee5da6e42a84bade6b +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-0.8-src.tar.gz 162872 RMD160 80b7a582ea91fb36b97675d7ea8a027221a28b8e SHA1 e171d4446ac6fcef526cad4c688892fe587fe90e SHA256 d54078dd9dc75aa589cb05fbe1136c1fb41d4a346e30b71de948425ea7c05a55 DIST haddock-0.9.tar.gz 163380 RMD160 27685313184e70270d7e4f043c7d671b84acfb23 SHA1 f3c5299b657b170e7a44b66ebd60d3e0947a35aa SHA256 beefd4a6da577978e7a79cabba60970accc5cd48fbb04c424a6b36ace3a9f8d0 @@ -11,15 +11,15 @@ DIST haddock-2.4.2.tar.gz 103033 RMD160 18317b3ffd60f2b0925d635ce1ea2ab35825860c DIST haddock-2.6.0.tar.gz 118432 RMD160 c05c79aa20661d1b97d0a0aa26bea344d58ea3bf SHA1 23ec1ecc5199c0de06f7c95fecc6f901cc807a50 SHA256 36110f1b7465ebef860b3e9c8a3ab94b877d45b9f5bc521af52c1ac7bc75eedc EBUILD haddock-0.8.ebuild 1691 RMD160 2275082d63a82cdf2e50b3b35ad3f4b8cc93adee SHA1 3feb6d51b114e201d48f185af86532ce859725fd SHA256 c311f887dff9e748689f969524d8e923735d1026282e95fbe5fe20c8dae2522e EBUILD haddock-0.9.ebuild 1160 RMD160 afbaecefe7e2e5259cb932b1057a254d6ac07ae1 SHA1 18d8b08c71a9de4be90cef743905a783221a37c7 SHA256 3a36527c9f8f772eeb65757e4574c344af79025599edf68cadde0eed6ec4203e -EBUILD haddock-2.4.1.ebuild 2652 RMD160 d702a4eee93de8ad23bb02230d541f54db380239 SHA1 ee64c80934280be02e055f7fcbfdb8cffcc7cbc7 SHA256 7b66c532f55af8f63000af79c31b95d295729884a8046ee9141d55b54b83efd2 -EBUILD haddock-2.4.2.ebuild 2272 RMD160 32077348d6ccec24973356ab0cd8cf4ad5065bf9 SHA1 8d890522720feda3ae08a4f518015f96dc8eac8c SHA256 6f0637483276e6e93310a3d41aadf6534ef8ba1c5694444da00f8f7833a9e73f +EBUILD haddock-2.4.1.ebuild 2652 RMD160 68dd9b741f6d4a19fa632f61b689f6b241ae993b SHA1 e3cd6fcc41370cc9dc7806d5b107f68fc115816f SHA256 8c56ca75e5bd4106c20839945c80402f835f6b10689f6df322022e8910b58ca4 +EBUILD haddock-2.4.2.ebuild 2272 RMD160 aa7a6a45c1ccdf51df46b3580be62e682873bc50 SHA1 b342e4c1799546ea894c4d1e6c73581eccb84b3d SHA256 4b37efe6d20939c321d27abafbf0365538f4b5c9a59c9725daf2fc1c16f6292c EBUILD haddock-2.6.0.ebuild 2364 RMD160 c930de8214310f880a25080ae3afc3a68686cac6 SHA1 11262746fac7df2f82e0b9b64eee4d2512fe1f3a SHA256 a72a7d5a7070cb7c0216e51efc01c26b4706374f3d786d53c90caf00b8b46630 -MISC ChangeLog 9437 RMD160 65ae3f9826c0e936dd63550c0edfb2aea907ff89 SHA1 21465f80b87668003ab6ee5ccf328f8a41652480 SHA256 5bbc1bb2bd932feba87454319458ddefcdfbde095c773b00f48638ddd8f842a6 +MISC ChangeLog 9732 RMD160 16ba844dd8ea5f472ca7089f365c6ea0aa3f998a SHA1 50a740643a7aa09bd94ff14686c5f247a9251839 SHA256 1c1b8f5d730792f069e1c7c639e47e31298c9d8002389f5504a0e86fd798999f MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuycU8ACgkQ1n/CYbXjntJn7wCcCVQSru4n960LRgPSk1PoqVTD -eOsAn18vS1kh9h+ljQgF1yL5ExsfRKMf -=xB0J +iEYEARECAAYFAkuyeboACgkQ1n/CYbXjntIGwQCdFZsRlTrpm7kFeJbt6hEfYiV8 +bocAn0wifBRjw0oECUI5/5QcXPSATIa2 +=+uQg -----END PGP SIGNATURE----- diff --git a/dev-haskell/haddock/files/haddock-2.4.2-Setup.hs b/dev-haskell/haddock/files/haddock-2.4.2-Setup.hs index 31ee04eb8168..19b2c5ba3a5e 100644 --- a/dev-haskell/haddock/files/haddock-2.4.2-Setup.hs +++ b/dev-haskell/haddock/files/haddock-2.4.2-Setup.hs @@ -1,6 +1,8 @@ {- Setup.hs: based on code from ghc-paths of Simon Marlow Fixed to not use the .buildinfo, and use -Dfoo flags for both libraries and executables + +Modified 2010-03-30 to work with both cabal-1.6 and cabal-1.8. See bug #302489. -} import Distribution.Simple import Distribution.Simple.Setup @@ -20,12 +22,18 @@ main = defaultMainWithHooks simpleUserHooks { confHook = myCustomConfHook } where +{- With cabal-1.6, myCustomConfHook has this type myCustomConfHook :: (Either GenericPackageDescription PackageDescription, HookedBuildInfo) -> ConfigFlags -> IO LocalBuildInfo - myCustomConfHook egpdpdhbi flags = do + With cabal-1.8, myCustomConfHook has this type + myCustomConfHook :: (GenericPackageDescription, HookedBuildInfo) + +So, better to not specify the type at all as we're not required to... +-} + myCustomConfHook gpd flags = do -- get the default LBI - lbi <- confHook simpleUserHooks egpdpdhbi flags + lbi <- confHook simpleUserHooks gpd flags let programs = withPrograms lbi libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags)) diff --git a/dev-haskell/haddock/haddock-2.4.1.ebuild b/dev-haskell/haddock/haddock-2.4.1.ebuild index 99649dc3c452..095e66712d91 100644 --- a/dev-haskell/haddock/haddock-2.4.1.ebuild +++ b/dev-haskell/haddock/haddock-2.4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.6 2009/08/30 09:12:54 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.7 2010/03/30 22:22:52 kolmodin Exp $ CABAL_FEATURES="bin lib" # don't enable profiling as the 'ghc' package is not built with profiling @@ -33,7 +33,7 @@ IUSE="doc" RDEPEND=">=dev-lang/ghc-6.8.2" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6 + =dev-haskell/cabal-1.6* doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 )" diff --git a/dev-haskell/haddock/haddock-2.4.2.ebuild b/dev-haskell/haddock/haddock-2.4.2.ebuild index 6ef9fc69794a..9b2209a54a94 100644 --- a/dev-haskell/haddock/haddock-2.4.2.ebuild +++ b/dev-haskell/haddock/haddock-2.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.2.ebuild,v 1.7 2010/03/30 21:46:56 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.2.ebuild,v 1.8 2010/03/30 22:22:52 kolmodin Exp $ CABAL_FEATURES="bin lib" # don't enable profiling as the 'ghc' package is not built with profiling @@ -31,7 +31,7 @@ IUSE="doc" # doesn't build with ghc-6.10.1, but that has never been in portage RDEPEND="=dev-lang/ghc-6.10*" DEPEND="${RDEPEND} - =dev-haskell/cabal-1.6* + >=dev-haskell/cabal-1.6 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 )" -- cgit v1.2.3-65-gdbad