gentoo resync : 18.11.2018

5 files changed, 89 insertions, 4 deletions

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|' \