gentoo resync : 18.05.2019

34 files changed, 324 insertions, 40 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 164e0466319a..38300b1c8cc9 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index ae08d57bc03a..80dc1704549c 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -3,5 +3,5 @@ DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf51324
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
 DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
 EBUILD gdk-pixbuf-2.36.12.ebuild 4076 BLAKE2B bc49bef8fc97cb3adcbfa5262713d700089f06cc7392bb85faf080ae02804520a6c89e36c024757cfa7f0e865e70a84639d4094d6a45de6968e3fc1953cf08f5 SHA512 516b6f8b9643e86bd19e10172ccc430e38a289f319a521b45ba336a6f87e163b26c51077a9e4a855502c240b7bedd63021a82b878ce1c779581b82e78a82a0de
-EBUILD gdk-pixbuf-2.38.1.ebuild 4094 BLAKE2B be9ce2c104b33ca0576980846f62aecfcdfc77f853623f1f456ed27e07e863e5cc9978949b06105d43c1dcc0c4586694cfa59134299415b4384d0afdad00a7cd SHA512 fbae9222d52ee853f67f72f155b50d6052b0d09f0d7d9306ffcabc33d75453b75f200327ac9f9cfd0268802dfb9aa8f88c4f437c73722343243a3824e4beb54a
+EBUILD gdk-pixbuf-2.38.1.ebuild 4090 BLAKE2B 0271340bb02ec1e4e9c9077e3c51a86f67bf4fc589c65890a3d7a21dc933d0b28a2c762b66ba5bf42923353213798da86434d88469133e2e823e0230fda8d1a5 SHA512 42ea3d708a1e24f01c6ca91efc02583d78f7fd4c9ef3af2e9df72bb4c585a6bee10e057413e91f2dca727c2d3ae1cd6563c0ac6b7604a4df9143f21ef04cf141
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
index 00b13a19cf66..3e3f3ed69a6f 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-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"
+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 gtk-doc +introspection jpeg jpeg2k tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index f907ae9a96f7..c73912fd3ed1 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -15,7 +15,7 @@ DIST gtk+-3.24.8-patchset.tar.xz 3684 BLAKE2B 686356993b95f5342942764af5f92ab52b
 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.4-r1.ebuild 7235 BLAKE2B a7341eac595ae6b8c8d4c90e621dd6d7bb48211c633c0ffe4cdb176fe0a4494fa54f41f112313da0c619f19c8eb5fe3a4cc6f383a77f55644a99ecfa796c6f75 SHA512 23dbf1f650a2a4e9f92b2cd01632891d17f731c944e748b2b95207035fa30afb6bc63a23137eb3e7e375b90e46a8848d854dcc5aac076a4d95e4aecd703993d5
+EBUILD gtk+-3.24.4-r1.ebuild 7234 BLAKE2B 7f9ba74e4e52d0a12c350782005a939dd35dfba9c488296307a51c46aab52eb5c9548dcce600931f5041323b9471d01639fb80ebef562b4c75c3055839062663 SHA512 c036f96ed89adeb14441a07a04a6c7be48871a207c07faf2ab466d37e15d944a2cfc808198fcad0762db01ddee406ebd75186a07f67c6b644c46ae08c1516363
 EBUILD gtk+-3.24.7.ebuild 6926 BLAKE2B 8ff7447cb823bf90058d425523fdba79eb550084505245526143e857947d816a74cf6001f140b5145f10d8fb99fd671b0a4d190a65311e3e23a140f537b2cc33 SHA512 bed669e8776dc1476f6448f0a717d2a45140a8ff9401ce88fa80f7ec56fe92357bdde2d2683388a2c4e7b57c72cbe9c5fb64cd2f6f0aa8f2618b8fe7552c432c
-EBUILD gtk+-3.24.8.ebuild 7073 BLAKE2B 687e8cf25648de0c4c197447fdeeff224588d63d88d6a173a8333a07b64efe22aff077ea6c5f463bb66bf443b245bf2e7a2db5da503df06360efdc263f0c75b3 SHA512 65f337f810e2db5d34be5e1fba30c4466bf971061d390e918ce01f3836969112071ac5e737800c120c2ff05c8a7cc438b40c54caaac1786871486ae160c8f2a5
+EBUILD gtk+-3.24.8.ebuild 7069 BLAKE2B d2468810981e7ea4410e69320d8348045a230ff2e29c0b45e24ed8525adc9a9af7afac556c7ce2782b5394f8f2390c571087d115322f8183a5bca043a48e5242 SHA512 9c0f312a731aa96dd668f98cb865e4b285aa4c8822661ca4e5e154e70b0caa8ef5f0c6b38eea5ebb4bd74600492a724d646f6caaf8a542698f06926c1a5c152f
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
index f790e163ce78..d4f976a52b19 100644
--- a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.8.ebuild b/x11-libs/gtk+/gtk+-3.24.8.ebuild
index 2044ec67b36e..b2e17857c858 100644
--- a/x11-libs/gtk+/gtk+-3.24.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.8.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index 6b024845281b..5fadee272fee 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,5 +1,5 @@
 AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r4.ebuild 1572 BLAKE2B 9bdce738b9fee3ba626b62797cf3fa14bfcaca60a3aea101f3183cc7ef3abfc032ea8c844500000447ed3a1c8a76fcb70fe512c328eef5a85cef1f4e2f5c1dd5 SHA512 0a7644d45b01dbe3b0ab321c7cd1c41bb4be9293273e6ca782491852982ab7a6b7b5d33d2b6a3e65b8bab5b86b51de292666ab9c95ecc84c54a8d69b98930e1c
