gentoo resync : 25.04.2020

7 files changed, 9 insertions, 16 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 8290748945d9..88d0be07904e 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index ff5e1be7b0a3..3960dc10f693 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -6,5 +6,5 @@ DIST qtdeclarative-everywhere-src-5.14.1.tar.xz 21299728 BLAKE2B dfa0dfc95956f9c
 DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004
 EBUILD qtdeclarative-5.13.2-r2.ebuild 1273 BLAKE2B 3198750bbd5d219f909223b8ddcd0c187f6e31d5489c67eb6c00f2c747040c7b93b5f1c2317b000dc89b8acf7bfa9bbcb1227e8b1528dd3bea5fa281be84f0b4 SHA512 5ea00b455cdb92ee5a3418e2ba18300c4e77bcc9c536cde02812754d0cb2276c4f5fc8592868b52aa2521debe8bcea83eef5a267660d61ea3ae3f6d5f700177e
 EBUILD qtdeclarative-5.14.1-r2.ebuild 1178 BLAKE2B 7f39248777ab4d62393d935318575fb69473e50b2a5794015ed5f5ce8adfa0012f60cd174e512f7aff76aaf27d568ececc8a2fb7051117f2ee690e71b5067af4 SHA512 f86b6074b37a635d1fb53b7c94ab47ba6a8558a9cf2a49f9ffc7821e8f507be6ab4972f8a14fd6fde89395f004bd3f277b68ec27c90eddd386ad91ea8ce7dff4
-EBUILD qtdeclarative-5.14.2.ebuild 1183 BLAKE2B 29b5e59dfa8fa2a5fb104a95de9b2678aefc49a40796fc5c9d127ea7d90f49e28a17439138641474a0436507c086cdc24ea3f9d1615f1eed8f175bd3f057cfdc SHA512 809dfeed5698658a76d307bf1da97825e71cb5012c3b1b82390b94896fee27b897a07826ba0e3ffbd509af2a311e9b4247653233fb1145d68ec6304d4d68b83d
+EBUILD qtdeclarative-5.14.2.ebuild 1190 BLAKE2B 674b96f1bf9ab7e675644561be68edf885d7dda7d7fb5a37550d68384ed9eb939d726dd8a1992f0caad1d220ffdc5e1cbe707cb3d69bf85cbe76f612b3d049a3 SHA512 3d0c2134af6d7bee98ef5c2bfe34f26d7f0a0091d9fcae452d1cff3cf3e144fe4203ae43a2585f290848ddd67aebc9808a6ed8a5c712abe780a166ab103d5694
 MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild
index 5e576bf96099..5e3c49a6f3ca 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild
@@ -8,7 +8,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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 74955dbff2b9..11f54e1dd1df 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -5,6 +5,6 @@ DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 EBUILD qtgui-5.13.2-r1.ebuild 3840 BLAKE2B 9d71fe389a8661e350cde868aa2ec190d1f9fd94f76183ac7d611e0d328e037ea993959f498337a4621f86202f148ad876dbd9c743626c745e7b5bbd01b20a69 SHA512 e90ba27502e65a967ef27dd4348a6d71cd463e86a36ae76d524ed594e59c83ec7da0c01a732ff8e40312350ea55fddae08a05567fc2d6e0bd85a545a0e2fdb69
-EBUILD qtgui-5.14.1-r4.ebuild 4216 BLAKE2B 6b161374e2399be7e2c4a3d5a75b322d45f1ffc3dc0a7e895873e7d9044acae135c53338d6a5ba6cf3271fab12f95f33f757b0a4d26aac9a6ac97538e51a48dd SHA512 cafc70227c72bad0fd29ffa0b3e002e4a577a5b0500ad81c50dc9290b6321ba5422db63562529e94d35d922469f08f1e65339b44c04a737963e8f9fc57653620
+EBUILD qtgui-5.14.1-r4.ebuild 3983 BLAKE2B 65973832eedae78b95fd4e3e1812debab366e8d5828a9f58339472dae8ae1502576365e675553e24f46515e626b2ee061d682cf12f154a68aa73c65ad2e2a13a SHA512 0765481c4f7c2d093c32d765c6f71cd3090304ab18d6265acc3b24e8b3b67e8eaf7c4dea02378d21bd2cf8904f7986e6aa52c5d76287a12503235f1407cbe4b5
 EBUILD qtgui-5.14.2.ebuild 3991 BLAKE2B 9e12b0b0f3b8b73031b56cf403da613d4a59f690f959828972d48fd61f698f061844769571b0a654875365ce4de5818747a1a2414fcb91d39338ba4c7949308d SHA512 8cf4e367499acaacbb59798b13d50382bc3c0c625903e8ca37c840f3f50a482a001d54f586a046c2a344f9290df64aaaa65d1e9a7909eb8729c164be613c8d6b
 MISC metadata.xml 1304 BLAKE2B a56dc3850426ef4395e27a093d2f0639444f01fe6595cdd7eadb17681cce17eba664c1df9907ca88e89060c3b37b8ae58d920c0149071de21b44789978c5e51b SHA512 c116aea83cf5d13d8e40d2d330106c07b71bce1e77dd4da10525df3dffdf67552780263ff7cb1eb109fed486648da7e1a6df0be2f07437e110809fd838e1dbc2
