gentoo resync : 31.10.2017

4 files changed, 2 insertions, 75 deletions

diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index edb45ed56224..c98facdf37fe 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,11 +1,7 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.6.2.tar.xz 9794512 SHA256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 SHA512 3b2a0d098e09353978ff1e54cfcc293b8c7b4ada323c3c98e6ce8d62cea4574d285fc169f9758ec019206184db0df39ac99971be0bcb335672b7f4f86c787327 WHIRLPOOL 7e4ab96eb762d4ea13fc19f5816f3b7633601746d6f4c83b7eefa7b9cecc65db0837bc85f9b69c6a69f13b0fac243d3491b6990a85d72ee24bee4d05a262e1fd
 DIST qttools-opensource-src-5.7.1.tar.xz 10011108 SHA256 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e WHIRLPOOL af661baeafa85e7af56bb8859415306d26fe7c0de8238d399a520623643de0e6c6ff6056715013d202285c6ef068f4c4c21fdf28098cb42ac6ec97cbfde127b2
 DIST qttools-opensource-src-5.9.2.tar.xz 9778248 SHA256 2bb996118b68e9939c185a593837e5a41bb3667bf5d4d5134fac02598bd2d81a SHA512 afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1 WHIRLPOOL 747a9c7ee7914ae613373c810891c0a4147b3c5614801677014fa1fadebc3bb985b120e855380ef05bb8c452968d6dd9d54db9ac2b4c530d5c0d0453226f378b
-EBUILD qdbusviewer-4.8.6-r1.ebuild 1224 SHA256 f8b1cd7807810402858d458c4a4ae7f8c04a189c239f2d916b59008d80e2371a SHA512 55fdb665e5771270f96ee40bc7ba8c2c072e2797bf9c98564c225a76c274a8f4602b167a01b32354eb53a5930af7545c57ad65ce92a59f3af99c0492f1d298d0 WHIRLPOOL 46f302e710ad6995f48e9bf45391b6f5e753ca9e2d0c8ed8efa62ebf842a176414409600e57e66e4d5e16c4d77f6b5e74d3e52e0a7e0cb7045258809e9c593b4
-EBUILD qdbusviewer-4.8.7.ebuild 1173 SHA256 3daee357f0c458afb5a3b03dd8973d50918dac7e678d4404f8b218aef968d2b2 SHA512 5684e0dd6f686a1deb09fe34ebe4161463c519bd3f73a24bbfc0783b262801b55b576ea879e0e26e2e4bd47fb4bf45bd3c3cc14150d36b755f04dd0a529813ba WHIRLPOOL 6d1e278324a027b6028a891d4700485e147ce7a14c0232532fd962785d0e047cb13f6f850e4319b79c4c296f7ac6c24c7e00a1625450200dbec92c93d0a13fca
-EBUILD qdbusviewer-5.6.2.ebuild 520 SHA256 e4cab1666c505782dd2e3528ec898f4208a20139f8bf7c6e43780db434b4c044 SHA512 9e5d12e5cf35f68527c50f37dcbcc8d9b972a080cb8d36fdcf36df30e93360b3b8dc2c38dcac8e73127a127b423b5d2b23730d06eefad7716e73fdc7b7bca2b5 WHIRLPOOL 4051d970ef7d79a3887c46b49b8d38529c7f6d5c72a04e0bc499ab1fb27f0b14dda3238af1e0608308f8a459afa2390d00dd4af3aa345c0c9690a51d0d982c70
+EBUILD qdbusviewer-4.8.7.ebuild 1174 SHA256 2d1e534530cfe50df56a5ef5a249e1fc6b8454c508cf80b7f378fe0a5d631414 SHA512 6f08b895885d8216d15a6ac7d35e8b4dccb504a7b2d9740ada1a48b2672eba530345e2af4bf7cdd4e27d01991d16c84177506f370bbf989680b62f711af828cc WHIRLPOOL b8db4a1b937e2bd91abc40e1ca5cc45ca75f8e14c042c6edd6758a226a2f698dc3125ad61a7a18301fc74312dd987d392a7425a5ebd07b888801ce2456169139
 EBUILD qdbusviewer-5.7.1.ebuild 521 SHA256 fde0aef38cfeb9bc9113659132ded64a0e9681d380e6a1f8c14f6c119b9a97f9 SHA512 2ca60a21301ca8f5db6a4a4e87f48edfed84a3de9eef980c73c5a6aaf00410783bbc25a8abe518bf7f1e68568664b174ce2764822f3f1c608da564435668d667 WHIRLPOOL ec40f9998b7aff027cf10a62a140e80072207b2ef0fe1cc15db308ce4e82c922a44da79b4796855701d269b3d4e811a449d65624191ef19909fa05122878d5b1
 EBUILD qdbusviewer-5.9.2.ebuild 525 SHA256 dcf648677ab7b54fc27f3c0d1597a6760ccde09760427f569dcca64ecdb856d9 SHA512 e33432316e553d54d5988626b72a88ffaa8622e992c59e5057419be3909486aa161c627e8682dd4b7e0cb0d83e2b525776d38b5ddd1bfedb64a81d7c47cfd1aa WHIRLPOOL 895ddafb88b6f9c49a56a9bf97b745fc0fd1e1eaf05ed39659185f617c2e47242f038c2fad732988555e1fd1ad77c3ad309d782df9f0ea81ebf94e6e5ef4bf7f
 MISC ChangeLog 7136 SHA256 59eaa4b98accfaf85124d68cfcfab501cfe5c438cdf2c5b8b3a92de0367ae8f6 SHA512 2658ef4142c572c2de1aa361668ff25a4317a6e2b0cd237864b5ddb9a07c5b65e10e6e8221df3daab1586b2f6e00d1e4225ce99b47674c40d84a9ee3004ebcb6 WHIRLPOOL bba8ef44b18a2839d2274beb69696e0faff22ae4dc1f6aef7de8a5ff6e452e35c0c0722e5a40d69b7b6555cf410d37ae536dd2d2c666167115ceecff165a1f15
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild
deleted file mode 100644
index f4df9d2bf65f..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-build-multilib
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
-
-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
-
-	newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
-	make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
-}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
index 5a0ad0e6e7bc..bf0dafdd0b9f 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit eutils qt4-build-multilib
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.6.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.6.2.ebuild
deleted file mode 100644
index b11f62f376d0..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.6.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbusviewer
-)