+EBUILD gtkglext-1.2.0-r4.ebuild 1571 BLAKE2B 794112f04810808f4b0c73813c632316d0c5a1e7acea625735db9aad1e8fc1867dd3981ba9d335d966c0d1cb6eb25ad25ecc3bb96021bbf069e209b310b9a3b5 SHA512 904e87622ea68dbe38832a6abb7556106fe29bf7409c792b0656134cf13ac63d4568f94664fb9e56a24bf4c9f55e3a4a56fe177abbdbc7402b52948334aa09f7
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index d817a80ab438..4276833aa200 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.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=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 3022b03bb678..23201c5f19f2 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -2,14 +2,16 @@ AUX 2.0/gentoo.lang 3910 BLAKE2B 12fac758dc1c8029a87e2cb24e477e7ca037b34d89a6c68
 AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.10.tar.xz 1422888 BLAKE2B df344049095a354d49474d0ff0ae9d875d1b523452d19f894a3e4615889ab402bf20c4870f4aea7665ea89fd219dc7d441b8b40576e331f90a2d218d4815a45f SHA512 990935ed7c3b10a1659cf22bd36eb71e76088768f7b70234b50465f542592720bb6b206746e0606c96ab99ba0208535fc6073b4f6c0f3427acd0ab5a43420d46
+DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
 DIST gtksourceview-3.24.8.tar.xz 1408964 BLAKE2B e406aa9f776821abfcc87333fc955b4f3ae334f73a8b1dfa0b123067df24bd4f473e326347c99df7dc6c97adbdde8739cb301e45ca70324f6e8de2ce9e1ea973 SHA512 84a02278344f9fe3c1b8f2440c6179feaea53df93061c63023d92bcaa1ec7ff8e95e1f3a463c23d8487c74492469f3dc367bcca3975ef169bf03925ecee7f7ff
 DIST gtksourceview-3.24.9.tar.xz 1414444 BLAKE2B 9d148fba03339c7dccca70822f498aea6423125af1a954e0c9f8ff9735141fc9e4f845c7172be5faf97e694445dc95d41d5d903ef5b5da3dd0ce7fe58b524ca7 SHA512 29b58afba1c0b473205cf7070997139d2ca07cf68d40185aa76fa59c900ad21c03ccb79dec9970e5f96743cfdb5a7d926b21a9947244bc8cf8cbd1033467cd01
 DIST gtksourceview-4.0.3.tar.xz 1396640 BLAKE2B 5e5f84597c1f75a732ac487c2107eb54be2740eb2cabd177aec76cb4b2504a32969c4918e2a1294e9d486660090985a4f588dbde49f241fbb1493eaa3daa335b SHA512 d3f7512bddf247166c12dc38bc66d55e44c1830f9b8d62758f06cb7117e33f8908f4d8186b9d7e77514623a58f3a973cc75e3fd6a09c5f891f8b948012a76955
 DIST gtksourceview-4.2.0.tar.xz 1410764 BLAKE2B 8f20a762c16a0abc47ff191a2ea4d6b44a397cabee056e98263d0ba59cbc7207ac72341a630aa83fe7855804bd6add77e0d93e706ac9561c9577843f17e00246 SHA512 f2350b1e7042309c01be0feda6059d788a7ef55c4ccd48e16b4c92a71292ed6f92243455ca42aa0950db61de8d68f4a76f4fac46cd46316b690bcef1ea34c641
 EBUILD gtksourceview-2.10.5-r3.ebuild 1371 BLAKE2B 07d773c8d95b87d929fc337d131d3c334a7063be8fd0af0d83631e02e14357aa3f57773f72f86c38b296e73fa8cc91b7d5e873e20041938cd5a214180bad921e SHA512 b4fb25286017d10ed43035293ed1bc7bd5e89b13ed411d3b3d22cfdc551dc2447c0ef21dc0efaf7c3ecb21b1a69c7d9f5dc9f15b78c358005f17987085f6b04f
