gentoo resync : 07.07.2018

13 files changed, 320 insertions, 108 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index c35f1a07f2e6..c869c3f5f563 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index cd29f9612e4f..bd9a67b5a828 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -1,3 +1,11 @@
+DIST 5.11.1-0-201806180847qt-everywhere-documentation.7z 195754941 BLAKE2B d9a5acc81bad5653f0c645321936d1a300f3e70ced154c2b700c36cb5edd66e1006953d637e8b0ec750935cc2ddc2c93c3558e67a7edf80344ee9521bc12f120 SHA512 49b5db9ebf63ba5e607e6a667c835f6d2b90916115bbb4aababf8dd25faaa37575b4bfdb27facc8225d6c8ca73b1f6898a7680fed788189904b1588095b73fbb
+DIST 5.11.1-0-201806180847qtcharts-documentation.7z 9203418 BLAKE2B 833c14923dc3bcd3696d761e675095770b4f843168199065831638ec0f6fcd5d630c8cb79a7a9d6870b0b2a6266c97e7067f619d803cdb07a10d9335cb40140d SHA512 ccf84c9df4e6561af58738e8740a51b38a56cb512224f2cb4dbcda26e8c9fa9110835e5b4499be38ff55f8d1f13deaebb18ad468ef91d8ea5c4a3c690fa82f57
+DIST 5.11.1-0-201806180847qtdatavisualization-documentation.7z 7605605 BLAKE2B 951edc6ecbf231132fedd96cb8d711fef18fb2bd3022bfa14bf8dc56244543f7b02bbad1e1ac24e26a79b93787212df0a2a9487759126be95c2dead06bf5d369 SHA512 7cb7ad1d0a71169ff8dd7508e8a2d89477f5203820c247369d2606dc00b9cfab97ab0e4df6fc568d1e356cc9c94c71ecfcef351605f09d0c2d7961def28c9f27
+DIST 5.11.1-0-201806180847qtnetworkauth-documentation.7z 293012 BLAKE2B 58fdb896ecdcaf9b95bdcd6e300f3bfa0dfde17b91bdbc539feb85d40353a4c76cacab5e934e6a721b9d786c842633d53a444007c8e225dedd651ef6b9b24ffb SHA512 3c7793921b331a9e233da56470d1f8d70e7004525a68bf1a692bdb9127846dfb2986b8da6c277816945304abf106bc8250bc586947406b19543c6d10b0992c81
+DIST 5.11.1-0-201806180847qtscript-documentation.7z 721409 BLAKE2B c1a36f60bc5a276ad57f5483bc045bdfbc21dff8fd309c0d39bd0c0f5a22d329ca5afc1c1edf42dc9b0f210e239c8e4afa9550cafa31452d4a8bb4fcae61797e SHA512 b7a7bee2390461fae49677b2df5920a411228eee885f47f6e1cd4338cd28edc99ec76584d4e4d7df646eacb58cb45825294b66fa121b0f657d34f6dc009964c2
+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.4-0-201801220610qt-everywhere-documentation.7z 213285230 BLAKE2B 9ff6df25cef33164afb515f34238bb689b85582fdca106f4d6341a5cfd179d557b9497f8092018151e67bb28d420b12bbcc9d9c395e0fcfc3132b2db6f193f09 SHA512 b843c78200dfc9c5f0ebd656267ca2d0d0efcdb589be0735137b5ba0a15ad90c9dc7daedcfa6c595ec1fcd7fc60523c5d8d504c34d642ffa1219cbeba8d0f27a
 DIST 5.9.4-0-201801220610qtcharts-documentation.7z 9070277 BLAKE2B bab608541ef8b236257bd640bfa4cdd6d3b75b867de55570ced3c1be87938a66ed4711b1c1ef8349eb6e361a1d26c93deed7e49addf56335ea9eadf614b044dc SHA512 3d2825fe9356a34abaf42aea3efa4e27d83c6acf12fb100f3c5aa4cd3faf25fbc1f2e2b3481fe95845a5c0c2b88924c8de19af9e9d5689c702f56252c2620df1
 DIST 5.9.4-0-201801220610qtdatavisualization-documentation.7z 6615754 BLAKE2B 757ed0c5c50e82bf3c8c5927306001c1226385bdd0fa343a342fe83acaf61c10255fd14684a3fe15f5a4c325c8503f74f5e6e13a17d4d7597435ae3b30671293 SHA512 75515a40880f890c5a4c725bb96a093d8af3ad03d52bd22a5f7fb0cd068e8f589eedd8c4560d5eaa8f968d599a223a438a4b447b5ed79083989d995e7c265365
