gentoo (leap year) resync : 29.02.2020

4 files changed, 5 insertions, 58 deletions

diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 59371178e3b1..0ce3d6993784 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -6,6 +6,5 @@ DIST qtdeclarative-everywhere-src-5.13.2.tar.xz 20940748 BLAKE2B acc688691a86318
 DIST qtdeclarative-everywhere-src-5.14.1.tar.xz 21299728 BLAKE2B dfa0dfc95956f9c9eeb6b790e0221cf745b0cefd89fc070caa741b9cdc644acd990128affbcef6ac585758a02f94b1693ccca77d9de080f04f4d1b6d2304537f SHA512 70094d24a977a5ae4a3a11ee31e49234592faca1ec8195560977e7834778d1b1fdc2a30e555dc6c43c98cef2a39d5c1bf6351093c0f46b9b22b4127f3bebef58
 EBUILD qtdeclarative-5.12.3.ebuild 1140 BLAKE2B 729d0c1acb73839bacbbfc7363f29cd0e01ff004a0f182c1a6cbe7f33c23f17be81478939eccd2ac828e727451910ed77901b73795ffe1a20a9f471c06b89dc0 SHA512 f8d5c239ce8a653c77fafccfa4d5df25a46ac7811dd359ae0399c7eab9087cf5b0793061dfb7291a7d84a36668571883ec4920ac2f0e1cc676a9e9f84cc56cdd
 EBUILD qtdeclarative-5.13.2-r1.ebuild 1286 BLAKE2B c681165cf03ee0358cb27492cf830cd2736ac74537294c7de2eea8fb6ef112bc644edfe61b53700ae8e5b9b66776d557b5244c2be61685282792c23b086d2579 SHA512 fd3137e47eeeb06994a9f4ce3a3b7086a4c6fe6fbc69c521bd325b7ff2123a7de50116f1fab74cdd0a8ccfe454555588eace3dfd185c1950a886bc1398fafb0f
-EBUILD qtdeclarative-5.13.2.ebuild 1146 BLAKE2B ddb8a3302fe9d9d427dbb9b8caaaa2c3e718e031a1b4937dee5b7c9a8a12718ef8e78fa355736c7620945c549b3f6f3b85ba501d2fd8c98c08b09cb1f568d37e SHA512 dc4e937e2c6f3717173ccf91bcde93a558f34791d929c25aa1cd073bca96d55419e8326118d5dcd1a37181bfce6e06aa2b4d91c324c6c191d0338a84d74b4679
-EBUILD qtdeclarative-5.14.1.ebuild 1148 BLAKE2B 87599e7f32ce5ec3026227ffb4c707ff0ebf0f5bfab374c19276c1d14d1f393268ec2fb940350ddde023b662cf765c8b1bd96da6fd56e7a52808681b542b2883 SHA512 bf7cffb9ff0e81f113e888f59f1f23802818d81a06946a233e68f63dd33464437994ef1f239b248f24f615e6d56ef00bb7f0d6fa9c6eb88eb803a00f408ed7fb
-MISC metadata.xml 718 BLAKE2B 8726e8349c867c54347bb2fae219fb858a2f31058d7fa83fb7aa5691b3dbff327a9b2ef4cdbfdfc087fe30847d037f55ed92a2797ad961764676c10d348148a5 SHA512 827be20878184958800c2b31b4fcff95e67bfff208d4669c4b0b1f190bbc8ebeb46795e62c06f46dd8ef54c072e82fe9f1b32bef14072e81c8f1dc7428e386c3
+EBUILD qtdeclarative-5.14.1-r1.ebuild 1163 BLAKE2B e4fa4b0e173b1ffbb3fb30df8072332c39d3ed5c098226daed90190ea5f49f4f3879f1f917eb4059dcd68c24aa307ac11386e48037bada54cae8720ee02d43ab SHA512 3692ba99a65363b8d9d5f49c806b9c6bcbc5b10a8c8e7d4ce97f85fa3e6339f41ffb1024a12f695991eb1d9a5df9b4b3fb35a2031c22c50fcde2e5ec23d1f1ab
+MISC metadata.xml 773 BLAKE2B d538bb46ae3554f3a18d426ea967606df009a2f55a9b02a7275d7cae32adc71e017e96d6c48db946d636dfcd33cfa1846209e87c9da99b90625ad4cae2595df8 SHA512 54f305948407d29a2506505f15b79cf912aace3ace002b92f085d82275ff2426293b8f94b8666b7a5c2f360aa39749e6924b8e0ec121dd268fe88e711dbeb20f
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index cffb0c60697c..9fc8265089ec 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag>
+		<flag name="vulkan">Enable support for Vulkan</flag>
 		<flag name="widgets">Enable QtWidgets support</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.2.ebuild
deleted file mode 100644
index 50821d0e0011..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.13.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="gles2 +jit localstorage +widgets"
-
-BDEPEND="${PYTHON_DEPS}"
-# qtgui[gles2=] is needed because of bug 504322
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qttest-${PV}
-	localstorage? ( ~dev-qt/qtsql-${PV} )
-	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtquickcontrols-5.7:5
-"
-
-src_prepare() {
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
-
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.1-r1.ebuild
index a70c3d60ba41..74bb692c392a 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.1-r1.ebuild
@@ -11,13 +11,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="gles2 +jit localstorage +widgets"
+IUSE="gles2 +jit localstorage vulkan +widgets"
 
 BDEPEND="${PYTHON_DEPS}"
 # qtgui[gles2=] is needed because of bug 504322
 DEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtgui-${PV}[gles2=,vulkan=]
 	~dev-qt/qtnetwork-${PV}
 	~dev-qt/qttest-${PV}
 	localstorage? ( ~dev-qt/qtsql-${PV} )