gentoo resync : 13.06.2020

6 files changed, 28 insertions, 7 deletions

diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 44d19c926964..da6fc41ad25e 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2020-06-09)
+# fails to compile, needs fixing
+=sys-apps/gentoo-functions-0.13
+
 # Fabian Groffen <grobian@gentoo.org> (2019-11-11)
 # We mask all system headers, and only unmask the slot matching the OS
 # install in the version profiles
diff --git a/profiles/prefix/darwin/macos/package.use.force b/profiles/prefix/darwin/macos/package.use.force
index 93ffdde1c0fa..f379b249c796 100644
--- a/profiles/prefix/darwin/macos/package.use.force
+++ b/profiles/prefix/darwin/macos/package.use.force
@@ -1,6 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2020-06-08)
+# Do NOT enable tinfo, it breaks ANYTHING existing, and it also breaks
+# ncurses itself, for it apparently doesn't link against tinfo itself,
+# which needs fixing before re-enabling tinfo again.
+sys-libs/ncurses -tinfo
+sys-libs/ncurses-compat -tinfo
+
 # Fabian Groffen <grobian@gentoo.org> (2012-03-24)
 # Non-threaded target doesn't exist for Mac OS X Intel
 media-gfx/tachyon threads opengl
diff --git a/profiles/prefix/darwin/macos/package.use.mask b/profiles/prefix/darwin/macos/package.use.mask
index fb0d24c54557..9060605d4173 100644
--- a/profiles/prefix/darwin/macos/package.use.mask
+++ b/profiles/prefix/darwin/macos/package.use.mask
@@ -1,6 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2020-06-08)
+# Do NOT enable tinfo, it breaks ANYTHING existing, and it also breaks
+# ncurses itself, for it apparently doesn't link against tinfo itself,
+# which needs fixing before re-enabling tinfo again.
+sys-libs/ncurses tinfo
+sys-libs/ncurses-compat tinfo
+
 # Andrey Utkin <andrey_utkin@gentoo.org> (2018-03-11)
 # This flag can be sensibly enabled only on macos
 # hence it is masked in base profile. Bug #637482
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
index 1b8aa47aaa58..77e5de432700 100644
--- a/profiles/prefix/make.defaults
+++ b/profiles/prefix/make.defaults
@@ -12,5 +12,4 @@ USE="readline zlib ncurses ssl"
 # In Prefix, aim for Python 3 only, leaving out 2 to avoid unnecessary
 # builds
 # NOTE: Both are incremental variables: Need to drop obsolete base values.
-PYTHON_TARGETS="-python2_7 python3_6"
-PYTHON_SINGLE_TARGET="python3_6"
+PYTHON_TARGETS="-python2_7"
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
index c101c1896932..71cdac1f6bc0 100644
--- a/profiles/prefix/package.use.mask
+++ b/profiles/prefix/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2020-06-07)
+# installing kernels has no business in Prefix
+sys-apps/debianutils installkernel
+
 # Michael Haubenwallner <haubi@gentoo.org> (2019-05-02)
 # gold is linux only, and is required by cxx
 sys-devel/binutils cxx gold default-gold
diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc
index 85a7eabccb1f..4b1478682762 100644
--- a/profiles/prefix/windows/cygwin/profile.bashrc
+++ b/profiles/prefix/windows/cygwin/profile.bashrc
@@ -191,7 +191,7 @@ cygwin-rebase-merge() {
 
 		[[ ${mode} == 'pending' ]] || exit 0
 
-		find "./${pendingdir}" -maxdepth 1 -type f \
+		find "./${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \
 			-exec mv -f -t "./${mergeddir}/" {} +
 	)
 	[[ $? == 0 ]] || die "Merging ${mode} files into rebase database failed."