@@ -7,5 +15,16 @@ DIST 5.9.4-0-201801220610qtscripttools-documentation.7z 76290 BLAKE2B 998230165d
 DIST 5.9.4-0-201801220610qtspeech-documentation.7z 148926 BLAKE2B a1727de25d2e2ad13c2c0cc1d075d9ee28f913a5c788e55b5c25d4b976a4f9f775e4b2b2e96d71d2a51f124c4a6ee1b24762292a9f134a25fb8ae87128c80098 SHA512 437d2ce4172d823be6fbfca644ee9085c34a9e3a0abcd2783edda492647fe98e62d40abf81d519a15b7250491801bab48888de7d406c262e5444a4530df4e73d
 DIST 5.9.4-0-201801220610qtvirtualkeyboard-documentation.7z 449521 BLAKE2B 33cd1477544a0bfe8753b7027eb97eda72687b3624267953592a6e45c5f5d7cc7601b65ca3394e418d589af8a9386cfa78afc95b177bf6f30fa2d7c5eabab30e SHA512 927f7161cbd9d400bb2077ad1342962350e0b96c09ff83cec2eb00d961372de305e1a84840993cebc7c4243379f201dcda864773654060ff021f44e20723c71e
 DIST 5.9.4-0-201801220610qtwebengine-documentation.7z 3378943 BLAKE2B f3b37fc3105a02cf8a09191b21898e4cf64d1201069832af3e24e25ef7873b6a722ec3a202183c0f7e234a53e14f3db18b9a15bcd74d5b3c68f0ab8699bf0702 SHA512 b4232c9312bfd659135a4f7895cf7b6695afd4eb71457e2bcab0fa08a281e9bf2cc44b7a775452af91ba64cc2089181fc38acd9b22f92290ce1aeb2df16e02f6
+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
+EBUILD qt-docs-5.11.1_p201806180847.ebuild 2029 BLAKE2B 4d48f98c7a891124c33ce0a08c1af452725282bc9a2360bd7fc9d06c667bd1b6ec26213c10e756ca329a6ae68c5f18b33b945e45014c65c06dd7f66d9870445f SHA512 9754bf952bb8f9af7b7bded2a58c390730347fa6109f10e2a07227d112e3a1e3ce7a94b7e14f1a96c2ad287ec0b5804f8e115df5e94fd8c2bc44e1f3468a3b94
 EBUILD qt-docs-5.9.4_p201801220610.ebuild 1634 BLAKE2B 3e1aca6d063fdf9859bb9e175049472c9afeea6a8e36c201428d7d6c8a84183074d2f1fe917f4dd85dd9b80d1e988d94cb1afb16c3fd577520decc7a1203d77e SHA512 95a705d2c003e01b213f912e0dd862ca10c79d6ac06e6ab3c7fea6f37c01215ef6afe4151597f1825edd111be8544dc6363943ce6043e60f70144aa024ea04a8
