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

[Fabian Groffen]

commit:     f81e23a7667ec3a0ed4b2af80c611be1b2d4d6d5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 14:27:49 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 14:27:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f81e23a7

scripts/bootstrap-prefix: add some dep-cycle workarounds from Sam Pfeiffer

Basically implements Error 1 from
https://pad.crans.org/p/gentoo-prefix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

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

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index cdcb8346d1..c4f8f18bb7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1553,9 +1553,21 @@ bootstrap_stage2() {
 	# on systems without a c++ compiler.
 	echo '<sys-devel/gcc-4.8' >> "${ROOT}"/tmp/etc/portage/package.unmask
 	
-	# cmake has some external dependencies which require autoconf, etc.
-	# unless we only build the buildtool, bug #603012
-	echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use
+
+	# kill some dependencies here while we're still fragile
+	{
+		# cmake has some external dependencies which require autoconf, etc.
+		# unless we only build the buildtool, bug #603012
+		echo "dev-util/cmake -server"
+		# avoid sys-apps/acl -> attr -> gettext cycle on Linux
+		echo "sys-devel/gettext -acl"
+		# gdbm depends on berkdb by default, which pulls in binutils
+		echo "dev-lang/perl -gdbm -berkdb"
+		# package needs perl, nls pulls in specific package
+		echo "sys-apps/help2man -nls"
+		# avoid hefty set of deps from glib
+		echo "dev-util/pkgconfig internal-glib"
+	} >> "${ROOT}"/tmp/etc/portage/package.use
 
 	for pkg in ${compiler_stage1} ; do
 		# <glibc-2.5 does not understand .gnu.hash, use