gentoo resync : 13.06.2020

3 files changed, 2 insertions, 39 deletions

diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 35e9465b793a..78f88795ad4b 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,7 +1,5 @@
-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
 DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
-EBUILD linguist-tools-5.14.1.ebuild 680 BLAKE2B bcdd31d6825840472309af44817c112838e7e645ae9fce2e424b9ff5925cbbafe2103a9c079b3e6456ceba2fcc16c2679ce1b602f4f67a64d9206d72fb8f1398 SHA512 080d12cde39c25e77537a2ff4e8c0dfa707a94c9e2d3337f3c5839d2d1f71dee5fbd9dbafd969b0a6b8804e01f61f5115d01e273feaf8d6379a7feac111702b3
-EBUILD linguist-tools-5.14.2.ebuild 683 BLAKE2B eaae47815ff529771b31fa45fe6f4f43c7255d70edc8cd99a0a6545841bb8db2f2f1b8508d6507ee33755a5275954f4080f3e7f16ffb30e45a9b2861ea1e6cdf SHA512 6771ad33e7a94ad9fab4ed44b8fafe18e843354a83486a3d0dfb25ffeb74402f4eb4d208c7708f9b3530659fc53e6b3648b854b7ac8d15544d71079faca86668
+EBUILD linguist-tools-5.14.2.ebuild 682 BLAKE2B bfe79eac879018faef52283dfe413f5855d91b0e4f7185eb1fcbdb4a3c855c799b38631ca8a4ebadf0b3278efd1a7b78abe034dc120b8c1fd54b5b3ab5aab7ad SHA512 35891619bc9b7db15599a980b20bebbbb69b8aa12e06668fb945f9fa4cdefbccca0988459c56d967f2ce3e0d010218f9871f426db10bd06094b7db9d7a2b62c3
 EBUILD linguist-tools-5.15.0.ebuild 1001 BLAKE2B a8bdb3f3e76441a511839a7b38dd0d9d643b190fe797bbbc2828c3ef828d2e44395df2e60e1068c20bdb0e166e2e91ba98567f6a750945a9dcc8b0695abc1c34 SHA512 7b40c6159e2bd4ee75e088d83db20b369473fcb6518d2c149a81702af04c95667a7ac84b67814f144c082b26d69408dc7ddd22a0263f4a7fb6b75c7e47ae992d
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.14.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.14.1.ebuild
deleted file mode 100644
index d081e853722b..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.14.1.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="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
-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 fce56e5ae781..ea280072e0e6 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"