gentoo resync : 24.12.2018

3 files changed, 17 insertions, 22 deletions

diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index c8f57c64ba74..ca49d9b956d6 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -6,15 +6,14 @@ DIST 5.11.1-0-201806180847qtscript-documentation.7z 721409 BLAKE2B c1a36f60bc5a2
 DIST 5.11.1-0-201806180847qtscripttools-documentation.7z 88560 BLAKE2B 3114249410ac579ff29d91299e9c3752fc819cc8aadae8f1b8a42125aa3d3ebb5dae2557e7aef55ff8d8384877a8e47bb6c2e7d259cb6bddb97fbdc10aa6a5f1 SHA512 4941dcf96b676026b05bb0ce975c423e0d5d074a6bbdb610b03fc43093fb0cf7d699b57b4844870098b3dfbe722cabe460de7a7ff197a1113007dd73c4b05d67
 DIST 5.11.1-0-201806180847qtvirtualkeyboard-documentation.7z 1489580 BLAKE2B 43161e759ba266bcd5b5eccb42f46c9836473fa9a6f465e82604e61cc05309c9df335421cfd9cb058995c4f60728fdede199cd10476b13e6bca50350e1c06dd7 SHA512 f74740078c4a50fe01b59dda824795881943e898980d6ee74bda80743e9b3b187bbdcfec76a5c4df2fbaf7ccb36055fad9158548f34c7575b7d21d2cdbd29fea
 DIST 5.11.1-0-201806180847qtwebengine-documentation.7z 3326394 BLAKE2B 94f0231d6a78873e8720e9a456025aa7594953be9b61b6560abb8608aa946c4038471909d1ff6c29f2d762f98fd5dbe81999e6cca7fc49aadd45fec6f040491d SHA512 cc8f0d626004e31d58f7f4fbbedfc717bf0d6b64af497683a696ffb81a06938b99ac7a08d2da2d12c33b3f5dbf6cf2b8faab37da64f1b51621e494709f80dacd
