gentoo resync : 31.10.2017

4 files changed, 2 insertions, 87 deletions

diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 2f697ecf62b6..512261dcb610 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,13 +1,9 @@
 AUX qtdbus-4.7-qdbusintegrator-no-const.patch 543 SHA256 a05de8d906be14160e5c951856fae2796b6f6eed91ed4781e8197433e94ce922 SHA512 1967f1b3f1a834eecf140df39c6e4826acf80fc2f8de85770252949910de357a4303d1c1b3202e2df164e8b1cd74b0ab4928a3b333df0a222bdf21e71696824f WHIRLPOOL c5d72b6fc8a9e55cfdacdd2a514e1acbd1c4f864f92596b3c3b9d013a24425619c04048063afb9aef267ade2b5fcf6b3921b90cddb2f9a3ee7d8721ae7d8eeeb
 AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 SHA256 648a06278bd4cbe98c61543475cf75b0251722d0f562e9ff8a3b8a89d3838811 SHA512 b3135450bcd7ab50e5b559b0e8619606053845852159853498756e50777cfbe8b5871bd7b0c178b3de038dc9229f3564c4827b35fcb67b354f0814ca1b2c58e3 WHIRLPOOL c28d79d56c284dc17489c31449b20d774021a0a9dac385c327e6b42997dabc0d92aeca4f5fae3020926f6c16053b30f82913800019e5419e3a82f58481fa30db
-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 qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
-EBUILD qtdbus-4.8.6-r1.ebuild 906 SHA256 82bc9ccc16a52a302a30d01eba4d680c50b01ed245cf4bc6a865ff574f04a2a9 SHA512 14bc3236a80e4f6cb9947c7414df10884c79ad3c8f96835a402f8e1c57dafc17007bf9ba2f81673c5cc67230fe9066cf9663290f7d7dc46198a420dbb14e0390 WHIRLPOOL 8d4f213420019956d4d3fcbd48119f59d1c8b2cd3807599303e4f336e9b12f78f636b37944eb87c9cbff830eb073d64073ff1a4ba75cb1f727c32ae6e4db7c70
-EBUILD qtdbus-4.8.7.ebuild 855 SHA256 ff8b4a055acf76064de57f548244d772ded3526f92d2682406711fea2675c8ba SHA512 caa35f76257429a367447fb3d77d304a5beabfc5cc995b593621f52b713d92ea8dfc5859c108a24993fcf318438a8bc55ca8ecc0f735a6eb96ab17fe5a63138d WHIRLPOOL ccd8191fb8751744b799166c6c07aa216249eec3620d79fca3ceec2c8c524c0f5df97372778f8070ebcd373b2b3e9d7d08c44ae1f820ca54258a6d77a3736473
-EBUILD qtdbus-5.6.2.ebuild 625 SHA256 1d561f1578ff9feef4111cd81a6e160dd58cd496e54bd9fd6632d6332b86e50b SHA512 c67fb94e7d9a7a207c17fa1cbeb243d48bacb87cefa5c9f01f8594dfbb848660d42fd004ee9ad4f7cc8bfac3349ef48cc31ed3094d695db499122be675fe5879 WHIRLPOOL 7fe0bb9cd276489ad61a2d7257e51f33229a37eed2933c51102b280b6ad4813ef4aa2465db26dd42c5c67597ab8fa9d8320de40c60d1f433df2e3ee983a0dfab
+EBUILD qtdbus-4.8.7.ebuild 856 SHA256 9b9c670d5d9b0580409531f099a35559edb067cf5c682eade8795b4d49a31f65 SHA512 5e1a3bfa62a290548f111fa9ad6bcda6faf67a718cb689a8420bebc4154d8d7d194ba5de5485219f77e7e844ccce897b5f34fe3bca3d9b0ce8ab87f336ed2a4f WHIRLPOOL 4b0013c6e59fd62734b991af57a60facd74de4efc16e613b9600debefdf7f19b2f90c0d5f43c0e40f426d955c522966bcf3b4205f64f8a1a4f629fd7a0a7ab84
 EBUILD qtdbus-5.7.1.ebuild 626 SHA256 eb5a60b23d5695ee3add922e7f4cfb77c75d33d7ed3913cb2e2f0907d0a26794 SHA512 73b433dc98af92d58dd0aec68dbfa73afe1830068790120fe0e809562ef41fa413145d0d917e07d7c8861bfc7f4ca34e7db0b3c6947f19a32b86f089d23134d7 WHIRLPOOL c172f8971990c8171a02677e516a3741794098dbc9c093e78d15e527cda179f72d8c3b44c6f0dce382b77edf07206f8914c8266dd283ee151c44d6304537b284
 EBUILD qtdbus-5.9.2.ebuild 631 SHA256 d1aecf65d62167ed072e96bc466e8f40df301aba0459c02060248677fe943496 SHA512 d70446d80b998541d703312c0dcb5db8957f8ca6e086f57754030745d1ea37b1fa69f277142fd6ee0c462976cc5c77b4d8e9573b5e2901ff041185869ec0b1c0 WHIRLPOOL 03e7c411df73b95f111ff2542bd20ce7c2028a7518bd17ca45dfc6c120ae9e8d40f09d08f262b6aadec303b46886207a89eed0329dc81d2d9e2c6bd5c3e5479b
 MISC ChangeLog 7164 SHA256 acba9684208c90be08ad51f6f871fdc0f433e3bf99c1a95a5de911d21fac7eac SHA512 80922a66ad1b2a81d114d498c91efea092cab1eb4271ac3edfdd5d9da7f7b6fff556c447a73b8d14f72beb80b49912899e5c68a7a5e0efe0304b97142a11bac0 WHIRLPOOL 3bd686494e5420f253297fb899b55db93dc2566c687de1ef53e04b3b8c5cc61e59051fd0d9b14a85196116d38d131a33e6be33880f5a46be005e0e2750dbb983
diff --git a/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild b/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild
deleted file mode 100644
index 9118a50333cc..000000000000
--- a/dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
-	"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
-)
-
-QT4_TARGET_DIRECTORIES="
-	src/dbus
-	tools/qdbus/qdbus
-	tools/qdbus/qdbusxml2cpp
-	tools/qdbus/qdbuscpp2xml"
-
-QCONFIG_ADD="dbus dbus-linked"
-QCONFIG_DEFINE="QT_DBUS"
-
-multilib_src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
index 1272e6a85ac6..144c5dd6cad8 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The DBus module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdbus/qtdbus-5.6.2.ebuild b/dev-qt/qtdbus/qtdbus-5.6.2.ebuild
deleted file mode 100644
index cf4d351f398e..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.6.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	>=sys-apps/dbus-1.4.20
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}