gentoo resync : 08.08.2018

3 files changed, 1 insertions, 63 deletions

diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index ececb5f8c0e6..117349d7c708 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,9 +1,7 @@
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD designer-4.8.7.ebuild 1746 BLAKE2B a6d8990f6498a02e3bc67d420ea5bdf2c942b20167e9ab9856ded2c48c115773464e4f932c7fd4fe5ec39b84055310b2758c4cd8df29f8bf55a75b1f5f4d2eb9 SHA512 69c7c89fde7f2bfb98ee87f0fa3af6bff2a815c0bf71436fc32a5d1d2e8dfa0184f2383b341be942c6581c0c218ad7d2ccef2ca2406da9b046180a7e79aba191
 EBUILD designer-5.11.1.ebuild 1244 BLAKE2B ad0534b8270814a5be1fd476da3a03c9eaaacca6c9188a3fe01237e7fa78dccf2734b5fab06e2a7aa40590229ed7cf18df208dbbf3c9a7bcce1ee5bf0cb34e99 SHA512 892e94e9ed8c3d90462f8141a18ae68304b8d096383a6d5d1dbf09ca439480ca6f289f0b59e16734477a845ae1a742235decdcb3b5f6224e2b2d8f65e7cafffc
 EBUILD designer-5.9.4.ebuild 1240 BLAKE2B 4e9a38c065ef1952e11e1aecb64641713a60158fb871366148b2a14e38f37f3bba3dd851af6785c60c4abb724a3f665a4420b04f6b4b94b0d95d0b2de3f57a6c SHA512 ce7311a632c53fac6ef6203136ca190518e5463f47536aa6bf32cfe9f06b8f2984889c23a0452c5f7c95d1f1e70df5ff20f133b9555c4546faf21b3c68be9a23
 EBUILD designer-5.9.6.ebuild 1242 BLAKE2B 4a1b3272132dd6eaf3e6c1392351a01d36dc56ae284c285f3d928c5e656350132fc960de0952bf4f852e4e7091b02d47d56983081ef4649a02fca13225af668b SHA512 988ade14b503688b4b9e8ed6c06a6022475cf3a4d0cf49cb7dfefb96616443e89cd7d75ee1777bff7ef3e56b96b609b37e44ffdccf1e138f22e86b706e22a617
-MISC metadata.xml 879 BLAKE2B 4d8a4c31c5cb415d18d59f54243bdb9b49bdbd6c374576d7294d2db2ce6505e31fa8da57966b04d9223e9a474d06f7078bab7432051629fa0a5dafdb9ca59152 SHA512 fba36502504141e09462fb211dacbfe43db6cb6e750f699058c757c1fc24072eb5ed50bbbb20e2bbacb831f165a58c20cb9c012ccbe96665969e1fc8fc153489
+MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-4.8.7.ebuild b/dev-qt/designer/designer-4.8.7.ebuild
deleted file mode 100644
index 7fbb1e9854ca..000000000000
--- a/dev-qt/designer/designer-4.8.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-
-if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-DESIGNER_PLUGINS="declarative phonon qt3support webkit"
-IUSE="${DESIGNER_PLUGINS}"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )"
-
-QT4_TARGET_DIRECTORIES="tools/designer"
-
-src_prepare() {
-	qt4-build-multilib_src_prepare
-
-	local plugin
-	for plugin in ${DESIGNER_PLUGINS}; do
-		if ! use ${plugin} || [[ ${plugin} == phonon ]]; then
-			sed -i -e "/\<${plugin}\>/d" \
-				tools/designer/src/plugins/plugins.pro || die
-		fi
-	done
-}
-
-multilib_src_configure() {
-	local myconf=(
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl
-	)
-	qt4_multilib_src_configure
-}
-
-multilib_src_install_all() {
-	qt4_multilib_src_install_all
-
-	doicon tools/designer/src/designer/images/designer.png
-	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
-}
diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml
index e72a70897a4f..7f1774a4eb6a 100644
--- a/dev-qt/designer/metadata.xml
+++ b/dev-qt/designer/metadata.xml
@@ -7,10 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="declarative">Build the qdeclarativeview plugin</flag>
-		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by upstream)</flag>
-		<flag name="phonon">Build the phononwidgets plugin</flag>
-		<flag name="qt3support">Build the qt3supportwidgets plugin</flag>
 		<flag name="webkit">Build the qwebview plugin</flag>
 	</use>
 	<upstream>