-DIST 5.9.6-0-201806072055qt-everywhere-documentation.7z 200837886 BLAKE2B 5bedc098c39a6b43c4fa25217c483072a69d760a29d585b4ad13e4891743cc44f496906ada61f413ab2850ad1cbce1195642002b1b43c1c3bd19a3d867314e5e SHA512 509e1a5f76bcae3fb96f8542c452fce1a417c12cbed9fb0e13369752f130846ddea1264ac9fb041c21c7562f4d139a0216b71644e895ffc5700be4920cd52d16
-DIST 5.9.6-0-201806072055qtcharts-documentation.7z 9071151 BLAKE2B 1533a41e4b13cc760309e7c607a464feca1a314dd36d34f941b0d3e413c0f6792bb745a05b09886061f6585e3ca8827fa6b0a957a40df62c1872a8d4390a4e44 SHA512 5f11848bee82f89269b5b45c058bc29b33fbbb52b891c3908f36cc912b00cab3605d163d5da0c9fc2ebdd610022300038f749cce07c6cd3a7982c3cc93f05dc1
-DIST 5.9.6-0-201806072055qtdatavisualization-documentation.7z 6617326 BLAKE2B d6d0951aa5712a571bed62b154672614163931965fb53aa3511dde2eede957d81a2c90a7a6c231af39f39056d32dc9d0866079f0b70d02a6f0823d55bf090ce0 SHA512 9797b355b82a06b51866bdac08101a76c4032756747b6e456141d98771ae6cf8a6a68e48b85d8de71b8dc14653238b1477f1cf86b497976928f9fe0a0bcc3bfa
-DIST 5.9.6-0-201806072055qtnetworkauth-documentation.7z 259691 BLAKE2B 55e060949594f2b6647b79c64628d6ec2a8645c0a94c64865f7f5b1fcd21493bf38eab96d586d0b3ff9ee5dc9824b6dcc0ada5ce253ea8c6186551c876fa0423 SHA512 2499150520d9994c7fb9c666f15040e6e789fc89f41cd65efb97525d7cac21bf2385197ebcde19788e85b8324fb08d04bc5ad9f60423a4dfaa6125e8a860514d
-DIST 5.9.6-0-201806072055qtscript-documentation.7z 721761 BLAKE2B 2f8c0b189580233c3e65d91538a9208c7a4b40c9b7553c83e7e5e3fe79fe5b748679986d036541bb2cb20659c6e424f52c7f635a5d2664ef1f584480a62f4158 SHA512 b42d59c9cbab2de7b2b71d4560d14130a3dd7a0ead6c086afc651ea86a11a254f48711dd7b122826cb41d8f078e5d6b7616a082489f6f3fdb058705afdf41f50
-DIST 5.9.6-0-201806072055qtscripttools-documentation.7z 76289 BLAKE2B 8335287080f72b893b8e3c9392d462b6219f82a8fd48a1dd2f2b9f7676f737c0ee70dfb875199180149c83f479526b9c06046aea4d5c22f66b9dbd2130d05559 SHA512 d2b5b30ea37731e9ba7e594e34d3d9813152fd4c361875b16a49a895fcadb400e9acfad0a2f2c43a7308b6df9537fca4649653306290ca081e795b38130f0d5e
-DIST 5.9.6-0-201806072055qtspeech-documentation.7z 148960 BLAKE2B f26ad95fbd75f001805566a0ca7ef58816be90327d6905948bc87e8d3fa2d1c01b519d9b4e3c20ad9e689a4d79cbd93f286db9cc01b7a167230ce6d2f7333699 SHA512 af64dd1a2fdb6b1b7a5049eff67576d8b5a1f1408c771ee1db1f78580325f2da71f4d2e74abe4cfb438a11fe1478e65a6366aeb585ed98769a51bf9d471d747d
-DIST 5.9.6-0-201806072055qtvirtualkeyboard-documentation.7z 449786 BLAKE2B 33a7e07d9b2cbd83bc8a6086172ba4cdbdcc4ad3d89c44b8e48df1a5400e1ae784a3e1742f0732f4dcc73a78008d0d2d9035ad412dc03152cd760a3882c4f014 SHA512 ba9d851e2100c895b6831b7a370a98cc5d43baba893a5861daf77bcb5fe490b9e15d6142315fedce89e0517a2aef90280494216175e2f39a6ac19f34d8852f01
-DIST 5.9.6-0-201806072055qtwebengine-documentation.7z 3382083 BLAKE2B dd2e40fe408a21347931e5c73059fe437ce2377018f431dabd1544828cbeb575eb36671cb0567284d6eee4623b699f8cdb9342ed5307c95edc23978235dc6a92 SHA512 394045b2ee583cd826b9aefd0c8fca94586400115f8fc31354854db3f002007c23c27c25ed19f76ce60a118600287f09d53f81a5b3a3fc07b9d6e2478319e1ca
+DIST 5.11.3-0-201811291914qt-everywhere-documentation.7z 250344112 BLAKE2B 08564b52167fce5456fab3e78c72b7eff458b6f8609c48872ed67c020c80b568e0a06018c3ba22f24728d4c949db71d1873afe332012ed64a2681a947c79ec97 SHA512 902a68b200a0deee445113dcc3308e5ecddf36b922cd23909f59a90a6a2eeafeb169ed67203fd0e516a33507456696cae4a97492f473f539532deb2a8842f70f
+DIST 5.11.3-0-201811291914qtcharts-documentation.7z 9204607 BLAKE2B 0fabe007d70f4ec85428862db1d9c48719ecaef3f9bd4cffe2c70574f77d337178c5df8928f74eabee218cdb62cde23c3ae0c826556e4682b4b8dc46f29ca86f SHA512 48a1fb4c0d5e2f46c9639eb2cf3a27cfad378abb8a6f480b1bc71f591b0417e4b05c615ac3b684912c6da861eca77a41e6cfb346e881eb306997d7c3257f8d78
+DIST 5.11.3-0-201811291914qtdatavisualization-documentation.7z 8359648 BLAKE2B 1c396c2d71ca2574e340b948dfc9364c78e3db8cf5482ce2df5a6f3949f01cb13db2eb3a3d17fd95b3796f4cf15ff51a95a2872256f16eb67d6433373849ee9a SHA512 1482f01b94fcac9a602c5cbf1072a96a40ce15becabe248e5506ad29747bd53d0e47f54ecc847999e8b67cbfd26b9aa70036428c72efbd3897af241e77494b1d
+DIST 5.11.3-0-201811291914qtnetworkauth-documentation.7z 293548 BLAKE2B 9010a64c7677475f3ee522e843fa4eee862c61a3c12f373c970d256245da41164095daf0abc0b9d6b742fb181779cd8c4c10f4423274948b0d0fa6e3f98b273a SHA512 31b8d63c1a7bc45bc9301d6451fc512acb13aadd0fec24fd5c806edcfb0ab624f920422321da6a2f5be53e2a253cd3224b6e21fe98b86f6196aa8b43b5ed9c27
+DIST 5.11.3-0-201811291914qtscript-documentation.7z 722145 BLAKE2B 97abb8f938b073a6f030ad01d463c2ca13897bb26134f32d5f97768957abce59962c9650cc95eca47bbbbec3ccdf96f62f6a47c485255c6ed008a5c80ed4ce03 SHA512 cc4eb6b047320dbc322f8b70049da11ddf095cf14922ee24410e3c005e548c432ca1292bcb165c50c6a91ea0a6973c204f629b6bc3baeeab82c576d30a4bdd6f
+DIST 5.11.3-0-201811291914qtscripttools-documentation.7z 88994 BLAKE2B 10d3593bd8261deefcb080b7602a24e2044e43d463a2cc2cef0a795d9fba3d307c3421d7cf07e238a8f7c129dbaccb713c2594bc8411a852fbf052ce4b796bd1 SHA512 29196525e15b3602ed38f03e02036c99fe1c2a2edb45a0c6f061e68c965d049e923ad4e8534c1580895e6b74d72f7f099e3c5771de61c229ec5812680b3b2a50
+DIST 5.11.3-0-201811291914qtvirtualkeyboard-documentation.7z 1637961 BLAKE2B a4c46e635563a6f37c6184a93f8eb1aaa345052873a43bfaf805e3790847324298161229c07420e8665347b45797455cb6ef56cbfdf8240840ccf9e1e8e2982a SHA512 fc48123592a7502abc05f5c8ecfb33d12e041f3f278a1dbc27d3bc8653bb3e2464da89a8f14ef4bf07f786b80c26104dfcc89034a44f62a5810d4a01bf578c88
+DIST 5.11.3-0-201811291914qtwebengine-documentation.7z 3654309 BLAKE2B abd0799f31f0f00af0faaa335ae821e68cbf7f90d0e2027c866bcf2a397fc57efa8a12556eb685d09cc4e65653af1e15946d7f9530b82de10bbe1c2d6ee5c606 SHA512 e61e3d410e39e78b02c7afd86877e7b3d3f18102d7cf07adecf420f84a991ee28edb98b5413b03f3f5248edd68eba33d4273630abd8f8c915c9761f7e8c9da3f
 EBUILD qt-docs-5.11.1_p201806180847.ebuild 2024 BLAKE2B 2c4bf3175b42df76156adc97f9478624f8b3c3d20dbc994d613952150f42b29e651f76f693729f338802cd92956c0706f19d968271515b57b1eebd8071559cdb SHA512 d6da3044733f2e66c341aecb4f6031ac8964bee37211914bffe3479d49c87b0f98c0289cd84927c6159b7bcb4a092a19ff34eea765ab0b9f44fe41bfc2bc7218