-MISC metadata.xml 978 BLAKE2B d2732b8f9b6160a7bbc7fdac5ed9db5d76bac4965df284e2ccd11aa49c4c2936386a258ce3ce7219898064069b76fe244362e6a3e4b8cdd6da775486b861539f SHA512 ed280d83f2ceda62d36dc7a95b4ad4bc356929692dd0084627aba8af47518e736d76d1bdd8402e8e2772fea4d69ad6476f0f34d9502f8bf181efc75d6e380fb6
+EBUILD qt-docs-5.9.6_p201806072055.ebuild 2102 BLAKE2B c301790ebc3010506f9cbe6e72a17fcd2b19b12bb38f6f3bc15b1afe9932f47813c89837c33bab4704339db9fc35223370a8b87d8d5ebddad1bde6b6295dd06a SHA512 d988043ea1a62298dfeb086ea1872b288022d4052254173c69fd65665a81a1808c09216b6a3c73f10dc41310744f6a233de476ac19677da47126a5f9dd04b57d
+MISC metadata.xml 1798 BLAKE2B eeb4fd398c6b8c9422c2be3445149f4745d6658c78d16f3ac92b25bf3b622d7fa0a914f5abcfe9170978853c033c8752eaa3afdbf3c2bc41f66df69f86173de4 SHA512 e8ff00579cbba2f2d0fd2d91a370e0c2f4f83dda0ddd4812850f50f7cae2add0fedde9a8ecad9c2fd7219ee344aebcc64ac85860127fea93e430224d45c6fe1d
diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
index ebf0bf1e5409..2cf47d81e171 100644
--- a/dev-qt/qt-docs/metadata.xml
+++ b/dev-qt/qt-docs/metadata.xml
@@ -6,10 +6,20 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
+		<flag name="3d">Install documentation for <pkg>dev-qt/qt3d</pkg></flag>
+		<flag name="bluetooth">Install documentation for <pkg>dev-qt/qtbluetooth</pkg></flag>
 		<flag name="charts">Install documentation for <pkg>dev-qt/qtcharts</pkg></flag>
 		<flag name="datavis">Install documentation for <pkg>dev-qt/qtdatavis3d</pkg></flag>
+		<flag name="declarative">Install documentation for <pkg>dev-qt/qtdeclarative</pkg>,
+			<pkg>dev-qt/qtquickcontrols</pkg>, and <pkg>dev-qt/qtquickcontrols2</pkg></flag>
+		<flag name="graphicaleffects">Install documentation for <pkg>dev-qt/qtgraphicaleffects</pkg></flag>
+		<flag name="html">Install documentation in HTML format</flag>
+		<flag name="location">Install documentation for <pkg>dev-qt/qtlocation</pkg></flag>
+		<flag name="multimedia">Install documentation for <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="networkauth">Install documentation for <pkg>dev-qt/qtnetworkauth</pkg></flag>
+		<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>
diff --git a/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild b/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild
new file mode 100644
index 000000000000..a475934e374f
--- /dev/null
+++ b/dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+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.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 )
+	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"
+
+IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
+	multimedia networkauth +qch script sensors virtualkeyboard webengine"
+REQUIRED_USE="|| ( html qch )"
+
+DEPEND="app-arch/p7zip"
+
+S=${WORKDIR}/Docs/Qt-${PV%_p*}
+
+src_prepare() {
+	default
+
+	# bug 597026
+	rm -r global || die
+
+	# bug 602750
+	rm Makefile || die
+
+	use 3d || rm -r qt3d* || die
+	use bluetooth || rm -r qtbluetooth* || die
+	use declarative || rm -r qtqml* qtquick* || die
+	use graphicaleffects || rm -r qtgraphicaleffects* || die
+	use location || rm -r qtlocation* || die
+	use multimedia || rm -r qtmultimedia* || die
+	use sensors || rm -r qtsensors* || die
+}
+
+src_install() {
+	# must be the same as QT_INSTALL_DOCS
+	local dest=/usr/share/doc/qt-${PV%_p*}
+	insinto "${dest}"
+	use html && doins -r */
+	use qch && doins *.qch
+	docompress -x "${dest}"
+}
diff --git a/dev-qt/qt-docs/qt-docs-5.9.6_p201806072055.ebuild b/dev-qt/qt-docs/qt-docs-5.9.6_p201806072055.ebuild
new file mode 100644
index 000000000000..d254f2be3327
--- /dev/null
+++ b/dev-qt/qt-docs/qt-docs-5.9.6_p201806072055.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+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"
+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"
+
+IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
+	multimedia networkauth +qch script sensors speech virtualkeyboard webengine"
+REQUIRED_USE="|| ( html qch )"
+
+DEPEND="app-arch/p7zip"
+
+S=${WORKDIR}/Docs/Qt-${PV%_p*}
+
+src_prepare() {
+	default
+
+	# bug 597026
+	rm -r global || die
+
+	# bug 602750
+	rm Makefile || die
+
+	use 3d || rm -r qt3d* || die
+	use bluetooth || rm -r qtbluetooth* || die
+	use declarative || rm -r qtqml* qtquick* || die
+	use graphicaleffects || rm -r qtgraphicaleffects* || die
+	use location || rm -r qtlocation* || die
+	use multimedia || rm -r qtmultimedia* || die
+	use sensors || rm -r qtsensors* || die
+}
+
+src_install() {
+	# must be the same as QT_INSTALL_DOCS
+	local dest=/usr/share/doc/qt-${PV%_p*}
+	insinto "${dest}"
+	use html && doins -r */
+	use qch && doins *.qch
+	docompress -x "${dest}"
+}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 43971c3e267a..c28f29dab15c 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -7,6 +7,5 @@ DIST qtmultimedia-opensource-src-5.9.6.tar.xz 3585964 BLAKE2B fdd18b1abcfbc8a1f8
 EBUILD qtmultimedia-4.8.7.ebuild 1298 BLAKE2B 2e78e5f2f0dfbf43aaabd1abcf06fb05a3612029bb9ed2f1007cda90ed32665cea64b2f56e7b64b879400a3a66ba4907fbacefa5bd431fce1a08b0db3c61c8cc SHA512 d7a6fb8aa9927fadfd23e59a695818b8e066ccba71877848669358fa640064a6dee16c38ba988e2501e3350939fddc13c6ec90791c1b7c670f1e654b6a5fe6d0
 EBUILD qtmultimedia-5.11.1.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
 EBUILD qtmultimedia-5.9.4-r1.ebuild 1460 BLAKE2B e845058b50a99d2744c32adc8044b0144988bfe898770e9f5f7a316eee2e5ed17974a36ad1e9ddef786ae8f789b16221534d56eea9d84ca713b7960e8810a764 SHA512 f5f1131f8915e62c8978663187f3a02b4f19fcb8285b4557f809fa1bef9c4277d7b2fe8b4c6fe92b3f55333bea1e4244f94e5af52539968aa15b98b810d55c5a
