gentoo resync : 13.06.2020

3 files changed, 2 insertions, 61 deletions

diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 239c3e328929..ea4f63b586b0 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/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 designer-5.14.1.ebuild 1242 BLAKE2B 10f39772b0e6ed55e487a4717562872b306e4a7cfdfa88de7366859a86a4ebb47c691adaa731e5d34db67c472c69c6ce730d12da95df7f5464f1b46027f23e0c SHA512 3bd954665346314762f030035c43e2953250be2a84a7b1151d0c611893af413d8f8caa21ba9a32c90d315c4d5609c2b3222b197d2ffd722721f75c0f89777710
-EBUILD designer-5.14.2.ebuild 1248 BLAKE2B a1afa366f9294ebd12e8b307040109922b5cf99431c44085f65240559501010bec5ef75172e2a5e906a184a5b1e71788a3f57a4fc6147a1120700669338acaff SHA512 3d800e0f56ff533b55c23d69d5352538fe8325b6ecd1ccb2b3d3152dac3fc9f346e669cfac0cea5a68e643a4af76df11048862dee1ac8e31f435ef1b8145402d
+EBUILD designer-5.14.2.ebuild 1247 BLAKE2B 12e20acddd2b74ddcfa1997abacf4e5ede609ef3f560ac3bdb66d259157f6aa0abd4ac396cff8353077366e94c3cbc8e82df058ac3bda6fe64eadd6cfbe79c4c SHA512 79ca21a87996b9141f6eeac2702a96341d8be3651a7a31cb4053d2a4f9e55ddb58895e081d2f7a2636cb65cb218356634e034410de614e927cf8836c9524e684
 EBUILD designer-5.15.0.ebuild 1215 BLAKE2B 179ac93c9f2ce863e36611fad62ab67ffde360528f6954bc7fe16de967ff09a1a656a54986f1a811612226f45857fb831b70df54956c75d1a202cedac9a7a6c1 SHA512 ef677f7c0a3f4e4926518b0fae7ebf39d7d3fba25da9c033ab5e1e89b8fe9bb3173e18609afa83c8dd4c7f22437803f2583c2021bfe82ba1293d7c54aac6a481
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.14.1.ebuild b/dev-qt/designer/designer-5.14.1.ebuild
deleted file mode 100644
index 168cccc7a620..000000000000
--- a/dev-qt/designer/designer-5.14.1.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="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
-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 a890aa2d3d72..29ac650d0892 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"