gentoo resync 08.09.2018

3 files changed, 2 insertions, 39 deletions

diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index a4f5aad071fb..e66531565e5a 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
-DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
 EBUILD linguist-tools-5.11.1.ebuild 693 BLAKE2B 39864f535257e8a5a878e9e1bada7bf211ca59c25a873bbd719f0f754ea44ca73b6bf60bf40e84956e9ab80c783d4d8f544ff1fe160ad5287fbda01b884e000a SHA512 9fbaa96994c68ba5cf1ad2c50cfde9c5ce1f3aad36a3c7072a8e9104f5e085d4fb6c5698e720a120b8c963c106cb228926499360734f6092a7dc3b301ee80306
-EBUILD linguist-tools-5.9.4.ebuild 689 BLAKE2B a9c6a757c7a558d2d29ec22f75be9be7d692706017422a5ea0020ec2b5eaf685a23d9894acbedf5ce493a094bbe5b23dfbf26bd4ba45cb669d6eb5395f61f265 SHA512 e4c747c0b392fda0a754a40832db8e7d6ee98b4caca74a07e608690497fbf5d09297ecd5a6dc1ea970a01075d064eea9cc889e57b5f4ddae6ebcafdd9019fd86
-EBUILD linguist-tools-5.9.6.ebuild 697 BLAKE2B dd9ac2855c52b0ed3eb5ae13d9f05d7ee233b05e036eb8f4c86332ce54ce68eae22230b4bc53a7b92784d2b75d76db5137856902480bba359135e719efd24425 SHA512 8f7923b02d1eebd291ea2a0a1df20e442445c4228cb6e70ccc3f1fde6a8a24813d1a0f800e2293dede8e4972cf1b6ab6bad73b27a10c453af9b3cc5a557ef1b5
+EBUILD linguist-tools-5.9.6.ebuild 696 BLAKE2B 84dc96b8c8b7039af136be737689c68be4878322deb002cc28b59dceafb9b0a27920a7e2d9a79416f64af244e008c4f7e4e35a38755952252c27b17a8a8f4127 SHA512 eef4e1a0302525eab0195fc1f334db7bcbc4ed98ccc12b10504e01713555b69ac9ed83e2c0bd22f24f5bcc94a2578d7c94700d7cdfdc4ab09f3c0ea7333426cb
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild
deleted file mode 100644
index 75f3f4396c89..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 x86 ~amd64-fbsd"
-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.9.6.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.6.ebuild
index ab852bf17d49..974ad6a3cf3f 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.9.6.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.9.6.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 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="qml"