gentoo resync : 18.08.2019

27 files changed, 171 insertions, 23 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e27fbbf9551d..399acdff4ce6 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 7f50293f905c..830920494a41 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,6 +3,6 @@ AUX cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch 751
 AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b4814253084c5ba7946b29ee5c5209c2c207721d9699d9fbab83e40f6d10394e89fe7a23ea5dc194cfcb2495e3ac2b075e22fa83bb SHA512 569cc28538333cdd907e3c9f26dd6512e48188dcb761284f2414936d60d4239d7ac15a5836f1f390d4881cce71bfb62a0679e097386116ecf807ecd03bf0f03f
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r3.ebuild 3808 BLAKE2B 197542ebf3a0b0d6309298b26caecb9e360a3645fe306aab046293070d0907f0db5f97016b4a9653e43f6e21c48771e3fef15059c8ae16e2204f6b304b3e7cb5 SHA512 46ef3fa23592fc554ed6433cadadb8683c0b60c359948d2c0a88425539f43b1111abdbf6bf12f344f71534d957ece4f105e18eca9775ce784dbc3b655b92c0f3
-EBUILD cairo-9999.ebuild 3692 BLAKE2B 95df8b4195124919a4e49485619e2fc550a0d267f86482c98dbffc473e4c44138f0d09e9879e240d46309b95faf02593cbd36f27f58ff1b17ab28b3dd18744a2 SHA512 c179e201e4a7e5ad1c61eea111e41b080f19d2f8cf0783064dd88e1bb276f5575ba91f09a4fc1bc17c069b399c8acbff667228f7d410e9c389535ff82d7c2fc4
+EBUILD cairo-1.16.0-r3.ebuild 3813 BLAKE2B 37ecf39e71c5d594d613e98f4f9cb07e58fc2d4a668ab46c0eabb47bed161a6e3399151165377c3e41a7fc276fd780827934491e9792fa52fe5b9ec0a2fdc2fd SHA512 3afd2f3665d2b3adfd38db0f5def6b184dcd7712a16581772a6d2973cd482971011b511a426b05dd9377a8fc3dccacfbae2b28fb09dc10224d06c6b1aa195b4a
+EBUILD cairo-9999.ebuild 3697 BLAKE2B f33815d336890636f83d2bdfdbdbb129eb6d1066cb76ba053da7a0c879c0306c0cff600006f5d152e696db31abd84f2ad4f7780f24339a91d8e90a6c055bba4e SHA512 0d2b3180334176378dc7ff48b4aa39c5e42cb5ffb27e054cf300dcfa8d4e43936d5a98dae01772cc57ec3c1f95833752e92b09ec73bbe930027a850c2bec06b0
 MISC metadata.xml 704 BLAKE2B 25cce9fa8743e9f12ee5f41d189dfdb8850673c129f0ee1089922aead08d50a0eca451f926a9f58fcfe7fee256764db2102364968971d7f971a026f8f29fcfd1 SHA512 4c2c54b38569197ebbcb8145017b77c4f77fed2f6b6b6c4198386ee1e3f067b3ca4539cbf239bd7f3ead1e3d428992bae67b3e80edfbf8bcf48fad43d14256b1
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 5b9b8adaa412..6c8fc8546e0c 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
 	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 2145909816d9..cc6873271ec6 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
 	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index de13ee04d7a0..9c38dd549bbb 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -14,8 +14,8 @@ DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f148
 DIST gtk+-3.24.8-patchset.tar.xz 3684 BLAKE2B 686356993b95f5342942764af5f92ab52b17fcd326ee3fd0de5179ed2a55b6e0192e16707ee882866d39ede7d28150b8b8bc6945355f04a4b191b671ae70fb7d SHA512 31f9b982592a81095afad91f16ad96e72a7a2b0e2bf812f0b719da56d70235bc06bc991b5f619fefded3e1634efc5b7e8ef00053929c89e967351d8625518428
 DIST gtk+-3.24.8.tar.xz 22419364 BLAKE2B 262384d0bf1d843edfcb13007eae3584235fa166286f071b8b98803d452df3f4f8934f2b1830427d0c0cd956b67170e576f8c3f733e9b6323b8f89f6d0ddea71 SHA512 a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5
 EBUILD gtk+-2.24.32-r1.ebuild 10008 BLAKE2B 8bceca83e3a73a2565cd980c80d1baa5fa2a79de61b4b8cb984738bbf6740c59a5df4b04e878fa2282d46642970e11dc4db8dadbf479447576b854f597b274cc SHA512 f3dca376a7794bc8ecdc47362a09dc58d46de7636dc0fec7dda86727ed47cb0d2105d5901884b60ae0601159ba1a79d0da2e05d725e0d119d9382a7771369ad2
