gentoo resync : 11.05.2018

3 files changed, 2 insertions, 39 deletions

diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index ee5dfc706410..f3d7c730f65d 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,9 +1,7 @@
-DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645
-DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e
+DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e
-EBUILD linguist-tools-5.11.0_beta4.ebuild 693 BLAKE2B 39864f535257e8a5a878e9e1bada7bf211ca59c25a873bbd719f0f754ea44ca73b6bf60bf40e84956e9ab80c783d4d8f544ff1fe160ad5287fbda01b884e000a SHA512 9fbaa96994c68ba5cf1ad2c50cfde9c5ce1f3aad36a3c7072a8e9104f5e085d4fb6c5698e720a120b8c963c106cb228926499360734f6092a7dc3b301ee80306
-EBUILD linguist-tools-5.7.1.ebuild 676 BLAKE2B 891a6b8d53de45067fe730fcb40a5481dc3ed7a72f013558fafd9d085514240bce60ffa5ccf11d34583f393548061588a66436d42e871577515adc3ce2c7920d SHA512 cb62fb1f219d8ee064952132b4f208a4cd0be6d208564a26f60df53ce6f0d3f60f8b20ae626b9f1cc5edd1101d556b002589dec22052863ee37e0b9867edf64e
+EBUILD linguist-tools-5.11.0_rc.ebuild 693 BLAKE2B 39864f535257e8a5a878e9e1bada7bf211ca59c25a873bbd719f0f754ea44ca73b6bf60bf40e84956e9ab80c783d4d8f544ff1fe160ad5287fbda01b884e000a SHA512 9fbaa96994c68ba5cf1ad2c50cfde9c5ce1f3aad36a3c7072a8e9104f5e085d4fb6c5698e720a120b8c963c106cb228926499360734f6092a7dc3b301ee80306
 EBUILD linguist-tools-5.9.4.ebuild 689 BLAKE2B a9c6a757c7a558d2d29ec22f75be9be7d692706017422a5ea0020ec2b5eaf685a23d9894acbedf5ce493a094bbe5b23dfbf26bd4ba45cb669d6eb5395f61f265 SHA512 e4c747c0b392fda0a754a40832db8e7d6ee98b4caca74a07e608690497fbf5d09297ecd5a6dc1ea970a01075d064eea9cc889e57b5f4ddae6ebcafdd9019fd86
 EBUILD linguist-tools-5.9.5.ebuild 693 BLAKE2B 39864f535257e8a5a878e9e1bada7bf211ca59c25a873bbd719f0f754ea44ca73b6bf60bf40e84956e9ab80c783d4d8f544ff1fe160ad5287fbda01b884e000a SHA512 9fbaa96994c68ba5cf1ad2c50cfde9c5ce1f3aad36a3c7072a8e9104f5e085d4fb6c5698e720a120b8c963c106cb228926499360734f6092a7dc3b301ee80306
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.11.0_beta4.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.0_rc.ebuild
index 72c04bdc9e06..72c04bdc9e06 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.11.0_beta4.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.11.0_rc.ebuild
diff --git a/dev-qt/linguist-tools/linguist-tools-5.7.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.7.1.ebuild
deleted file mode 100644
index f43b11c69bbd..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.7.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 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"
-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
-}