gentoo resync : 20.10.2021

3 files changed, 2 insertions, 52 deletions

diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index cdda59cbc0b7..839aee2a66e9 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD linguist-tools-5.15.2-r10.ebuild 763 BLAKE2B 12ed0c804c055985d923f87564fc85747051cd85e3b04be62af7e58766aaf6defc339b277fa81ffcd5494f36a1d2464c19696f78435adc6bef0a712d5dbb2a3d SHA512 58b8b8298280bb3ac50692a1631c85d7f8f1990bf755cf34c2d06c96f1b3022ec83811d1306058bc36bdb934062a8ac346359b71d3062dd2d53b79125acbd288
-EBUILD linguist-tools-5.15.2.ebuild 1022 BLAKE2B ceaefee8134e4ec654d8eaf3dde8ae085332b72a4e6efc61e31e71cbb3ab1bd593bb286beab9bb444329bd1c2bdc09c282dbe15fde7ca5fb1552e42f7771140c SHA512 597c04f3ebc80a32a601beeb9a760b0dfb1cced4fa5e74f0fd4687b775196fde21a26ed42182ce4b1ea3c409503de674dcec60142ce39ed09db522cdef4e2a7e
+EBUILD linguist-tools-5.15.2-r10.ebuild 761 BLAKE2B 0a0a92dd4c3ea44dd16f21dfc172c28dea25cd70c932ef4122a65b535738cd0602e11ee3edf38a9f2b93db0f5fee71e6a0fe22e9fb6c222ff7460566fd75658b SHA512 cb25ea547ae2dbdab01cbca18fc5e2f06bc56c1aefc6b503ce2a7396eca9a2815a9dcc0f16b1fffaff727376e435655253e2357899a0abb5de4d671142c5de56
 MISC metadata.xml 553 BLAKE2B 0306175072e5a0abff04f61eca76aa56daba272d1308419efd9ab80c4693eb795012b4e45a4cc102f6a9ec842105a805d9c5e75f84ae8007508a4d7d807d444b SHA512 d1edc09cbb7d757cd72b9b3dce980e0fede2cf69a83b78a072d81aea97692cb235227213cf02aa8207f33bc4a510a63baee359d5e8669ea7e0e5268dcd522e79
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
index 639bf1ae2cad..b41bec103407 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
@@ -10,7 +10,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 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild
deleted file mode 100644
index 9d680f58c928..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 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 ~riscv ~sparc x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtxml-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
-
-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
-}
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}