-EBUILD gtk+-3.24.1.ebuild 6868 BLAKE2B e602a63f626d30650b4ffdec0b7e5f21447646bd5cfc3c179aabbbe7c0447fa4714774e929becd35986dd39c4f800858721212945cc609f769aa451c39efa9c2 SHA512 779d1a44e18d00cb6051df289fc413bb9766ea4be932fd6207f83ac0d71c9a15883d585f778c1752460e5957a326f9d2b16550c1009230623c8561381bd51b6d
-EBUILD gtk+-3.24.10.ebuild 7282 BLAKE2B d3da35953d01bf291179469241325c2a696d0dc5273f87f324355eb64a95f2979f8a5743ee8df7c8053b1baa1bfb91141af6fd0c3d1633494783c64a91ce9a3f SHA512 6f776fd68dc300ecb3f349f1be88e1b95ad365819c71d33803b3dc50c9bdd9addd014217dfa446fabc45bdaf90fd6695ecf58434e5384532156b1e2b39a1f2c2
-EBUILD gtk+-3.24.4-r1.ebuild 7234 BLAKE2B 7f9ba74e4e52d0a12c350782005a939dd35dfba9c488296307a51c46aab52eb5c9548dcce600931f5041323b9471d01639fb80ebef562b4c75c3055839062663 SHA512 c036f96ed89adeb14441a07a04a6c7be48871a207c07faf2ab466d37e15d944a2cfc808198fcad0762db01ddee406ebd75186a07f67c6b644c46ae08c1516363
-EBUILD gtk+-3.24.8.ebuild 7064 BLAKE2B a01098b0b5faad0f845261289e07cbc515d26cc1a608528ba91914a66f78c6137c20729c621f0497dd9738a3775b159c3f2b5fec9b2840214bebc434f16522e2 SHA512 07c33d2a52adb53df62be8c89312b980065b5b98f133aa5d97233ba609d8268ef59af47eb696b5f4b5ddd8a25f75f5abb1d24e5bbe965514faddf2ccc08e317c
+EBUILD gtk+-3.24.1.ebuild 6911 BLAKE2B 2320cdd69304ba179e9d3a679f4fcbbbef233f454b4661fa1268e7f209401fac175d1a50f57c931ec669ff64168891d66abea8f057b84837cf3801404f6cc6e8 SHA512 0df091ae2f0ad31ef4a77c77ea62e1e6075af62234483bc841b9c027aff45e0c7632354895d3066f9d480177f90eaa25069b6082b21da48640e7525b96000194
+EBUILD gtk+-3.24.10.ebuild 7325 BLAKE2B 5462361af2e23d93b6fb6f55666a2c15552edefa201bc22443688e628a13bfab77714e3b55e0be2c57d92b18e01d4681d2730967e55a393eb1f3009b1880a29e SHA512 dfe6cffe3836606a87ce162b7c5668c284c0da4dfb0848941ed2a41b95efcda2d098997ce20921f7e149c89ed4c3978f484d3640f674f4bf1b000f5889a85adb
+EBUILD gtk+-3.24.4-r1.ebuild 7277 BLAKE2B 833c8d22a401ba319fce77e3dc17223213d96e3d170b382377af5aa95fcee179c357e69d7dabc02e653a21877e199c5871e9843f800887dfe87985e3a068e231 SHA512 a26d38f97f1186452abb836ae7508f1d70d8913f466915afc7f6970af52a389bfb1b16914ee933be4ef0e2cd9eed99684f7b3aa2c41cbd793a3d55bbb0b4e0fa
+EBUILD gtk+-3.24.8.ebuild 7107 BLAKE2B d7f5db20d8f6821c5c50568493ffa0a01fe0b50c935055cd6d4cc0ea0ee34ea8fb3cbb8737f15868267017430466c0404c2c8084f759001d4642af4970c25b99 SHA512 051a2cbad61cff75b30fc8c889f7a1884bb8ee483cf304f92cd5b04a81dadae664aee1994d71111b2b3ff8389f794b0d02dbf998826367ffab70a7441f5ce4b9
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.1.ebuild b/x11-libs/gtk+/gtk+-3.24.1.ebuild
index d1d0caea0f2a..b06c229a87d5 100644
--- a/x11-libs/gtk+/gtk+-3.24.1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.1.ebuild
@@ -51,6 +51,7 @@ COMMON_DEPEND="
 	)
 	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
diff --git a/x11-libs/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
index 6a435ba6df4a..5f80a015c446 100644
--- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.10.ebuild
@@ -52,6 +52,7 @@ COMMON_DEPEND="
 	)
 	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
diff --git a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
index d4f976a52b19..cbc785377abb 100644
--- a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
@@ -51,6 +51,7 @@ COMMON_DEPEND="
 	)
 	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
diff --git a/x11-libs/gtk+/gtk+-3.24.8.ebuild b/x11-libs/gtk+/gtk+-3.24.8.ebuild
index 37ea639ea409..2d9a9b11f63b 100644
--- a/x11-libs/gtk+/gtk+-3.24.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.8.ebuild
@@ -53,6 +53,7 @@ COMMON_DEPEND="
 	)
 	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdlo/Manifest b/x11-libs/libdlo/Manifest
