gentoo resync : 22.01.2021

4 files changed, 4 insertions, 60 deletions

diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index ae2dc793fa9e..3796e58d8aff 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD designer-5.15.1.ebuild 1209 BLAKE2B 3fd4e04438f649271420eca585c05ce23365ca6f1b4fbfbd9c8bfe41d37597ee46a575817ee48ef9c8a6b1b8fcf3b869cdb0e4a82092b8dd88560cdca8c11e23 SHA512 a224a83a6564e9770b912c0371371975202c3e291e3343bac153b00746c98ab2121b11f5e55f6f2d38bd6b6e0fa3cccd08b62447076e7ffddd53d85722fa14d1
-EBUILD designer-5.15.2.ebuild 1206 BLAKE2B 55836f12f3c95242df27f0de6bc32679302a13f041302ab8f855e717a2e80bfeb546895e1e096cb3d3ce553441fe2c31810d3a9f47e9d9f3d470c1b8c1202d74 SHA512 c407cdfbf5e45f221e0bc0f4bd5de67373bc47b5d794c2fca1d1bd2b86c31ca73690e906dab92a4202ae5d72c15b89a4a03efc8ca21c16fccbe2206671cde486
-MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
+EBUILD designer-5.15.2.ebuild 1200 BLAKE2B 1fd848db96b7d42f20b641b95ab352cd1eb39d0fbbe1c9f0e9c1ab385ced5e0b6e2b4f91d7c9d4482d860d929d5083565c53dede075a095c9516646809d43a73 SHA512 aee529db1c679dda08030d548d70369bce6e02bd07f71046704367f00c1d86555137231ae66f599d87f0af0705b56f06d2fc4e0062e91283d3037870e7c1dd16
+MISC metadata.xml 564 BLAKE2B 99065231d080f2944ac1ab745f68fcf4f5ff84ccd4700f6e1c796d150f572475a33736b35bd013623027fa7eb384a3811f7bba6ebd9dd1c5c249cf0f04a7b5d4 SHA512 3a3bf5cc3ca2e11381fbb68e48ffac172bf41ab6fbb6ae42e354ffa53968f577b1c2b9a3df815501d46d9e4d66e32996ea2b971738c7a182cdc6fc8954bb4f18
diff --git a/dev-qt/designer/designer-5.15.1.ebuild b/dev-qt/designer/designer-5.15.1.ebuild
deleted file mode 100644
index 1f61eb738c6e..000000000000
--- a/dev-qt/designer/designer-5.15.1.ebuild
+++ /dev/null
@@ -1,53 +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}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~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}"
-
-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.15.2.ebuild b/dev-qt/designer/designer-5.15.2.ebuild
index a61c840e711d..0ee67e0758db 100644
--- a/dev-qt/designer/designer-5.15.2.ebuild
+++ b/dev-qt/designer/designer-5.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,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"
diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml
index 7f1774a4eb6a..d07a54a9ddc4 100644
--- a/dev-qt/designer/metadata.xml
+++ b/dev-qt/designer/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="declarative">Build the qdeclarativeview plugin</flag>
-		<flag name="webkit">Build the qwebview plugin</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>