gentoo resync : 22.05.2018

6 files changed, 2 insertions, 62 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 00a3a7d614b7..465c8a555b7a 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 9c3defd9e506..0de446f20c70 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,7 +1,5 @@
 DIST qqc2-desktop-style-5.43.0.tar.xz 36916 BLAKE2B de086300fb86fbebafaa4f5d0065b9ce2e8d7bc9e6c68698d938b555a834857357ab9f949597a42f3a7c80236bfc5a396b881ac92210d578b3a2e0f63672b921 SHA512 f20f67745bfd58a78fbe943b0676326ddcd18f4d733d77d50c29ed5a0b4215e7500634225e14700f3b344a9b5952def756b90bd5844c7fa516fba28e7a27bb13
-DIST qqc2-desktop-style-5.46.0.tar.xz 39376 BLAKE2B 3a671e8a0d76019ab92ce6d1f0f81bfe858a3177fe76e0ab94e6336f9699a31b5bd84d29012f7c15e47d74aefeae0fa1693b7f5981d2ef4d9a40784a1e7de4d3 SHA512 5d00a9362b238e3c84c0d0c0d75d0d0c3db1ab13e5e64ea811dfe262c08b4ec4bee7b7c110fc010bc4bb3bfc2fa7c1cd741fef6635c9a787734d2c5cd2f087a3
 DIST qqc2-desktop-style-5.46.2.tar.xz 39368 BLAKE2B 1b72456653dce0f4cc7655c78f37ca14615c59cdf2ca10ba8e4a5d2b0a6994b842938244a100f3306ef2c2e4e98e2efef99cb55b0ea62e1e9288186bf82acaa4 SHA512 068f0668c146e2c9c4905d7357ee7339cb06fa0871fba706437b688cec825d6615e4247136fefb912a8b017d5b79160261a541c284b4d509ceb58466bcb94a71
 EBUILD qqc2-desktop-style-5.43.0.ebuild 650 BLAKE2B dc1131e8e91a288ecafc59c793146bf288e2cf5ba4ddf70a6874e92dd3ad98d25a2d8cc2db6041387bfbf3dc0b52981518c51058064575de8c9d362cda5f99e9 SHA512 2ea4ea5e92c43c66b8e384f0a38a2265f7a512d31337abe5a20e4121dda5439ec86ab3289f926193e192deda668dcde9f4e83a14eba5f3f57fe6fc0cdff021e2
-EBUILD qqc2-desktop-style-5.46.0.ebuild 578 BLAKE2B 610aa7d37668a6653fe07b92a610491f1131c1a23c1180d4a6c44feb4ed83099f8490b30ca81784077d975067197b6c94131e4eac8c15f8acc0f96e42f86e07e SHA512 c1ead7d1af1996bcf77823a329e4e67f0614db9e3c16bb19e0757c249209463dde757205b502f6bc10f5558ab47453edbea51bf94e20737311b54c896e42b7be
-EBUILD qqc2-desktop-style-5.46.2.ebuild 578 BLAKE2B 610aa7d37668a6653fe07b92a610491f1131c1a23c1180d4a6c44feb4ed83099f8490b30ca81784077d975067197b6c94131e4eac8c15f8acc0f96e42f86e07e SHA512 c1ead7d1af1996bcf77823a329e4e67f0614db9e3c16bb19e0757c249209463dde757205b502f6bc10f5558ab47453edbea51bf94e20737311b54c896e42b7be
+EBUILD qqc2-desktop-style-5.46.2.ebuild 589 BLAKE2B a2b57c417613bc0353e6976223a7310e42a2ea3db2a4fdeb231a4a394a2e815f78caa8bc134280389c352c4f52e0be8cefab444cfd3eb3d5c5482700f9bd9d75 SHA512 1bf95e85f05f7174790ba993311b270f47f0ce5a9fcd3805b4b1d7d1a59a7f7b577295de419fe9f9109174c9e2128be1a4754e82d0fd076c059d64fd3d30a604
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.46.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.46.0.ebuild
deleted file mode 100644
index 37fd3f67ea3a..000000000000
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.46.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-KEYWORDS="~amd64 ~arm ~x86"
-LICENSE="|| ( GPL-2+ LGPL-3+ )"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtquickcontrols2)
-"
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.46.2.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.46.2.ebuild
index 37fd3f67ea3a..f250d641152b 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.46.2.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.46.2.ebuild
@@ -15,7 +15,7 @@ DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtdeclarative '' '' '5=')
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 44bddcb2ee2d..242361659b06 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -3,5 +3,4 @@ DIST solid-5.43.0.tar.xz 249208 BLAKE2B 26db66973201b164b227e25763f619a4988edfd2
 DIST solid-5.46.0.tar.xz 257668 BLAKE2B 3ec991f4b5b9f68cbf6770663625f7c332f1cbfc3d0ec6b489b464c8c460bd509dc570135075cae45430b2857d9cccbc6df48bf754f4d880858e4484f8fcbb32 SHA512 3b5a62f9723cd164a0ee2504e27a650bfae4a9d6b063db08e95d4a2735242092b39cb5b509d28408ca435adce18bf780c22a0acb4c8bf47749c5273edf6ed46c
 EBUILD solid-5.43.0.ebuild 721 BLAKE2B 54d4937bf158d6829b43a52ceadc0cf9291a96a4f1c5b876d478511e40201f9c397a1c669457683eb9d93e4c46a0e815fcc1805cbf65959e274eb1a46ecab72a SHA512 3497cfe5c1761c01db16b649126d2953e25b98fe6d628c2df9fb1140cbb787e78be3050a1999bfc93c7a917086dfd829674b54121e1f40cb613fbf143d585b85
 EBUILD solid-5.46.0-r1.ebuild 779 BLAKE2B 818923b01483c2ead8fbccc71bb40f1fc115a4cfe2e038ac06ea4bbfecc3ab429fdc0b42ee270158ae2f95b5644ff156f06ac58396cdeecc4bd34b7efd2bea87 SHA512 f4d4cfff1e15cbb4def3c66c778b396307489d798728827344fd39859590ac8c1af70e0f9ce9c4867c3da6892530a60bfc81d3f75a1da396c1c26303729719f8
-EBUILD solid-5.46.0.ebuild 723 BLAKE2B 911ac9dfbdb3d07f1813c2ab918afc61db02f32503170a7d602fe3c3e8c3dc9edb40359132c80f4d11c913c50fdef1928898e7b7a91dcdea1a041090cc91368c SHA512 34fc5f901ea145470607edb4a636fcc0aaeb86b475140ccb6b595315cf09e20d3e146b763ff76af8d7dc89aa010eb884de53caac53e646b88d7aaa81dae54204
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.46.0.ebuild b/kde-frameworks/solid/solid-5.46.0.ebuild
deleted file mode 100644
index 5ba7d7e87013..000000000000
--- a/kde-frameworks/solid/solid-5.46.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-fs/udisks:2
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "app-misc/media-player-info" ; then
-		einfo "For media player support, install app-misc/media-player-info"
-	fi
-}