index 0849c466d9f9..1885ae51197a 100644
--- a/x11-libs/libdlo/Manifest
+++ b/x11-libs/libdlo/Manifest
@@ -1,4 +1,4 @@
 AUX disable-testprogram.patch 832 BLAKE2B d0658618b0042f51e0f85efbff77933e62efc2acf571bbc539f908a771d290834d5b60f3840cac317d56f378f0c3b1c457fb966782df417d8d3af33c6dee88c5 SHA512 b07a0ddd5eca10f13e82039690c3d310981cdafebc38a9e632a55be38c5c8ff22b7dddffcf0ab0f9795e650e61f9079ff1d9c12b3ddaad8d018f060c377aecd3
 DIST libdlo-0.1.2.tar.gz 476865 BLAKE2B b2391b58046e1f403b7e0d1eb915a46aa17c47e8ad804246f12f3b94f9ffb4dbc811e5d08aac29c2f4196b5d384e7244bddad3193adff5d5e890a7463a503fbb SHA512 6df69bebcf3142e0a87f66bb9d690fd78b96e08c2ae5d46fe0f3d91bc135364d5f5dd0c3a481705c3cd90c78a0a076757220fbcc3b0ad4343cdddb54501e3f2f
-EBUILD libdlo-0.1.2-r1.ebuild 1152 BLAKE2B 343b0c53c6039c61951c3f9579b02f92a24e0ca89894ca542219cbc72606eafa6345403fd14ec45de7ce246de9168cb2bb552a2ad172b8cf02030a7b79d99420 SHA512 0b4457a6ca89b41d242fd2fd497e3fa7ea361e62540c6d6c44611162e01bb7b2405ecb0a073ab31ecf8cf6987a0f4ec98779256c962e8f8f05a74f5505c0e414
+EBUILD libdlo-0.1.2-r1.ebuild 1157 BLAKE2B 3918cc2d81e944fecbd3f3e8e654d9ec330cf39e6695cd7bb0aa6f9fe40109a5d68d21f0f9f3167e7a01eb382c391dcf8ab12c49a5910b5bbff550a5e94fc625 SHA512 d89f090b004872757d638feee7b591571c02cffe97e7c25e43170aa9c04d1317359c2607a311f553af0ed5f0e3cc4fec37796aeb090b10e3f20a4ba65b00e930
 MISC metadata.xml 807 BLAKE2B 84e05485afa5f0e78ea57310124a541c4f1855c36ae9b49568fa9a4d672484e6fe5d02b71e4325c3a07cf5edda074b02410c4b7b52a967840bb695b98e135546 SHA512 56c18fe35f8c672f9d694fc2c62ffd864774baeeeb9cfd8f75118cf7e51376ee7a4280933d53aa5ed5e85dd605ecca737a70a37c4b82b7293bc2963d250a4c96
diff --git a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild b/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
index a299b2e70e8d..1b720a84b95b 100644
--- a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
+++ b/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~berniet/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="static-libs test-program"
 
 RDEPEND="virtual/libusb:0="
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 73971150124a..e51e4e6a7f56 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -7,6 +7,6 @@ EBUILD libva-intel-driver-1.7.3.ebuild 1412 BLAKE2B 9e985438dd80942d725ef893e818
 EBUILD libva-intel-driver-1.8.3.ebuild 1429 BLAKE2B bc33591d741b7e6fe6a339d2f8b89b94a75a86f0c13643b3103a0edaafce267ca6b72bb3fbb38b4d0e979296e7cc45edaa5adce7addfe6dbace9137509ad8144 SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5
 EBUILD libva-intel-driver-2.1.0.ebuild 1426 BLAKE2B 1c956f7292f762816ae86ceab6a94acde5a7965772008dff36a0f4ddf1632670570d28c361cd23381dbcdfe22a3d5e0838bcde7582d9229bf0cf521196846bdc SHA512 9ac2e4bf42a57d0a914d64114f475513352850ba5e36f0cf9f1ee8b0a9a98ec17d0cd423862e4bbaeb96087343940aa7f8c4d1c0c2c9a4cd0f33e72dd4f961f8
 EBUILD libva-intel-driver-2.2.0.ebuild 1400 BLAKE2B d22802d407a9164b5f1921f9c0cf238bfe51ed37111b21cd4f62449c25c8fbda6296a691e797227ba70a12f169f10cd7e88cb864fc5f92aac7d91aebe678ac7c SHA512 8400d77fd9b3fe407e0b642a9f0f87da047aa827e44be5ddfe4051856698181082a0d073cb7f8c0450e2a17510e76aad16535ebd3ceb7c1fccb56b7f856f1a6a