-EBUILD qtmultimedia-5.9.4.ebuild 1351 BLAKE2B 6ffd46d9ac8586ccd662757ba2119fd40f6788c9930436eeeaf8639d1f44c2c62c3251719e4752a8781a9cd422d3b52322eea88462f9f00f84156065cba22dc5 SHA512 40b7d32b7f77d1cb9e84be35ea9580b36c8aca9701a206616ffef299255b1fd67ac153ccb55e555ca779c5be82d657141e5fccf64f737912673b66cf9103bf21
 EBUILD qtmultimedia-5.9.6.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
 MISC metadata.xml 937 BLAKE2B 804145c6bfe640955c5de227bdf2ba51570749541d5febec508b874fa823a2386da52648b2ba2bff959de2ef1371fa6384007591606410829d6fe4c12afd7ce4 SHA512 b5007c578748a64091105fd04aec3133587dcf0f8cf22b758520776e903699de80555fa2e69206edaf8415dad037018f8c169966fb48c1d402118a6e32509d31
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
deleted file mode 100644
index ccc57e3e45a4..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtnetwork-${PV}
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2=]
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	qt_use_disable_config openal openal \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use alsa)
-		$(qt_use gstreamer)
-		$(qt_use pulseaudio)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 71042536a3ba..f6c66acdb52b 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -4,6 +4,5 @@ DIST qtwayland-opensource-src-5.9.4.tar.xz 314932 BLAKE2B de90fb47af0d07e0b6476b
 DIST qtwayland-opensource-src-5.9.6.tar.xz 316152 BLAKE2B a1ebbf98eea9ca36f8229ed0bdfdeb79eb9d1519ff35eb153d7f8b7af2ad9831905e564464ec1faf793a7b11088d43d6dda6dc21b36943fccb569163c119a30a SHA512 7376f76001323d7971cb3be7592086b26c855d8d702184e84f28656b4262a9780b4cc0a0991c97ca011863570b6abd63b006c78021934e1516be65715f82ae4b
 EBUILD qtwayland-5.11.1.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
 EBUILD qtwayland-5.9.4-r1.ebuild 973 BLAKE2B 11a8749fecdbc4fc8035ad2001dd4614e17d2577f194d6ba10a02fc5929e31e65488e86857498ea822590b098295722938096c2901c391cad97e78ab0c477de8 SHA512 7288dd998a999c98eb2053f21c82f9d0518ce6d79a6992bea0b1a58c6bfedcc530cdea0e0b501751df0e07c8afdee4a21a6bcadc945cb8dcdd0a07cb6ef2e4a8
