gentoo resync : 19.05.2018

3 files changed, 2 insertions, 107 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 5a118c283160..7e424817d1f3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,13 +1,12 @@
 AUX qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch 1897 BLAKE2B b72be2793ccfe5738136cf6456e7929905ed975101625b859b4eb298f37f6b28125df54edbe61d66689b824acd9aefc05cfba32d49c3bcce12710a2632574650 SHA512 ee2a483751e576b5508a8ae9c5afffde6df63b5431371abf71bdb3635c9dddfea1c918f43516ef78222ab9ea7bdd1fc804ee81662fbd8bf83ce544bcf0248e1d
-AUX qtwebengine-5.11.0-update-shim-headers.patch 2030 BLAKE2B 53325012dc516ac1c6dc43bcb0e22e5e59e6f7c808f85b884183922053886816a9b7887211a4e607b39f52ab7f9fd97940e2fb009f72bd918790e76066f8c365 SHA512 88aca795e37ff45fbe35a0cdb4324573005dd4bfad1bfa82220d48e5b4adaff03ebe3897d7813a130b8d8786dd9ba9279c65ec25e0a66a6605e46b8a1834b683
 AUX qtwebengine-5.9.3-icu-60.1.patch 664 BLAKE2B eb36ee21a907677d6599dfd7fa3960619492ca0616cace73e475ceba64b1f43631d6f81b303801d934dc6e4a71bf7dc4c4b43fc73d3d048ca51bd7ceea13bc68 SHA512 9652916b675ae2d94f761ebd1e13effbb7545d14bda130a61122d082ea7e826da1be1d22d9063f5e3a4a3b2bb3bc51edb7a98a51869ec8bb9db9089e4c31dd5b
 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
-DIST qtwebengine-everywhere-src-5.11.0-rc.tar.xz 233695496 BLAKE2B e9dc4449cd56a7079091f5f78fdbbd19197c3f770b98d98828f99b45dd65bb3a2198e8f4f16a693408c6aac40b494c884bd0b3116678d76e9cf7e54741ea6507 SHA512 2ec16851e45540aab65f891be0ac33518f7d9a017ff7bf3c49a012b29e08c8f17c2c90683ceaacb7359259f08fbf073d8edd53563f8604293ab71fce61adf76f
+DIST qtwebengine-everywhere-src-5.11.0-rc2.tar.xz 233745356 BLAKE2B 12fd78886532b5422122fbccb5a3b1f61ee12d72e4868ba2340cd525320de017bfe13520d7ad405db396b40a2ad40152a9d12a97f900302b21a2ece100f72afa SHA512 b46733628b162cfdf47311597d09bed97048dfdddff7e6970c6e29a3b91f3f2a9641e680fdc77979ce5da6cf978a6495d245f57692c3f081caa8e896e89b0228
 DIST qtwebengine-opensource-src-5.9.4.tar.xz 217337248 BLAKE2B 8a8c55dc08b06b07822fd53c780c1b7898516c8a7d021711f4ad5409630a131a90b1916c21d4e83e43dac773c4c73b4a1045baf96ed3c1d39f2d3d4c35c4a8c0 SHA512 c576e81cd9d202a4614c3eedd008bc41bd6212cd4d06e639469b843726be427f9e7a9551b3e604cbfee90f8dde22afb5bcd4905818ca65234e198078971d6ac9
 DIST qtwebengine-opensource-src-5.9.5.tar.xz 216767300 BLAKE2B 9c05c808d18ed27833b48deaab1c0a6d12a7fa17288a522a8aa04c9b06746e9d69ba06467297369353979844e94efad354a124e28dae94d3128e853a8218e6d7 SHA512 74aa2a36ba5a56d0870f5269f93b54c036fccabf60d906b5b0f0db38afb8582d8794be4025ecea28e4c5b8c4c9beda345e3c2b2155e77bbedfe688308009de2a
