gentoo resync : 02.08.2019

3 files changed, 2 insertions, 48 deletions

diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 831bb6e67a24..f2cad767c3f2 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,3 @@
-DIST solid-5.57.0.tar.xz 258688 BLAKE2B c0024c205b4e2c215ff35010bc0142f3fa9aefaa7fc713fd4625e6925838745e9bfda6e6b88095624a190d927f3decdde345e1b98c000355c386d7bfa9221836 SHA512 b43bdbf7ad9bb2c6892efe6121f6ffd1b051549964a0eb519f18fb0eac20e7a4b461db5f5c1df76b6963d97f317414deea000238a2a24af6676faa1373c8acc8
 DIST solid-5.60.0.tar.xz 261152 BLAKE2B 0dfbf35a8fa435d92e97a0e8745a0e0e38e89f0d58b81a8db8f985fe453647d045ba1e7c9523f276c55d3d72630226069b6b05a7991c9fd9698c6a91d0d193c4 SHA512 51781374fede9e16f546924d1a103704e68e1d67a852d53ca9c6e69cf00c3b46a92533b398aad7ba434eefbf25f6201696f46af532623bc5cfac01e4f1cae755
-EBUILD solid-5.57.0-r1.ebuild 986 BLAKE2B ca582289494f9294fc3ae5460e00cb10b26aa7f664facfe174497174277a50822c47d2ca33ce41de31bbf480b110f67380b690525d19f174158d84543834f25e SHA512 a76f09a137efb89197bfbba8c86d97d3a9f4729937cd80199ad5a776d8863e146bef99854ad42a5dff426fe67481e9e1c1308b52e4802b313fa80948ed26e14c
-EBUILD solid-5.60.0.ebuild 773 BLAKE2B 7023232cddd377bbfcbcb9b6ea391ff5ef2d61d5607297094cf582ecbc2ea38832a2523c8f60a67971fa5b41be4fe700490272761a8c1661033f03b7feaa372d SHA512 2d3a6aa55860a1f1ceab798d02dadafec2d5530aa43372bf6a1f409b83cf6742da6b6cb091d78a764763a7d17952828d2ad9d6ab7feeb6b95927d0d3373cfe8d
+EBUILD solid-5.60.0.ebuild 770 BLAKE2B 0a55f1a63f0c54bef1705fd124b4b87cef32fbf4f00ce76f56e9f00f32613306615da0edec8b7eadca8879482d4ce77f8a129167070199950c4dacb84380f441 SHA512 fbb97c0083ac57c367c622847bfb65e9fbdfa3bec5d4e4c0bb36f581317460af455e011efa13b6032ab3f621fd6fe2d25f02e861df714bbb9878e7fd1d953c33
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.57.0-r1.ebuild b/kde-frameworks/solid/solid-5.57.0-r1.ebuild
deleted file mode 100644
index 017f08c3beb4..000000000000
--- a/kde-frameworks/solid/solid-5.57.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 udev"
-
-BDEPEND="
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-fs/udisks:2
-	udev? ( virtual/libudev:= )
-"
-DEPEND="${RDEPEND}
-	test? ( $(add_qt_dep qtconcurrent) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUDEV_DISABLED=$(usex !udev)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "app-misc/media-player-info" ; then
-		elog "For media player support, install app-misc/media-player-info"
-	fi
-
-	use udev || ewarn "Building without udev support may cause unintended runtime problems in consumers."
-}
diff --git a/kde-frameworks/solid/solid-5.60.0.ebuild b/kde-frameworks/solid/solid-5.60.0.ebuild
index 39b3869d7cf6..9dc4f16edf8b 100644
--- a/kde-frameworks/solid/solid-5.60.0.ebuild
+++ b/kde-frameworks/solid/solid-5.60.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="nls"
 
 BDEPEND="