Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/
Date: Sat, 08 Jul 2017 13:18:19
Message-Id: 1499519892.d1798083a2a89196960d9fde2d053cab9f6f991b.slyfox@gentoo
1 commit: d1798083a2a89196960d9fde2d053cab9f6f991b
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 8 13:17:56 2017 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 8 13:18:12 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1798083
7
8 dev-lang/ghc: fix check-reqs usage
9
10 Apparently pkg_pretend / pkg_setup don't share global environment.
11
12 Package-Manager: Portage-2.3.6, Repoman-2.3.2
13
14 dev-lang/ghc/ghc-8.0.2.ebuild | 10 +++++++---
15 1 file changed, 7 insertions(+), 3 deletions(-)
16
17 diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild
18 index 4ba077cf90b..1fd964ad314 100644
19 --- a/dev-lang/ghc/ghc-8.0.2.ebuild
20 +++ b/dev-lang/ghc/ghc-8.0.2.ebuild
21 @@ -327,7 +327,7 @@ relocate_ghc() {
22 rm "$gp_back"
23 }
24
25 -pkg_pretend() {
26 +ghc-check-reqs() {
27 # These are pessimistic values (slightly bigger than worst-case)
28 # Worst case is UNREG USE=profile ia64. See bug #611866 for some
29 # numbers on various arches.
30 @@ -336,11 +336,15 @@ pkg_pretend() {
31 # USE=binary roughly takes
32 use binary && CHECKREQS_DISK_BUILD=4G
33
34 - check-reqs_pkg_pretend
35 + "$@"
36 +}
37 +
38 +pkg_pretend() {
39 + ghc-check-reqs check-reqs_pkg_pretend
40 }
41
42 pkg_setup() {
43 - check-reqs_pkg_setup
44 + ghc-check-reqs check-reqs_pkg_setup
45
46 # quiet portage about prebuilt binaries
47 use binary && QA_PREBUILT="*"