-EBUILD libva-intel-driver-2.3.0.ebuild 1310 BLAKE2B 0941bb1ef76ddfcd7346c12e31ffd1f98cf76f4b15260a9584bb2398c3ffda64b675f401535b2d987a0df74799ba576caee2641b6b2c9f87e23750c8b4c97ee3 SHA512 9f6aea6aae9b45d0ec612b072089ba1f794487447a27b332505cf6390558c33fc8fba3363e9090a8fd61f339ccad5ffb12c54670663ffea30767a78875d591a7
+EBUILD libva-intel-driver-2.3.0.ebuild 1308 BLAKE2B 2aed9e5ffb8b4c557fbe3fe405025a987653f308a9e87435b69270a0b3269d00341c4eb6087a3c118dc8027de17ff0516d90fc698948eaf8f8ea7b586e2e92ef SHA512 284c598bd7933a807ee0e63e782cb5a0e03c0a2e863e2df559605434e1679779774f636d9f963fa58cb492483853d49d70012b5ce29e66dcace78cf686b41736
 EBUILD libva-intel-driver-9999.ebuild 1310 BLAKE2B 0941bb1ef76ddfcd7346c12e31ffd1f98cf76f4b15260a9584bb2398c3ffda64b675f401535b2d987a0df74799ba576caee2641b6b2c9f87e23750c8b4c97ee3 SHA512 9f6aea6aae9b45d0ec612b072089ba1f794487447a27b332505cf6390558c33fc8fba3363e9090a8fd61f339ccad5ffb12c54670663ffea30767a78875d591a7
 MISC metadata.xml 421 BLAKE2B f0188d8af65943438672ecd3ca5fdee0050ede13770668e54ebb99cdecbd816a4888f23939ddd1c0f467a000bb9357114db6d1934159cc808d9c981e849ec4b2 SHA512 ce09ecee2e99fa3a1dbb0ba9d320d39b6ed037cb0e6402bc2ea7762acd9dff09313d087e128e377e9d58558cfbc9374dd96acad2ea427a623a68bf1d972b9dd7
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild
index 1d8bbf4cd84b..9ae6b9627fbf 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
 if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
 	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 9c0ff4b2eb23..39c9e31bf22c 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -5,6 +5,6 @@ DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe361
 EBUILD libva-1.7.3.ebuild 2266 BLAKE2B f7807f5eca706ca9895d517626d8114e8db889d37ca44a09370243f4a8b89ac00b01416ee41ddb14110b91cd9923610a87699c05302523ec771755a0265e99d4 SHA512 fb26954bd83809530bfa4358e5b8021438c5743ba3deafb988a94cfdd92a56c960a7bd5a1ebca3c03f1c84aa96305b3b202f29c9e1de8d84b4b25ce8df5fdb71
 EBUILD libva-1.8.3.ebuild 2228 BLAKE2B f8ec448a272a59b1a15fd863bb813215d15c5c30a7fb7b100548a89e03a0af46d4a001c9ea76ed51fd2086c26c235101ac23cd13f6c46c6e9b2aaa7dabf54b42 SHA512 61a2b89d42c961f6a12c956091ec5cebc9dec5094854c8dd8191fa891c3de76254dd5df60ecbfa8b5387a30a4c2091848955145edcae5a9d98496b1804bcae85
 EBUILD libva-2.4.1-r1.ebuild 2189 BLAKE2B a57e450dd0eaf80a440f5dafdbf48e1ea337ba897468bf831f11c89e412a03916f2c9190f06bea45215d34084311618d29089995af9cab7011f20ba3693725e2 SHA512 94cacf1f0eea1290e3e493ec7d7a30bbede70a9ad9d372c762c9905d01e9a2558bd31e9d5f4c80539d53ee25b7146744d28742add3676b7b1f9cd642a2962f74
-EBUILD libva-2.5.0-r1.ebuild 2189 BLAKE2B a57e450dd0eaf80a440f5dafdbf48e1ea337ba897468bf831f11c89e412a03916f2c9190f06bea45215d34084311618d29089995af9cab7011f20ba3693725e2 SHA512 94cacf1f0eea1290e3e493ec7d7a30bbede70a9ad9d372c762c9905d01e9a2558bd31e9d5f4c80539d53ee25b7146744d28742add3676b7b1f9cd642a2962f74
+EBUILD libva-2.5.0-r1.ebuild 2186 BLAKE2B 7c9a9dc3f979909e02812398551197938bce437f0092940361853613fff9813e2d06af44f4e09130cb27ac4313722eba8b869ec0a8681532f07c6449ee4c0078 SHA512 2d8f8705c68d3a1bda268a18e8e65dc3e8d8f0d73fdcea6f6e8e5908028598f1a0e3865818ef37643bc6843af9dcb3f4fa9a167d021dbf67772937af2df721ed
 EBUILD libva-9999.ebuild 2189 BLAKE2B a57e450dd0eaf80a440f5dafdbf48e1ea337ba897468bf831f11c89e412a03916f2c9190f06bea45215d34084311618d29089995af9cab7011f20ba3693725e2 SHA512 94cacf1f0eea1290e3e493ec7d7a30bbede70a9ad9d372c762c9905d01e9a2558bd31e9d5f4c80539d53ee25b7146744d28742add3676b7b1f9cd642a2962f74
 MISC metadata.xml 518 BLAKE2B 2d363f9ee3a690cda208cd96d14003254c0226bb8c396e367d4382107b675fe9f5d0713f826ef611ddb250e3dd919da5e19473f6e10aa59c05e99cd13335e34e SHA512 655f89ce0b04f3d31f02617065baf715a4e6394828b83b18fe12f35a7fa3a626192d9165d2520a5731b98215afea3db4e5b50caf3ed1915be1a707389449a367
diff --git a/x11-libs/libva/libva-2.5.0-r1.ebuild b/x11-libs/libva/libva-2.5.0-r1.ebuild
index 00629ae44aeb..f23c9f5ecc52 100644
--- a/x11-libs/libva/libva-2.5.0-r1.ebuild
+++ b/x11-libs/libva/libva-2.5.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then # Live ebuild
 	AUTOTOOLS_AUTORECONF="yes"
 else
 	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/x11-libs/mx/Manifest b/x11-libs/mx/Manifest
