gentoo resync 08.09.2018

3 files changed, 2 insertions, 33 deletions

diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index d5ac9df64ddf..f9c87084d6bc 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/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 qtxml-5.11.1.ebuild 511 BLAKE2B 0da6673cd01121e0789d9f60caa191d803874fb136084893b246a9f11bd0919a94ff0f2e75c63c5719c804ec0b295c7dc7b9d462b6244cf9139b10b91b0a1f09 SHA512 35c035c4dd3c782166f4cfe9fd3bb76cb8ea0e0e3f95f974b57d9a2a684f924193377b211e8ad2ae30c968aca144197713b311dd19b947681170ffeaf8be1c1b
-EBUILD qtxml-5.9.4.ebuild 500 BLAKE2B a8c227d6065e6c8a16d9ab9cb4ff3684fc9016a9e9dc8903431a34a2cafef7cb9d3a7d36c7ad8a4b311c7fa35fe3431a5221a214e3fdd315482fad478b863dc3 SHA512 a1d121e4f44472f93b4d37bbf30e73f55e03546cb4fe441d0915c51afc728265cc8fb816bf3306908139d39e0513ff9e532585d801c29632defe662e9e73c8b4
-EBUILD qtxml-5.9.6.ebuild 508 BLAKE2B ca5fd1fb9d0e68f02ebc50816faf44d56e260df2b4d8f2522f554e29bf24d2e90cd48fa066150951fd43b26bb931402164c30a5dfea8153e1fea8f5a1700bf8d SHA512 9ccf907541bf40724a53dd8254b72db07366c8f6f59c81596da5803f9eade557111dade37a0d8bc866260de48a5bb08b586f494e4af0af0e46cd2a41a2845112
+EBUILD qtxml-5.9.6.ebuild 507 BLAKE2B b572852e82ae20616836d734ecc8be38cb959449de26a8b7e26d695ea77d0f9300a0dc244e813b6df0023b8101fd63ada972d9147a653764d0b52467f661f786 SHA512 a9fddae162b13948179be9c38258a7be6b312b6bb926684eb55ad7c37034f2e47e1e8cca41dbb1e8b36cab730da77d56c60498aaf849861987167e5c95fb7386
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.9.4.ebuild b/dev-qt/qtxml/qtxml-5.9.4.ebuild
deleted file mode 100644
index a8415869254c..000000000000
--- a/dev-qt/qtxml/qtxml-5.9.4.ebuild
+++ /dev/null
@@ -1,29 +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="Implementation of SAX and DOM for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/xml
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:xml
-)
diff --git a/dev-qt/qtxml/qtxml-5.9.6.ebuild b/dev-qt/qtxml/qtxml-5.9.6.ebuild
index 36a25d95f354..6c327122e02a 100644
--- a/dev-qt/qtxml/qtxml-5.9.6.ebuild
+++ b/dev-qt/qtxml/qtxml-5.9.6.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 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=""