gentoo resync : 10.02.2020

6 files changed, 58 insertions, 92 deletions

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 4168be0accad..2b9f96f21ace 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,12 +1,12 @@
 AUX qtcore-5.12.3-CVE-2019-18281.patch 4122 BLAKE2B 057663881e9427edc80a9fbfc97e0f026dff0722e23452d06f16f0ab9ad69af7470ea10dbbd4d076f248edab435a60a0fcc8282a38f963e316b3b262b5029628 SHA512 60b72443dab594e24167abf2dae6f46eb171a7cfbb0e114386ebdbbd8d14b935f33fe6bc086c50f4c8f94e942f88c4bb06dee6656644c619ea5fd23898303944
 AUX qtcore-5.12.3-CVE-2020-0569.patch 1103 BLAKE2B e19236089dde2c6e15ef3f4c53e8cbcf8e68b09d0f61570adbb5e62a449c647e1d51c185735d2086ca336513d51eaf43d3c414eebaf9849cbe9ca3bba33a675c SHA512 721a16079acba96e784713b092543dc187b1c041889da745228b625ae727b602279ff882054929320cabc4228f47233e50fd63fcc75f543d8266f8fb0a043809
 AUX qtcore-5.12.3-CVE-2020-0570.patch 2539 BLAKE2B 87282e51d64cf94cbc33eea6da901bef2135f0b25237dccb72c5f5f107f3270e5286fba15ba413d4e04d3cfa109934c97fea32f8295b727d38f047ffc85b28c7 SHA512 ed05b2efffc96dbd263dfb2714f45190b7bb61a17ff7395ec3d136c6fae2b460eb40a751df615d15394a7b22a989b3163cd1441b164554613aaac4de90cb873b
+AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtcore-5.12.3-r1.ebuild 1678 BLAKE2B 375ac9b155170c9242ace84099345be98776adca28892ded36063fef64ae6f82872f680555dd041d476b6adc526a16b3173f024d83c4e312321d0035f20e984d SHA512 c899510233208b1b8b5b0b3c642688afb13635286e828849d325727c16a39de7acb4c4320a296c157262f081db348c5e9f7e603db0699bf58afd532d610775ec
-EBUILD qtcore-5.12.3-r2.ebuild 1761 BLAKE2B 75e97cad0b984ab2f5298f76ff4b7a6fed6867a26537db5cda078d5274a825549a29088beab4369532e528a2f6c7922829e797cd1fb311e844e429439f5d75d8 SHA512 b6cf9c5b7bb5588734f9ab0dae25359d83186a8de980d5281cc39534e930368780d0e329a867b7ae5c8d6ba284b87778d5ca70efe86c4eb7fcb4bf43ac9302f1
+EBUILD qtcore-5.12.3-r2.ebuild 1755 BLAKE2B 53aeb4bf14488b8b109dd5010fd121366e78c233c57bcce087c9df5adf066d002509995e68a596162f923d36bb7b7512512d6e677a1d7413d9c9e904da449688 SHA512 81eefb280388cbdfe437c4956d6553cbd0b2f4bd718c4e2527b472dca65478d7139cafe67aede6a819d88a0f89687dfba983fc969354b99cb8dcaee884b70f44
 EBUILD qtcore-5.13.2-r1.ebuild 1659 BLAKE2B 48c8eaa36be4c1084d12b501e9e50397097eae45c62475a69d103686bb787f114e393135ecfcaa9a7475fe91412edd40bd84f6ed6312233e9a5cdde1f401f6f7 SHA512 59360b4a7671d52b0448e06db5a8935643626b5e03bfcae25f8071fa533feedc03ced5a7912f3a7b17616d51c2d5a53d4461c291ce6953b4d6f88453dee38a77
