commit:     c3e9bd6f88b4d24a55bd8959f5248732077e376b
Author:     Jack Todaro <solpeth <AT> posteo <DOT> org>
AuthorDate: Tue Aug 24 07:17:23 2021 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 08:22:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e9bd6f

dev-lang/ghc: sync 8.10.6 from ::haskell (no keywords)

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Jack Todaro <solpeth <AT> posteo.org>
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 dev-lang/ghc/Manifest                              |   4 +
 .../ghc-8.10.5-modorigin-verbose-conflict.patch    |  20 +
 dev-lang/ghc/ghc-8.10.6.ebuild                     | 814 +++++++++++++++++++++
 3 files changed, 838 insertions(+)

diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index d072a4397b6..0c3307d5e44 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -2,6 +2,8 @@ DIST ghc-8.10.4-src.tar.xz 19818108 BLAKE2B 
069dd8436c373ccf73c20d8b577243792ffd
 DIST ghc-8.10.4-testsuite.tar.xz 2236932 BLAKE2B 
17d0520ad5c6daa0cc60530279ae7e617e4d79328b9f436abbe75e72f0803d9a997fb9e1ae61425326b070f45794a488d8507957fec9a6ed49eea86d30a1e579
 SHA512 
1bf129c8d872e3ceff7c19929605adc5d68daab9ded9aa2e5109b0de162089631472c66f04993adf8481291f8128bf804fe64a9d344c81e257f1b962ba5e382c
 DIST ghc-8.10.5-src.tar.xz 19920148 BLAKE2B 
bd3b702fdac4d1c94366bb233a665c2f5677b795d9041c61cc13d813aa43738d5270c3604731f964393035cef90768d4c6e0e401aa35fec6dab61465782f41dc
 SHA512 
b5f39be0accd5c1cecf1cc326ba3142f561d2ac93e9abf366fe46307d7c0712aac244836e659e1a4d9d0fb98299ea96edc8e8a06f3a81b528b14914b94057ffe
 DIST ghc-8.10.5-testsuite.tar.xz 2270504 BLAKE2B 
076afc4565c7ba52814547b09313c44bfc3875fc0b05d1af1d3fa702cec9b6b219d86fd56d26a3df07aaa00b37eeb87c58b509162a231bf4e03a07bcc57e9550
 SHA512 
adae7ff8005c73fc5ded42035c51b1ad6c476beed54de7ba336437a67e81a75d7af8c1be3817516e877b1b2ff0e771fe667d07b93d3a73de8df26a06ed42f334
+DIST ghc-8.10.6-src.tar.xz 19932832 BLAKE2B 
f5d0c43aa5df87648e32beeb5ed6866b231cbce4f344fb03110db826b36bbac435f5e89d9ffeef3f87c15e830fdee6b95150b7bdcd06906575bfcd9c83797dff
 SHA512 
6314eb9744d47d803b30b621bd12bf6179dad5cc578ec267b3a65b89e9c9b431bdb4913936f040c7ca4fcc71a676a43e78b5f6173d123a844e7f29004405b8b6
+DIST ghc-8.10.6-testsuite.tar.xz 2265044 BLAKE2B 
72a1e955acecc92a720ee2747d96cacf56f2968c9deabb254c882a969c154baa0fdb639a857844ec91a4e47ee553dd13b58c3b790202e7e73500095c1ec85ee9
 SHA512 
f74d743bd8f889c2941be8fd5348e92abcaf75bce48140f7f9cc0c6ce33ba24a8479bef48631ffe2a10397c0ecf166b3bddb6ca8ee905859c029175de5d43f2a
 DIST ghc-8.8.4-src.tar.xz 19395252 BLAKE2B 
6fa898b9552398a724f0452f5cc88ba073264a5645288c73507258959efec40ce5a56a0eaafdabe58f15c5a9210b2c9da5954411dff5c81c52e061569d6a350a
 SHA512 
efd23bd819f7429486696a3a929a040471db7ea8a2d1f1d832e4cf0825b9e1e0c5e6ecad0ab8376f58b74e9c28c1d2f773bd126596d6d853c9e57d57e5ceb090
 DIST ghc-8.8.4-testsuite.tar.xz 1965820 BLAKE2B 
3b715700561788b8abdc986961d533b91399461d57a1686ededb4ccc36881503cdc3fc126b9a7b204a728c24b9a9ca97320142348644367aca9b47c87a5b3b51
 SHA512 
79d8fb0ba8de0fb48c938bd54c8c3278f1895d8ce5c700ce8cf6b3fc550073bb757208e85d4f9818400ebecca96f51d9248b8bbdac9eb2995671756164d08c16
 DIST ghc-9.0.1-src.tar.xz 20782336 BLAKE2B 