-EBUILD qtwebengine-5.11.0_rc.ebuild 3322 BLAKE2B 966f7dfc43a58160e3f42fc3f612006b143fb8809e94a23367a38d7fb2e73b47cbf9f2625b9fd26aa4fb39be09ab57677a841d08ff635db12378a09e31b06a0d SHA512 40cbdb054465624a2a033a426926c56bffd8574e51b34b479ff39e3c8c153bc9deb8443ab5afd8628d73b8f7daed4283f1ad3174c16624a807553636843e6a3e
+EBUILD qtwebengine-5.11.0_rc2.ebuild 3198 BLAKE2B a723c9d8e6e79c10aac06689b15f7d6cf26860e1ab9049a6c8915af8ec5bdbb4c24e28bfca6e20c839b2728472889cc684ea30d49f670935f9e99974e0b3556d SHA512 fc4f40ddff12b971560bb70c919d856eef1bef7ecd876a646045a11524e5a1f7b1a19e07e8902b64392da1e657f330dcc6f20ee9883478525bd806a9cc5c4a93
 EBUILD qtwebengine-5.9.4.ebuild 3223 BLAKE2B ef411c3f0e15c72b2592cd04ef8f04b57cedd089c4b83005b575ef4db264dfadccf711f8598309fbabed6c2a141dcd983eca53f3e8506ea7517eb62301b9caec SHA512 8002221d79b292097d23cae4f6423d28ede730564ba09b164f9494ca08b84f46d9cade2247622739f41dfea37939891795ec1b12421a02d53f349de0c9851faf
 EBUILD qtwebengine-5.9.5.ebuild 3195 BLAKE2B 8165a853d4a02ea34babf6ce46f897cec10b7597fcadf1df9c2b0089d8ecde55ba1d482b7d4622870c55cc630148181805e30959bd9c9d6772b955cbd3b7f45c SHA512 ec0540064675ca249271a812b1f632b9f0cc1d0879f8099cf3949bb7413d812d52a18d7a90bf915c8b0f1d0dfe2f11bd41df9f8c44675dda823735deda0e46ab
 MISC metadata.xml 948 BLAKE2B c3f99b9a59aeb8ad3754b0caafdd7132ee60142f41d992b0fecdb3ed0f396ec7903fb68bc2e734e127f4f722c4f0c6c8398f94685925296037684912ace05764 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch
deleted file mode 100644
index e5e3831236fe..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/src/3tdparty/chromium/third_party/icu/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn
-@@ -1153,6 +1153,8 @@
-     "measunit.h",
-     "measure.h",
-     "msgfmt.h",
-+    "nounit.h",
-+    "numberformatter.h",
-     "numfmt.h",
-     "numsys.h",
-     "plurfmt.h",
-@@ -1180,11 +1182,11 @@
-     "tzrule.h",
-     "tztrans.h",
-     "ucal.h",
--    "ucoleitr.h",
-     "ucol.h",
-+    "ucoleitr.h",
-     "ucsdet.h",
--    "udateintervalformat.h",
-     "udat.h",
-+    "udateintervalformat.h",
-     "udatpg.h",
-     "ufieldpositer.h",
-     "uformattable.h",
-@@ -1197,6 +1199,7 @@
-     "upluralrules.h",
-     "uregex.h",
-     "uregion.h",
-+    "ureldatefmt.h",
-     "usearch.h",
-     "uspoof.h",
-     "utmscale.h",
-@@ -1216,13 +1219,16 @@
-     "appendable.h",
-     "brkiter.h",
-     "bytestream.h",
--    "bytestriebuilder.h",
-     "bytestrie.h",
-+    "bytestriebuilder.h",
-     "caniter.h",
-+    "casemap.h",
-+    "char16ptr.h",
-     "chariter.h",
-     "dbbi.h",
-     "docmain.h",
-     "dtintrv.h",
-+    "edits.h",
-     "enumset.h",
-     "errorcode.h",
-     "filteredbrk.h",
-@@ -1245,23 +1251,26 @@
-     "rep.h",
-     "resbund.h",
-     "schriter.h",
-+    "simpleformatter.h",
-     "std_string.h",
-     "strenum.h",
-+    "stringoptions.h",
-     "stringpiece.h",
-     "stringtriebuilder.h",
-     "symtable.h",
-     "ubidi.h",
-+    "ubiditransform.h",
-     "ubrk.h",
-     "ucasemap.h",
-     "ucat.h",
-     "uchar.h",
--    "ucharstriebuilder.h",
-     "ucharstrie.h",
-+    "ucharstriebuilder.h",
-     "uchriter.h",
-     "uclean.h",
-+    "ucnv.h",
-     "ucnv_cb.h",
-     "ucnv_err.h",
--    "ucnv.h",
-     "ucnvsel.h",
-     "uconfig.h",
-     "ucurr.h",
-@@ -1280,8 +1289,8 @@
-     "unimatch.h",
-     "uniset.h",
-     "unistr.h",
--    "unorm2.h",
-     "unorm.h",
-+    "unorm2.h",
-     "uobject.h",
-     "urename.h",
-     "urep.h",
-@@ -1294,10 +1303,10 @@
-     "ustring.h",
-     "ustringtrie.h",
-     "utext.h",
-+    "utf.h",
-     "utf16.h",
-     "utf32.h",
-     "utf8.h",
--    "utf.h",
-     "utf_old.h",
-     "utrace.h",
-     "utypes.h",
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild
index 735be56a730c..82890439c645 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild
@@ -81,8 +81,6 @@ PATCHES+=( "${FILESDIR}/${PN}-5.11.0-fix-build-w-o-qtlocation.patch" )
 
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
-	use system-icu && has_version ">=dev-libs/icu-59" && \
-		PATCHES+=( "${FILESDIR}/${PN}-5.11.0-update-shim-headers.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