gentoo resync : 18.11.2018

13 files changed, 227 insertions, 10 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 313cd63ec8a5..b361209e1cde 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 8c3858a41bb9..bb6ca7411764 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.2.tar.xz 9691816 BLAKE2B 6391d9ec8c12789568db152a7131109e504449b82c738304f1360430d40c465a2f2bd6a77bf80ec8139c2ba93b896b62f59b6698a6f234ac606b9d2d396de211 SHA512 a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5
 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8
-EBUILD qdoc-5.11.1.ebuild 748 BLAKE2B 2cfeb0fb1fa9029e0f623bf05fb857bcfc23baedfe63cbe718534cd80c0b80f751db5a8652fe559251acc4819609a284c9f6d90057eafeb79086b83d0ce93cb9 SHA512 d21d49d2f7b3e4f4d74a8c478aa50b5d65a9d071d54b24ee41bd645fecc3104ed5a89ab19be778eaec248105759f111b4c7edd4bc7a6cf268dfa2126a85cdff3
-EBUILD qdoc-5.11.2.ebuild 750 BLAKE2B eb3e07dfd858c8553e5595d9b6258e9e81e07e57efa4fd7f16319fb64b0e3fc2769877ce78eaa9d2286448d6f41490b8a6fb092a7aef6da2a845dde269e080ab SHA512 8e960867e7463571e7e08ba51c145847269311f210bdc6f0151be8c283a745e0ecf59cc76ba9e4584bc57ed6dd5e1cdeaa95dadc1e15103d26a8f4ea2b36420e
+EBUILD qdoc-5.11.1.ebuild 755 BLAKE2B 395639f24784f4d831f443f7fe3c2d5b9aa88b31e15abd97142f513f7f95c68723b44b7127d4b3988ff17dd68e1b013854a80fe3f0dc96e368449de1160571ab SHA512 1da1934c116b9251deef1b92307de45345023a7ee5fd97a940804ddb0330fdeb3fa0786c141f346e4d24c6398e1495f8c24d4b927bc56fdfdb9933e584a183bd
+EBUILD qdoc-5.11.2.ebuild 757 BLAKE2B f7f06d953f50d8b49c335fbb51a35c3627a5ad0cc958579b70accbb6573f44c8b02939c135caf02ee10fd2c74342eed6bf068fcf5276ef9123b8773e6da4a9b7 SHA512 75e521af77a7c7a39ff71bc35c75066494982c732dc24cb64555173446e1c95481d2ebfb8ce483c5cc12d9020e154a6965a560273e92bc9c06ed8958aaef703e
 EBUILD qdoc-5.9.6.ebuild 534 BLAKE2B 3817288c91c7c034346c8b9d093d243cbb37229c411117d20efad801fd483730f51de736fffd3f697a081b8be2a083b5e9ee50a1e73d646100aa409306389eb8 SHA512 ab20a092b666c13b4e248c6abe9e2fff6a79d740ee3ea996cd3aecd72b23857e950b9555fb0293908c49b4719f923876b5035247e28210bbd82cf19a99e3c57d
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.11.1.ebuild b/dev-qt/qdoc/qdoc-5.11.1.ebuild
index c54433b0aee2..3fd4b332dcc8 100644
--- a/dev-qt/qdoc/qdoc-5.11.1.ebuild
+++ b/dev-qt/qdoc/qdoc-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qdoc/qdoc-5.11.2.ebuild b/dev-qt/qdoc/qdoc-5.11.2.ebuild
index 6e802bc94b9f..b9413ea45a74 100644
--- a/dev-qt/qdoc/qdoc-5.11.2.ebuild
+++ b/dev-qt/qdoc/qdoc-5.11.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 14dc71d319c4..0f758081895c 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,6 +2,8 @@ AUX qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch 2517 BLAKE2B 8339
 AUX qtwebengine-5.11.1-ffmpeg4.patch 1261 BLAKE2B 1c076c83921f223b6001d2bd71039637ffe7cab8c2f88c3ba6aa78a4ec6f8cbfc6fcdba6a89e8c8cb2d6e8f38dc06bcd28e9012931632d7af2d0157bdaaa1579 SHA512 64c64db96b1270d157c08fe572cde7e559700ced28b5b350a46ce1f1f0007a871f165547ef8a2d26b2269bd592b92c3aa2655618917c4f3c2d4f02165eef2c91
 AUX qtwebengine-5.11.1-libxml2-disable-catalogs.patch 1609 BLAKE2B c3683d221556c6051874c7a7d9d36caaebd86a9689682a19ea8f16df68ff9403a5d182a33ae5bc9b5efbb485bbdd335e81757642f1a71f562fb3ae2533af5d67 SHA512 284fbee4559a38a64e7426be272f4d4362613d8a55c6aef2123c12ddfef3f5c2cfb534bd11ba4c698b6c2bf29bc58fb4c6a06eef7bdf7e766d99673c2434dcf5
 AUX qtwebengine-5.11.1-nouveau-disable-gpu.patch 3710 BLAKE2B 880d63b7552973cf91bb1411f92ab3ee2d88013f144bdfcc6b5e1eec1d886bf76ab2166bc7600212701031da63a69ed2f5e03a4bc15549834a9a770ed68f35ef SHA512 a0b9592201d950ae97b92d5d0161ccc5bc675a37fbf657fe15ea0fe12870a370cf3ce54f5f033c073af23defded5c4ad0b43993c5b559024b285c5341b4673a0