-EBUILD qtcore-5.13.2-r2.ebuild 1771 BLAKE2B 4f969411c17dc25e0a81114354d626827df01fc5100c9e56ce4a8721c04e8c93c2de88f1f8affce20b06772d13bd07a70cd38a1cd25c3bce0c0a04262302973f SHA512 6fadf34d160ebc55bd0a6cbdfa4aa7e174e86216a1a014f138859db088766aea78c955c9505ab5352d1df8f1065b216a41db2b2df3c04431cae6a32b7a459c26
-EBUILD qtcore-5.14.1.ebuild 1637 BLAKE2B 0869d9c3dd593453eff5b758664bc736233300df9cd5a161126516bb32100eb36f299a975f2ed49174daea89097971cf942e5a4bf6d7c7723d52209c749536e5 SHA512 e9f88439742e969a6b0505c39960711b1cb01a44239098a48a7b358d8a99ba787aa5e79987d8cc3f092559582155057cb5e7dffe63c9d1803f91208b81fc20ea
+EBUILD qtcore-5.13.2-r2.ebuild 1770 BLAKE2B 5d52cfff1cb34b2c35255a04647901472173c5cfe91cea160070ca71ecb2a9a518aca0ec46e4944f901909503af845e20aa2e911c05c9b9ffba6bdee997b4c32 SHA512 cb69319f0c4676de8669f5c5a5aca6a45cfc325e7bd1796ce37b4480b50e35e4911d07123352119dd1408d57d447eb2384e7471c868154fc5885ea8e6b61f8a4
+EBUILD qtcore-5.14.1-r1.ebuild 1716 BLAKE2B f7cbcb6d8b06dfb49b65a95901c0c47cc01dedce2a263f19f203fe94254becfd0dadf772d58c7f8297dff0b9216f3cfe685cc9be7908d6f14156bbfba9cc0b82 SHA512 8be645c3ab9d5cf4ba3391f611f1a1baa6cee2e28b5a3a6c2a6cdf5019beb5c4221595e8304b4cbaafe2b6fcdef84218026c66de421b7b8644ec5b45a7dd3a13
 MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666
diff --git a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
new file mode 100644
index 000000000000..30b5abc39759
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
@@ -0,0 +1,50 @@
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 9 Feb 2020 11:45:00 +0100
+Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14
+
+In upstream commit:
+
+https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
+
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument
+IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for
+QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland.
+During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some
+reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
+cmake files regenerated, leading to cmake errors like:
+
+https://bugs.gentoo.org/703306
+https://bugs.gentoo.org/705198
+
+From mkspecs/features/create_cmake.prf:
+
+# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
+# functions whether a Configuration specific generator expression needs to be added to the values
+# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
+# configuration specific values. For singular builds (only release or only debug), we want the
+# values to be applied regardless of the configuration.
+# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
+# build a Debug configuration of an application, even if Qt was built in a Release configuration.
+
+qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
+optional and default to FALSE.
+
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-01-23 13:37:32.000000000 +0100
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-02-09 15:15:21.156219814 +0100
+@@ -538,8 +538,14 @@
+ 
+     file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
+ 
+-    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
+-          IsDebugAndRelease)
++    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
++        set(IsDebugAndRelease FALSE)
++        set (list_var ${ARGN})
++        list(LENGTH list_var num_extra_arg)
++        if (${num_extra_arg} GREATER 0)
++            list(GET list_var 0 IsDebugAndRelease)
++        endif()
++
+         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+ 
+ !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild b/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild
deleted file mode 100644
index 8fa01e2779f6..000000000000
--- a/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/tools/qfloat16-tables
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2019-18281.patch" )
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		-no-feature-statx	# bug 672856
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild b/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild
index a4e53c829627..853f70c37ab3 100644
--- a/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm ~x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="icu systemd"
diff --git a/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild b/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild
index b2930ae17ffe..260a83e50bdd 100644
--- a/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="icu systemd"
diff --git a/dev-qt/qtcore/qtcore-5.14.1.ebuild b/dev-qt/qtcore/qtcore-5.14.1-r1.ebuild
index 63378ff04bcb..d96ec59bb319 100644
--- a/dev-qt/qtcore/qtcore-5.14.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.14.1-r1.ebuild
@@ -42,6 +42,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 	!:xml
 )
 
+PATCHES=( "${FILESDIR}/${P}-cmake-macro-backward-compat.patch" ) # bug 703306
+
 src_prepare() {
 	# don't add -O3 to CXXFLAGS, bug 549140
 	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die