[patch] draft of combined patch to portage tree

portage-prefix.patch (text/plain), 30.83 KB, created by Alexey on 2023-09-03 17:47:31 UTC

commit 768c3b4cf039b2e950fefe55f8e5185810ec4561
Author: Alexey Sokolov <[e-mail]>
Date:   Sat Aug 26 17:38:47 2023 +0100

    fixes

diff --git a/app-crypt/gpgme/gpgme-1.21.0.ebuild b/app-crypt/gpgme/gpgme-1.21.0.ebuild
index f1f283dbf..6fb2c1cc1 100644
--- a/app-crypt/gpgme/gpgme-1.21.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.21.0.ebuild
@@ -14,7 +14,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..12} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
 
-inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
+inherit autotools distutils-r1 flag-o-matic qmake-utils toolchain-funcs verify-sig
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
@@ -63,7 +63,7 @@ PATCHES=(
 src_prepare() {
 	default
 
-	elibtoolize
+	eautoreconf
 
 	# bug #697456
 	addpredict /run/user/$(id -u)/gnupg
diff --git a/app-crypt/rhash/rhash-1.4.3.ebuild b/app-crypt/rhash/rhash-1.4.3.ebuild
index b7b11fc50..e962027b7 100644
--- a/app-crypt/rhash/rhash-1.4.3.ebuild
+++ b/app-crypt/rhash/rhash-1.4.3.ebuild
@@ -46,7 +46,9 @@ multilib_src_configure() {
 	# https://github.com/gentoo/gentoo/pull/28355
 	# mold needs this too but right now tc-ld-is-mold is also not available
 	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
+		if ! use kernel_Darwin; then
+			append-ldflags -Wl,--undefined-version
+		fi
 	fi
 
 	set -- \
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
index c9e12df8e..bc7704c91 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
@@ -110,7 +110,9 @@ multilib_src_configure() {
 	# https://github.com/gentoo/gentoo/pull/28355
 	# mold needs this too but right now tc-ld-is-mold is also not available
 	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
+		if ! use kernel_Darwin; then
+			append-ldflags -Wl,--undefined-version
+		fi
 	fi
 
 	local myeconfargs=(
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index 6e83a9465..a28822594 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -25,7 +25,9 @@ src_configure() {
 	# https://github.com/gentoo/gentoo/pull/28355
 	# mold needs this too but right now tc-ld-is-mold is also not available
 	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
+		if ! use kernel_Darwin; then
+			append-ldflags -Wl,--undefined-version
+		fi
 	fi
 
 	econf \
diff --git a/dev-libs/popt/popt-1.19.ebuild b/dev-libs/popt/popt-1.19.ebuild
index d51fca730..881beb211 100644
--- a/dev-libs/popt/popt-1.19.ebuild
+++ b/dev-libs/popt/popt-1.19.ebuild
@@ -33,7 +33,9 @@ multilib_src_configure() {
 	# https://github.com/gentoo/gentoo/pull/28355
 	# mold needs this too but right now tc-ld-is-mold is also not available
 	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
+		if ! use kernel_Darwin ; then
+			append-ldflags -Wl,--undefined-version
+		fi
 	fi
 
 	local myeconfargs=(
diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass
index 223e2a15b..3cdd26fa5 100644
--- a/eclass/llvm.eclass
+++ b/eclass/llvm.eclass
@@ -64,6 +64,8 @@ esac
 if [[ ! ${_LLVM_ECLASS} ]]; then
 _LLVM_ECLASS=1
 
+IUSE="bootstrap-prefix"
+
 # make sure that the versions installing straight into /usr/bin
 # are uninstalled
 DEPEND="!!sys-devel/llvm:0"
@@ -242,6 +244,11 @@ llvm_fix_tool_path() {
 llvm_pkg_setup() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	if use bootstrap-prefix; then
+		# AppleClang has unparseable version numbers, but it's irrelevant anyway
+		return
+	fi
+
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		LLVM_SLOT=$(get_llvm_slot "${LLVM_MAX_SLOT}")
 
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index b86a9682b..1c7a34bd8 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -1186,4 +1186,68 @@ gen_usr_ldscript() {
 	done
 }
 
+# @FUNCTION: tc-get-cxx-stdlib
+# @DESCRIPTION:
+# Attempt to identify the C++ standard library used by the compiler.
+# If the library is identified, the function returns 0 and prints one
+# of the following:
+#
+# - ``libc++`` for ``sys-libs/libcxx``
+# - ``libstdc++`` for ``sys-devel/gcc``'s libstdc++
+#
+# If the library is not recognized, the function returns 1.
+tc-get-cxx-stdlib() {
+	local code='#include <ciso646>
+
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#elif defined(__GLIBCXX__)
+	HAVE_LIBSTDCPP
+#endif
+'
+	local res=$(
+		$(tc-getCXX) ${CPPFLAGS} ${CXXFLAGS} -x c++ -E -P - \
+			<<<"${code}" 2>/dev/null
+	)
+
+	case ${res} in
+		*HAVE_LIBCXX*)
+			echo libc++;;
+		*HAVE_LIBSTDCPP*)
+			echo libstdc++;;
+		*)
+			return 1;;
+	esac
+
+	return 0
+}
+
+# @FUNCTION: tc-get-c-rtlib
+# @DESCRIPTION:
+# Attempt to identify the runtime used by the C/C++ compiler.
+# If the runtime is identifed, the function returns 0 and prints one
+# of the following:
+#
+# - ``compiler-rt`` for ``sys-libs/compiler-rt``
+# - ``libgcc`` for ``sys-devel/gcc``'s libgcc
+#
+# If the runtime is not recognized, the function returns 1.
+tc-get-c-rtlib() {
+	local res=$(
+		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} \
+			-print-libgcc-file-name 2>/dev/null
+	)
+
+	case ${res} in
+		*libclang_rt*)
+			echo compiler-rt;;
+		*libgcc*)
+			echo libgcc;;
+		*)
+			return 1;;
+	esac
+
+	return 0
+}
+
 fi
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 069e532c2..fff2d6072 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -53,7 +53,7 @@ cache-formats = md5-dict
 masters =
 
 # Use thin Manifests for Git
-thin-manifests = false
+thin-manifests = true
 
 # Sign Git commits, and NOT Manifests
 sign-commits = true
diff --git a/net-dns/libidn2/libidn2-2.3.4.ebuild b/net-dns/libidn2/libidn2-2.3.4.ebuild
index 6cc9c6255..e9be96097 100644
--- a/net-dns/libidn2/libidn2-2.3.4.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.4.ebuild
@@ -41,7 +41,9 @@ multilib_src_configure() {
 	# https://github.com/gentoo/gentoo/pull/28355
 	# mold needs this too but right now tc-ld-is-mold is also not available
 	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
+		if ! use kernel_Darwin; then
+			append-ldflags -Wl,--undefined-version
+		fi
 	fi
 
 	local myconf=(
diff --git a/net-libs/gnutls/gnutls-3.8.0.ebuild b/net-libs/gnutls/gnutls-3.8.0.ebuild
index c0a448c45..0af325da1 100644
--- a/net-libs/gnutls/gnutls-3.8.0.ebuild
+++ b/net-libs/gnutls/gnutls-3.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc
-inherit libtool multilib-minimal verify-sig
+inherit autotools multilib-minimal verify-sig
 
 DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
 HOMEPAGE="https://www.gnutls.org/"
@@ -69,7 +69,7 @@ src_prepare() {
 	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
 
 	# Use sane .so versioning on FreeBSD.
-	elibtoolize
+	eautoreconf
 }
 
 multilib_src_configure() {
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index dad9b1707..4fe2a198e 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Alexey Sokolov <[e-mail]> (2023-08-07)
+# Only needed during bootstrap of prefix
+bootstrap-prefix
+
 # Hans de Graaff <[e-mail]> (2023-04-10)
 # Ruby 2.7 is masked for removal.
 ruby_targets_ruby27
diff --git a/profiles/features/llvm/make.defaults b/profiles/features/llvm/make.defaults
index 54254b71b..b21737ab8 100644
--- a/profiles/features/llvm/make.defaults
+++ b/profiles/features/llvm/make.defaults
@@ -11,7 +11,7 @@ CXX="clang++"
 LD="ld.lld"
 
 # linker flags
-LDFLAGS="${LDFLAGS} -fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind -Wl,--as-needed"
+#LDFLAGS="${LDFLAGS} -fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind"
 
 ## hardening flags
 #SOME_HARDENING_CFLAGS="-fPIC -fstack-protector-strong -D_FORTIFY_SOURCE=2"
diff --git a/profiles/features/prefix/use.mask b/profiles/features/prefix/use.mask
index 482ce57f0..1aaa46b7a 100644
--- a/profiles/features/prefix/use.mask
+++ b/profiles/features/prefix/use.mask
@@ -16,3 +16,6 @@ pam
 # Andreas Sturmlechner <[e-mail]> (2020-06-06)
 # sci-libs/mkl does not have prefix keywords
 mkl
+
+# Allow bootstrapping the prefix
+-bootstrap-prefix
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/clang/eapi b/profiles/prefix/darwin/macos/13.0/arm64/clang/eapi
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/clang/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/clang/make.defaults b/profiles/prefix/darwin/macos/13.0/arm64/clang/make.defaults
new file mode 100644
index 000000000..9807a87ed
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/clang/make.defaults
@@ -0,0 +1,4 @@
+LD=ld64.lld
+#CFLAGS="${CFLAGS} -Wl,-search_paths_first -L${EPREFIX}/usr/lib -Wl,-rpath,${EPREFIX}/usr/lib"
+#CXXFLAGS="${CXXFLAGS} -Wl,-search_paths_first -L${EPREFIX}/usr/lib -Wl,-rpath,${EPREFIX}/usr/lib"
+#LDFLAGS="${LDFLAGS} -Wl,-search_paths_first -L${EPREFIX}/usr/lib -Wl,-rpath,${EPREFIX}/usr/lib"
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/clang/package.mask b/profiles/prefix/darwin/macos/13.0/arm64/clang/package.mask
new file mode 100644
index 000000000..918cb31a0
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/clang/package.mask
@@ -0,0 +1 @@
+sys-devel/binutils-apple
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/clang/package.unmask b/profiles/prefix/darwin/macos/13.0/arm64/clang/package.unmask
new file mode 100644
index 000000000..d92abec60
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/clang/package.unmask
@@ -0,0 +1,4 @@
+# For Darwin bootstraps
+sys-devel/native-cctools
+# For Darwin bootstraps
+sys-devel/native-cctools
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/clang/package.use b/profiles/prefix/darwin/macos/13.0/arm64/clang/package.use
new file mode 100644
index 000000000..3b74ba66f
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/clang/package.use
@@ -0,0 +1,30 @@
+# Disable bootstrapping libcxx* with libunwind
+sys-libs/libcxxabi -libunwind
+sys-libs/libcxx -libunwind
+# Most binary Linux distributions seem to fancy toolchains that
+# do not do c++ support (need to install a separate package).
+sys-libs/ncurses -cxx
+sys-devel/binutils -cxx
+# gmp has cxx flag enabled by default. When dealing with a host
+# compiler without cxx support this causes configure failure.
+# In addition, The stage2 g++ is only for compiling stage3 compiler,
+# because the host libstdc++.so runtime may be not compatible and
+# stage2 libstdc++.so might conflict with that of stage3.  The
+# trade-off is just not to use cxx.
+dev-libs/gmp -cxx
+sys-devel/binutils -gold
+# Disable bootstrapping libcxx* with libunwind
+sys-libs/libcxxabi -libunwind
+sys-libs/libcxx -libunwind
+# Most binary Linux distributions seem to fancy toolchains that
+# do not do c++ support (need to install a separate package).
+sys-libs/ncurses -cxx
+sys-devel/binutils -cxx
+# gmp has cxx flag enabled by default. When dealing with a host
+# compiler without cxx support this causes configure failure.
+# In addition, The stage2 g++ is only for compiling stage3 compiler,
+# because the host libstdc++.so runtime may be not compatible and
+# stage2 libstdc++.so might conflict with that of stage3.  The
+# trade-off is just not to use cxx.
+dev-libs/gmp -cxx
+sys-devel/binutils -gold
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/clang/packages b/profiles/prefix/darwin/macos/13.0/arm64/clang/packages
new file mode 100644
index 000000000..0b46fa6d3
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/clang/packages
@@ -0,0 +1 @@
+-*sys-devel/binutils-apple
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/clang/parent b/profiles/prefix/darwin/macos/13.0/arm64/clang/parent
new file mode 100644
index 000000000..845cedb73
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/clang/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/llvm
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/package.unmask b/profiles/prefix/darwin/macos/13.0/arm64/package.unmask
new file mode 100644
index 000000000..361ed2e7a
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/package.unmask
@@ -0,0 +1,10 @@
+# For Darwin bootstraps
+sys-devel/native-cctools
+# For Darwin bootstraps
+sys-devel/native-cctools
+# For Darwin bootstraps
+sys-devel/native-cctools
+# For Darwin bootstraps
+sys-devel/native-cctools
+# For Darwin bootstraps
+sys-devel/native-cctools
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/package.use b/profiles/prefix/darwin/macos/13.0/arm64/package.use
new file mode 100644
index 000000000..648c3941b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/13.0/arm64/package.use
@@ -0,0 +1,75 @@
+# Disable bootstrapping libcxx* with libunwind
+sys-libs/libcxxabi -libunwind
+sys-libs/libcxx -libunwind
+# Most binary Linux distributions seem to fancy toolchains that
+# do not do c++ support (need to install a separate package).
+sys-libs/ncurses -cxx
+sys-devel/binutils -cxx
+# gmp has cxx flag enabled by default. When dealing with a host
+# compiler without cxx support this causes configure failure.
+# In addition, The stage2 g++ is only for compiling stage3 compiler,
+# because the host libstdc++.so runtime may be not compatible and
+# stage2 libstdc++.so might conflict with that of stage3.  The
+# trade-off is just not to use cxx.
+dev-libs/gmp -cxx
+sys-devel/binutils -gold
+# Disable bootstrapping libcxx* with libunwind
+sys-libs/libcxxabi -libunwind
+sys-libs/libcxx -libunwind
+# Most binary Linux distributions seem to fancy toolchains that
+# do not do c++ support (need to install a separate package).
+sys-libs/ncurses -cxx
+sys-devel/binutils -cxx
+# gmp has cxx flag enabled by default. When dealing with a host
+# compiler without cxx support this causes configure failure.
+# In addition, The stage2 g++ is only for compiling stage3 compiler,
+# because the host libstdc++.so runtime may be not compatible and
+# stage2 libstdc++.so might conflict with that of stage3.  The
+# trade-off is just not to use cxx.
+dev-libs/gmp -cxx
+sys-devel/binutils -gold
+# Disable bootstrapping libcxx* with libunwind
+sys-libs/libcxxabi -libunwind
+sys-libs/libcxx -libunwind
+# Most binary Linux distributions seem to fancy toolchains that
+# do not do c++ support (need to install a separate package).
+sys-libs/ncurses -cxx
+sys-devel/binutils -cxx
+# gmp has cxx flag enabled by default. When dealing with a host
+# compiler without cxx support this causes configure failure.
+# In addition, The stage2 g++ is only for compiling stage3 compiler,
+# because the host libstdc++.so runtime may be not compatible and
+# stage2 libstdc++.so might conflict with that of stage3.  The
+# trade-off is just not to use cxx.
+dev-libs/gmp -cxx
+sys-devel/binutils -gold
+# Disable bootstrapping libcxx* with libunwind
+sys-libs/libcxxabi -libunwind
+sys-libs/libcxx -libunwind
+# Most binary Linux distributions seem to fancy toolchains that
+# do not do c++ support (need to install a separate package).
+sys-libs/ncurses -cxx
+sys-devel/binutils -cxx
+# gmp has cxx flag enabled by default. When dealing with a host
+# compiler without cxx support this causes configure failure.
+# In addition, The stage2 g++ is only for compiling stage3 compiler,
+# because the host libstdc++.so runtime may be not compatible and
+# stage2 libstdc++.so might conflict with that of stage3.  The
+# trade-off is just not to use cxx.
+dev-libs/gmp -cxx
+sys-devel/binutils -gold
+# Disable bootstrapping libcxx* with libunwind
+sys-libs/libcxxabi -libunwind
+sys-libs/libcxx -libunwind
+# Most binary Linux distributions seem to fancy toolchains that
+# do not do c++ support (need to install a separate package).
+sys-libs/ncurses -cxx
+sys-devel/binutils -cxx
+# gmp has cxx flag enabled by default. When dealing with a host
+# compiler without cxx support this causes configure failure.
+# In addition, The stage2 g++ is only for compiling stage3 compiler,
+# because the host libstdc++.so runtime may be not compatible and
+# stage2 libstdc++.so might conflict with that of stage3.  The
+# trade-off is just not to use cxx.
+dev-libs/gmp -cxx
+sys-devel/binutils -gold
diff --git a/profiles/use.desc b/profiles/use.desc
index bca8dffc4..231e71bd4 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -29,6 +29,7 @@ big-endian - Big-endian toolchain support
 bindist - Flag to enable or disable options for prebuilt (GRP) packages (eg. due to licensing issues)
 blas - Add support for the virtual/blas numerical library
 bluetooth - Enable Bluetooth Support
+bootstrap-prefix - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used for bootstrapping Gentoo Prefix
 branding - Enable Gentoo specific branding
 build - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used for creating build images and the first half of bootstrapping [make stage1]
 bzip2 - Use the bzlib compression library
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
index c1b3e6844..05314eb36 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
@@ -42,6 +42,7 @@ src_prepare() {
 	cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c md/md.c || die
 	cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 md/md.1 || die
 	eapply "${DISTDIR}"/adv_cmds-md-${MD_VER}-compile.patch
+	eapply "${FILESDIR}"/${PN}-12-md.patch
 
 	cd "${S}"
 	eapply_user
diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md.patch
new file mode 100644
index 000000000..d8bd255f7
--- /dev/null
+++ b/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md.patch
@@ -0,0 +1,14 @@
+diff --git a/md/md.c b/md/md.c
+index ec8e2d4..2c16557 100644
+--- a/md/md.c
++++ b/md/md.c
+@@ -148,8 +148,7 @@ static void parse_dep();
+ static void save_dot_o();
+ 
+ int
+-main(argc,argv)
+-register char **argv;
++main(int argc, char** argv)
+ {
+ int size;
+ 
diff --git a/sys-apps/debianutils/debianutils-4.11.2.ebuild b/sys-apps/debianutils/debianutils-4.11.2.ebuild
index 4402e3b85..512be05f5 100644
--- a/sys-apps/debianutils/debianutils-4.11.2.ebuild
+++ b/sys-apps/debianutils/debianutils-4.11.2.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 src_prepare() {
 	default
 	eautoreconf
+	sed -i -e 's/int cleanup_tmpfile/void cleanup_tmpfile/' run-parts.c || die
 }
 
 src_configure() {
diff --git a/sys-apps/portage/files/portage-3.0.49-prefix-stage2.patch b/sys-apps/portage/files/portage-3.0.49-prefix-stage2.patch
new file mode 100644
index 000000000..2ca9d74ea
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.49-prefix-stage2.patch
@@ -0,0 +1,16 @@
+During first part of stage3, some programs are installed from EPREFIX/tmp to EPREFIX which break this qa check
+The check I'm adding is heavy-handed, but I don't know how to fix this better
+
+TODO: check whether portage-3.0.30-prefix-stack.patch fixes the same issue
+
+--- a/bin/install-qa-check.d/05prefix
++++ b/bin/install-qa-check.d/05prefix
+@@ -95,6 +95,8 @@ install_qa_check_prefix() {
+ 				# reasons
+ 				sed -i -e '1s:^#! \?'"${line[0]}"':#!'"${EPREFIX}"${line[0]}':' "${rf}"
+ 				continue
++			elif [[ -n "${PORTAGE_OVERRIDE_EPREFIX}"  ]] ; then
++				continue
+ 			else
+ 				# this is definitely wrong: script in ${PATH} and invalid shebang
+ 				echo "${fn#${D}}:${line[0]} (script ${fn##*/} installed in PATH but interpreter ${line[0]} not found)" \
diff --git a/sys-apps/portage/portage-3.0.49.ebuild b/sys-apps/portage/portage-3.0.49.ebuild
index 148d1f425..a1178dd66 100644
--- a/sys-apps/portage/portage-3.0.49.ebuild
+++ b/sys-apps/portage/portage-3.0.49.ebuild
@@ -92,6 +92,7 @@ python_prepare_all() {
 		# disabled in 3.0.24: does not apply, while useful, rarely used if ever
 		# "${FILESDIR}"/${PN}-3.0.30-ebuildshell.patch # 155161
 		"${FILESDIR}"/${PN}-3.0.30-interrevisions.patch # 832062
+		"${FILESDIR}"/${PN}-3.0.49-prefix-stage2.patch
 	)
 
 	distutils-r1_python_prepare_all
diff --git a/sys-devel/clang-common/clang-common-16.0.6-r1.ebuild b/sys-devel/clang-common/clang-common-16.0.6-r1.ebuild
index 358dca01c..6b02bab08 100644
--- a/sys-devel/clang-common/clang-common-16.0.6-r1.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.6-r1.ebuild
@@ -10,10 +10,11 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld llvm-libunwind
 	hardened stricter
+	bootstrap-prefix
 "
 
 PDEPEND="
@@ -67,6 +68,7 @@ src_install() {
 	newbashcomp bash-autocomplete.sh clang
 
 	insinto /etc/clang
+
 	newins - gentoo-runtimes.cfg <<-EOF
 		# This file is initially generated by sys-devel/clang-runtime.
 		# It is used to control the default runtimes using by clang.
@@ -175,6 +177,25 @@ src_install() {
 			@gentoo-common.cfg
 		EOF
 	done
+
+	if use kernel_Darwin; then
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			# Gentoo Prefix on Darwin
+			-Wl,-search_paths_first
+			-Wl,-rpath,${EPREFIX}/usr/lib
+			-L ${EPREFIX}/usr/lib
+			-isystem ${EPREFIX}/usr/include
+			-isysroot ${EPREFIX}/MacOSX.sdk
+		EOF
+		cat >> "${ED}/etc/clang/clang++.cfg" <<-EOF || die
+			-lc++abi
+		EOF
+		if use bootstrap-prefix ; then
+			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+				-Wl,-rpath,${EPREFIX}/../usr/lib
+			EOF
+		fi
+	fi
 }
 
 pkg_preinst() {
diff --git a/sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild
index 6483c7c0c..8c1458899 100644
--- a/sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
index c4e73ad72..8a6a4b270 100644
--- a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
+++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/sys-devel/clang/clang-16.0.6.ebuild b/sys-devel/clang/clang-16.0.6.ebuild
index 2e8a27ba4..20370951c 100644
--- a/sys-devel/clang/clang-16.0.6.ebuild
+++ b/sys-devel/clang/clang-16.0.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/libtool/libtool-2.4.7-r1.ebuild b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
index a098f7ae0..48efffd0f 100644
--- a/sys-devel/libtool/libtool-2.4.7-r1.ebuild
+++ b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
@@ -76,6 +76,7 @@ src_prepare() {
 		# return the correct result for -print-search-dirs (doesn't
 		# include prefix dirs ...).
 		eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
+		sed -i -e 's/.*keep_private_externs.*/:/' m4/libtool.m4 || die
 		eprefixify m4/libtool.m4
 	fi
 
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild
index 4b849cdd1..cecf6cc8f 100644
--- a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86 ~arm64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/sys-devel/lld/lld-16.0.6.ebuild b/sys-devel/lld/lld-16.0.6.ebuild
index 69d4c5905..ec21f13f8 100644
--- a/sys-devel/lld/lld-16.0.6.ebuild
+++ b/sys-devel/lld/lld-16.0.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos"
 IUSE="debug test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm-common/llvm-common-16.0.6.ebuild b/sys-devel/llvm-common/llvm-common-16.0.6.ebuild
index 4dd4fe395..fe40f75db 100644
--- a/sys-devel/llvm-common/llvm-common-16.0.6.ebuild
+++ b/sys-devel/llvm-common/llvm-common-16.0.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	!sys-devel/llvm:0
diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
index bd3ab9fa4..531b47105 100644
--- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
+++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/sys-devel/llvm/llvm-16.0.6.ebuild b/sys-devel/llvm/llvm-16.0.6.ebuild
index 96270daf4..6275202b5 100644
--- a/sys-devel/llvm/llvm-16.0.6.ebuild
+++ b/sys-devel/llvm/llvm-16.0.6.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
 	xml z3 zstd
diff --git a/sys-devel/slibtool/slibtool-0.5.34.ebuild b/sys-devel/slibtool/slibtool-0.5.34.ebuild
index 1d121794e..c77bfd033 100644
--- a/sys-devel/slibtool/slibtool-0.5.34.ebuild
+++ b/sys-devel/slibtool/slibtool-0.5.34.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://dl.midipix.org/slibtool/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-midipix )"
 fi
diff --git a/sys-libs/binutils-libs/binutils-libs-2.40-r5.ebuild b/sys-libs/binutils-libs/binutils-libs-2.40-r5.ebuild
index 50fa72363..cf39edbdc 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.40-r5.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.40-r5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV%_p?}"
 IUSE="64-bit-bfd cet multitarget nls static-libs test"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.6.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.6.ebuild
index 6cc57799a..cb5d13cee 100644
--- a/sys-libs/compiler-rt/compiler-rt-16.0.6.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-16.0.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/libcxx/libcxx-16.0.6.ebuild b/sys-libs/libcxx/libcxx-16.0.6.ebuild
index ca63d0624..11c91d10c 100644
--- a/sys-libs/libcxx/libcxx-16.0.6.ebuild
+++ b/sys-libs/libcxx/libcxx-16.0.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="+clang +libcxxabi static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.6.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.6.ebuild
index 6298cb7cb..0c7bc329b 100644
--- a/sys-libs/libcxxabi/libcxxabi-16.0.6.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-16.0.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="+clang static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.6.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.6.ebuild
index 2d3feb7a3..2989b340a 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.6.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="+clang debug static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"