+AUX qtwebengine-5.11.1-paxmark-mksnapshot.patch 1007 BLAKE2B 3f7acf876b78caa945a72a797c08da9b24cb7e6363a904734265872c382789d5aec8e67e0ece7b0e50b6e7ccd9dc15f1e8aa7936736bed3ce14897c706d07938 SHA512 9a89eda73c08279d9bd6e871d138e670f8d6fb2e9efb191effe2c9063cf4eb007c6fbbd907005ebcc57f576a8faa5cb8a5ce996b9692aa226703765ddd939c06
+AUX qtwebengine-5.11.2-paxmark-mksnapshot.patch 888 BLAKE2B d44e8772dafd8962805abe412470d94ced2d11e47d3e7e25acbfafa54669677a1e072b435a06ed093f7c9ce27d8d98fab4b042cd49862350d77c944418a335b9 SHA512 893aef4801d1f2a3fad1f4d1ef2c2b122d4004b7966e76d8e1adeb8cc5b03ce8b0ddf30d20690ca6e0b15b76074aa386b46b00d0c828b7684c6fcacc33b2865f
 AUX qtwebengine-5.9.3-paxmark-mksnapshot.patch 997 BLAKE2B e6fd8d6830ee2ca7b4e9c5586e52ce0ce577ddf6839d1de33a125606bc94bd483e4bef3008196f60e6c622074d23166a01b560dacfc5cec86e82dd360376627d SHA512 4a93fa1bdc7c4bbf22c68af4eff9473c4c9e39bc9cdc725441d5bdaec0521fd54db2b25f6900d4dc5d41a8cbeb04d5b420a85f334e3c18348d2e9dd1d9700dc3
 AUX qtwebengine-5.9.4-jpeg-9-1.patch 2782 BLAKE2B eb52d5ab51ca47603f3cdf684e0d34bdb0e6441aed99603608866d41fbfaeb812129199d28f7d01763bd9a86cf0a4e9b46199ab1b227d5e0a3add1ad7bc43329 SHA512 85f305333741e88461c792e5ab1e65f3efaa762d60c52f6afd56c6344375e3467b3268c478d51de0340d99ad2ce3ea2aa5fad83364dfeed2d665244dc84c36ab
 AUX qtwebengine-5.9.4-jpeg-9-2.patch 1295 BLAKE2B 93fdcc0a69fa39c85583dcacd3052b87897e4b8df045b81090524e84a90e259d7824521e71639eec5ef8cfd86c5823302846bd1a05dff3fb39d5b988544bf46b SHA512 57551a4859791431d921fc0f514332d408f43c05ead7919468727069e01b9cf3cfe70f5ca014af57b8842f8ba745d1abe5838fa271d354b775a520ef296bd6a5
