[gentoo-commits] repo/proj/prefix:master commit in: scripts/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     23d7631f8c99e03625576906f3b552de6608f959
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 16:33:46 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 16:40:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=23d7631f

stage3: emerge final packages without USE=-ssl

In the stage where portage is pulled in, we now need ssl.  So unmask
this here, so the depcalc will succeed.  We're far enough to be able to
compile ssl at this stage.

 scripts/bootstrap-prefix.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index fd91236..8bba76f 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1293,10 +1293,6 @@ bootstrap_stage3() {
 		sys-devel/make
 		sys-apps/file
 		app-admin/eselect
-		$( [[ ${OFFLINE_MODE} ]] || echo sys-devel/gettext )
-		$( [[ ${OFFLINE_MODE} ]] || echo net-misc/wget )
-		virtual/os-headers
-		sys-apps/portage
 	)
 	# for grep we need to do a little workaround as we use llvm-3.4
 	# here, which doesn't necessarily grok the system headers on newer
@@ -1304,6 +1300,17 @@ bootstrap_stage3() {
 	ac_cv_c_decl_report=warning \
 	emerge_pkgs "" "${pkgs[@]}" || return 1
 
+	# gettext pulls in portage, which since 2.2.28 needs ssl enabled, so
+	# we need to lift our mask for that.
+	pkgs=(
+		$( [[ ${OFFLINE_MODE} ]] || echo sys-devel/gettext )
+		$( [[ ${OFFLINE_MODE} ]] || echo net-misc/wget )
+		virtual/os-headers
+		sys-apps/portage
+	)
+	USE="ssl" \
+	emerge_pkgs "" "${pkgs[@]}" || return 1
+
 	# Switch to the proper portage.
 	hash -r