53eaf903081d705d641459fbc1e6fa7387a6039f9cd466b4708bda86e81252a84d80878d6eb956ec2e1e5b721a313e68eeb796f8345244ca62f536a7a3f0c6df
 SHA512 
bee7950a5118be8d8cefe0db5070139a5a93ca21c5bc6f8bf453429831f0c44f5e0fb5ee569865d6b8b92749044ee4123be06920928ac7a1ec9cffa9404a3e53
@@ -10,6 +12,8 @@ DIST ghc-bin-8.10.4-i686-pc-linux-gnu.tbz2 123831294 BLAKE2B 
1ca4c1b5c34c9480110
 DIST ghc-bin-8.10.4-x86_64-pc-linux-gnu.tbz2 122558873 BLAKE2B 
9f07c7bdc3beccfa629d28b2524ccd2f4688a5c0036a45408f5ace2d530a2a0e42f95b3cda5037ebb365317999e1ae776c6f9d21692867abfe85e33f2892b1be
 SHA512 
68bd70f94961547746a696aa2839e156c95858fda0c7ec5b2ecf802070724ab7102b0aa86bcbf93432170d521cce4af10f46b851b470e5dc49dfa5b07380f46d
 DIST ghc-bin-8.10.5-i686-pc-linux-gnu.tbz2 124356781 BLAKE2B 
53c5d259a19f11db83d69f7a2f39090d623b07caf1859eb8bf0385183586f538d8eb3eadb06f56f4b7160fa82043eb0f7b8df1632d55af562b8b1cb21c08b4c3
 SHA512 
58676b4eaeef9e05f69b7c821e115f3a678487b0de696e702ff6378f7d8f23fafda997b0c19d52a730c22bf8012a99c01783d16d00e356fe12532156d5965fc6
 DIST ghc-bin-8.10.5-x86_64-pc-linux-gnu.tbz2 123186918 BLAKE2B 
5049514a7c2c58e7f5c929cfb9e818cdc20280f4fc002350cf0cc19f410eb4d4be4d0b46db88205633fde73151e322f3cabd050a9c07e05ccae168c7e6be8be9
 SHA512 
3a8ef5f0c259ad86adc6a7a5718db419fb0e38a5d1e0bdcc8676e44d1a0130a4b25658ab23572e4e860307b024409da021e08b038fac64a773437c23519b1d0a
+DIST ghc-bin-8.10.6-i686-pc-linux-gnu.tbz2 124324289 BLAKE2B 
afb34984872b35fdedbdedeb8756cc7c33e5b943dba57dd86910b076d483bb643265d0ab0027784dec5dc489eabd65b5ab17474f25fb2ce657925aa0efaa9033
 SHA512 
4be13e6dba298d12a4d49ae4633eec83cfaaaf22b5f8cfca5f5952aa294ae52fb3601490beed3bda5a7f7b6a5bd81e0ecc9fc39e8df836cc8fd377a0d0b783a0
+DIST ghc-bin-8.10.6-x86_64-pc-linux-gnu.tbz2 122871118 BLAKE2B 
527b36abf60390c91f91bc650ee25484d39d377739da87b5b6fd1a752705c1f3bc0ce0c68644657c9a7c1fc9a3b858b9dd7d84b25eab1a89125fccb6eb1f6250
 SHA512 
42b7fae339e82a6078fae8920efea8d0992e4774ea66b100e22dd9df168be57d8bce52558b8501c3c567c40776389d94bde3f17d26d63535140ce26ac16c27e1
 DIST ghc-bin-8.8.4-i686-pc-linux-gnu.tbz2 120336081 BLAKE2B 
55dfbb90d5e55c2af5e93c69249828a85cd9171c164b80dfdaf86512972b2c6854c8e4f07426af4ab52a5fb1a85d96a58c2cf003fb02372c55428001cfaea491
 SHA512 
ad3b83344349976d3253934195b2dc6299648391572b13735943c5ea2239c031c19b0cafd86c16cfb0c061e73bc72e9248f9c1731494a9a15fbe188f02913c12
 DIST ghc-bin-8.8.4-x86_64-pc-linux-gnu.tbz2 118897883 BLAKE2B 
a180b2dd1a3bc222044ece809ad700aee29d0c3e75b57ee9af3ca33c9c0f59dbf36f68202f746d99f80915cb717a9c41fc12db507f1cb469981732703a06b9cc
 SHA512 
9d4be02dbd9704c93ef18feb92ea30bd5d590df31f288bf1b364818424c5019ca9ada26eec88418199f90ae8f4459d0a9352104e3f3186bbdc241891eb1b66c4
 DIST ghc-bin-9.0.1-i686-pc-linux-gnu.tbz2 122955511 BLAKE2B 
