gentoo resync : 14.05.2020

3 files changed, 2 insertions, 61 deletions

diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 33cfa2f637dc..61f18d956919 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/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 designer-5.13.2.ebuild 1209 BLAKE2B 766c8df7e01de72a109bf7eaf309c4ecdf17a97bed8266b40e6dca8b618e4084ea3dbbf69f1ccda8a5504a6a001370ec79e0ae9292b690bbe4b8e89c1750fd04 SHA512 cc9a875c22e3fcc11be672f17b6db69541d3978b5d6409ff3eefca124c4a0bf0bdffe49663c0919aaf2fbfe54ae442c8ad95a1916fabeea26618dc23cc2c4cdf
 EBUILD designer-5.14.1.ebuild 1242 BLAKE2B 10f39772b0e6ed55e487a4717562872b306e4a7cfdfa88de7366859a86a4ebb47c691adaa731e5d34db67c472c69c6ce730d12da95df7f5464f1b46027f23e0c SHA512 3bd954665346314762f030035c43e2953250be2a84a7b1151d0c611893af413d8f8caa21ba9a32c90d315c4d5609c2b3222b197d2ffd722721f75c0f89777710
-EBUILD designer-5.14.2.ebuild 1253 BLAKE2B 0bbb89f14cb3673bc17a7f2858f46ae88370c4a79d36bf81422b5ddb3f52e93d0e5e78cc312a02c31a7c0e2e6c3cb1aa3de31eb803c8010b218ac4befda019f1 SHA512 a5029db5991981cde423727db9654a5f45f2e6ff0f49579f5acdb714e624b75cbd62d24393b1504f624b20e07515c10229a61a62be448a79fae01abf700e8f48
+EBUILD designer-5.14.2.ebuild 1251 BLAKE2B 8c18309ae74b118b105faa3853b11cda4d5d60a9a62b8d2f3fbd1ae1fe73258b5c9bf5e46407ea6fbf14c880280ac248e066f48330c86bfc4b68465b79744578 SHA512 f3fe044b3779d255e2863c3caded3e682bfd9e82e692149b89e9cdbdff8b26f0d9086e7e321afe92be2561eb7fe09b693e3221e5b75ed10d47b1b8c4167d6131
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.13.2.ebuild b/dev-qt/designer/designer-5.13.2.ebuild
deleted file mode 100644
index f70d3ad7a151..000000000000
--- a/dev-qt/designer/designer-5.13.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE="declarative webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
-src_prepare() {
-	qt_use_disable_mod declarative quickwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt_use_disable_mod webkit webkitwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 128 src/designer/src/designer/images/designer.png
-	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/designer/designer-5.14.2.ebuild b/dev-qt/designer/designer-5.14.2.ebuild
index 8e394f7f3b59..396d0426c011 100644
--- a/dev-qt/designer/designer-5.14.2.ebuild
+++ b/dev-qt/designer/designer-5.14.2.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~x86"
 fi
 
 IUSE="declarative webkit"