Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: eclass/
Date: Fri, 04 Dec 2015 07:01:17
Message-Id: 1449182513.7fd182316f62c5323e034a785bf440f81de2f698.jlec@gentoo
1 commit: 7fd182316f62c5323e034a785bf440f81de2f698
2 Author: Benda Xu <heroxbd <AT> gmail <DOT> com>
3 AuthorDate: Wed Nov 25 14:37:23 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 3 22:41:53 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7fd18231
7
8 eclass/alternatives-2.eclass: support Prefix.
9
10 Use ALTERNATIVESDIR_ROOT for ${D}.
11
12 app-admin/eselect-* has been renamed to app-select/eselect-*.
13
14 eclass/alternatives-2.eclass | 8 ++++----
15 1 file changed, 4 insertions(+), 4 deletions(-)
16
17 diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass
18 index 4ec9f2b..a0c18d9 100644
19 --- a/eclass/alternatives-2.eclass
20 +++ b/eclass/alternatives-2.eclass
21 @@ -33,9 +33,9 @@ esac
22
23 DEPEND=">=app-admin/eselect-1.4.5-r102"
24 RDEPEND="${DEPEND}
25 - !app-admin/eselect-blas
26 - !app-admin/eselect-cblas
27 - !app-admin/eselect-lapack"
28 + !app-eselect/eselect-blas
29 + !app-eselect/eselect-cblas
30 + !app-eselect/eselect-lapack"
31
32 # @ECLASS-VARIABLE: ALTERNATIVES_DIR
33 # @INTERNAL
34 @@ -58,7 +58,7 @@ alternatives_for() {
35
36 dodir /etc/env.d/alternatives
37
38 - ALTERNATIVESDIR_ROOTLESS="${ED}/etc/env.d/alternatives" \
39 + ALTERNATIVESDIR_ROOT="${D%/}" \
40 eselect alternatives add ${@} || die
41
42 ALTERNATIVES_CREATED+=( ${1} )