index 7045886a6550..678f5bab6cb7 100644
--- a/x11-libs/mx/Manifest
+++ b/x11-libs/mx/Manifest
@@ -1,4 +1,4 @@
 AUX mx-1.4.7-gl-types.patch 1730 BLAKE2B ecc907923c89bad0a52a311cfff92bcce8487e55170cce4cfb4bedc5e8b8af2385c1b32df80950050289c848e608f1d10f3bfe186d55ed3c8ca1f6e90efb1cab SHA512 bbb2e8fc95b054b23982ff031f6298b2a9addebec557ab234ef88ef6fe67ac4cc1bd35545c73aee162e59113b0c49f8337e5f98efcb997d22a6f4b2410fdbbfe
 DIST mx-1.4.7.tar.xz 939672 BLAKE2B 3f55018c6d282af95b80852748a6baa7a56ea1ea69e1b3740b6d936633818f3b18124f1bec2d5bc51596df75a5633d355362d1d22549c5a7e490e053fcca2bae SHA512 6870898548c947d43947ea6ded7c06d01d18aa721c81927fabf3ee0cfe20f65739e927d32277acce5c2e13968502828e29e043f9a8cf31af8f2bc20ec1ad0349
-EBUILD mx-1.4.7-r2.ebuild 1374 BLAKE2B 24894c5963aee67a69104f00281378487dd7c92d1783787170be2aa8041fb58f4b9ea933d33fd4ebd1e7d81b78c8bde5301c3c681a26b436c56fdbced6cb0d0b SHA512 c0a1d237a6c68a99d78519f78c1efd85fdcd46157cf6cd061472d6571e9cef0fb7d00dd1491088fe0b1a78ba1c6dc297a4ea363f80c43a30a080c0fe31dbb06c
+EBUILD mx-1.4.7-r2.ebuild 1381 BLAKE2B 3f239ce3973ecf7ac4f7a798e9976b1d8ba7e3e2fb7a9bf8f18d2e2aacb18da1d98cea8cfda8afeba7741d4acb329f89a7f41fd8ea80e7ebd58cae67c17a05ac SHA512 cec26f6d376a3d0f0a5ee6afddd188b52da44fa0011d191a474db1b5f46c0533efcbca54f8c6662ef58accf366b3924697ef783ab17b57a83b5453ad02d2d74f
 MISC metadata.xml 336 BLAKE2B fa952ba6aa8ff9649c6da50285fdeb59e1d1181c5e80ceb63849df9e674a009bdfd8f7ea5aa2bd711cdd6355e5c4adf331534c39663fe4a988689a38ee3ee1f0 SHA512 aeac1b46fd9bba7bfc87813dceffe14128763f931816e7b9e320c9e75631d383a097e499e73f0b50d3e6a6e375605fa30b147b1e8f2f8db972aa8a707e593249