-EBUILD qtwayland-5.9.4.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
 EBUILD qtwayland-5.9.6.ebuild 907 BLAKE2B a7f254dc9571a1860f8caa6cfa15a13e8d6859116f0de5cf7cd66ad5cd6969a948445391f78dc3df927c90437235bf1cbb26bc4809a5f6faf66b6ae23f2fed41 SHA512 db097b4577f81f5354c9b07944c3a47120f93fb61cad54346114c515460390d375d7412464904b9a07a24c08edc150df9378b766ca348694182a1b6209069174
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/qtwayland-5.9.4.ebuild b/dev-qt/qtwayland/qtwayland-5.9.4.ebuild
deleted file mode 100644
index 4c3553046dbc..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.9.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="+libinput xcomposite"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput?]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	xcomposite? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_config libinput xkbcommon-evdev \
-		src/client/client.pro \
-		src/compositor/wayland_wrapper/wayland_wrapper.pri \
-		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
-		tests/auto/compositor/compositor/compositor.pro
-
-	use xcomposite || rm -r config.tests/xcomposite || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 456a2eaf9d3f..0e11d1da938e 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,6 +1,9 @@
+AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f
 AUX qtwebkit-5.4.2-system-leveldb.patch 711 BLAKE2B 26eb498e422836585b2fb2c1212600bc57ef2b13ed64c790efd346e7a8e780132f3158775bf5df0aefcb795f8f50e510dc065114fb71521bd0afa116f29575e1 SHA512 d95d6e697d5e0b951465180d3f6bfa0ac16fc0f7a29504f773cf3bb28b1a7472f7bab83f379ea980851b6ed64a7d49cefcb27a503d37e5ce90110318628febcb
 AUX qtwebkit-5.5.1-disable-jit.patch 460 BLAKE2B a5ec0644d7f4341993cfbec916bc3c9d69ab992d29df3a62630bf077e211d6c1d3848a93ab25bb6bae2971e44518dafe2841c8b78d3556f1d8f1380d85269fb2 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749
 AUX qtwebkit-5.8.0-disable-gstreamer.patch 714 BLAKE2B 3bb7ec6976934e20d016fc6fa0421cab5d6ce51731a0c5a12b92b6e1611a75396f9db751074f7d9ffdb1c000b1964689d69606ba16e29f3ee5329d141dd3c90a SHA512 7b47d5e549f8bc0113bdff596a191fff3f8c6deafd6ebc456e224c1657a07e0208c478fdd49b9790ef618371cb969ae8aaaf08f9c5f9eb10b5841817f0f8736d
+DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
 DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5
+EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3666 BLAKE2B 76a73fb3fdf64aa7c9af23590eb91fb1101a27466f8196231e3cc0723974ade983e4f3d2963f94dcd469fde675dcab877dd0264ebd2fae6d816e6cf5bae0421f SHA512 05a46e48d3398df8a1e645c1ff01e8e5527aa2386fb42b3550fb4bee45c89238551217004dcc51e6d5f79790da610f5ec9de2cdcafec5955c22064e40c736e7d
 EBUILD qtwebkit-5.9.1.ebuild 3503 BLAKE2B 0bed04771bb14fbea809c3a2db5254943883f34b971b459c3c2a3f008660b24c4813b800cd14bc4a47c1d807ed17725e16eddc30f6f50ed62cf678931d6e2f87 SHA512 5b80352dcf1f6be843cd94b90c90552c06662494359b1d84a91e495274674fc3bc9a807e8e86d67da96ca28e00c7a74590a250e74d845183ff53fd002bec51c9