-EBUILD gtksourceview-3.24.10.ebuild 1305 BLAKE2B 836d8b02ffe41dd37e5b60b3d05b3f3e97e77f2c19d5bf02d2aab5071c4bc8cce90365d1e87b54d6af015ff1bd61a954c1783ef68a784821db310ed3202b91b6 SHA512 d560f3d691c4980a8a917fe601c175b057f9010ae586a9de0996ab2a565c53f68d57a30b9d09f1570dbe16a520a444088ded928253d121a84f9527729711845c
+EBUILD gtksourceview-3.24.10.ebuild 1303 BLAKE2B 75da5a2157e6d6f861a07da939eecc8902cf276b57a00cca014a1c3fd7c778c0dc90ea817dce3dc1f4bfe634594bb9c2959f2ea826f72d578ca99473098c1e64 SHA512 235c5dc87df5db85d25b8a0acfe67d633d6aab8e988792c786e0016b051b3054fb007e99f6ac08e7cef105b3152853ee6498b2d95d338d6a0a33ed658f019a89
+EBUILD gtksourceview-3.24.11.ebuild 1305 BLAKE2B 836d8b02ffe41dd37e5b60b3d05b3f3e97e77f2c19d5bf02d2aab5071c4bc8cce90365d1e87b54d6af015ff1bd61a954c1783ef68a784821db310ed3202b91b6 SHA512 d560f3d691c4980a8a917fe601c175b057f9010ae586a9de0996ab2a565c53f68d57a30b9d09f1570dbe16a520a444088ded928253d121a84f9527729711845c
 EBUILD gtksourceview-3.24.8.ebuild 1341 BLAKE2B 394f5dd3f61147fb8ec00df11f9d3b2fffe3bbf6bade00e816509753f842110d1bcab10572b901f1825bd937d05c50e6d3e7a05fc6646dc77a9409cc35dd4291 SHA512 354e3549b4b61259abaa4e8ce5a1f4bc191adee90ba9ad1ca8adb54796d86141f498ecaf35a7839149f2e0804172448a3dac700371951530c9cbff3bd7a6891c
 EBUILD gtksourceview-3.24.9.ebuild 1305 BLAKE2B b486efcf25b6d39c0e8f58b5a9e95a7ef56a5897d1999f9da080ae07b11c5b24b893491739f687c73e70c4ae401b746726fc6347bbe653b28ecb474f170ca4c9 SHA512 ec64b1481ed1ac8262cfddd3c2d1d47b4fd87dee2cf5f4a9fb480404e51f8a8e20496e90ac27971fc4d928cfe6601fa3d1a35f3235d1a5f5ef8b43ececbeaf04
 EBUILD gtksourceview-4.0.3.ebuild 1646 BLAKE2B e0139497e27c2c4bc33f58c4cefab414c73975be8adcab92d52acf2ae51782064f5912a2fec89127b4bb7deda4ebf1fdb89d5505aa8a71829e1bafd2e62295b2 SHA512 b80508c144dc81278df128eff1c6e226623a5d10ec1f62d83f0e98f385f288dcae85243c82afb15c046c7ff6253d1ca08f1efb5469eb3a8f90a650fe6eda7ce4
-EBUILD gtksourceview-4.2.0.ebuild 1646 BLAKE2B 5bc7bdd767090f71e6e52e824bca6401dc1299b3394df47dda7c23538308d394790cc31c127c349010a042f7a43f27d45a3b522eda782ab41b91ab20fa5d4386 SHA512 4920bafe37d56c878b93445cbba08a9299046cc4848e3307a1938c58d2bceb10c975342500c8a0cf46b3812068814924c32cec56285ef3310e9b3b975fdfa460
+EBUILD gtksourceview-4.2.0.ebuild 1644 BLAKE2B 2f03e337cf53ca9a5edf31e6b72c71d0a50a4c7655c3df23dfa3b94e94cc164416a842b573718ef0665eab04a7f3b3f3a60ab230ac4c9e2134d8ef873ddb4b50 SHA512 465999a1319f257397373df7a6a75222ecbd14c5ac5ab479c12c0e394d61ca2bd2f0b5ce7729d5bfb3d46e54a79417d2008395b984a09db2da6695b93b998799
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.10.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.10.ebuild
index 0fd73d20f6c1..fa0136f80f78 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.10.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.10.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
new file mode 100644
index 000000000000..0fd73d20f6c1
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/3"
+
+IUSE="glade +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-3.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
index d3bac6fc419c..f1554c1121fc 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
@@ -16,7 +16,7 @@ SLOT="4"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 20a4a2039ab6..16f3e4c00d37 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
 DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
-EBUILD libXScrnSaver-1.2.3.ebuild 520 BLAKE2B 08a9e8575f1cbaab178f933c1d300d11833855ee4f88c369011d195ed1d775dd1f3fa13a6a97a761868f9e19b3c770b0008deb84d7f243c51bbeedbe22ce2ab9 SHA512 a75128b98fec70a83252c590cc520e41a278c5bd92be61520dd0fa3b94568ee17ac23656884a6f517f557fd14f1dc54443f7cff5c9b97d9ad67101c89b37a1b6
+EBUILD libXScrnSaver-1.2.3.ebuild 519 BLAKE2B 49a00aa1c338009dccc855af237a2e0658dadcdc00fc375f949f5a71aec5ff7c6a37bc6408948fd815e3d87de6f2487b357bb6ff6c1fffb8ef6a8c02014f9116 SHA512 cd030b9805ae990e7ce69cd3334808517473618fe8a82e3260e10dddaf00ece2bb7e54d9de5eb0d2b76b4ed70c923430f4472ff6a8989904d32ad07894d21674
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index 22b97bc96ca7..d02df00cc4cb 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.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
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index a748d2a03d0f..5a09e01b6e83 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,3 +1,5 @@
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
+DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
 EBUILD libfm-extra-1.2.5.ebuild 2565 BLAKE2B d39853407d9a146d8114f9f06c53551b0a800acfe15be1e425b6e5b0a7a4396ec912cf63d486537820c32a70628178e7111933f5be0dbc5b62203c85872a69af SHA512 f4775b74a6496c15115d8e2c79b8faeddbb6dd0e18cf93e5675d51f7d62c9b490dee85c9bfd8ca0f0b7a28e0f74913580a12ecef83aa89e944d226d8569a86a5
