Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: scripts/
Date: Sun, 29 Mar 2020 17:45:28
Message-Id: 1585503879.b86df0838044e4233785abdd499ba194eb4ecdd6.mattst88@gentoo
1 commit: b86df0838044e4233785abdd499ba194eb4ecdd6
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 29 17:23:15 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 29 17:44:39 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86df083
7
8 scripts/bootstrap.sh: Use full cat/pkg names
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 scripts/bootstrap.sh | 12 ++++++------
13 1 file changed, 6 insertions(+), 6 deletions(-)
14
15 diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
16 index e0dae52f02d..0a4bc06c3c8 100755
17 --- a/scripts/bootstrap.sh
18 +++ b/scripts/bootstrap.sh
19 @@ -272,14 +272,14 @@ for atom in portage.settings.packages:
20
21 # This stuff should never fail but will if not enough is installed.
22 [[ -z ${myBASELAYOUT} ]] && myBASELAYOUT=">=$(portageq best_version / sys-apps/baselayout)"
23 -[[ -z ${myPORTAGE} ]] && myPORTAGE="portage"
24 -[[ -z ${myBINUTILS} ]] && myBINUTILS="binutils"
25 -[[ -z ${myGCC} ]] && myGCC="gcc"
26 -[[ -z ${myGETTEXT} ]] && myGETTEXT="gettext"
27 +[[ -z ${myPORTAGE} ]] && myPORTAGE="sys-apps/portage"
28 +[[ -z ${myBINUTILS} ]] && myBINUTILS="sys-devel/binutils"
29 +[[ -z ${myGCC} ]] && myGCC="sys-devel/gcc"
30 +[[ -z ${myGETTEXT} ]] && myGETTEXT="sys-devel/gettext"
31 [[ -z ${myLIBC} ]] && myLIBC="$(portageq expand_virtual / virtual/libc)"
32 [[ -z ${myTEXINFO} ]] && myTEXINFO="sys-apps/texinfo"
33 -[[ -z ${myZLIB} ]] && myZLIB="zlib"
34 -[[ -z ${myNCURSES} ]] && myNCURSES="ncurses"
35 +[[ -z ${myZLIB} ]] && myZLIB="sys-libs/zlib"
36 +[[ -z ${myNCURSES} ]] && myNCURSES="sys-libs/ncurses"
37
38 # Do we really want gettext/nls?
39 [[ ${USE_NLS} != 1 ]] && myGETTEXT=