gentoo resync : 16.02.1018

3 files changed, 2 insertions, 61 deletions

diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index eec92c50461e..b6e8e726540c 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
-EBUILD designer-5.11.1.ebuild 1237 BLAKE2B 78fafc4bf17f03f904161e0db22f1a0821adf3f7326997f1126824325d60951504613fa6be16885ec1600f65b1e6d4df7844961fa4020987aa6a40a247bea4a6 SHA512 379e29b9a3d2339a9c63728ac7870837e7fbaeee52207b1eab0e683ca5ab47d8465b3ff4e3ca3ccd028fc682b29095c0e14b7def40e1d212afb4bb61230b5e48
-EBUILD designer-5.11.3.ebuild 1238 BLAKE2B d0c429e259df4fad6ea7c351bd07737de5cbb64d2a565a3781963f07bc51c39dc97d742eaf15ffdf27487296687cd7fe328b59b48fbe3f362184003b77052f9a SHA512 c3e6ec16ccc8ff5cfa47ff98ddcb6591292d26baa9ad5304ec26dd91a7d61b4c0e4448354f3ec8eda74ba5155e5e03b5e14236fcfd676c65b67baab19b07f439
+EBUILD designer-5.11.3.ebuild 1237 BLAKE2B d359737ae3770e66e9784f814c57ec1741c6db6ae10f6f2e918cdb0ce65a5ea7b27d736433f3e7335add56d17b4598814f58f0163c4c5cc767a07dee63987769 SHA512 6808aa8956d242fb6ecf97bf913d76c0477fe075c2a530a07158321d35a8b6538f037d46ee3b824e688bfb8251119cf2ebba99e016c1b8ebbd1b293f88820b3f
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.11.1.ebuild b/dev-qt/designer/designer-5.11.1.ebuild
deleted file mode 100644
index 0ab9ea09952c..000000000000
--- a/dev-qt/designer/designer-5.11.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
-
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
-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
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-qt/designer/designer-5.11.3.ebuild b/dev-qt/designer/designer-5.11.3.ebuild
index dee05be1b36b..8591ca4d2aa2 100644
--- a/dev-qt/designer/designer-5.11.3.ebuild
+++ b/dev-qt/designer/designer-5.11.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="declarative webkit"