b870f46cc78fcc1d715aafe7108951582cfd12495b4e9d804d4b66562c66a6a2b2d9513031aedc8f3630a0cdbb3257943304b05732301a084f89487452f2f2d9
 SHA512 
aafd4233c40f93b71e6ac1acc8a75e30d49b826e4bce6d9832836966fd5f6c4898963bd4c2f34577f4199c1d9a3f537ac1e7d87eab11e9fb5e849573580ed3fb

diff --git a/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch 
b/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch
new file mode 100644
index 00000000000..a34c0c9059f
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch
@@ -0,0 +1,20 @@
+--- a/compiler/main/Packages.hs
++++ b/compiler/main/Packages.hs
+@@ -219,12 +219,14 @@ fromFlag = ModOrigin Nothing [] [] True
+ instance Semigroup ModuleOrigin where
+     ModOrigin e res rhs f <> ModOrigin e' res' rhs' f' =
+         ModOrigin (g e e') (res ++ res') (rhs ++ rhs') (f || f')
+-      where g (Just b) (Just b')
++      where g x@(Just b) y@(Just b')
+                 | b == b'   = Just b
+-                | otherwise = panic "ModOrigin: package both exposed/hidden"
++                | otherwise = pprPanic "ModOrigin: package both 
exposed/hidden" $
++                                text "x: " <> ppr x $$ text "y: " <> ppr y
+             g Nothing x = x
+             g x Nothing = x
+-    _x <> _y = panic "ModOrigin: hidden module redefined"
++    x <> y = pprPanic "ModOrigin: hidden module redefined" $
++               text "x: " <> ppr x $$ text "y: " <> ppr y
+ 
+ instance Monoid ModuleOrigin where
+     mempty = ModOrigin Nothing [] [] False

diff --git a/dev-lang/ghc/ghc-8.10.6.ebuild b/dev-lang/ghc/ghc-8.10.6.ebuild
new file mode 100644
index 00000000000..4276efffd61
--- /dev/null
+++ b/dev-lang/ghc/ghc-8.10.6.ebuild
@@ -0,0 +1,814 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+       if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+               export CTARGET=${CATEGORY/cross-}
+       fi
+fi
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-any-r1
+inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
+inherit multilib multiprocessing pax-utils toolchain-funcs prefix
+inherit check-reqs
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="https://www.haskell.org/ghc/";
+
+# we don't have any binaries yet
+arch_binaries=""
+
+BIN_PV=${PV}
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( 
https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( 
https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2
 )"
+#arch_binaries="$arch_binaries arm64? ( 
https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2
 )"
+arch_binaries="$arch_binaries amd64? ( 
https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 
)"
+#arch_binaries="$arch_binaries ia64?  ( 
https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( 
https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( 
https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( 
https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2
 ) )"
+#arch_binaries="$arch_binaries sparc? ( 
https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries x86? ( 
https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( 
https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+       case "${ARCH}" in
+               #alpha) return 0 ;;
+               #arm64) return 0 ;;
+               #arm) return 0 ;;
+               amd64) return 0 ;;
+               #ia64) return 0 ;;
+               #ppc) return 0 ;;
+               #ppc64)
+               #       use big-endian && return 0
+               #       return 0
+               #       ;;
+               #sparc) return 0 ;;
+               x86) return 0 ;;
+               *) return 1 ;;
+       esac
+}
+
+GHC_PV=${PV}
+#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? (
+       https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz
+       test? ( 
https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
+)"
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+
+BUMP_LIBRARIES=(
+       # "hackage-name          hackage-version"
+)
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+#KEYWORDS="~amd64 ~x86"
+IUSE="big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile 
test"
+IUSE+=" binary"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       >=dev-lang/perl-5.6.1
+       dev-libs/gmp:0=
+       sys-libs/ncurses:=[unicode(+)]
+       elfutils? ( dev-libs/elfutils )
+       !ghcmakebinary? ( dev-libs/libffi:= )
+       numa? ( sys-process/numactl )
+"
+
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
+PREBUILT_BINARY_DEPENDS="
+       !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
+       sys-libs/ncurses:0/6
+"
+
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+       virtual/pkgconfig
+       doc? ( app-text/docbook-xml-dtd:4.2
+               app-text/docbook-xml-dtd:4.5
+               app-text/docbook-xsl-stylesheets
+               dev-python/sphinx
+               >=dev-libs/libxslt-1.1.2 )
+       !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
+       test? ( ${PYTHON_DEPS} )
+"
+
+needs_python() {
+       # test driver is written in python
+       use test && return 0
+       return 1
+}
+
+# we build binaries without profiling support
+REQUIRED_USE="
+       ?? ( ghcbootstrap binary )
+       ?? ( profile binary )
+"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+       [[ ${CHOST} != ${CTARGET} ]]
+}
+
+is_native() {
+       [[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
+}
+
+if ! is_crosscompile; then
+       PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
+fi
+
+# returns tool prefix for crosscompiler.
+# Example:
+#  CTARGET=armv7a-unknown-linux-gnueabi
+#  CHOST=x86_64-pc-linux-gnu
+#    "armv7a-unknown-linux-gnueabi-"
+#  CTARGET=${CHOST}
+#    ""
+# Used in tools and library prefix:
+#    "${ED}"/usr/bin/$(cross)haddock
+#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+
+cross() {
+       if is_crosscompile; then
+               echo "${CTARGET}-"
+       else
+               echo ""
+       fi
+}
+
+append-ghc-cflags() {
+       local persistent compile assemble link
+       local flag ghcflag
+
+       for flag in $*; do
+               case ${flag} in
+                       persistent)     persistent="yes";;
+                       compile)        compile="yes";;
+                       assemble)       assemble="yes";;
+                       link)           link="yes";;
+                       *)
+                               [[ ${compile}  ]] && ghcflag="-optc${flag}"  
CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+                                       [[ ${persistent} ]] && 
GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+                               [[ ${assemble} ]] && ghcflag="-opta${flag}"  
CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+                                       [[ ${persistent} ]] && 
GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+                               [[ ${link}     ]] && ghcflag="-optl${flag}" 
LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+                                       [[ ${persistent} ]] && 
GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+                               ;;
+               esac
+       done
+}
+
+# $1 - lib name (under libraries/)
+# $2 - lib version
+# example: bump_lib "transformers" "0.4.2.0"
+bump_lib() {
+       local pn=$1 pv=$2
+       local p=${pn}-${pv}
+       local f
+
+       einfo "Bumping ${pn} up to ${pv}"
+
+       for f in ghc.mk GNUmakefile; do
+               mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
+       done
+       mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
+       mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
+}
+
+update_SRC_URI() {
+       local p pn pv
+       for p in "${BUMP_LIBRARIES[@]}"; do
+               set -- $p
+               pn=$1 pv=$2
+
+               SRC_URI+=" 
https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz";
+       done
+}
+
+update_SRC_URI
+
+bump_libs() {
+       local p pn pv
+       for p in "${BUMP_LIBRARIES[@]}"; do
+               set -- $p
+               pn=$1 pv=$2
+
+               bump_lib "${pn}" "${pv}"
+       done
+}
+
+ghc_setup_cflags() {
+       # TODO: plumb CFLAGS and BUILD_CFLAGS to respective 
CONF_CC_OPTS_STAGE<N>
+       if ! is_native; then
+               export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+               export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+               einfo "Crosscompiling mode:"
+               einfo "   CHOST:   ${CHOST}"
+               einfo "   CTARGET: ${CTARGET}"
+               einfo "   CFLAGS:  ${CFLAGS}"
+               einfo "   LDFLAGS: ${LDFLAGS}"
+               einfo "   prefix: $(cross)"
+               return
+       fi
+       # We need to be very careful with the CFLAGS we ask ghc to pass through 
to
+       # gcc. There are plenty of flags which will make gcc produce output that
+       # breaks ghc in various ways. The main ones we want to pass through are
+       # -mcpu / -march flags. These are important for arches like alpha & 
sparc.
+       # We also use these CFLAGS for building the C parts of ghc, ie the rts.
+       strip-flags
+       strip-unsupported-flags
+
+       # Cmm can't parse line numbers #482086
+       replace-flags -ggdb[3-9] -ggdb2
+
+       GHC_FLAGS=""
+       GHC_PERSISTENT_FLAGS=""
+       for flag in ${CFLAGS}; do
+               case ${flag} in
+
+                       # Ignore extra optimisation (ghc passes -O to gcc 
anyway)
+                       # -O2 and above break on too many systems
+                       -O*) ;;
+
+                       # Arch and ABI flags are what we're really after
+                       -m*) append-ghc-cflags compile assemble ${flag};;
+
+                       # Sometimes it's handy to see backtrace of RTS
+                       # to get an idea what happens there
+                       -g*) append-ghc-cflags compile ${flag};;
+
+                       # Ignore all other flags, including all -f* flags
+               esac
+       done
+
+       for flag in ${LDFLAGS}; do
+               append-ghc-cflags link ${flag}
+       done
+
+       # GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single 
build.
+       # Skip any gentoo-specific tweaks for cross-case to avoid passing 
unsupported
+       # options to gcc.
+       if is_native; then
+               # prevent from failing to build unregisterised ghc:
+               # 
https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+               use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
+       fi
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+       local from=$1
+       local   to=$2
+       shift 2
+       local file=
+       for file in "$@"
+       do
+               sed -i -e "s|$from|$to|g" \
+                       "$file" || die "path relocation failed for '$file'"
+       done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+       local to=$1 ghc_v=${BIN_PV}
+
+       # libdir for prebuilt binary and for current system may mismatch
+       # It does for prefix installation for example: bug #476998
+       local bin_ghc_prefix=${WORKDIR}/usr
+       local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+       local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+       # backup original script to use it later after relocation
+       local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
+       cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to 
backup ghc-pkg wrapper"
+
+       if [[ ${bin_libdir} != $(get_libdir) ]]; then
+               einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug 
#476998)"
+               # moving the dir itself is not strictly needed
+               # but then USE=binary would result in installing
+               # in '${bin_libdir}'
+               mv "${bin_ghc_prefix}/${bin_libdir}" 
"${bin_ghc_prefix}/$(get_libdir)" || die
+
+               relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+                       "${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+                       "${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+                       "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+                       "${WORKDIR}/usr/bin/hsc2hs" \
+                       "${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+                       "$gp_back" \
+                       
"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+       fi
+
+       # Relocate from /usr to ${EPREFIX}/usr
+       relocate_path "/usr" "${to}/usr" \
+               "${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+               "${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+               "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+               "${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
+               "${WORKDIR}/usr/bin/hp2ps" \
+               "${WORKDIR}/usr/bin/hpc" \
+               "${WORKDIR}/usr/bin/hsc2hs" \
+               "${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+               "${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+
+       # this one we will use to regenerate cache
+       # so it should point to current tree location
+       relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+       if use prefix; then
+               hprefixify "${bin_libpath}"/${PN}*/settings
+       fi
+
+       # regenerate the binary package cache
+       "$gp_back" recache || die "failed to update cache after relocation"
+       rm "$gp_back"
+}
+
+ghc-check-reqs() {
+       # These are pessimistic values (slightly bigger than worst-case)
+       # Worst case is UNREG USE=profile ia64. See bug #611866 for some
+       # numbers on various arches.
+       CHECKREQS_DISK_BUILD=8G
+       CHECKREQS_DISK_USR=2G
+       # USE=binary roughly takes
+       use binary && CHECKREQS_DISK_BUILD=4G
+
+       "$@"
+}
+
+pkg_pretend() {
+       ghc-check-reqs check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+       ghc-check-reqs check-reqs_pkg_setup
+
+       # quiet portage about prebuilt binaries
+       use binary && QA_PREBUILT="*"
+
+       [[ ${MERGE_TYPE} == binary ]] && return
+
+       if use ghcbootstrap; then
+               ewarn "You requested ghc bootstrapping, this is usually only 
used"
+               ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+               [[ -z $(type -P ghc) ]] && \
+                       die "Could not find a ghc to bootstrap with."
+       else
+               if ! yet_binary; then
+                       eerror "Please try emerging with USE=ghcbootstrap and 
report build"
+                       eerror "sucess or failure to the haskell team 
(hask...@gentoo.org)"
+                       die "No binary available for '${ARCH}' arch yet, 
USE=ghcbootstrap"
+               fi
+       fi
+
+       if needs_python; then
+               python-any-r1_pkg_setup
+       fi
+}
+
+src_unpack() {
+       # Create the ${S} dir if we're using the binary version
+       use binary && mkdir "${S}"
+
+       # the Solaris and Darwin binaries from ghc (maeder) need to be
+       # unpacked separately, so prevent them from being unpacked
+       local ONLYA=${A}
+       case ${CHOST} in
+               *-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
+       esac
+       unpack ${ONLYA}
+}
+
+src_prepare() {
+       ghc_setup_cflags
+
+       if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != 
*-solaris* ]]; then
+               # Modify the wrapper script from the binary tarball to use 
GHC_PERSISTENT_FLAGS.
+               # See bug #313635.
+               sed -i -e "s|\"\$topdir\"|\"\$topdir\" 
${GHC_PERSISTENT_FLAGS}|" \
+                       "${WORKDIR}/usr/bin/ghc-${BIN_PV}"
+
+               # allow hardened users use vanilla binary to bootstrap ghc
+               # ghci uses mmap with rwx protection at it implements dynamic
+               # linking on it's own (bug #299709)
+               pax-mark -m 
"${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
+       fi
+
+       if use binary; then
+               if use prefix; then
+                       relocate_ghc "${EPREFIX}"
+               fi
+
+               # Move unpacked files to the expected place
+               mv "${WORKDIR}/usr" "${S}"
+               eapply_user
+       else
+               if ! use ghcbootstrap; then
+                       case ${CHOST} in
+                               *-darwin* | *-solaris*)
+                               # UPDATE ME for ghc-7
+                               mkdir "${WORKDIR}"/ghc-bin-installer || die
+                               pushd "${WORKDIR}"/ghc-bin-installer > 
/dev/null || die
+                               use sparc-solaris && unpack 
ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+                               use x86-solaris && unpack 
ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+                               use x86-macos && unpack 
ghc-7.4.1-i386-apple-darwin.tar.bz2
+                               use x64-macos && unpack 
ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+                               popd > /dev/null
+
+                               pushd 
"${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+                               # fix the binaries so they run, on Solaris we 
need an
+                               # LD_LIBRARY_PATH which has our prefix libdirs, 
on
+                               # Darwin we need to replace the frameworks with 
our libs
+                               # from the prefix fix before installation, 
because some
+                               # of the tools are actually used during 
configure/make
+                               if [[ ${CHOST} == *-solaris* ]] ; then
+                                       export 
LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+                               elif [[ ${CHOST} == *-darwin* ]] ; then
+                                       local 
readline_framework=GNUreadline.framework/GNUreadline
+                                       local 
gmp_framework=/opt/local/lib/libgmp.10.dylib
+                                       local 
ncurses_file=/opt/local/lib/libncurses.5.dylib
+                                       for binary in $(scanmacho -BRE 
MH_EXECUTE -F '%F' .) ; do
+                                               install_name_tool -change \
+                                                       ${readline_framework} \
+                                                       
"${EPREFIX}"/lib/libreadline.dylib \
+                                                       ${binary} || die
+                                               install_name_tool -change \
+                                                       ${gmp_framework} \
+                                                       
"${EPREFIX}"/usr/lib/libgmp.dylib \
+                                                       ${binary} || die
+                                               install_name_tool -change \
+                                                       ${ncurses_file} \
+                                                       
"${EPREFIX}"/usr/lib/libncurses.dylib \
+                                                       ${binary} || die
+                                       done
+                                       # we don't do frameworks!
+                                       sed -i \
+                                               -e 's/\(frameworks = 
\)\["GMP"\]/\1[]/g' \
+                                               -e 's/\(extraLibraries = 
\)\["m"\]/\1["m","gmp"]/g' \
+                                               rts/package.conf.in || die
+                               fi
+
+                               # it is autoconf, but we really don't want to 
give it too
+                               # many arguments, in fact we do the make 
in-place anyway
+                               ./configure --prefix="${WORKDIR}"/usr || die
+                               make install || die
+                               popd > /dev/null
+                               ;;
+                               *)
+                               relocate_ghc "${WORKDIR}"
+                               ;;
+                       esac
+               fi
+
+               sed -i -e "s|\"\$topdir\"|\"\$topdir\" 
${GHC_PERSISTENT_FLAGS}|" \
+                       "${S}/ghc/ghc.wrapper"
+
+               cd "${S}" # otherwise eapply will break
+
+               eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
+               eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
+               eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
+               eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
+               eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
+               eapply 
"${FILESDIR}"/${PN}-8.10.5-modorigin-verbose-conflict.patch
+
+               # a bunch of crosscompiler patches
+               # needs newer version:
+               #eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
+
+               # mingw32 target
+               pushd "${S}/libraries/Win32"
+                       eapply 
"${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
+               popd
+
+               bump_libs
+
+               eapply_user
+               # as we have changed the build system
+               eautoreconf
+       fi
+}
+
+src_configure() {
+       if ! use binary; then
+               # initialize build.mk
+               echo '# Gentoo changes' > mk/build.mk
+
+               # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+               echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> 
mk/build.mk
+               echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> 
mk/build.mk
+
+               # We also need to use the GHC_FLAGS flags when building ghc 
itself
+               echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
+               echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+               echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+               # Speed up initial Cabal bootstrap
+               echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> 
mk/build.mk
+
+               # We can't depend on haddock except when bootstrapping when we
+               # must build docs and include them into the binary .tbz2 package
+               # app-text/dblatex is not in portage, can not build PDF or PS
+               echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
+               echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
+               echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
+
+               # this controls presence on 'xhtml' and 'haddock' in final 
install
+               echo "HADDOCK_DOCS       = YES" >> mk/build.mk
+
+               # not used outside of ghc's test
+               if [[ -n ${GHC_BUILD_DPH} ]]; then
+                               echo "BUILD_DPH = YES" >> mk/build.mk
+                       else
+                               echo "BUILD_DPH = NO" >> mk/build.mk
+               fi
+
+               # Any non-native build has to skip as it needs
+               # target haddock binary to be runnabine.
+               if ! is_native; then
+                       # disable docs generation as it requires running stage2
+                       echo "HADDOCK_DOCS=NO" >> mk/build.mk
+                       echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+                       echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+               fi
+
+               if is_crosscompile; then
+                       # Install ghc-stage1 crosscompiler instead of
+                       # ghc-stage2 cross-built compiler.
+                       echo "Stage1Only=YES" >> mk/build.mk
+               fi
+
+               # allows overriding build flavours for libraries:
+               # v   - vanilla (static libs)
+               # p   - profiled
+               # dyn - shared libraries
+               # example: GHC_LIBRARY_WAYS="v dyn"
+               if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+                       echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+               fi
+               echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
+
+               # Get ghc from the unpacked binary .tbz2
+               # except when bootstrapping we just pick ghc up off the path
+               if ! use ghcbootstrap; then
+                       export PATH="${WORKDIR}/usr/bin:${PATH}"
+               fi
+
+               echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" 
>> mk/build.mk
+
+               # don't strip anything. Very useful when stage2 SIGSEGVs on you
+               echo "STRIP_CMD = :" >> mk/build.mk
+
+               local econf_args=()
+
+               # GHC embeds toolchain it was built by and uses it later.
+               # Don't allow things like ccache or versioned binary slip.
+               # We use stable thing across gcc upgrades.
+               # User can use EXTRA_ECONF=CC=... to override this default.
+               econf_args+=(
+                       AR=${CTARGET}-ar
+                       CC=${CTARGET}-gcc
+                       # these should be inferred by GHC but ghc defaults
+                       # to using bundled tools on windows.
+                       Windres=${CTARGET}-windres
+                       DllWrap=${CTARGET}-dllwrap
+                       # we set the linker explicitly below
+                       --disable-ld-override
+               )
+               case ${CTARGET} in
+                       arm*)
+                               # ld.bfd-2.28 does not work for ghc. Force 
ld.gold
+                               # instead. This should be removed once gentoo 
gets
+                               # a fix for R_ARM_COPY bug: 
https://sourceware.org/PR16177
+                               econf_args+=(LD=${CTARGET}-ld.gold)
+                       ;;
+                       sparc*)
+                               # ld.gold-2.28 does not work for ghc. Force 
ld.bfd
+                               # instead. This should be removed once gentoo 
gets
+                               # a fix for missing --no-relax support bug:
+                               # 
https://sourceware.org/ml/binutils/2017-07/msg00183.html
+                               econf_args+=(LD=${CTARGET}-ld.bfd)
+                       ;;
+                       *)
+                               econf_args+=(LD=${CTARGET}-ld)
+               esac
+
+               if [[ ${CBUILD} != ${CHOST} ]]; then
+                       # GHC bug: ghc claims not to support cross-building.
+                       # It does, but does not distinct --host= value
+                       # for stage1 and stage2 compiler.
+                       econf_args+=(--host=${CBUILD})
+               fi
+
+               if use ghcmakebinary; then
+                       # When building booting libary we are trying to
+                       # bundle or restrict most of external depends
+                       # with unstable ABI:
+                       #  - embed libffi (default GHC behaviour)
+                       #  - disable ncurses support for ghci (via haskeline)
+                       #    https://bugs.gentoo.org/557478
+                       #  - disable ncurses support for ghc-pkg
+                       echo "libraries/haskeline_CONFIGURE_OPTS += 
--flag=-terminfo" >> mk/build.mk
+                       echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> 
mk/build.mk
+               elif is_native; then
+                       # using ${GTARGET}'s libffi is not supported yet:
+                       # GHC embeds full path for ffi includes without 
/usr/${CTARGET} account.
+                       econf_args+=(--with-system-libffi)
+                       econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) 
libffi --cflags-only-I | sed -e 's@^-I@@'))
+               fi
+
+               einfo "Final mk/build.mk:"
+               cat mk/build.mk || die
+
+               econf ${econf_args[@]} \
+                       --enable-bootstrap-with-devel-snapshot \
+                       $(use_enable elfutils dwarf-unwind) \
+                       $(use_enable numa)
+
+               if [[ ${PV} == *9999* ]]; then
+                       GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status 
| sed -e 's@^.*=\"\(.*\)\"@\1@')"
+                       GHC_P=${PN}-${GHC_PV}
+               fi
+       fi # ! use binary
+}
+
+src_compile() {
+       if ! use binary; then
+               # Stage1Only crosscompiler does not build stage2
+               if ! is_crosscompile; then
+                       # 1. build/pax-mark compiler binary first
+                       emake ghc/stage2/build/tmp/ghc-stage2
+                       # 2. pax-mark (bug #516430)
+                       pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+                       # 2. build/pax-mark haddock using ghc-stage2
+                       if is_native; then
+                               # non-native build does not build haddock
+                               # due to HADDOCK_DOCS=NO, but it could.
+                               emake utils/haddock/dist/build/tmp/haddock
+                               pax-mark -m utils/haddock/dist/build/tmp/haddock
+                       fi
+               fi
+               # 3. and then all the rest
+               emake all
+       fi # ! use binary
+}
+
+src_test() {
+       # TODO: deal with:
+       #    - sandbox (pollutes environment)
+       #    - extra packages (to extend testsuite coverage)
+       # bits are taken from 'validate'
+       local make_test_target='test' # can be fulltest
+       # not 'emake' as testsuite uses '$MAKE' without jobserver available
+       make $make_test_target stage=2 THREADS=$(makeopts_jobs)
+}
+
+src_install() {
+       if use binary; then
+               use prefix && mkdir -p "${ED}"
+               mv "${S}/usr" "${ED}"
+       else
+               [[ -f VERSION ]] || emake VERSION
+
+               # -j1 due to a rare race in install script:
+               #    make --no-print-directory -f ghc.mk phase=final install
+               #    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c 
-m 755 \
+               #        -d 
"/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
+               #    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c 
-m 644  utils/hsc2hs/template-hsc.h \
+               #           
"/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
+               #    /usr/bin/install: cannot create regular file \
+               #           
'/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404':
 No such file or directory
+               emake -j1 install DESTDIR="${D}"
+
+               # Skip for cross-targets as they all share target location:
+               # /usr/share/doc/ghc-9999/
+               if ! is_crosscompile; then
+                       dodoc "distrib/README" "LICENSE" "VERSION"
+               fi
+
+               # rename ghc-shipped files to avoid collision
+               # of external packages. Motivating example:
+               #  user had installed:
+               #      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
+               #      dev-haskell/transformers-0.4.2.0
+               #  then user tried to update to
+               #      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
+               #  this will lead to single .conf file collision.
+               local shipped_conf renamed_conf
+               local 
package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+               for shipped_conf in "${package_confdir}"/*.conf; do
+                       # rename 'pkg-ver-id.conf' to 
'pkg-ver-id-gentoo-${PF}.conf'
+                       renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
+                       mv "${shipped_conf}" "${renamed_conf}" || die
+               done
+
+               # remove link, but leave 'haddock-${GHC_P}'
+               rm -f "${ED}"/usr/bin/$(cross)haddock
+
+               if ! is_crosscompile; then
+                       newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
+                       newbashcomp utils/completion/ghc.bash         ghc
+               fi
+       fi
+
+       # path to the package.cache
+       local 
package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+       PKGCACHE="${package_confdir}"/package.cache
+       # copy the package.conf.d, including timestamp, save it so we can help
+       # users that have a broken package.conf.d
+       cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial 
package.conf.d"
+
+       # copy the package.conf, including timestamp, save it so we later can 
put it
+       # back before uninstalling, or when upgrading.
+       cp -p "${PKGCACHE}"{,.shipped} \
+               || die "failed to copy package.conf.d/package.cache"
+
+       if is_crosscompile; then
+               # When we build a cross-compiler the layout is the following:
+               #     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
+               # but
+               #     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
+               # containst host binaries (modulo bugs).
+
+               # Portage's stripping mechanism does not skip stripping
+               # foreign binaries. This frequently causes binaries to be
+               # broken.
+               #
+               # Thus below we disable stripping of target libraries and allow
+               # stripping hosts executables.
+               dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
+               dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
+       fi
+}
+
+pkg_preinst() {
+       # have we got an earlier version of ghc installed?
+       if has_version "<${CATEGORY}/${PF}"; then
+               haskell_updater_warn="1"
+       fi
+}
+
+pkg_postinst() {
+       ghc-reregister
+
+       # path to the package.cache
+       
PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+
+       # give the cache a new timestamp, it must be as recent as
+       # the package.conf.d directory.
+       touch "${PKGCACHE}"
+
+       if [[ "${haskell_updater_warn}" == "1" ]]; then
+               ewarn
+               ewarn 
"\e[1;31m************************************************************************\e[0m"
+               ewarn
+               ewarn "You have just upgraded from an older version of GHC."
+               ewarn "You may have to run"
+               ewarn "      'haskell-updater'"
+               ewarn "to rebuild all ghc-based Haskell libraries."
+               ewarn
+               ewarn 
"\e[1;31m************************************************************************\e[0m"
+               ewarn
+       fi
+}
+
+pkg_prerm() {
+       
PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+       rm -rf "${PKGCACHE}"
+
+       cp -p "${PKGCACHE}"{.shipped,}
+}
+
+pkg_postrm() {
+       ghc-package_pkg_postrm
+}

Reply via email to