+EBUILD libfm-extra-1.3.1.ebuild 2579 BLAKE2B 57fddd0541183c3a571525d5da01d304150f50896a484dfaf772b22e1f602065c58db5b876ebab410d7044288377f02ccb8dcd3c9c1412684016bafc3cf3d5a2 SHA512 aec03e6d46edd9146cae44f17a6cd1a5577161512c0ca4a84307e9e31f61f19a0bd2efa20363f22f9720afe0a80a6e1bc2c200cd713370d6e87f97ce8f2898cb
 MISC metadata.xml 493 BLAKE2B 5f295aa7bd56f402ee0452a48ef4a68088d4256bc33480bebe6406e144e4bcfdf3efbf92d39a2f166b6265c8ad9459543cd82cfdbd03e4fb29ffbf2c3a0735eb SHA512 12e967cd0e2f30984b1c3d826c65e33033391687210e1a39efc837871b671fd002f2e2d17673366dadcf74bb55cf2c253524eb7b5e200160b6d982974ad6249b
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
new file mode 100644
index 000000000000..c4dff66b8025
--- /dev/null
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg-utils
+
+MY_PV=${PV/_/}
+MY_PN="libfm"
+MY_P="${MY_PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.18:2"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext
+	!!<=x11-libs/libfm-1.2.3"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+
+	#disable unused translations. Bug #356029
+	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+		progress;do
+		echo "data/ui/"${trans}.ui >> po/POTFILES.in
+	done
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+	eapply_user
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}/etc" --disable-dependency-tracking \
+		--disable-static --with-extra-only
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
+		rm -r "${D}"/usr/include/${MY_PN}
+	fi
+}
+
+pkg_preinst() {
+	# Resolve the symlink mess. Bug #439570
+	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
+		rm -rf "${ROOT}"/usr/include/${MY_PN}
+	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
+		cd "${D}"/usr/include
+		ln -s --force ${MY_PN}-1.0 ${MY_PN}
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 1a0448de19e9..4271a20089b6 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,5 +1,7 @@
 AUX libfm-fix-use-after-free.diff 863 BLAKE2B 6ec30c5c96ea4b33a1b21427e223bde954596ecea752286816e338b3255498a8fbaa79839344b77507f731012cd66a511ffe2bfca416e398f84d9dcd567b3df0 SHA512 7d9cc8699b66ec3538c27ee65b03f892752036d57432e861acfa76983ffbaeac9c1252e400f9cae3d05e7b49a33cc0af8299236c5b74a86b4c967392b879e47e
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
-EBUILD libfm-1.2.5.ebuild 3721 BLAKE2B 66ac26f51b4088f142b468ad08fd3eacae2b6a2921fc5dfdabdd561fee47701bc37618f512d8b52e1f795156894044ae9e883701e6fdbaa2522f46858fcc04ff SHA512 cf0c08209691d48837e07954654046e5c5798053989bf0299d6e21e890980cc9fc6bab6e0b5e7b937b2edad1556bca83d4710c2aee9a34dab3a3ef8c43fd4c38
-EBUILD libfm-9999.ebuild 3433 BLAKE2B a9f4c902f98da8f78f14a66cc248f043c34443e417934bcf756d931885163abb2016893b4aa44435f1fb40fa8a331d201ef27641c39e1009ef4368fd42e839f2 SHA512 933f45c173ac3df6493e8b190955cf310e119826dd1fdefddf68f03ba956210cd49115659e7a31f2a816168811b5d0f9f7e74074519e2eea17ecf820875dabde
+DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
+EBUILD libfm-1.2.5.ebuild 3719 BLAKE2B f117cd5f6312e2734ae70e0ef7046143b6768f3174d4a506f374cbca29d049b6b5fcafd21d4ba4714076adbcbcfa096b0ab22bf8471de31c9f79ba1f9b86a32f SHA512 9d873ec7eb023f3e41c9d43b68415b270c871b0b46aeeecd62c8bd7ab0a6c07519cbd777b46eb11cfb211ecd510afac13f9349c4600b2f8100e8f4499cc7b160
+EBUILD libfm-1.3.1.ebuild 3625 BLAKE2B 1b0b71cbbc5242e07e80845dd7fcb1b9be5f28d246bf778d071a980b4eacf5012d2bc2f3d66a04a03523a776c605b0caef44bb0fceb2a07c2e6d6a43387eb3a1 SHA512 c792e2074bae2a039b7a19646484bcfb6d43f1c0135bb2823e1385a9d5606a109ad2a9e3c35f7f8a1a84dab42abc102047f25737cfac6ec8a38d2f0c1f535ee5
+EBUILD libfm-9999.ebuild 3431 BLAKE2B 2f0c94b93a17784f26b4ef81171a41fdbb07b0d57490d5b9afb725874a5a05d912edf3d35806dfb58bb8c1949d1f035fe2be81468ea09fd9081cfcfe03ede4a8 SHA512 8073f7d92c8547fa3998d17057d9d22348e2fb6c57c84a332477e18b7a12d35118661792eeda254fd9a9fe09ff4102c3c3256a5ebaa62fd8ba8a96ab805c32ec
 MISC metadata.xml 774 BLAKE2B caefdee6833d990105f460b981552ead9ccf7e463bc54816c93de770efcaec85ba3e9d6bd43c56fb0ed36736ec7e850a70c57b49d5b3f262b25bac1f3712552e SHA512 025fd60a7244e8cc4040da0f53c47be6437c1d4c1cee5601f25fd54a9b6f294abd8e0c10ef356e6a3a390f8bf773a6a9a17271ba448a686764e75d332119b7d4
diff --git a/x11-libs/libfm/libfm-1.2.5.ebuild b/x11-libs/libfm/libfm-1.2.5.ebuild
index 1a0ea5310742..e83944fa6bf8 100644
--- a/x11-libs/libfm/libfm-1.2.5.ebuild
+++ b/x11-libs/libfm/libfm-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit autotools multilib vala xdg-utils
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
 SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
diff --git a/x11-libs/libfm/libfm-1.3.1.ebuild b/x11-libs/libfm/libfm-1.3.1.ebuild
new file mode 100644
index 000000000000..55117ef17be9
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.3.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib vala xdg-utils
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	gtk? ( >=x11-libs/gtk+-2.16:2 )
+	>=lxde-base/menu-cache-0.3.2:=
+	~x11-libs/libfm-extra-${PV}
+	udisks? ( dev-libs/dbus-glib )"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxshortcut
+	x11-misc/shared-mime-info
+	automount? (
+		udisks? ( gnome-base/gvfs[udev,udisks] )
+		!udisks? ( gnome-base/gvfs[udev] )
+	)
+	exif? ( media-libs/libexif )"
+DEPEND="${COMMON_DEPEND}
+	vala? ( $(vala_depend) )
+	doc? (
+		dev-util/gtk-doc
+	)
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+
+src_prepare() {
+	if ! use doc; then
+		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+	fi
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+
+	#disable unused translations. Bug #356029
+	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+		progress;do
+		echo "data/ui/"${trans}.ui >> po/POTFILES.in
+	done
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+
+	# subslot sanity check
+	local sub_slot=${SLOT#*/}
+	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	eautoreconf
+	rm -r autom4te.cache || die
+	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}/etc" \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable examples demo) \
+		$(use_enable exif) \
+		$(use_enable debug) \
+		$(use_enable udisks) \
+		$(use_enable vala old-actions) \
+		$(use_with gtk) \
+		$(use_enable doc gtk-doc) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	# Sometimes a directory is created instead of a symlink. No idea why...
+	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+	# symlink to it.
+	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+		rm -r "${D}"/usr/include/${PN}
+	fi
+	# Remove files installed by split-off libfm-extra package
+	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
+	rm "${D}"/usr/$(get_libdir)/libfm-extra*
+	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
+}
+
+pkg_preinst() {
+	# Resolve the symlink mess. Bug #439570
+	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
+		rm -rf "${ROOT}"/usr/include/${PN}
+	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+		cd "${D}"/usr/include
+		ln -s --force ${PN}-1.0 ${PN}
+	fi
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index 75b2ae42c535..6aed4f9e783e 100644
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ b/x11-libs/libfm/libfm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/lxde/${PN}"
 inherit autotools git-r3 vala xdg-utils
 
 DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
 
 LICENSE="GPL-2"
 SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
index 30150cf8bbea..d58eba0e34fd 100644
--- a/x11-libs/libva-vdpau-driver/Manifest
+++ b/x11-libs/libva-vdpau-driver/Manifest
@@ -2,5 +2,5 @@ AUX libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch 892 BLAKE2B 5a5a12aff1
 AUX libva-vdpau-driver-0.7.4-glext-missing-definition.patch 659 BLAKE2B 2729caf9edaaf2826d1f74de4594522323c5bf15ec0b40e7fbeef71d9b193d5cdfa5786bebc81bc6cda721717f9abf61a50c13003434f5838057cd923a8fc5b2 SHA512 bb86ef063eb695c77bbe0fd0c273f1c2a479d1803b8381ffaeac5917de8a7d6e11cef33569d75fbbc1d16e9b64913e8f4a60fbb1b80afc5e381033bf34a192de
 AUX libva-vdpau-driver-0.7.4-libvdpau-0.8.patch 442 BLAKE2B c32509511f6d51b2b614b19576ac6802200262c505ad457bd2add5db1203954e0aa4d5968e05cb9be1c3d84c5c7f973ef65014ac260f5af7d5f294f35daea6ae SHA512 969fb8011408acb2bc78a52672cb5a227ae876a2beb5cf209ae558031d71cf255849d5aeb301479f420de97a69b0055990d4ecdd3e0c684f678845b08e6b6632
 DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 BLAKE2B b9cd0bbbe1e638ad29363cd0d8c6452de222023017283ce81f138730c7ba3396f3ffca40478746cab4b93a8855e73de405aa783e44e6c1179c5e347bd7eff657 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094
-EBUILD libva-vdpau-driver-0.7.4-r4.ebuild 1135 BLAKE2B e8159dece38845848be84b61372a730d85a0a04ba43dd4e259d2ddccbcbe2b93d79603a30716be3f9a8670c05102afeee8f5f01ed4bec6f298fa3f148c25499a SHA512 113fc968bc1e276d1f04df7d63add804cc619e345e333309f0c14c55a586512832c0e99b43f2732e9128b55321d42b39394f8b4e733baa07a66b4eecc3d1b1e8
+EBUILD libva-vdpau-driver-0.7.4-r4.ebuild 1131 BLAKE2B 4e07ca091e60a04ebf2d3dbfdf4adf572f37fd8c990814e939ed6ed62f986fada773947a0ed9fe8fa0e35034a2f08ef89965bf08208b3cdfae4496012cfd9b17 SHA512 869c76363f55138f35f01e9ce2c051d4f46d53263a759cac286dbd3a1028457793c5c234eefbb7909f7af9b4eb5e36ad2d6c6f4cb3fef32ba8bffd86dad881b3
 MISC metadata.xml 354 BLAKE2B d83783f14cc4b4e0c43c6fc50fc3324a8b1fc19af5457bfdaa48ce3ade989764d06a4a12702aaaddbf292900903896813beb30fe4506e3e8029d966c446880fd SHA512 99a9dd9651a16776c22ce528709e588a956d4b20d305392054b3c65e59bbd1ef855c2e916f2458cfda9797efa2570ac0ed706ca20d1df2f878435c6f4f6ca2cd
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
index 3ca7e6224bae..b316dddbdf9e 100644
--- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="debug opengl"
 
 RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}]
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 1a78ad1f3f00..2ef5a5c6a294 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -4,7 +4,7 @@ DIST libva-2.1.0.tar.gz 214894 BLAKE2B 0e29d3de915ce44d90ac96bc2ead73725efc34163
 DIST libva-2.2.0.tar.gz 218971 BLAKE2B c715f5f94cf25bcdf03be9ddeeb390fc073fe3fc7cea324e2f6da9bea490b14a99c41cf5f74d89fa3847c1357297d2c6faa877e76dce470319f532dc76d36f8a SHA512 0b026c99be2600a56833377a1cfd8efb736862dee942576d4d360b9844ace1efb21a2f1b9b1c2fabbbe4a9c483af24e47f31dd07516816acc8fa72e207f8cad4
 DIST libva-2.3.0.tar.gz 222152 BLAKE2B 235cb4ba79eeac334163e32b51313f74506e54a7ca5693b81a2bf00eff1d5204ba630e32028dc02fb47268772d12032471d7d6d47e189318230e8a52cc940fcc SHA512 b328e7426bd5fb33a4ed4817d7a33fb104b1f524f5ca83f60349df66cff22e9cd46d40238d29d5bf527f32c7da153088525e43d50454832ac9b4b7fe0be40692
 DIST libva-2.4.0.tar.bz2 455989 BLAKE2B 740460b5e23fc09dbb4de61dbe6c7d3820032d54d0ff9895d0a5e3235362e559e50d5349eab4c907367cef101f367256a9da3cf3a87526c444450f830b0ac4d6 SHA512 67373e20932bca0d52cd8f48ed10c1f01752be73642ad4d2c85dcee813dccf205c8ca62fdc69fb3f4f83a685e2a8ef2c6646174e3453a8f5763cac16a58321c3
