Fixed building against newer Cabal library versions (bug #316613).

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

diff --git a/dev-haskell/ghc-paths/ChangeLog b/dev-haskell/ghc-paths/ChangeLog
index c43d4b701a3d8d80aabfbc48db79a731611b2e5c..71ec5bba737017e9efcfd943b3a720a98ccdeb5c 100644 (file)
--- a/dev-haskell/ghc-paths/ChangeLog
+++ b/dev-haskell/ghc-paths/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/ghc-paths
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ghc-paths/ChangeLog,v 1.2 2010/06/14 17:25:46 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ghc-paths/ChangeLog,v 1.3 2010/07/17 12:41:26 slyfox Exp $
+
+  17 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org>
+  ghc-paths-0.1.0.6.ebuild:
+  Fixed building against newer Cabal library versions (bug #316613). Thanks
+  to Diego E. 'Flameeyes' Pettenò <flameeyes@gentoo.org> for the report.
 
 *ghc-paths-0.1.0.6 (14 Jun 2010)
 

diff --git a/dev-haskell/ghc-paths/Manifest b/dev-haskell/ghc-paths/Manifest
index e24bcdb357ecf2f252ce377fa3be8a94db028d91..287c16b7717549812d9d728148f88169c80a0bc3 100644 (file)
--- a/dev-haskell/ghc-paths/Manifest
+++ b/dev-haskell/ghc-paths/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST ghc-paths-0.1.0.5.tar.gz 2304 RMD160 098804e5a48ce9381174245601b3896304464219 SHA1 f9a70a8564be268e4aa88436ea18fc84a1ce303a SHA256 ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10
 DIST ghc-paths-0.1.0.6.tar.gz 2291 RMD160 a7e6bc6b644c172df64e3984176a46f0575d74ec SHA1 4f4c05e24e14d9b1f83aa74c41fd7022deae361b SHA256 95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243
 EBUILD ghc-paths-0.1.0.5.ebuild 639 RMD160 e4d4ccaca303d79d5e9a8644b5561b1fe9a57cde SHA1 d4138bba0a6acb4388dfcf113f34050f175beadd SHA256 73e2ab4d47598894ea40bdda886a60989ccee40c2c266b3ea00431288605ff34
-EBUILD ghc-paths-0.1.0.6.ebuild 638 RMD160 547f70c9faa45005aa8c4b9f9bda3f57ce0a9f6c SHA1 b85630bed9df45c5bb23f59a43019f9e4e80edfe SHA256 1c1dc6c760e67c648111b96a793a93bc49dca6937eb2b2def7b1063f437c4dae
-MISC ChangeLog 503 RMD160 9742e0a477e08e60a239221ce278cfbc71e6ae99 SHA1 5ea285bc904ff2cd0213cebbd9c0012cf73195f6 SHA256 02f21a0b2ee2960b23f5dcf9de31fa6fac4977a5b9db1d184b6cfd01a8157018
+EBUILD ghc-paths-0.1.0.6.ebuild 1525 RMD160 2bbcb8674868ba9cfa09d4f6f14e99689d9dc4bd SHA1 af550bdc0cbcd0b04afc7b09305b60407934e23e SHA256 f1876f4f742a4da23219d18c3aa6936c82e1534e60fe68783b4ce8609e03e9de
+MISC ChangeLog 734 RMD160 9f2d288db28a1117dbb2b13c739704896b14b5cf SHA1 68f43520188c694c6fa4622f95c8acd79c1c381d SHA256 9e7cea68b7f8df43c3a3441d6da8926e3eafed1c4b61912c18f2f92d318f28ab
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwWZhoACgkQ1n/CYbXjntL4bgCeJQeEODZwiOso6twGeIWNT0fA
-eUAAnjVy2+/e7WGI/L1xLTzEMwL9ahq1
-=moEN
------END PGP SIGNATURE-----

diff --git a/dev-haskell/ghc-paths/ghc-paths-0.1.0.6.ebuild b/dev-haskell/ghc-paths/ghc-paths-0.1.0.6.ebuild
index 8ba8e93c094ef940a44c7db104672073ec63b3d1..253c18a7ccaee13ab276921bb206ec6ab45996d7 100644 (file)
--- a/dev-haskell/ghc-paths/ghc-paths-0.1.0.6.ebuild
+++ b/dev-haskell/ghc-paths/ghc-paths-0.1.0.6.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ghc-paths/ghc-paths-0.1.0.6.ebuild,v 1.1 2010/06/14 17:25:46 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ghc-paths/ghc-paths-0.1.0.6.ebuild,v 1.2 2010/07/17 12:41:26 slyfox Exp $
 
-CABAL_FEATURES="lib profile haddock"
+EAPI=2
+
+# haddock feature is explicitely disabled, as this library can be used as haddock depend
+CABAL_FEATURES="lib profile"
 inherit haskell-cabal
 
 DESCRIPTION="Knowledge of GHC's installation directories"
@@ -17,3 +20,28 @@ IUSE=""
 RDEPEND=">=dev-lang/ghc-6.8"
 DEPEND="${RDEPEND}
                >=dev-haskell/cabal-1.6"
+
+src_prepare() {
+       # ghc-patch it has awfully unportable (across cabal versions) ghc detection code
+       # but in gentoo we install it to fixed patch, so remove Setup.hs detection code
+       cabal-mksetup
+
+       # and use gentoo's hardcoded one:
+       # a few things we need to replace, and example values
+       # GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
+       # GHC_PATHS_DOCDIR /usr/share/doc/ghc-6.12.0.20091010/html
+       # GHC_PATHS_GHC_PKG /usr/bin/ghc-pkg
+       # GHC_PATHS_GHC /usr/bin/ghc (be careful: GHC_PATHS_GHC is a substring of GHC_PATHS_GHC_PKG)
+
+       cat >"${S}/GHC/Paths.hs" <<EOF
+module GHC.Paths ( ghc, ghc_pkg, libdir, docdir ) where
+
+libdir, docdir, ghc, ghc_pkg :: FilePath
+
+libdir  = "$(ghc-libdir)"
+docdir  = "/usr/share/doc/ghc-$(ghc-version)/html"
+
+ghc     = "$(ghc-getghc)"
+ghc_pkg = "$(ghc-getghcpkg)"
+EOF
+}