@@ -9,7 +11,7 @@ AUX qtwebengine-5.9.6-gcc8.patch 1184 BLAKE2B aea72fb7563517f6c1f0f1330bad21ae71
 DIST qtwebengine-everywhere-src-5.11.1.tar.xz 233633572 BLAKE2B 06fb9d490377ebb4af937e0fa1688cdfeb9bfdadf6c80afeef609d20a76bdb7c4fed6c1042405b762e59b11d7b16369990c66a395ec1b6b48bbb1ea5b8cd47f2 SHA512 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596
 DIST qtwebengine-everywhere-src-5.11.2.tar.xz 233642812 BLAKE2B fbf1ac14cec9a515fb9c401f1a04487aec2ebe1b64103db5ec2625791356cae71ff9a0048d3485d7fcbce4e0eb8bc77550f99b19542c7a0f8b56f902df4958cb SHA512 be8db67a9cd46bdff24a4fc3882193dbe2c7bd487822ad7345bf3464f8c21713b6e459867c9e9678bc33e9d14ea7e09cbaa171139799810c131c7b625c742e64
 DIST qtwebengine-opensource-src-5.9.6.tar.xz 216733460 BLAKE2B 6f6f4d89559899b7faa6c8a31187967e5dab357d63f6c096953bdffa9ff8e8299f22f3fe97bc5295093a89200b38f47b4b214ff91765f8da3a992c5058f06e1e SHA512 493e9b4fb7274253eca107bfbb6ff044068c78997299c48b62a504ba5511c4d3e2a7f481d986f34c75d035e4804b18f74bf6a4bf0daf0f6a5778abd8aa7ee68a
-EBUILD qtwebengine-5.11.1.ebuild 3542 BLAKE2B fabdec89cf02dfcfc6d42664d6ee4bb7fe8177e643446cda3ba05d459b96eec894306bda35f4a681ac5ea1ac624dfb80f53b2ecaa3caf78c766906963e1e082b SHA512 834c4c481f1841904bc579bf289b4b62ae6be2817e08e2e1f4cde74864fd428a222244e3ac3d313590c591969633c5435f024c90b803218859cba78c8d56444f
-EBUILD qtwebengine-5.11.2.ebuild 3526 BLAKE2B 9107f0c9e764439cb929701e23b9ac5555562e878258d6aa2f642b322fb0e3e550c72bcb381588677d127f5a78adf17411864d81fb78d371165a117b79ee1389 SHA512 4383028aac8738b722af32b4f1f42b7e5e0322498d27f2b42d0c05e195ee6635acda45f7e132e8f44167a7d34e1a00833fe0d86574aecff33abd6dc434053a90
+EBUILD qtwebengine-5.11.1.ebuild 3535 BLAKE2B e806536baec3071808ff3c0a7f5f0d7f287b1c4489bd51f76fdc5d3eb5951c047199660c5daddec7f75dee50f1d7fdfbe2e6e6859d89979e1b28c8bdb79ad686 SHA512 9fb74dedea97963bd8363c6861e92395c0a4d9152dfe1ef26f8df7ad9e55ae4c6f60858c52fc6a9df90a3c96460230fbda099fd22dbb6c2eef7899963e7c1daa
+EBUILD qtwebengine-5.11.2.ebuild 3538 BLAKE2B efa4a066cdfdc976d535a305c317032f893890c074ae3b92e35f4baa9cb28e84bbcab43b5fc9b78c332da56d2fdd689cd3be7637b49a0eaa0d8629ed054fe0f6 SHA512 a3fa0563d7615a7063776669bef280eb74ee64bb7cc21acd3e832b00936ff0e9973bb7d543816bd7b21f68b6a1a14bd41a28eb4613f8e222dcc199082b09b31c
 EBUILD qtwebengine-5.9.6-r1.ebuild 3411 BLAKE2B 146d96022668be866f724a8905c82ed139a517cb68492dd97c554c3389e97b7fa4125afa5b4ca343fe4057bccc9efa25566ebf76d26d9e40b43968838cbaa96e SHA512 6d84cc73e712355e3c0069d753556f0f9e8e64a89a4574bde151bc776fecc67f01923c973af64258163ebe9d5950582c6bb5fd02ced78c121f86e3c6907a7066
 MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch
