From 9c417bacd51da6d8b57fa9f37425161d30d4b95b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 28 Nov 2020 20:40:51 +0000
Subject: gentoo resync : 28.11.2020

---
 eclass/Manifest.gz      | Bin 36956 -> 36960 bytes
 eclass/cargo.eclass     |   2 +-
 eclass/qt5-build.eclass |   7 +++----
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 12b73dbf0964..1222fc788312 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 1042f31e7e65..7f7a681f6f52 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -347,7 +347,7 @@ cargo_src_compile() {
 	[[ ${_CARGO_GEN_CONFIG_HAS_RUN} ]] || \
 		die "FATAL: please call cargo_gen_config before using ${FUNCNAME}"
 
-	tc-export AR CC CXX
+	tc-export AR CC CXX PKG_CONFIG
 
 	set -- cargo build $(usex debug "" --release) ${ECARGO_ARGS[@]} "$@"
 	einfo "${@}"
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ad7f6a64a447..dce88d642cc0 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -112,10 +112,9 @@ BDEPEND="
 if [[ ${PN} != qttest ]]; then
 	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 fi
-RDEPEND="
-	dev-qt/qtchooser
-"
-
+if ver_test ${PV} -lt 5.15.2; then
+	RDEPEND+=" dev-qt/qtchooser"
+fi
 
 ######  Phase functions  ######
 
-- 
cgit v1.2.3