-EBUILD qt-docs-5.9.6_p201806072055.ebuild 2100 BLAKE2B b76b031a1e4a72cf86c2135d7f7f3eed9288ab647e4f4ef6817ef4dc83e5b80764c0e590d072c1ee9dcdd5960f9311e876590a4ce20b0de32eae32aad41ff787 SHA512 a883ade826c6e40e49bb68669c9f4cd3b2daa83cf99e4cc5dcef988f124c9938198780c7f1891a09ebb328fac72d194b3790a4cb9d3f482441a2cc099f17b80e
-MISC metadata.xml 1798 BLAKE2B eeb4fd398c6b8c9422c2be3445149f4745d6658c78d16f3ac92b25bf3b622d7fa0a914f5abcfe9170978853c033c8752eaa3afdbf3c2bc41f66df69f86173de4 SHA512 e8ff00579cbba2f2d0fd2d91a370e0c2f4f83dda0ddd4812850f50f7cae2add0fedde9a8ecad9c2fd7219ee344aebcc64ac85860127fea93e430224d45c6fe1d
+EBUILD qt-docs-5.11.3_p201811291914.ebuild 1937 BLAKE2B 6c556a214244799b15b8d67ea6d75a8d00121d0bdbd92e3aa2793802839de29ce285577816963c4b6567270f374af29b0feac6b5f95b1b003cb5ab54248b5e1c SHA512 3354ab5e5e729574fe0881ed1796aab6be4ef42769a79417fdd914e601444903268b90dcaa537ca8c5d8500120ea63a23586dbc644650cd6782e280f64b0d2fe
+MISC metadata.xml 1716 BLAKE2B 1a50a8c7b4b2125df82206b03fad6e9721495a0748bbb98ccf059628b03c19dc2e180fe92dd2ce71195357dde2df8717726721afbc6c3cb53687384d13c931fa SHA512 6f7b54859302dd8f7364e7be60e7750286c0326d22debc6488029e4c144d8935dd1c6042d28d31c41cd67b3ab83cbfcd9cc3f9a1d5d0bed66d65a42de61bada5
diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
index 2cf47d81e171..37c1163e40ea 100644
--- a/dev-qt/qt-docs/metadata.xml
+++ b/dev-qt/qt-docs/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="qch">Install documentation in QCH format</flag>
 		<flag name="script">Install documentation for <pkg>dev-qt/qtscript</pkg></flag>
 		<flag name="sensors">Install documentation for <pkg>dev-qt/qtsensors</pkg></flag>