new file mode 100644
index 000000000000..352deefb22ac
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch
@@ -0,0 +1,41 @@
+Bug: https://bugs.gentoo.org/634220
+
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -661,6 +661,7 @@ action("run_mksnapshot") {
+ 
+     deps = [
+       ":mksnapshot($v8_snapshot_toolchain)",
++      ":run_paxmark",
+     ]
+ 
+     script = "tools/run.py"
+@@ -706,6 +707,28 @@ action("run_mksnapshot") {
+     args += [ rebase_path(v8_embed_script, root_build_dir) ]
+   }
+ }
++action("run_paxmark") {
++  visibility = [ ":*" ]  # Only targets in this file can depend on this.
++
++  deps = [
++    ":mksnapshot($v8_snapshot_toolchain)",
++  ]
++
++  script = "/usr/sbin/pypaxctl"
++
++  sources = []
++
++  outputs = [
++     "$target_out_dir/mksnapshot",
++  ]
++
++  args = [
++    "-sm",
++    "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
++                                      "root_out_dir") + "/mksnapshot",
++                       root_build_dir),
++  ]
++}
+ 
+ action("run_mkpeephole") {
+   visibility = [ ":*" ]  # Only targets in this file can depend on this.
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
new file mode 100644
index 000000000000..f7a5c064fc4e
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
@@ -0,0 +1,41 @@
+Bug: https://bugs.gentoo.org/634220
+
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -803,6 +803,7 @@
+ 
+     deps = [
+       ":mksnapshot($v8_snapshot_toolchain)",
++      ":run_paxmark",
+     ]
+ 
+     script = "tools/run.py"
+@@ -854,6 +855,28 @@
+     }
+   }
+ }
++action("run_paxmark") {
++  visibility = [ ":*" ]  # Only targets in this file can depend on this.
++
++  deps = [
++    ":mksnapshot($v8_snapshot_toolchain)",
++  ]
++
++  script = "/usr/sbin/pypaxctl"
++
++  sources = []
++
++  outputs = [
++     "$target_out_dir/mksnapshot",
++  ]
++
++  args = [
++    "-sm",
++    "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
++                                      "root_out_dir") + "/mksnapshot",
++                       root_build_dir),
++  ]
++}
+ 
+ action("v8_dump_build_config") {
+   script = "tools/testrunner/utils/dump_build_config.py"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index ba8cd487b93d..72de09bfac98 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -86,7 +86,7 @@ PATCHES+=(
 )
 
 src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${P}-paxmark-mksnapshot.patch" )
 
 	# bug 620444 - ensure local headers are used
 	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
index 57fa9ada481e..503918439e7a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/harfbuzz:=
+	media-libs/lcms:2
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	>=media-libs/libvpx-1.5:=[svc]
@@ -84,7 +85,7 @@ PATCHES+=(
 )
 
 src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${P}-paxmark-mksnapshot.patch" )
 
 	if ! use jumbo-build; then
 		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index fafe6277d186..00c0e2796821 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,4 +1,6 @@
+AUX qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch 4466 BLAKE2B 62a135c8f7270077873291dec3d2d29bd663e3c4583c4886e781a974704628bc46aa4aa24ac45ea3a70c2b8652e78029eed4bba441a6a02eafb6d9b34562ff6c SHA512 9feab732ee2bb7aaeb67049d202e8f6b12ac92b0a1e963b518e85c13e7e3a856c842c3c12c9662ce06d0d77d7a61795270749eba73070eadbb066dcb88aa066e
+AUX qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch 1164 BLAKE2B d0d12652387ed24a21548746687fb4689d3d9198e66ba5bb3fa6ec3aeb83db610f5f9e9910ec6c5f240ac6a0f2af855afa4413f971585588fe0d9bd6b718203c SHA512 52f34491d15cc8ca381347427cb440788f8ac6d7d8e52bab067fe997e321bd9e693c9d48669b6bbc23f060c9475d25563496e368b7a94198aff25a21a1491e3e
 AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f
 DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
-EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3712 BLAKE2B f65061c5d552f394d83e7ff08e2d7282d1e9de526b04c528b456b9c98f51e0c5a287702966dbb6e7285b3b543a42642b1bc2a90e7d0ba954554d648f98ce3962 SHA512 3f3e5d90e272de0cbbc73a954c4e833d9fa207d285f2a271831a38410d8dd7bc754b6669099414fe3ead9018e99172586d9c40cbb519ba82edf481476319c984
+EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3813 BLAKE2B 5dcfd0311f11e96beaa9e77a1e2ee0b1ab717093e011997d82f95fdf361c67570465fbedb3bd47c6fa3a4f7aa595242247af039dd66eeee76343599ccb1174a8 SHA512 ebc56bac4850fd81c7d4d91c70c32c037b6267f3ab528a415face02f2bbba944c47283fe8a711671cddadc1f30dfd366a699274fef13d324f90263a72bcc64e0
 MISC metadata.xml 1225 BLAKE2B 29d533721955dea3cd9f1d23494438d3abc079d713cf77d707920a765e3eba4e2160d0f80b05ec2ba8cbcf7999aad51201bbf002e8b59161bb2d0d85cd945e50 SHA512 b382f115f4705a577e210760d499fde421d0091818914674f0c2eb7fc4967d19d5dbf752be19f43f0edb27493ebec58b89e07a65ffa505842a089d06353aa122
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch
new file mode 100644
index 000000000000..a460cec609bc
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch
@@ -0,0 +1,97 @@
+From 326604b27878566d581ea8c1991abd280453a75b Mon Sep 17 00:00:00 2001
+From: Andrew Webster <awebster@arcx.com>
+Date: Tue, 20 Mar 2018 09:08:00 -0400
+Subject: [PATCH] [cmake] Make spelling for PKGCONFIG_DEPS consistent
+
+It was referenced as PKGCONGIG_DEPS and PKGCONFIG_DEPS which left
+Qt5WebKitWidgets with empty dependencies.  Correcting to
+PKGCONFIG_DEPS gives it the proper dependencies.
+
+Qt5WebKit was already working, but the spelling has also been
+corrected to avoid confusion.
+---
+ Source/WebKit/PlatformQt.cmake | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
+index 28976b611cd8..de3eabab1157 100644
+--- a/Source/WebKit/PlatformQt.cmake
++++ b/Source/WebKit/PlatformQt.cmake
+@@ -427,7 +427,7 @@ install(
+     COMPONENT Data
+ )
+ 
+-set(WEBKIT_PKGCONGIG_DEPS "Qt5Core Qt5Gui Qt5Network")
++set(WEBKIT_PKGCONFIG_DEPS "Qt5Core Qt5Gui Qt5Network")
+ set(WEBKIT_PRI_DEPS "core gui network")
+ set(WEBKIT_PRI_EXTRA_LIBS "")
+ set(WEBKIT_PRI_RUNTIME_DEPS "core_private gui_private")
+@@ -448,11 +448,11 @@ if (USE_MEDIA_FOUNDATION)
+     set(WEBKIT_PRI_EXTRA_LIBS "-lmfuuid -lstrmiids ${WEBKIT_PRI_EXTRA_LIBS}")
+ endif ()
+ if (USE_QT_MULTIMEDIA)
+-    set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Multimedia")
++    set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} Qt5Multimedia")
+     set(WEBKIT_PRI_RUNTIME_DEPS "multimedia ${WEBKIT_PRI_RUNTIME_DEPS}")
+ endif ()
+ 
+-set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit")
++set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit")
+ set(WEBKITWIDGETS_PRI_DEPS "${WEBKIT_PRI_DEPS} widgets webkit")
+ set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKIT_PRI_RUNTIME_DEPS} widgets_private")
+ 
+@@ -465,12 +465,12 @@ if (ENABLE_PRINT_SUPPORT)
+ endif ()
+ 
+ if (USE_QT_MULTIMEDIA)
+-    set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5MultimediaWidgets")
++    set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5MultimediaWidgets")
+     set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKITWIDGETS_PRI_RUNTIME_DEPS} multimediawidgets")
+ endif ()
+ 
+ if (QT_STATIC_BUILD)
+-    set(WEBKITWIDGETS_PKGCONGIG_DEPS "${WEBKITWIDGETS_PKGCONGIG_DEPS} Qt5PrintSupport")
++    set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5PrintSupport")
+     set(WEBKITWIDGETS_PRI_DEPS "${WEBKITWIDGETS_PRI_DEPS} printsupport")
+     set(EXTRA_LIBS_NAMES WebCore JavaScriptCore WTF)
+     append_lib_names_to_list(EXTRA_LIBS_NAMES ${LIBXML2_LIBRARIES} ${SQLITE_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
+@@ -494,7 +494,7 @@ if (QT_STATIC_BUILD)
+     endif ()
+     list(REMOVE_DUPLICATES EXTRA_LIBS_NAMES)
+     foreach (LIB_NAME ${EXTRA_LIBS_NAMES})
+-        set(WEBKIT_PKGCONGIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} ${LIB_PREFIX}${LIB_NAME}")
++        set(WEBKIT_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} ${LIB_PREFIX}${LIB_NAME}")
+         set(WEBKIT_PRI_EXTRA_LIBS "${WEBKIT_PRI_EXTRA_LIBS} -l${LIB_PREFIX}${LIB_NAME}")
+     endforeach ()
+ endif ()
+@@ -504,7 +504,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
+         BASE_NAME Qt5WebKit
+         DESCRIPTION "Qt WebKit module"
+         INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit"
+-        DEPS "${WEBKIT_PKGCONGIG_DEPS}"
++        DEPS "${WEBKIT_PKGCONFIG_DEPS}"
+         FILENAME_VAR WebKit_PKGCONFIG_FILENAME
+     )
+     set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.")
+From 8c76aabf062232c3fb26839b76716006eca44eec Mon Sep 17 00:00:00 2001
+From: Andrew Webster <awebster@arcx.com>
+Date: Tue, 20 Mar 2018 10:33:59 -0400
+Subject: [PATCH] [cmake] Another PKGCONFIG_DEPS correction
+
+---
+ Source/WebKit/PlatformQt.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
+index de3eabab1157..6ab441b98d29 100644
+--- a/Source/WebKit/PlatformQt.cmake
++++ b/Source/WebKit/PlatformQt.cmake
+@@ -452,7 +452,7 @@ if (USE_QT_MULTIMEDIA)
+     set(WEBKIT_PRI_RUNTIME_DEPS "multimedia ${WEBKIT_PRI_RUNTIME_DEPS}")
+ endif ()
+ 
+-set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONGIG_DEPS} Qt5Widgets Qt5WebKit")
++set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKIT_PKGCONFIG_DEPS} Qt5Widgets Qt5WebKit")
+ set(WEBKITWIDGETS_PRI_DEPS "${WEBKIT_PRI_DEPS} widgets webkit")
+ set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKIT_PRI_RUNTIME_DEPS} widgets_private")
+ 
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch
new file mode 100644
index 000000000000..e5d7796ee142
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch
@@ -0,0 +1,29 @@
+From fbd1de045999d1e5b5dcae7ac6c1e674ac0044fe Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Sat, 24 Feb 2018 15:09:53 +0300
+Subject: [PATCH] [cmake] Fix include dir in the generated pkg-config files
+
+---
+ Source/WebKit/PlatformQt.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
+index 6fe440be800c..28976b611cd8 100644
+--- a/Source/WebKit/PlatformQt.cmake
++++ b/Source/WebKit/PlatformQt.cmake
+@@ -503,6 +503,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
+     ecm_generate_pkgconfig_file(
+         BASE_NAME Qt5WebKit
+         DESCRIPTION "Qt WebKit module"
++        INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit"
+         DEPS "${WEBKIT_PKGCONGIG_DEPS}"
+         FILENAME_VAR WebKit_PKGCONFIG_FILENAME
+     )
+@@ -728,6 +729,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
+     ecm_generate_pkgconfig_file(
+         BASE_NAME Qt5WebKitWidgets
+         DESCRIPTION "Qt WebKitWidgets module"
++        INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets"
+         DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}"
+         FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME
+     )
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
index cee7596f99c8..d520d1f87ea0 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -76,7 +76,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${COMMIT}
 
-PATCHES=( "${FILESDIR}/${P}-functional.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-functional.patch"
+	"${FILESDIR}/${P}-fix-pkgconfig.patch"
+	"${FILESDIR}/${P}-cmake-fix-pkgconfig_deps-spelling.patch"
+)
 
 CHECKREQS_DISK_BUILD="16G" # bug 417307