-EBUILD libva-1.7.3.ebuild 2255 BLAKE2B 9b0fd7ebbcea8faaa400c9ca4aa56a0e8323a91d5cc36f07494334624c540ac1c46805202784e876ccc2d49bb7cf52925033cb39d4ef415d2091ebbdf6d4a43f SHA512 352e493cbd4a0bcb0ad71346f5d0da5fa65459180ad630cea5801351219c2c6619874f5c11dab0c794c86fcef1d8515a22a62a01900e66e9e93d1f6a4cf2a801
+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.1.0.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
 EBUILD libva-2.2.0.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
diff --git a/x11-libs/libva/libva-1.7.3.ebuild b/x11-libs/libva/libva-1.7.3.ebuild
index 442042222ed7..463df89d0fa8 100644
--- a/x11-libs/libva/libva-1.7.3.ebuild
+++ b/x11-libs/libva/libva-1.7.3.ebuild
@@ -25,9 +25,9 @@ fi
 LICENSE="MIT"
 SLOT="0"
 if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 else
-	KEYWORDS=""
+	KEYWORDS="arm64"
 fi
 IUSE="+drm egl opengl vdpau wayland X"
 
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 255918b2f734..a52ab40ce435 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,6 +1,6 @@
 DIST libvdpau-1.1.1.tar.gz 541752 BLAKE2B 346dad1ee83193fb489a67016874b1cb9eccc88833766f1df987ed7369078cf259c168546d64ab847d81baceb4e4969d859c29a4081befbe100925d457dfb6df SHA512 e094494fc820c2395c9dbb4e69daa89334b9186e2ad1a6c06671c7f844568db191ce4d1d9df95c4536579864bcc8541eb6fd159c377bc73c228cdf2a0fea50fb
 DIST libvdpau-libvdpau-1.2.tar.bz2 140017 BLAKE2B 0420961c48fcd5c92e7e98f84f629946f6234c28781bd7d8c9eb4aa2ab11b76e89e05f50cc423a2935b3376ff3b919ad9e6ef1710ff3549369567f298b5efa50 SHA512 f76c2283a1bd2e854aa6b86a564f7f08c1ff7da34e971c7c39f36e77fbd51fe0440d1ba01bff0b80be6c0326817ee4e6bff719dbe8dbf5e1ec7a94fad5016b7e
 EBUILD libvdpau-1.1.1.ebuild 1165 BLAKE2B 6fb9d1bdac07ea034a84c7d30377c745458069c25fe472e03be4a1a37aafce067fcfe8983e3e3b97d7445dfd42d72258834ebc4fd19a5d3d10f409528d490c37 SHA512 932f0a2b09e6cd324847e035c9d28882ea4b4dfc268df68c280b288bbc0e22a5da83e4d0965b2b7e605f54724a5c52600c6e2055481b7635841f9b61d6bd495d
