commit: 4c718cec2c5a79a1b6e88a8ab5b770ee8b817d50
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 10:49:12 2018 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 30 01:10:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4c718cec
Revert "scripts/bootstrap-prefix: add some dep-cycle workarounds from Sam
Pfeiffer"
Not needed anymore: We are now able to pass use flags from the env.
This reverts commit f81e23a7667ec3a0ed4b2af80c611be1b2d4d6d5.
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
scripts/bootstrap-prefix.sh | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ea6bc9313f..6af97eaba6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1549,20 +1549,9 @@ bootstrap_stage2() {
[[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \
>> "${ROOT}"/tmp/etc/portage/package.mask
- # 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
+ # 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
emerge_pkgs --nodeps "${pkgs[@]}" || return 1