-		<flag name="speech">Install documentation for <pkg>dev-qt/qtspeech</pkg></flag>
 		<flag name="virtualkeyboard">Install documentation for <pkg>dev-qt/qtvirtualkeyboard</pkg></flag>
 		<flag name="webengine">Install documentation for <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
diff --git a/dev-qt/qt-docs/qt-docs-5.9.6_p201806072055.ebuild b/dev-qt/qt-docs/qt-docs-5.11.3_p201811291914.ebuild
index e98530caa87f..d252c8f53b43 100644
--- a/dev-qt/qt-docs/qt-docs-5.9.6_p201806072055.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.11.3_p201811291914.ebuild
@@ -1,36 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit versionator
+EAPI=7
 
 DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
 HOMEPAGE="https://doc.qt.io/"
 
 PV_FULL=${PV/_p/-0-}
-PV_NODOTS=$(get_version_component_range 1)$(get_version_component_range 2)$(get_version_component_range 3)
-BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.${PV_NODOTS}.doc"
+PV_NODOTS=$(ver_rs 1-3 '' ${PV/_p*/})
+BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
 SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
 	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
 	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
 	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
 	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
 		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
-	speech? ( ${BASE_URI}.qtspeech/${PV_FULL}qtspeech-documentation.7z )
 	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
 	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
 "
 
 LICENSE="FDL-1.3"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
-	multimedia networkauth +qch script sensors speech virtualkeyboard webengine"
+	multimedia networkauth +qch script sensors virtualkeyboard webengine"
 REQUIRED_USE="|| ( html qch )"
 
-DEPEND="app-arch/p7zip"
+BDEPEND="app-arch/p7zip"
 
 S=${WORKDIR}/Docs/Qt-${PV%_p*}