gentoo resync : 14.05.2020

3 files changed, 2 insertions, 39 deletions

diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 9ddaeaed2117..491569ed8dbd 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD linguist-tools-5.13.2.ebuild 640 BLAKE2B 8e3a500949b583f96b4243d1eced0cacb64446a285fda0f10d88fa111f61729585b95ffbd98013d36136b2e4436c2137fd8521de78c076fb7a801445541c2089 SHA512 906271788a46139e398a71afb677a541999d2ada861a8b74c01e4be71c7bc0f704d240d7d4c4418fe3c9013d6ac7c48df09d3a3c40173a5dde74f11d235add0b
 EBUILD linguist-tools-5.14.1.ebuild 680 BLAKE2B bcdd31d6825840472309af44817c112838e7e645ae9fce2e424b9ff5925cbbafe2103a9c079b3e6456ceba2fcc16c2679ce1b602f4f67a64d9206d72fb8f1398 SHA512 080d12cde39c25e77537a2ff4e8c0dfa707a94c9e2d3337f3c5839d2d1f71dee5fbd9dbafd969b0a6b8804e01f61f5115d01e273feaf8d6379a7feac111702b3
-EBUILD linguist-tools-5.14.2.ebuild 688 BLAKE2B d1102039c57f0b6fb140d7b55ebaa8424ccf5d43dfc23839c9d0565a46abe25388e61e11d2bd5cdcc4f416c6c9189d71c99e191d2b33b44d48069848fa565ded SHA512 48404073715709bc1bd7f9fa9fd8a49d715aad242b5aaef00774d45b2e443083dd2bfc9a1203b0cc562dad876493b90899a9ff6aa17700fbc88d4921ee82fbea
+EBUILD linguist-tools-5.14.2.ebuild 686 BLAKE2B 83184ab8c90c600b170744ac086ca1a01c60e926e4def20bcf81dcde75615ac6c945c3b9ea782c80eb5616599c49cc25b2d20dc24811a908924e38de5904fd41 SHA512 6550bcade00923644ed7a9ef1a0a1683f9330ea6ea9b3d6ed6d0f5615f1302c3d1dece68f2b2f5e5a8ff68570a8c84b7e5560f74210c12a990929ff4bae97e8a
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild
deleted file mode 100644
index 9221737f1a06..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtxml-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist
-)
-
-src_prepare() {
-	sed -i -e '/SUBDIRS += linguist/d' \
-		src/linguist/linguist.pro || die
-
-	qt_use_disable_mod qml qmldevtools-private \
-		src/linguist/lupdate/lupdate.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild
index c038a48e8afb..f55c65b6bdc3 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="qml"