-EBUILD libvdpau-1.2.ebuild 1144 BLAKE2B 71338cf334f61204a63710b6e638bf65fe2c5aa40dfb6771fc5e26a7e972ab4fdab55414fd51ff09e3d9372aed675faaf452c97d171a626eb9d54d8e5e4b186f SHA512 3149416e809cc4de2f67bd15262c4470dc22d9e42d0cb22db38acc61e1ba090e4ec5688bfaea2b81cd537f296fff71fd2b6c32a387f51ab7d6e4deebc280afff
+EBUILD libvdpau-1.2.ebuild 1141 BLAKE2B 58d92ed94816b94efc377b9e8788853b6e0e3c6474998727e03ea5287814007f960f921f0b38b978ea7caae78cc915bb85fb42c07cfecd36cc43df01688f6b62 SHA512 ca5e09592d0de74fe1b430b562e486d0bdee721eb42e0fcf41cbe54b4fcb46f168a36f882097f0903e276257b6bbacecd98194322949910099536f70a5b472a6
 EBUILD libvdpau-99999.ebuild 1122 BLAKE2B b2e74c53c093e22e58257b67b91b59f51e98cc3715f68c67958a57e366df36bb660436e3bb7abdcb0fe11490f60d6a0c5bc8b2658c58d3979125385f6d7f7276 SHA512 8da6e8637191f4b8c198498e4f81fb4e7a0f5fa8108c16edf3ae89d52ee7ab360a2c2e505b3b5341076e7cfe18f1ad1093c251cad96f456ad81f134fdd940851
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/x11-libs/libvdpau/libvdpau-1.2.ebuild b/x11-libs/libvdpau/libvdpau-1.2.ebuild
index 4490f4119d16..6c0d86d35a77 100644
--- a/x11-libs/libvdpau/libvdpau-1.2.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${P}/${PN}-${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc dri"
 
 RDEPEND="
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 4e385d352ba6..d7308d84e6ae 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,6 +1,6 @@
 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 2297 BLAKE2B 1a1b837fb751f1cb663ef6b6831ddacefa500e4cb7494ce410bab8519720b59b19e7fdc4e5bcb0b3c42e2e8d48faa5385390fdf503841f88de286f30d610e08e SHA512 714e15e151257264f710d7d7bc0e66a08a01d72dde9c6c2eaec0c111ba8e0815de6741d6810b1582a58097b2f5e9d3ccb1d4843251606531950b17b85e7b1974
+EBUILD pango-1.42.4-r1.ebuild 2293 BLAKE2B 58c0829ce3439304a94bba0c46900a6cc50ddb11f6c01fb12c1932e50dcdbf8f7c5ba462002d26a607b93b9a3315c0412d69f96211c2841f659b494139881ef5 SHA512 ada5d0136b967e8a7895d32a3a8c7b3d19f03655a97d01ff15420fdb9a04f44472b0f8d77775d0db8ea6f39ad9744ed64de3c2ad749ae23f0d88bb599893797a
 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/pango-1.42.4-r1.ebuild b/x11-libs/pango/pango-1.42.4-r1.ebuild
index 6d39dcbd4297..70de8eab6d14 100644
--- a/x11-libs/pango/pango-1.42.4-r1.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+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"
 
diff --git a/x11-libs/pangox-compat/Manifest b/x11-libs/pangox-compat/Manifest
index a25399ce3d94..43a073dfc772 100644
--- a/x11-libs/pangox-compat/Manifest
+++ b/x11-libs/pangox-compat/Manifest
@@ -1,4 +1,4 @@
 DIST pangox-compat-0.0.2.tar.xz 267396 BLAKE2B 364761c9610e497e3bc2c8a1d311cffa0298256b3cf68754c5ea4e31ce096d136cd50e2deca473d2b34aedf24e50577e8e8c37ca2556ed53c9210e4d3ff663c9 SHA512 fd3e257157d78c3d86c948e7909226fdebe52408d02a52432de8a295443b64b80b37cb795fe646d581515e6072bd278f2dcab0e43cf27b63b03a82c01eb6b9b3
-EBUILD pangox-compat-0.0.2-r1.ebuild 809 BLAKE2B f520d1d91be00638258119c482f9f927ac1da65a87d5bf89eda1c0f46d15f7e2a196de9bd9423a729b94f63884d4b3e185e81650d0bd9660292eeb6d0e9c472e SHA512 16d8c6c633824cd288cad691e743ab58e19ab85d023107975d12ff5c6f1929e238950100419edf16c9e6dfdb739e417dd45c8a26c14feb9995c350090ef2f967
+EBUILD pangox-compat-0.0.2-r1.ebuild 805 BLAKE2B 5e9a841badce35bcc2efbcf6e3f7406fd5be0f545e96e61b61f0627006d5f1bb00f0ae4d7515b8a2b436045b30f2aace79dfa054c9193eab6f347a1dea754f07 SHA512 d1600ba3f28ef688487662ead8b6c35057bb9797e6e3348b3107d73f7db2c71174491960146c75aad61df88c155d2b8c8a6545e5ac54746206c91d9cc344e4d1
 EBUILD pangox-compat-0.0.2.ebuild 657 BLAKE2B f1232c58b686630086e57db3a396b30af233710be816d1cad67c33e93993d009dbd1a193f042bbf4f1656d659e619aa93a72270a82dce38b50c3e0e7a8ee55cf SHA512 afa7f9f7cdec3aad745c95f9a6f63ebe869ec7253c7661d2b6ec06b1a5d717b142a63f92fa0beb90ed67e1491e0e6e00d25a4ae62f4cecd61fe910a31fdf0228
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
index 82aed893e05d..0194f284d590 100644
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
index 6c6874e29e9c..8677107a3e9d 100644
--- a/x11-libs/tslib/Manifest
+++ b/x11-libs/tslib/Manifest
@@ -1,4 +1,4 @@
 DIST tslib-1.0-patches-5.tar.bz2 6602 BLAKE2B 3cd67f4eeacd0651354af8ee4637e27084e9ad61246e6cab631ef52c7435e6d37acdaffd4ca72d8435335860f12d2b0fb4205b33092ea603aafc837e2dba6885 SHA512 dcde900942a3c9e9114e2c36d1d9554eeae8e5ca64463d69c52188a30734b19d6ba0439e8bb009b0d535dfae3f8f8e688a6861ec0a0371fdcb0e9986abb963de
 DIST tslib-1.0.tar.bz2 47522 BLAKE2B 99f43b5175fadef240a973d0e88c80a227b5ffe518c97c6d890fa4194148ff099055b98e7b5b3fee542249bb9c9bae88a22d1d050f2f7ca1563d03b453aac34c SHA512 a12e569b1d9cd809776a605775c3000f4e405789d95eeda21451d3911b5aa67003c921d9988f5ea8eba8b32108c8b0816e6609b5f013a2594d27b6e00e75de8c
-EBUILD tslib-1.0-r3.ebuild 1107 BLAKE2B a98468d0ec9b2bd6046a5884f9d5577b8ac0f4cca697aa7e39014e3172274daaf794e32905786081e42e13de67f4d89fd2dbdc447b1abe55f983b721c20c96ea SHA512 58813dbc3399a08b4d60e360343ca1ca0ee3d8f8f58eaaa9ee7dd7473615ff0e0e3df80c40e51983d3bcc014bd2b7e498346c6af9c88f4b998de0bcc0d3f89ff
+EBUILD tslib-1.0-r3.ebuild 1103 BLAKE2B 48107042388b9b05dfa1977a62cea786856e267b762dc64c80c2a48b0469cdcc6c072dd06b8bc2c66bae768431f4af1939ebafe9c54a468496180fe60768d4b7 SHA512 a41e3bee36018b625230f165585afb9493ce86aadeaf1d651773a5b26fd8e0bf35673b1387098321d9aa3a8e0afe90e3cef4d6d52665a29fb0e039b14291b29c
 MISC metadata.xml 329 BLAKE2B 0bc3d02cbc1aa33d242977276c8edc2aa27a58b2b32144be6b6c03bf91cbb77f79c7f6278eb7b505a1be9631d200a198630ec3491bb84ddc486a2d9a305039f9 SHA512 cf3b3310e40c72fa30927c8877d2bcdbf66f38adb2e43a82f7bbea771f4e7f1c292948c03a292b550db0dc8d2e3ef2e12ddb9d676e3bc5663d40714325d0c044
diff --git a/x11-libs/tslib/tslib-1.0-r3.ebuild b/x11-libs/tslib/tslib-1.0-r3.ebuild
index ea1c7561c1b6..77ef6bda4952 100644
--- a/x11-libs/tslib/tslib-1.0-r3.ebuild
+++ b/x11-libs/tslib/tslib-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 #extras arctic2 collie corgi h3600 linear-h2200 mk712 ucb1x00"
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index d75bc39f53ed..a294b3a7933f 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -9,5 +9,5 @@ DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444
 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 2223 BLAKE2B f66e8f6d02e07e4ec980d5103485196b48c091f2ac2a48030de905e6afd6cd77f9aa832ec898fad53622ce39e2888b3251baf935335683f95c55483611fdb183 SHA512 2effd18c71a048c75c3b1884f2317c81b539363a8d5b77d860ede9489da58bc83774832f24d61d92e12a4929094763349aed1febeb1ce4dc4503b45f33b88f4a
+EBUILD vte-0.54.4.ebuild 2221 BLAKE2B 9d917a26722a6bf7ccc904437d54da15f3ea3fec9a5a44c64df787e3912175b3599045dde0f90bc40d53fe9547fb3ff6eaed5774c4cf4d1a3bdc180e345b85cc SHA512 0cf5c5054d3bbc0c90fb7ba0af6b5626e20ff88bc7f58af431b36270d6bdad262f5556adb32e05a3c641f63fc7a3fb1fb005bebee14c7a7a6ae671ec08842abd
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.54.4.ebuild b/x11-libs/vte/vte-0.54.4.ebuild
index c992365299a9..4c8942032ebf 100644
--- a/x11-libs/vte/vte-0.54.4.ebuild
+++ b/x11-libs/vte/vte-0.54.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"