diff --git a/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild b/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild
index 59370d3b5715..34de9be66424 100644
--- a/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.1-r4.ebuild
@@ -7,7 +7,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${PV} # bug 707658
+SLOT=5/$(ver_cut 1-3) # bug 707658
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
@@ -26,7 +26,7 @@ REQUIRED_USE="
 	X? ( gles2-only? ( egl ) )
 "
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/glib:2
 	~dev-qt/qtcore-${PV}
 	dev-util/gtk-update-icon-cache
@@ -66,17 +66,10 @@ COMMON_DEPEND="
 		x11-libs/xcb-util-wm
 	)
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	evdev? ( sys-kernel/linux-headers )
 	udev? ( sys-kernel/linux-headers )
 "
-# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules
-RDEPEND="${COMMON_DEPEND}
-	!<dev-qt/qtimageformats-5.14.0:5
-	!<dev-qt/qtsvg-5.14.0:5
-	!<dev-qt/qtvirtualkeyboard-5.14.0:5
-	!<dev-qt/qtwayland-5.14.0:5
-"
 PDEPEND="
 	ibus? ( app-i18n/ibus )
 	wayland? ( ~dev-qt/qtwayland-${PV} )
@@ -179,8 +172,8 @@ src_configure() {
 		-opengl $(usex gles2-only es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use tslib)
-		$(qt_use vulkan)
 		$(qt_use udev libudev)
+		$(qt_use vulkan)
 		$(qt_use X xcb system)
 		$(usex X '-xcb-xlib -xcb-xinput -xkb' '')
 	)
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 0c2cee223659..a64919116779 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -6,5 +6,5 @@ DIST qtwayland-everywhere-src-5.14.1.tar.xz 544744 BLAKE2B cc74e6ac4519484713795
 DIST qtwayland-everywhere-src-5.14.2.tar.xz 544532 BLAKE2B 13cf07116737ec2fd301f51f517cbc062fdd42b800d6d2739193f3570f1a9552e66e9909de15c22cc530d5284c3be9ff24915ce4b36f529ec6c22faeb0edff58 SHA512 0f396cabace17f099c2f2c0be54317006dc00c5f4be08cd79a4fa4fdc94362f63cc6ce9decc7feb63f566dd2ea52d562257e4bb23332557054418fc16dc7e899
 EBUILD qtwayland-5.13.2-r1.ebuild 1320 BLAKE2B 9344c1b8e41ca9e15709de22b0c3c02f154e75441a58494d852d08d13fa179d17336380ab8fd4480ad2e1b8ba62fba2da71daee86add5fb2eee3753754539ea6 SHA512 76b3880ad3d064d6d63a34695f3e39552bcc13afbd67aae94dfe89e6d0e788a4f65319ed377de1567afbf70fd51cff5a2e6b591bcde119911dd77dedfa47e502
 EBUILD qtwayland-5.14.1-r3.ebuild 914 BLAKE2B 4e32f25761bdf73ccf6d5b2a4351e155d272515584d97c858d6057df871ee3aa60237ec73ee5a6c3a9274e41ac0df0ddd8dbb1da4497e640e9ba5324cd16ab9c SHA512 41dc0ea2242c0b55f8879047f221b97067f5e47cf5b29af67a3d99cba62f6cab54039b72f13744395fb6aca66f3858c60b1982d6d60e6e98d6552af0cda67367
-EBUILD qtwayland-5.14.2.ebuild 919 BLAKE2B 415b0adbb5f67868266485c5d5874286a9d4545b85dd6016a8e04963ecfff5e6cc1ce11464ebc0f19ddb007f0958ae1d5b7ab3e71877035549ace86d61ed1bfe SHA512 a39274d6406da64ba6726a752f8c51ee2fd1b4d2786d65da40089657dfad7f9f7f3f5dd1adde0cf4a0a5c93670db6ae64655d1fcc27979e37c78f182aea49db7
+EBUILD qtwayland-5.14.2.ebuild 926 BLAKE2B 2acdf36e81cf827a7c1b8cadf14ff8dbf2e599aebf32ec3a4b52a32b246624ef1ebb251b83d9f0a251293a01b08b3389d936787e348dfe9a0025b404b992fd04 SHA512 9b230f63721a1f26f32c951e106196d3a2cecad1520d7fe1a2c362937af13d4e4a0e332b678ed5d9303b36804595e3fac1d22dc32096b7d015e325115a6acfe3
 MISC metadata.xml 680 BLAKE2B 4ec031890956f3b2cfcb6c53678ce58580ad11416f1a4b3c20c5fe07d5e8bfa4c06999bce68491487a3d3fd98bc5994472138cd2bb10d012657d852d74c01eec SHA512 b76508be78d0b3976fe4d3e7af103dd0b0749fbcd84a63ffa7d97e527fbadbd06973ab4af18a37eba4e6d256512a1e2453b90c990f288b994cc6997cdabdefd6
diff --git a/dev-qt/qtwayland/qtwayland-5.14.2.ebuild b/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
index 00131b6ecb13..03b11bd2cd79 100644
--- a/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="vulkan X"