gentoo resync : 19.03.2019

4 files changed, 21 insertions, 9 deletions

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index c75c149605c1..d758e5a79961 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,6 +1,6 @@
 DIST qt-creator-opensource-src-4.6.2.tar.xz 23397676 BLAKE2B a6c641d2daaa1d692919739de1a26da0a8806db3a8678dffc792fc77855ecf14136ad1e990e678f66afc471950c6bcc0803a6d47a21af6eb91ff010e77383ee6 SHA512 32d583cc3684b268a649e265ebe97bde0a9fdcea60013d8966edef6df3fa0097bcb19d9fc7abf5ece9b59870ad1049e8320477df4321f0f311843e359aaea6b6
 DIST qt-creator-opensource-src-4.8.0.tar.xz 24545016 BLAKE2B f2c4256ab2d2eb1ac8bf897df2517f8784b97723564a9f53347de858301997c4d02f6a20269a4d74d0305f27babc65491521965b7e1941cd3c3778cb9701c8d5 SHA512 4b6c6778493b7c8b593868ebfe90ccb21eb3daec16853604ea422f29fc57be5623033c79610507931202fa34a648760c29134670d26b1c4c098e1eae28bb1743
-EBUILD qt-creator-4.6.2.ebuild 5399 BLAKE2B 8bb4a5266e8ace09a90d2eb40ce2e316ab879cde9602021aa5445627a33fd5f4cf300dcc58fc182a90c813b6e81db79570ff3cb6a0816db99567eaab128f5822 SHA512 83f105c2721bff1f9d82870f32e9cffaaaed55d5b5371998a6c7db61a590bd59a0b1521c8d0e62e6cd3ba29f2bcca5fdd2dc1238d1751db14d82722ac8137ce3
-EBUILD qt-creator-4.8.0.ebuild 5614 BLAKE2B 06d9a96f2036400bf26de6dd9dc6b3d57b1b282174eb56b2485d713ecb31fb1287033a794b6071d997ef2467e1f454d3bc3313c975e639e6e470059ce7f176de SHA512 d7b2a5943857007e53798231b8a2b91d72a7ff2be82cbb240f5ad9f11902d1881cf9e3471b2d4d2285fc94fa9ba59511e7521983810069e3190608e4a5c0ff97
-EBUILD qt-creator-9999.ebuild 5614 BLAKE2B 06d9a96f2036400bf26de6dd9dc6b3d57b1b282174eb56b2485d713ecb31fb1287033a794b6071d997ef2467e1f454d3bc3313c975e639e6e470059ce7f176de SHA512 d7b2a5943857007e53798231b8a2b91d72a7ff2be82cbb240f5ad9f11902d1881cf9e3471b2d4d2285fc94fa9ba59511e7521983810069e3190608e4a5c0ff97
+EBUILD qt-creator-4.6.2.ebuild 5489 BLAKE2B 9d5843e2606f36f8980ce92825798ccd4962e0b04681ffc210dfc6d45b39a4de4ae54605e53ddbcbcf7d130c30bfabac0d41fded953856b94cfac342caa76065 SHA512 bd02baabb6f105d59f3735c05f3052ad637815697ff1761169244cd526b0b32c63472a00b4545e7e827402cd7ed302cd862314920d4bf3c609e177f4101e48ed
+EBUILD qt-creator-4.8.0.ebuild 5704 BLAKE2B 31391f9e95e94737f1138aedf3b42d6358f9fb1226e004eb9cd8d22f27cec221f913ab99d561274300e355d0f3dec8db348c7f003d6998317f27ffe72565c6c2 SHA512 00f37924fe760f62aef1b534873105eed1bdb21c3d9d1540f5b3b619d3d01a3c792c503e9ac72ed5321f2d803fb377e3dba94e29a0dd843af2cd0536556b2400
+EBUILD qt-creator-9999.ebuild 5704 BLAKE2B 31391f9e95e94737f1138aedf3b42d6358f9fb1226e004eb9cd8d22f27cec221f913ab99d561274300e355d0f3dec8db348c7f003d6998317f27ffe72565c6c2 SHA512 00f37924fe760f62aef1b534873105eed1bdb21c3d9d1540f5b3b619d3d01a3c792c503e9ac72ed5321f2d803fb377e3dba94e29a0dd843af2cd0536556b2400
 MISC metadata.xml 2716 BLAKE2B 171285a8ef6f2a73d3dba545e7e6f44eba9f1d180ea28d78e8697691e20fb23b871403e6928d0505e464d6a3820837f7060740877c54e7f727fe0706cee94bd5 SHA512 7875017b499987e058a243086cc843d9bb12e8578ffc48831c49185aafa9fa698070e59d4dc3fc1066b14e563a7a76abb0142474577aadd43be798f4ccbd5550
diff --git a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
index 7e5bc26a04df..5ab18aec2d43 100644
--- a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -62,7 +62,11 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
+		|| (
+			>=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)]
+			<dev-qt/qtdeclarative-5.12.0[xml]
+		)
 		>=dev-qt/qtquickcontrols2-${QT_PV}
 		>=dev-qt/qttest-${QT_PV}
 	)
diff --git a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
index 207b4b6cbf83..fa9b4277be58 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -65,7 +65,11 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
+		|| (
+			>=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)]
+			<dev-qt/qtdeclarative-5.12.0[xml]
+		)
 		>=dev-qt/qtquickcontrols2-${QT_PV}
 		>=dev-qt/qttest-${QT_PV}
 	)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 207b4b6cbf83..fa9b4277be58 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -65,7 +65,11 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
+		|| (
+			>=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)]
+			<dev-qt/qtdeclarative-5.12.0[xml]
+		)
 		>=dev-qt/qtquickcontrols2-${QT_PV}
 		>=dev-qt/qttest-${QT_PV}
 	)