-MISC metadata.xml 1287 BLAKE2B c73fa9c1384ee77a1086a77e3f163e6be0460ede09f84ad4ded3d476ec67dc9c3b677619a06e136d9bca19c1dd884fb1f5397e2f16c1c7a4db70acba2b21adcb SHA512 2ef43378ea8190cac99ff2a400198aa9747b1e451a94cdafc6dc06487aa77afc9322e70e984c48b483dc2c8a3c9e73c5f538f707fbe7837eb4a3f0bff6c4070d
+MISC metadata.xml 1374 BLAKE2B 582f07a66b4dd4ff72e865c69596a364247bffbe1c11ea4a77c38c8b1dd6af6062a97889116387a251e890aee572724f2293e7b281fb5200fa3b3c1b91d4ccde SHA512 6f845148e018566a18f4dc86f1ff2224c45e5a135083263f7335fb0bb7a5ebba620787485ac1746f5207854b752be9ab3e5385b4fed63251359172bd4c196742
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
new file mode 100644
index 000000000000..d8b5ba6cf31e
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-functional.patch
@@ -0,0 +1,22 @@
+From 4ce8ebc4094512b9916bfa5984065e95ac97c9d8 Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annulen@yandex.ru>
+Date: Fri, 26 Jan 2018 20:50:07 +0300
+Subject: [PATCH] Add missing #include <functional>
+
+Change-Id: Ic5499c1854479064b735bff79b3501992a20a12f
+---
+ Source/WebCore/dom/SlotAssignment.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h
+index 0fcd4dfa6de8..9b9ebe429816 100644
+--- a/Source/WebCore/dom/SlotAssignment.h
++++ b/Source/WebCore/dom/SlotAssignment.h
+@@ -28,6 +28,7 @@
+ 
+ #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ 
++#include <functional>
+ #include <wtf/HashMap.h>
+ #include <wtf/HashSet.h>
+ #include <wtf/Vector.h>
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 645be81df281..c7df499ff74f 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
+		<flag name="hyphen">Enable hyphenation support via <pkg>dev-libs/hyphen</pkg></flag>
 		<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag>
 		<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
new file mode 100644
index 000000000000..93dd7e443a41
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+HOMEPAGE="https://www.qt.io/"
+SRC_URI="http://code.qt.io/cgit/qt/${PN}.git/snapshot/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD LGPL-2+"
+SLOT="5/5.212"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
+
+REQUIRED_USE="
+	nsplugin? ( X )
+	qml? ( opengl )
+	?? ( gstreamer multimedia )
+"
+
+# Dependencies found at Source/cmake/OptionsQt.cmake
+QT_MIN_VER="5.9.1:5"
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/icu:=
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtcore-${QT_MIN_VER}
+	>=dev-qt/qtgui-${QT_MIN_VER}
+	>=dev-qt/qtnetwork-${QT_MIN_VER}
+	>=dev-qt/qtwidgets-${QT_MIN_VER}
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-bad:1.0
+	)
+	hyphen? ( dev-libs/hyphen )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
+	opengl? (
+		>=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
+		>=dev-qt/qtopengl-${QT_MIN_VER}[gles2=]
+	)
+	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
+	qml? (
+		>=dev-qt/qtdeclarative-${QT_MIN_VER}
+		>=dev-qt/qtwebchannel-${QT_MIN_VER}[qml]
+	)
+	webp? ( media-libs/libwebp:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	dev-lang/perl
+	dev-util/gperf
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${COMMIT}
+
+PATCHES=( "${FILESDIR}/${P}-functional.patch" )
+
+CHECKREQS_DISK_BUILD="16G" # bug 417307
+
+_check_reqs() {
+	if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then
+		einfo "Checking for sufficient disk space to build ${PN} with debugging flags"
+		check-reqs_$1
+	fi
+}
+
+pkg_pretend() {
+	_check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	_check_reqs pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix, bug #395875
+	tc-export CC
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local mycmakeargs=(
+		-DPORT=Qt
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		-DUSE_GSTREAMER=$(usex gstreamer)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_QT_MULTIMEDIA=$(usex multimedia)
+		-DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_DEVICE_ORIENTATION=$(usex orientation)
+		-DENABLE_WEBKIT2=$(usex qml)
+		$(cmake-utils_use_find_package webp WebP)
+		-DENABLE_X11_TARGET=$(usex X)
+	)
+
+	if has_version "virtual/rubygems[ruby_targets_ruby25]"; then
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
+	elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
+	else
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby23) )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# bug 572056
+	if [[ ! -f ${ED%/}$(qt5_get_libdir)/libQt5WebKit.so ]]; then
+		eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
+		die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
+	fi
+}