gentoo resync 08.09.2018

3 files changed, 2 insertions, 47 deletions

diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 91de1011fa6d..57eb54649404 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtdbus-5.11.1.ebuild 702 BLAKE2B de3e2236a5685d935eb20e0b4d1d9a19edaaaf874a2e953dbee4321793df6b79e947d1085067935271416e04a65c8f6ff124f2d81ef153917500ad4a3d6a9a18 SHA512 1616bdec772c779d73b4f4c428d519f8d45ac15ca8a76ce40d01782a326585434e98df62a43fe32b78a9b435be86df701520f6aebe4eaffed85135aec6cf6dec
-EBUILD qtdbus-5.9.4.ebuild 691 BLAKE2B 64f68d852a92951dacbb397743fc5f6df49e11a49fd58ee8c9665f571be28133bdde594afe0c874eb80b1dafd65ad926adca7e88845b621d62426645f364baf9 SHA512 f25adcbd53b903dfdeff2fde800419c11b8b42df29d44f40b7b5b4cfad08233ef64f6e467ab65b2610e2415b44d0994f549355d13df306d90cfee6f0bb1766ad
-EBUILD qtdbus-5.9.6.ebuild 699 BLAKE2B e6592c20597995c81c9cdb1f621811aa61a8b3b67e031427dcde49ca0a3ea3e3291a34f4ae102473f1aff5d4fa6c84d7b17fd768d689423592be6d59f8cd2503 SHA512 afa644b9f2787575036c35fb83cfa2824dcfd2f71dfcebb2e5ea63d579445dd166bd67789d3c92f00ad719cb801402e8dda8f29f6d257d9a2320ef25685971de
+EBUILD qtdbus-5.9.6.ebuild 698 BLAKE2B e36bd662664c15e3f4349f39207655309e74e19cd32cc110dba194869df0e135bb6ada418d3efa5296f54643499b00e6771354f9c1f869b54a03311b384df306 SHA512 f27de442a099e481b51c55cb4cf2e8d6fd46c38229c5e929470e71d59eea47d7c6ad08d16c09646d4f779bf065cfb885a5ab418132b7be726f2e1a923891f3c9
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.9.4.ebuild b/dev-qt/qtdbus/qtdbus-5.9.4.ebuild
deleted file mode 100644
index 961e906e5c81..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.9.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 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 ~amd64-fbsd"
-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:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:dbus
-	:dbus-linked
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdbus/qtdbus-5.9.6.ebuild b/dev-qt/qtdbus/qtdbus-5.9.6.ebuild
index fcd375218f46..34c8c8730156 100644
--- a/dev-qt/qtdbus/qtdbus-5.9.6.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.9.6.ebuild
@@ -8,7 +8,7 @@ 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 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""