diff --git a/x11-libs/mx/mx-1.4.7-r2.ebuild b/x11-libs/mx/mx-1.4.7-r2.ebuild
index 9467672d801f..d6b126f844bf 100644
--- a/x11-libs/mx/mx-1.4.7-r2.ebuild
+++ b/x11-libs/mx/mx-1.4.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://github/clutter-project/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="dbus +gtk +introspection startup-notification"
 
 RDEPEND="
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index fc4e461dae7d..85dc6d2bb1d7 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,6 +1,8 @@
+AUX 1.42.4-CVE-2019-1010238.patch 1088 BLAKE2B 7517b2b4c3502546a554d3b592c8c48af444bf2797fcffd18bd63fb97023f3fff666c70359d4935cf179d7e98be12b885e5a2937d882b27f213e17658002e0a9 SHA512 24f46b5d14dd589b0d5ca992169fb46a696d0251c63cf3c0210bfded534f4f35d20bcd158c4397d6ebe828ae995a5321daca4ecc634f0d5f38bc7f5ccf8f2fee
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 EBUILD pango-1.42.4-r1.ebuild 2287 BLAKE2B ca72e458f6d20aa04760e5e683ec5bc4c92a5966ee87b6cea8661f46c35f4d463f1c390dfaad9836bbe6859bf91d49eabfd4fe8220c30647103f5bdf468090e4 SHA512 8497a2a3a992eb6405161691e985c561fac5b387a43ba7567ca2ba4227358f6a18ccc174e36557b5b296197f7138fd3f7bd5a231ee529f493918ef3b66294d88
+EBUILD pango-1.42.4-r2.ebuild 2335 BLAKE2B 91b269ef582a419a2f9b51430392af9176f026aa33a73be70518becd961e2061deb07d5ba06457ab0fd485a04db85ad827ddc12deb06a9e044848d8bd84c8eed SHA512 10a82a2386317fb19b2669114857d61d896acf6a18c04bd1534bd4a10958c068afa8832ec649716f515dfd1a241f8a9ac755ac6b373755bca59dd2ef734f4d44
 EBUILD pango-1.42.4.ebuild 2047 BLAKE2B 1248ddc636fd6345ddf29062120a48e81e6047f609e0ee2f18d62ebb543163b7b0c37ad7457882b50c07af0a781c95e5e93a31bd033755f50ccab3c9e337a79f SHA512 4da1edd151fc0bc03c8712520ea21145b9bc84209372ca9d81023d0f59e66a0883820c0a5f188f575d709ffefb91b81c8eef04b0b4a5f13b3392d49a9da624c5
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/files/1.42.4-CVE-2019-1010238.patch b/x11-libs/pango/files/1.42.4-CVE-2019-1010238.patch
new file mode 100644
index 000000000000..eaf0784c1b31
--- /dev/null
+++ b/x11-libs/pango/files/1.42.4-CVE-2019-1010238.patch
@@ -0,0 +1,34 @@
+From 490f8979a260c16b1df055eab386345da18a2d54 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 10 Jul 2019 20:26:23 -0400
+Subject: [PATCH] bidi: Be safer against bad input
+
+Don't run off the end of an array that we
+allocated to certain length.
+
+Closes: https://gitlab.gnome.org/GNOME/pango/issues/342
+---
+ pango/pango-bidi-type.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c
+index 3e46b66c..5c02dbbb 100644
+--- a/pango/pango-bidi-type.c
++++ b/pango/pango-bidi-type.c
+@@ -181,8 +181,11 @@ pango_log2vis_get_embedding_levels (const gchar    *text,
+   for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++)
+     {
+       gunichar ch = g_utf8_get_char (p);
+-      FriBidiCharType char_type;
+-      char_type = fribidi_get_bidi_type (ch);
++      FriBidiCharType char_type = fribidi_get_bidi_type (ch);
++
++      if (i == n_chars)
++        break;
++
+       bidi_types[i] = char_type;
+       ored_types |= char_type;
+       if (FRIBIDI_IS_STRONG (char_type))
+-- 
+2.21.0
+
diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild
new file mode 100644
index 000000000000..f740511e7bca
--- /dev/null
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +introspection test"
+
+RDEPEND="
+	>=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.50.2:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( media-fonts/cantarell )
+	X? ( x11-base/xorg-proto )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+PATCHES=(
+	"${WORKDIR}"/patches/ # bug fix cherry-picks from master by 20190216; each patch has commit id of origin/master included and will be part of 1.43.1/1.44
+	"${FILESDIR}"/${PV}-CVE-2019-1010238.patch
+)
+
+src_prepare() {
+	gnome2_src_prepare
+	# This should be updated if next release fails to pre-generate the manpage as well, or src_prepare removed if is properly generated
+	# https://gitlab.gnome.org/GNOME/pango/issues/270
+	cp -v "${FILESDIR}"/${PV}-pango-view.1.in "${S}/utils/pango-view.1.in" || die
+}
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 7dbcf179edb2..11fa1d9acd0a 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,3 +1,4 @@
+AUX 0.54.4-vala-0.44-compat.patch 883 BLAKE2B ecf653b7d37d731eace38d8bd1b52d9b6420fa46c67ce0090e0d0e2d4c48aa03f1951438db6bfe62a5e0094d080605d0cb51d71247d133307d47c98b6bd45f7a SHA512 9aa4961497931d7d18f7107b6101aa04dbbc034e45313272154e7e685166e565022e025e407ff56a95661e7c1bf135d68023ed0d513ceb0a6b6f83a43292d161
 AUX vte-0.28.2-interix.patch 1566 BLAKE2B 1d6b4b7cfc1fee464779e3efb8de09554c9e52f562d90d280e03493f01d8f44e468260b4c92327006a2358688414cf04d9639eea1162808597c590eeb6c21af0 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7
 AUX vte-0.28.2-limit-arguments.patch 1477 BLAKE2B 329e8eb93156244526ebe3ccb3c2a75234da7a57a994c2c1b42e283a65011d6245133f858778571efefec18bf18bc7db9afe5aeded0df0cec35a72a31507671b SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d
 AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 BLAKE2B d57f20415193bf9bc283399bcae4e3c2a23ff7f2f8ffee08e8a67c3af2956b137f788322e26bf2537e785c0d0ce6266b56269abe5a18e2e881ea548b5c1b4625 SHA512 46a54c96889c3a0c5a293a097f777dd2e24e5a3025b808d7fb0bbfe71e8938f7d30ba26a05e67cb6b63ad59719eace57d0f6e0ff9f2860fbe9f12c36e022b8ec
@@ -8,6 +9,6 @@ DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b2
 DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
 DIST vte-0.54.4.tar.xz 1087748 BLAKE2B 65fb762414e832930ce1519dc99fe306b3c9c3860bf8116c29e66b758178d1f0a52705cd6f7ab1be30374fb2956a01aaccc8f6859d0af971f2037809421bb502 SHA512 7e0f4140a4c474fad9a48eaf0e4c29f83e7bf50719087983c238b362c6303824836c34485eb2ca135be0961fa4b83a318d08ef70d4cf0dab0d37dc2e36710c41
 EBUILD vte-0.28.2-r208.ebuild 2962 BLAKE2B 7004c56381a05ed2c0c309736581f2e03478faae88903ca6eb2b74acfefaf37464fc8b1f1a077d3bff1344ad6a60383f4338b0a27ce2521bb0f68727eb252da6 SHA512 bf607001b0dd305cef30e4f1ae3389b73ae30c747a52915e4dd3df9bb051c44f29317c591a2d47add9bc0e95559ead75155338a69acd31fea9fb79c57f18577d
-EBUILD vte-0.48.4.ebuild 2296 BLAKE2B 1ae75d444433f1c6ea478e69968ae1a369b96e6ff7410a22a7f110d157369f15aeb0b22662da1ca4574b60b6151932823e2866596cc45394a38b76eb89009fd0 SHA512 80c270a32cf543c2bb29a534ff07179c5897505132383862cab59ec203789dda70e3c62e6cd6dffe305a3e36113510f2f5b7dfb49bf1de1e476e87a685499315
-EBUILD vte-0.54.4.ebuild 2215 BLAKE2B a5f21e683c7300ff8f92c65d8edfc9b6cf0eff19912908cb5fa225486003e372c6228e7e373cb8103be696f67c90a098945b61e7e081d7b6fe09fe9c05285f62 SHA512 ff2fb100a8ba5256d67a2112078b235e014bea274320ea42b8c7d5666c94a5bd1b8e4dd5cd7754dd99e386e8bd9bc79918dd141ec2dd35f506f3037e078b23a4
+EBUILD vte-0.48.4.ebuild 2454 BLAKE2B afa4f22fe6dc8cca9404be315b8f483ac710ca25f2b0d51077350191789fa9369f3d0683d7877117f671ec0b005caf2498e2a6f8cac325d17405d1f2c6a857c8 SHA512 177d216a4ef222f60fae1cd77aa1e0605d02e5c32f22f1726c5900728689b637637b0077fcb34144eb56d0389b82d88f642dd36ba989446cd591de0e4a436ed2
+EBUILD vte-0.54.4.ebuild 2372 BLAKE2B f06d6a983494e7e9d3f5855614c878f1823dec35cb6278c391040092237ceb5886ff1b9d73ecbd492338e8ffd26711ea15aa9ba3b35b2971ebc2f530cf390813 SHA512 5b9d03b07bb8036e9f07fee6320d974a4cf671385a6696ae65158f5839ec08d73e493c1a7b82ca2755e9a8a50f8ae687c721f26ae6d21cc9514c963108523590
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch
new file mode 100644
index 000000000000..5da32bea838a
--- /dev/null
+++ b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch
@@ -0,0 +1,29 @@
+From 53690d5cee51bdb7c3f7680d3c22b316b1086f2c Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 1 Dec 2018 19:04:59 +0100
+Subject: [PATCH] vala: Fix build with vala 0.43+ git master due to empty
+ struct definition
+
+This should get a proper refactoring as the FIXME suggests.
+
+See https://gitlab.gnome.org/GNOME/vte/issues/76
+---
+ bindings/vala/app.vala | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
+index 8663d63c..a534e76b 100644
+--- a/bindings/vala/app.vala
++++ b/bindings/vala/app.vala
+@@ -819,6 +819,8 @@ class App : Gtk.Application
+ 
+   public struct Options
+   {
++    //FIXME Merge this struct into App class
++    public int dummy;
+     public static bool audible = false;
+     public static string? command = null;
+     private static string? cjk_ambiguous_width_string = null;
+-- 
+2.20.1
+
diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index 23c0c8fdfbdb..779dabd7b871 100644
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ b/x11-libs/vte/vte-0.48.4.ebuild
@@ -52,6 +52,9 @@ src_prepare() {
 		eapply "${WORKDIR}"/${P}-command-notify.patch
 	fi
 
+	# Fix bindings test compilation with vala:0.44 and newer - https://gitlab.gnome.org/GNOME/vte/issues/76
+	eapply "${FILESDIR}"/0.54.4-vala-0.44-compat.patch
+
 	use vala && vala_src_prepare
 
 	# build fails because of -Werror with gcc-5.x
diff --git a/x11-libs/vte/vte-0.54.4.ebuild b/x11-libs/vte/vte-0.54.4.ebuild
index 5880df276f93..e11d9d2ec6bb 100644
--- a/x11-libs/vte/vte-0.54.4.ebuild
+++ b/x11-libs/vte/vte-0.54.4.ebuild
@@ -52,6 +52,9 @@ src_prepare() {
 		eapply "${WORKDIR}"/${PN}-0.54.1-command-notify.patch
 	fi
 
+	# Fix bindings test compilation with vala:0.44 and newer - https://gitlab.gnome.org/GNOME/vte/issues/76
+	eapply "${FILESDIR}"/${PV}-vala-0.44-compat.patch
+
 	use vala && vala_src_prepare
 
 	# build fails because of -Werror with gcc-5.x
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 0240941bbc8b..8f76c23b0cc7 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -13,9 +13,9 @@ DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce
 EBUILD wxGTK-3.0.3-r300.ebuild 5056 BLAKE2B 187c4e043e912beee9a58c9796866493fe83b85e5c814b30029bf5e4d92a3c561d814cd41e635028d97b9e9d8b7dbdb9b19694023caed063976b9ec1b919d5fe SHA512 aa1ba5f27f7593e0a3f57010509169173ab6521f66890400d2f654f636cbc154723cc2fea403c02bdfca516ef7ec5cf83e71be74ef5cdc543b2676d01ec3d65e
 EBUILD wxGTK-3.0.3.ebuild 3982 BLAKE2B 5b49474a6ab03648d801c2cc1e1df298bb52b2cc61c2e957368f1d2bb06f910d20b533ab1cf80dcf9fdf124b9c37b56b9233b775e3fc07803173d440e3a28e29 SHA512 4c63f058ba1c7eded7978a9adac5637d3d4b40de6cdb92eb079eb697a3792581a32641f4d8e6062181d1c2e763e2528416691f5b4fe8d88d7bd41092eeda0509
 EBUILD wxGTK-3.0.4-r1.ebuild 3989 BLAKE2B 114505f94787230c4dd9cdf61211178fa0cf738ffccee3d73bda054d6611286084a7025fc1317508d93d263547cd90414a78ca619f328407fd30f1bc49c2826d SHA512 481a9bad6508a6bddae036838394560a82aea6be5591ec6b53e56e97aaba615b70486362bf142497e0980c8a25105a6730bae6dff6cd6175cfac0f636ed72581
-EBUILD wxGTK-3.0.4-r2.ebuild 4039 BLAKE2B 957732c12ffcc6ef2224917fb1caa77e537eefdad65f47ad3cb8fc7da97b679e30369d825fe95cb209cb9fa6967aecda7282ef58b1c0aa6a6ac52f315e5f460b SHA512 9a552056190cd4c6357dbdb10b4436cfd64e2c21519db55a3052e5c4b0889460659c08f7660cc1cf01c58bc0e43515085ba610c5b944a5c1310558e843297dd1
+EBUILD wxGTK-3.0.4-r2.ebuild 4030 BLAKE2B ce44d342436d6c558e1b0b0b284a43d987277487d9a8845940a57731113fd93324b56e0e913f8eed148e07843c74fdbbf2881104724d129a53231ebcc71de7f0 SHA512 1b86f7c4d4a6600aded907efc346ebe59e56d73549f97baeeb515a2ef97bfc1f26fdea8932859e93a06f048e6d830e724a9cd73aa48f4e1267e2dd2fb46b7867
 EBUILD wxGTK-3.0.4-r300.ebuild 5206 BLAKE2B 2dd0c671bc03e6a1d5e1725c04abfe182ddf9e580a20fc5c191d6ae108cada7df303514022feff00e40c76a051d34348c1f1d8ddcf7a7c1f69d1d8ae924a142d SHA512 a529c3de9c9bcd54770661ae1861a1331402153018969eb592b1e04e743a8faf0ad8c8157151da29cc84f55fb8854bcf12d3205c25953d7ac0950b0d0f6886ff
 EBUILD wxGTK-3.0.4-r301.ebuild 5206 BLAKE2B 3f3b13b90dfc95527d7c2a0aaa31728f5a299143cb43b7faa5077167e9191273e9f150ac1f2e5b8be90b9d11d2d9c5fb8603254c6a22794037e85fb8d0d58a9e SHA512 4283fc65d9284b98ccbffc689164bbdbe70d1b9160003b9c722a855ec58b73ea80f57efba8320b66ea6124a9197e8fa76c5aaf49bc294491c4abb1867507e34e
-EBUILD wxGTK-3.0.4-r302.ebuild 5256 BLAKE2B 34b2cf853e403376d6227c2d15e6a3c24e3142718d04f8cab6c17595535f56720701c855d6d63348ae03ca6cec51a96d835ee9bc366508310edde43e63e26c3b SHA512 5c263b0f8582759b79d75373ca0a716ffa1dea09b5629f824f78c3602e4cbdee890c59c3604e79d9871d667aa1599373e8a8e78693a94e2d8c74f298f56759a9
+EBUILD wxGTK-3.0.4-r302.ebuild 5257 BLAKE2B 45d6bde1955533aa8298bf8ce9690a5458a5860522c9e62ad3683ce1c616cbcf4a572afd6e84e64d106ae58a759365e1d788680df7fbe666894289eb3b2ae048 SHA512 84a4f811e2288e09fd09e466746c54ca654a6b5d428ca4ae24be3d19c6f87c6c1abcea4b2bcc1bcbbe9241caf3f0dd18d1f92ce17a2fce66df8581978f2c3309
 EBUILD wxGTK-3.0.4.ebuild 3978 BLAKE2B b11f966c518da65ab09703128eec655f13fb5713b2736c934dd82e941ec5031cd8ca1448f2895df5210a91f2a91dd40ca55129cd3016bb2bf4a83a3feb78f902 SHA512 39ad229bab491bec77d88336b7ff036aff0f5628e8648ed933d0573a9dae8ef1107ee2a0d06d73efb54012094834b22cfc7e1121f6d9866d80e7d3460e893aa5
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index 006d41c84fd8..5821004698f5 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
index 79ab9a6bf105..b4479fe7201d 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 WXSUBVERSION=${PV}.0-gtk3			# 3.0.3.0-gtk3