gentoo resync : 03.03.2019

30 files changed, 412 insertions, 107 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 42580eac1765..1d64ad6d9885 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index 1a35e5f70f00..00b9e1418879 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX fox-wrapper-2.sh 1905 BLAKE2B 1b437efc5d8fa8b4d12ccd84469b1c6b8c19cad06fafcdca19304f352edb97e645815411a49ff1aeea1347b3ad024b40bacb761727d32c1d2692e2d5a040f893 SHA512 9cf96c083ea0d787992f40c5acce69dec162535122d65788aa05fe4bf33473103c889a1de98dfd80526c4a53e684cf536105f88bd610e9e50a55eb68bc2ecf35
 AUX fox-wrapper-3.sh 1901 BLAKE2B 20b6ca94deee62464642e5a7e127c78135dc83a5c8c4d369fe35d7e6c2686b825b7fe966998f58dbd7bd5d77ae30a9f6e98d1bac46bb06050cf52a1d8c9f30fb SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5
 EBUILD fox-wrapper-2.ebuild 521 BLAKE2B 3180b08d0c55585f0cbaedc43fab068ed68d02a47d51631f2bcbac6b88ffa76924c41c610f113c4ff8e60f505c9059db21de99ad5336e1dd32039b6fb19526f6 SHA512 8cbb277dbd1f60a13e7319aa5f8e9788ef96ca8bb6aec46ff765d8cd3e186b7dbbf0bc55671dc7bb90e5a6bc7f44fbaf101544dd3fbf0255e2c9a79326823839
-EBUILD fox-wrapper-3.ebuild 542 BLAKE2B 635930b9ec415321ecdc2d291c269a854c48d3919f6d4981b1673882c2d0e69bbf55c83ce57ef0fa7218a4a0122d3287120b7c12391de60e73955f9baf31df1a SHA512 0f19dc92535474212e5e26b544717bd6755d2a4fc2ae40a4cde4b1bb5d961dddea76246ecd83efd31d8f65d00bfa7df4ff52cf0bdb8ed5e3de549e4ae9b9fe17
+EBUILD fox-wrapper-3.ebuild 546 BLAKE2B b9754081417a1ff8d3bf3bd68a5e7679fa9fa84ebb8a5c0fc8ba75adc3a22d78b6fccaf8a48d2e64f083531e36aaac9e51f543c04c013b6040f9b4c7c7693585 SHA512 fd9344cccb19c121e737e3002ed4301e6e77e744eb64b35974e0f36a75c1e83d3b0a3599ce6db51ac80b688eeea00396101ec2d408c8c1efdc795245d4b167a2
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
index 62ecfd896f60..6fcc4113bf1d 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-3.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=6
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 2a0583ab51d2..10705afb4126 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -2,6 +2,6 @@ DIST fox-1.6.49.tar.gz 4383152 BLAKE2B a3d626786086e6b46fc82ce4396bd42d060c234ce
 DIST fox-1.6.50.tar.gz 4381855 BLAKE2B eef3bd77d6343a65adf4bcc3a59690b1d47d1e92faf81b01a347aa4fdc46053ab17d05ce4016fd147ee64b66c8e582754536c895b87d3c3e073e45435ab9d4ff SHA512 195751d223e9af7d76a3bd3192ae7566a129cfe254f0ba3035b4f7e189c68b43daa8276edad95ebf2b1b403b6212a755000eebf1716a11bb7f06845fde4aceae
 DIST fox-1.7.54.tar.gz 5384000 BLAKE2B 8970872d1c626d7ac5b0f944e8ea26a29bb757e4c646116016eaa1eccc2c0328c5047438e87fb6c2deab0a65e2b34cc91e8458150329a3e574e93608694a2dec SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795
 EBUILD fox-1.6.49.ebuild 998 BLAKE2B 3b0c9e16007f3445c61b5ded6b926cd3f852b2fb6edca03a16324a439ec0ec2f6b71f06b18e1c0169659d1449ee35c5178193bf30d8fdf8eb517d963264447e9 SHA512 e033bf329528cd8a569cef5c3760e5aa92258f62a34cb28ef3c086322c8315fb9c7b300183ddf265257d3d5054d6cd04e05eaf7802a2596ca72213dbc83d9195
-EBUILD fox-1.6.50.ebuild 1012 BLAKE2B 6572846cccff56fecc21b29a0272c75de5e3b9c1378728ebe4ede9d13347e8fc18f187446c4e62c86ea4eaa919bfa58b59084587b14f97c80dff4f56875874ee SHA512 8ed3371abcd6bee69b85759c50f4773a55861d63af3e7212266451c8f28cb51ab70cb0ee3c5b1387a00248de7b22ca3fb79f876dc76eb38c85c9a080f920d0ed
+EBUILD fox-1.6.50.ebuild 1016 BLAKE2B 3aaf84aa03724d7a117db9a39fdd6564a18c73e9f9d2a4a4aeeafebca891af91aeb8b2657d6d2ed75826588fe1b05ec16f7832f79cec4546cd952ccbed761228 SHA512 651329a14b50595ea6787953962d1988c8e2a7bc2e55a13a2c3668a618649c0fea66c228a4a2c3ca47d443eb23f03d639da012cf7b6d75c868e67976771e0589
 EBUILD fox-1.7.54.ebuild 1296 BLAKE2B d5a19de333cfa6346b4e18532838c5c24295f443eddbb77810f8a7a7e55b1c59064913f828e61906e5215d5bc1d62e78b534aaca710977975e332cd6e461a3c1 SHA512 a9760a4ef8ff82d60b58592fc648ccb2de4d3c8e3ed3f1320f62eac8cae2a765a2ca7291486a32204ca6502c0345c25779c35e61c8c71afe46e62f68d4fb8785
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/x11-libs/fox/fox-1.6.50.ebuild b/x11-libs/fox/fox-1.6.50.ebuild
index b566273e59cd..b44e36ac7869 100644
--- a/x11-libs/fox/fox-1.6.50.ebuild
+++ b/x11-libs/fox/fox-1.6.50.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 @@ inherit eutils fox
 
 LICENSE="LGPL-2.1"
 SLOT="1.6"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
 
 RDEPEND="x11-libs/libXrandr
diff --git a/x11-libs/gnome-pty-helper/Manifest b/x11-libs/gnome-pty-helper/Manifest
index 54ab255691b5..df0cccfef7f9 100644
--- a/x11-libs/gnome-pty-helper/Manifest
+++ b/x11-libs/gnome-pty-helper/Manifest
@@ -1,7 +1,7 @@
 DIST vte-0.36.3.tar.xz 1013412 BLAKE2B 989d84de4eae397e070cad85908f169a778df3fa7f6b7efb750b9d5f79aba9ee003d63320cb62cbdca3b1e64e1252eba86e01916e6d7e46725c6be16e7b83ac4 SHA512 9e0c4e60c5a271720d7b480c9618069752faec6c310cc2477e67cdb1c3e961f6981d39c9116716739390dc8e4bab9bf06cf6c5d7d2546062e48523f85d731c77
 DIST vte-0.38.3.tar.xz 1005548 BLAKE2B ccf9d2aeaef89697279f5863d9967df4e42420cac216833a5f7381d01dbbaddc2ef819d98f20e230e58c0a2df951eb323554ee79599c4e8405402872d4e24a7c SHA512 f8a28be524dcd4a6a5dbdd83655eaea0e41ce20e642130c1db8a1bbb29b71ff2421972cb630322a6e443a4aae21e2cc9350d7b06264bf3a1b7b7f793d3818164
 DIST vte-0.40.2.tar.xz 923852 BLAKE2B 666f1e8bd5ce1392c8c533c180e7e6700a6b0023e9b0ab467f2d99a38661fb600c53d83bda10bc97302dc54801f8e1d8780eb27a2c5cd184d786a55d513dfc24 SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2
-EBUILD gnome-pty-helper-0.36.3.ebuild 822 BLAKE2B 499caf4a45d99200e269dc01cbafb945125f6f3792e420c08c6fef7286de75a0a50aee6f2665927f7d9a8913c55d15f37701ba985354810fdb7871bdde0a84f0 SHA512 77e60d516b21388957c46b696b0cb10a4c65c28e18f3736738af6ebee776cd29707020191ff0c58af88b2701c1ae279f5eb47e767df8a6ac424fbfd70bfdf4d6
-EBUILD gnome-pty-helper-0.38.3.ebuild 829 BLAKE2B 488c6ae94ca77f4bb483a479f42ae3b41389e484bbc7e8ee770344c86167039756042f5ab4cff71f0cf07754f2d1c1939545a13299485ca23edc672acc368911 SHA512 862089e2748633a7c290d5eddc88bdee54082fc7a36191eaf01a255d81d62eee0bca627177d40bdca8bd950589dbd4f6490c530895d0f52cd759b13717caefbc
-EBUILD gnome-pty-helper-0.40.2.ebuild 829 BLAKE2B 488c6ae94ca77f4bb483a479f42ae3b41389e484bbc7e8ee770344c86167039756042f5ab4cff71f0cf07754f2d1c1939545a13299485ca23edc672acc368911 SHA512 862089e2748633a7c290d5eddc88bdee54082fc7a36191eaf01a255d81d62eee0bca627177d40bdca8bd950589dbd4f6490c530895d0f52cd759b13717caefbc
+EBUILD gnome-pty-helper-0.36.3.ebuild 807 BLAKE2B ce6dd7145387f450b16edbd870d78a48e6672308a59b7db5f8d51cc46193e03d9cfdb50906db023be96d5eaae52f18d79ad43dab9e3a599432bec0fc8295d95e SHA512 67b68a407f1d4a8961d9aea04dfbe128fd39aebe1748fa6e700b5ae0d0ee09a3b9105ea1fa5e6dbe310356ca602842eed60d8c9e8f95d71a12f35ab0d7238d6b
+EBUILD gnome-pty-helper-0.38.3.ebuild 814 BLAKE2B 33767758b41d0b2075ca190e6977cd209090477c5690cd5499c604d7d4b4b646a0411e0706bd68a9e8f59cfec37314bcc816e9b19f278a47df5dd5961aaac959 SHA512 f0b45fe3c184ca60cbd828ee9935f63403b217a606f504f6485b5cc564b3bc5b934496a910bd3684f531df4f0c6bdd80fd26966a52ab05c3d994d9bfd2108c07
+EBUILD gnome-pty-helper-0.40.2.ebuild 814 BLAKE2B 33767758b41d0b2075ca190e6977cd209090477c5690cd5499c604d7d4b4b646a0411e0706bd68a9e8f59cfec37314bcc816e9b19f278a47df5dd5961aaac959 SHA512 f0b45fe3c184ca60cbd828ee9935f63403b217a606f504f6485b5cc564b3bc5b934496a910bd3684f531df4f0c6bdd80fd26966a52ab05c3d994d9bfd2108c07
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild
index 719f93187ac4..d1ce767aa729 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ GNOME_ORG_MODULE="vte"
 inherit gnome2
 
 DESCRIPTION="GNOME Setuid helper for opening ptys"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 # gnome-pty-helper is inside vte
 
 LICENSE="LGPL-2"
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
index 5ce679f4e3aa..c254408c7ddd 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ GNOME_ORG_MODULE="vte"
 inherit gnome2
 
 DESCRIPTION="GNOME Setuid helper for opening ptys"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 # gnome-pty-helper is inside vte
 
 LICENSE="LGPL-2"
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
index 5ce679f4e3aa..c254408c7ddd 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ GNOME_ORG_MODULE="vte"
 inherit gnome2
 
 DESCRIPTION="GNOME Setuid helper for opening ptys"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 # gnome-pty-helper is inside vte
 
 LICENSE="LGPL-2"
diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
index 2122a3a0ff4d..48ef2980b309 100644
--- a/x11-libs/libXaw3dXft/Manifest
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -1,5 +1,3 @@
-DIST libXaw3dXft-1.6.2c.tar.bz2 574326 BLAKE2B 05a869567972c8b0aee270281c38dcc75ca849ffa1b5510557ddbf95974f93db5b2255cc2a99969b2da40ca125df95d7b0c7d905dec10ce373baab404ee5b9ba SHA512 4bc2b8257cc44cbdf1640c9946acd5958694beef4af9f5910cf07b1d32133708561e59532a3ae8f1540b930f97649978910b2eed349e81486ab86f340363faad
 DIST libXaw3dXft-1.6.2d.tar.bz2 584670 BLAKE2B cde040659a90edb50ac5aa374e8ec04442479ae1c06fe3d5b1387bd3e02c1a0b40ff286ad40f0ae7841544d1244648e34905570e5827dc0efe60a62da3261c9a SHA512 ac434b7f055d20ceb0bd17851d8ba69976ec562a60cb8012a259045e52c038278f0a8b25b52a61befab3aa169b74fd919278c671f1b6e282efb404e089772740
-EBUILD libXaw3dXft-1.6.2c.ebuild 714 BLAKE2B 74570912dfb9fb5dade34aeab9c974182aa707cbe6715723c3e29830b26ab5510f4cf896dd5945fa10c09f37cf0dab0706f7ffb0eee6c85fbb8da6dea6d59bc8 SHA512 6b0266b786fecfe01ebc79d3f679204234adf9d4be147fdc21de68a91d94d4800080d6e991cd4995f0a9e2db58271f654d5181b0d3278eb542952ac4db5e9177
-EBUILD libXaw3dXft-1.6.2d.ebuild 712 BLAKE2B 39517f4108e6703d8224be915fdc95c7bef2ce4433e122e15ce1749167b0dbc330bceadec9c146a19131b5128854cbc698c71a406da3442b90154d829e686b83 SHA512 2a1f4f93a318cfbddb2d1bf26f6efdf61d662b55fd772441dc1762f29d51b813ef191c151968253134f26f0824207f8d158ef98ef06985d578af8854352eea9b
+EBUILD libXaw3dXft-1.6.2d.ebuild 711 BLAKE2B f7df8b1cb6dca60d4689a6435630d4da462f5360baf6f7baf80a98fa070e771dafb6734e95d725e04449f43284e73093b2e6fd3fb5f745200d2175bb9ae1ac67 SHA512 3b9b0fb21387b68f302425e102a7be10a214918ad3751affa5cdfccd462d729403dd95734ab7b3d4bde0e9be459278ff509bbd7358b0c2b4cd187450bce6ed46
 MISC metadata.xml 246 BLAKE2B fdb264ea0fcdffe3b15f288ef6958a743a7c88bc85f82e13d20af443e93182007ffcf8ccfd62071b57660a668f9c25753c12baa7a409c9d42a408293c21f482c SHA512 be42da502b805b08126629fdde43bd1473535fc5588faf7c65c05e923736fb18f0249fe61ac5c18c4de1619bd52e4865449d1f02ec19f2c2581f6c2e23a5ed4c
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild
deleted file mode 100644
index e75364e419e5..000000000000
--- a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Xaw3dXft library"
-HOMEPAGE="https://sourceforge.net/projects/sf-xpaint"
-SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
-
-KEYWORDS="amd64 x86"
-IUSE="unicode xpm"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXt
-	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	x11-base/xorg-proto"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable unicode internationalization)
-		$(usex xpm "--enable-multiplane-bitmaps" "")
-		--enable-arrow-scrollbars
-		--enable-gray-stipples
-	)
-
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
index be5b81c48aba..705b95f8aae6 100644
--- a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Xaw3dXft library"
 HOMEPAGE="https://sourceforge.net/projects/sf-xpaint"
 SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="unicode xpm"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 176cfb87a2db..02ee5ba087e3 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,3 +1,5 @@
 DIST libfontenc-1.1.3.tar.bz2 301494 BLAKE2B 1d9d5387cd11820b1d458cab8de26fbaebeb2d0b5c6197a455b0261e53004e6d8eb9cea7dab27ad163c8897237a864075f981ec3a740cf8056c3f15be23ecd3d SHA512 7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c
+DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee665598db3432ef5a33e78d1db4b12460c7467bcbcc1dad67e9f6ade0173f9fad915a2fbbee51f0be23feedc242e7bd SHA512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582
 EBUILD libfontenc-1.1.3-r1.ebuild 539 BLAKE2B ecb19be659b4c3196f61a601523a60c1dd71efe169aafa26eaec87233803d6ea0390e20d64438549fe5f4bc6cebcc1578b0c7a7a5408d6e9bf3416ab3fc8a8f8 SHA512 afffae656694c41c6ea15be00b4efcf1cc0ef2377ab46c99577497495235fcecf5230b0f3f58d9db5b6cc31f7d55cae34c8762121522e9bee85e6179c23aedf5
+EBUILD libfontenc-1.1.4.ebuild 548 BLAKE2B 8c523ab4c91b3fa6465d8492b601c44a0fb1bae119fd88e2cdfa6ce6df3c0818872ecf42fd3bdda5057a1796f99060ee7925035e434da3528db914017a0da7ee SHA512 729cb36edfc75a18db9a249cad532038511e7d86dc4aa039c32f102d5d4951c0795b7d431337071e8396b6fa988b6293367bcd739a03d050dee008067e5b0e7a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
new file mode 100644
index 000000000000..15246b281cd5
--- /dev/null
+++ b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org fontenc library"
+
+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 ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
+)
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 09b09a495390..73971150124a 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,3 +1,4 @@
+DIST intel-vaapi-driver-2.3.0.tar.bz2 2901075 BLAKE2B 606635c2b4ad05119a3fe1269354e2a27b944c56117360b5c4171b679506f3aa10d48057f1c99957efa1cff3b625a315138ac93e616aa14d30d20d540a3bb6a8 SHA512 60f37c09269e6ae07e55ecfc2c046ae7b6321abe71647625310ea7c75627ea875b94ed8e14813a36ec068bbd605c6d447dfa2c3bd692eb7953a58a871064fd5b
 DIST libva-intel-driver-1.7.3.tar.gz 1648659 BLAKE2B 5d5bf82d02c6e887f4afd332fa395e3044ac9b9bbf8e1682aeaf80d6c61c1db537b27ed22b25e932ec71d9011af07d9008f64df2e7c77a2c6f9dd0e10860d41f SHA512 57ae4fbf1bd5799e8a311fcd67eda1a8a6d5b5267df502b83f63f8bd0cdd510a4f78b4d09088833bfa2e98447d841c3d4e7229f4e75a9d9f4b8096fb14027878
 DIST libva-intel-driver-1.8.3.tar.gz 2591242 BLAKE2B 954ad024ea93073f23045530506c6988cd55bc4bce565856071b30cfc0c10b673a225d4cfdd50cd360a3f828bf236386ba2937e59c260f72717dbdf72a29152c SHA512 0457147aa998014df82ef6180c873fd087b03573adac7ba84c79516a16bd73eb43ff5f07cf3f40c7f590f4e04981ae3010877a468fb20fe4606843932aaa0990
 DIST libva-intel-driver-2.1.0.tar.gz 3954965 BLAKE2B 6ff759860477896df6ee433d7b1ff8f3fda498e98210bfcbec33dc663a65bc07b8304ae219885225985fc65a785d7510aacb785a17d9fd66fb1c16a0ca7ffd57 SHA512 2df0d617a4a64ee37641fd9134f8455f59160d003c252b0e82f7be47adaad7d531f9f2f3ab16d75457b2852e8893887d5be6da5f8128e64ffe8311853baf6453
@@ -6,5 +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-9999.ebuild 1400 BLAKE2B d22802d407a9164b5f1921f9c0cf238bfe51ed37111b21cd4f62449c25c8fbda6296a691e797227ba70a12f169f10cd7e88cb864fc5f92aac7d91aebe678ac7c SHA512 8400d77fd9b3fe407e0b642a9f0f87da047aa827e44be5ddfe4051856698181082a0d073cb7f8c0450e2a17510e76aad16535ebd3ceb7c1fccb56b7f856f1a6a
+EBUILD libva-intel-driver-2.3.0.ebuild 1310 BLAKE2B 0941bb1ef76ddfcd7346c12e31ffd1f98cf76f4b15260a9584bb2398c3ffda64b675f401535b2d987a0df74799ba576caee2641b6b2c9f87e23750c8b4c97ee3 SHA512 9f6aea6aae9b45d0ec612b072089ba1f794487447a27b332505cf6390558c33fc8fba3363e9090a8fd61f339ccad5ffb12c54670663ffea30767a78875d591a7
+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
new file mode 100644
index 000000000000..1d8bbf4cd84b
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="intel-vaapi-driver"
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
+fi
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS NEWS README )
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+src_prepare() {
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index 92d13cf8a5b3..1d8bbf4cd84b 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -1,42 +1,40 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
+MY_PN="intel-vaapi-driver"
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
 	EGIT_BRANCH=master
 	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
 fi
-
 AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM}
+inherit autotools-multilib
 
 DESCRIPTION="HW video decode support for Intel integrated graphics"
 HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+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"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
 IUSE="wayland X"
 
-RDEPEND=">=x11-libs/libva-2.0.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
-	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
-
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
+	)
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS NEWS README )
 AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index f6ad7d84e2f8..d8109ad86927 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -1,4 +1,6 @@
 DIST intel-media-18.3.0.tar.gz 14422845 BLAKE2B 07da8e78d069de091bd4f29beb0699c97f007ff0f6543baa40d35923488d6152cb0a921cbe16006b045be973d5651ee01dc98ead0b79d4c779ed39e7a8fb38d9 SHA512 96ee85c087994d1e46666b6bbd5fca8e558d9169f8b7c130fdb4571ecd4dcbb31fe4a73607cc1b055918f27e90dbb25843d851bb8a1e2557733b4795e937479d
+DIST intel-media-18.4.1.tar.gz 14657816 BLAKE2B eb0be7c756e290bf5318987e375e9ad531fb4e318e4bf83f6c5d68106112a06d505ed7f8abc5ecb277b4430883d2153fe6c68ba683241253cb0d32853bb8dab2 SHA512 ed5d4116ab4af36761a0a819105f4ff5551d437e3f1ab8c1b2ea20a89a1792b7558bacd1ea8f082f595fce21d72810f806820b8543e1cbfcd2de7e28e649a536
 EBUILD libva-intel-media-driver-18.3.0.ebuild 892 BLAKE2B fd24321a622354cab7622f05b377b284d0ec301fb4a3e223413b991034ae93ff62b9d7d0bcc59d6dc13e9fad17619d5b448114eff8fd002d2595de32cbe19672 SHA512 f921231ce8251b7fc990f3a2ddc666d0a72035e8e9c3e80e632a0298c040872cb30c3e6e556f022e08dd0b75f7eb2e73f88f97e6308f0121a2c6684d6088f555
+EBUILD libva-intel-media-driver-18.4.1.ebuild 892 BLAKE2B efb6cbcf1340852a3ca27f5e763be43175e9d6c870877beb4a794f1da03d1e47c8d08668274b9e8dc26f4ef3674581e4bb6518547515c984bff7a6767d011ce1 SHA512 ace25c724f3434ddc08884d7bed8f944e78364d8f72c54b33f1f6f5919596a7a81581b369a0f0b9024858cc274a43df3095a76643a9433fc4a3d54ee1abb1d23
 EBUILD libva-intel-media-driver-9999.ebuild 892 BLAKE2B fd24321a622354cab7622f05b377b284d0ec301fb4a3e223413b991034ae93ff62b9d7d0bcc59d6dc13e9fad17619d5b448114eff8fd002d2595de32cbe19672 SHA512 f921231ce8251b7fc990f3a2ddc666d0a72035e8e9c3e80e632a0298c040872cb30c3e6e556f022e08dd0b75f7eb2e73f88f97e6308f0121a2c6684d6088f555
 MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.4.1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.4.1.ebuild
new file mode 100644
index 000000000000..e08e05733d2d
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.4.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=media-libs/gmmlib-${PV}
+	>=x11-libs/libva-2.4.0
+	>=x11-libs/libpciaccess-0.13.1-r1:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_RUN_TEST_SUITE=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 3b048019aca8..c00f9496921f 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -3,10 +3,12 @@ DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274
 DIST libva-2.1.0.tar.gz 214894 BLAKE2B 0e29d3de915ce44d90ac96bc2ead73725efc34163da92da7d8791547d6ca2fd407319093fee89bce5b26b26818cc0131cc0c7f3cd4f511e3f847e3fd2cf1dff3 SHA512 dd4c901f9c75d03fa45b32af5ca08ba24ef68d354ad26ad53d0f87d3290bee152eed9e61b4dd4116c2d15baf0c74f2d37996d08f007d485c57af5e8d9648eb82
 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 2269 BLAKE2B f26dd1b8cc005a35ee3d1b68dcd96015dcccc7191bd77aa50781669a76b226fc2f7c79ff82a348e895994057b39e322181888306d52706e309eb07f23af0c1e8 SHA512 56c8c0c7f479e5fc0a74245001524ee8e9b99920092f2d80ad6392a4c9eee5d37549bcc05b09470a1f323db8107ddff450d6e07a03daba46269f6686f9699b4e
 EBUILD libva-1.8.3.ebuild 2231 BLAKE2B 28f6d39d8e23fd2714acce8982be6462e7035e3fbcbfc91358533a2387a99af25d0247c413ec336cc22fba607dcbbb8ff8e29af5a5ca47f892311ada74fef7eb SHA512 c5d8cadb64d2952cb7e119d87a2c37c3f809b53e8fd5441d54d07e9264d049b50c5115150fd2112da08d0420af53416b6ed90de18db0c8725b68f9160937fee8
 EBUILD libva-2.1.0.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
 EBUILD libva-2.2.0.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
 EBUILD libva-2.3.0.ebuild 2184 BLAKE2B 92b05e58ba15e2629bfacad470f97b4e04f46f97e97cc2bf38d7f73825c95d68cba13e13e73d77b7bc0ec549b539f8f776a1b3d291edbd72bb79c7525acbbc4c SHA512 487fbbede1034edefb87eeb854cac46476919037b7e55a0d1d18def4f514125a454fcac1b52db6297304e61f68bbe72454416e0834b2235a22bffe9721f84856
-EBUILD libva-9999.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
+EBUILD libva-2.4.0.ebuild 2053 BLAKE2B ea191297339491e347dc69561a740e5e73eee8e31398b43d4da4ac4bd9801542e03bafcf86b0395032c4d5fc5ef711ce4a68c81d424332f88ae31da30c9237bb SHA512 0907ae20fb8e229ec7559ff61c415d5a8a556106f5cee6ae68ea63666eb99e0ddeda6690470a6ed5c1ca206e333dc77538ced3f61f7a14b0904f5bf078346a1e
+EBUILD libva-9999.ebuild 2053 BLAKE2B ea191297339491e347dc69561a740e5e73eee8e31398b43d4da4ac4bd9801542e03bafcf86b0395032c4d5fc5ef711ce4a68c81d424332f88ae31da30c9237bb SHA512 0907ae20fb8e229ec7559ff61c415d5a8a556106f5cee6ae68ea63666eb99e0ddeda6690470a6ed5c1ca206e333dc77538ced3f61f7a14b0904f5bf078346a1e
 MISC metadata.xml 518 BLAKE2B 2d363f9ee3a690cda208cd96d14003254c0226bb8c396e367d4382107b675fe9f5d0713f826ef611ddb250e3dd919da5e19473f6e10aa59c05e99cd13335e34e SHA512 655f89ce0b04f3d31f02617065baf715a4e6394828b83b18fe12f35a7fa3a626192d9165d2520a5731b98215afea3db4e5b50caf3ed1915be1a707389449a367
diff --git a/x11-libs/libva/libva-2.4.0.ebuild b/x11-libs/libva/libva-2.4.0.ebuild
new file mode 100644
index 000000000000..7de898cf6aa1
--- /dev/null
+++ b/x11-libs/libva/libva-2.4.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva"
+	AUTOTOOLS_AUTORECONF="yes"
+fi
+inherit autotools-multilib eapi7-ver multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl utils vdpau wayland X"
+
+VIDEO_CARDS="nvidia intel i965 nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+	utils? ( media-video/libva-utils )
+"
+
+REQUIRED_USE="|| ( drm wayland X )
+	opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index 2cfeb67ae2f1..7de898cf6aa1 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -1,61 +1,56 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
 	EGIT_BRANCH=master
 	EGIT_REPO_URI="https://github.com/intel/libva"
+	AUTOTOOLS_AUTORECONF="yes"
 fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib versionator
+inherit autotools-multilib eapi7-ver multilib
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
 
-LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1)"
-if [ "${PV%9999}" = "${PV}" ] ; then
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
 fi
-IUSE="+drm opengl vdpau wayland X utils"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl utils vdpau wayland X"
 
 VIDEO_CARDS="nvidia intel i965 nouveau"
 for x in ${VIDEO_CARDS}; do
 	IUSE+=" video_cards_${x}"
 done
 
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
-
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
 	video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
 	utils? ( media-video/libva-utils )
-	"
+"
 
 REQUIRED_USE="|| ( drm wayland X )
-		opengl? ( X )"
+	opengl? ( X )"
 
 DOCS=( NEWS )
 
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 07a69ea2ff7e..255918b2f734 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,3 +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-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
new file mode 100644
index 000000000000..4490f4119d16
--- /dev/null
+++ b/x11-libs/libvdpau/libvdpau-1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIRTUALX_REQUIRED="test"
+inherit autotools flag-o-matic virtualx multilib-minimal
+
+DESCRIPTION="VDPAU wrapper and trace libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${P}/${PN}-${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc dri"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		virtual/latex-base
+		)
+	dri? ( x11-base/xorg-proto )
+"
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-cppflags -D_GNU_SOURCE
+	econf \
+		$(use dri || echo --disable-dri2) \
+		$(use_enable doc documentation) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+multilib_src_test() {
+	virtx emake check
+}
+
+multilib_src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/libvdpau/libvdpau-99999.ebuild b/x11-libs/libvdpau/libvdpau-99999.ebuild
new file mode 100644
index 000000000000..ecc84d2648b3
--- /dev/null
+++ b/x11-libs/libvdpau/libvdpau-99999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic git-r3 meson virtualx multilib-minimal
+
+DESCRIPTION="VDPAU wrapper and trace libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/vdpau/${PN}/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc dri"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		virtual/latex-base
+		)
+	dri? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	sed -i -e "/^docdir/s|${PN}|${PF}|g" doc/meson.build || die
+	default
+}
+
+multilib_src_configure() {
+	append-cppflags -D_GNU_SOURCE
+	local emesonargs=(
+		-Ddri2=$(usex dri true false)
+		-Ddocumentation=$(usex doc true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+multilib_src_test() {
+	virtx meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index e652d4657d97..b0ec6d077f1c 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,7 @@
 DIST libxkbcommon-0.8.2.tar.xz 644040 BLAKE2B c323384308d9730924d6f1cb7ad55fdb3d1a37289f648b981c54dc5997c67c857d33f8ad872fc7646b462ebc97252dca30efe2a2e12d1f1f08a8a1604a5de23f SHA512 b714240ec6120bbe44b5da7a4f89b1c2f24cfd6e5ebbe81e5290d135c8f2e5a68f89ac256b73430a446167345f8db309b35dcf74f3d3840e20897cd91eccc172
 DIST libxkbcommon-0.8.3.tar.xz 646124 BLAKE2B c80d5065395ee8adec436243cf42fa82a05a5797be711b4e10d70d92ef742c707f034adf870480e1797e1b05135b5ce644e6ebefd036aaac7d3fb7435b5bd543 SHA512 0a3dfacc17eddfc10fe3edb946bede5070f2744effe642bd96076996f262a41addb691d62c0d738457da522d1fea02c297c9a2a8b1f56521adbf50ca917577c2
+DIST libxkbcommon-0.8.4.tar.xz 648592 BLAKE2B 6205ca08f1ccb6d85320428317e9d023e2f2a56dcaa77e34a9f9ea42bbf67c9ee27a3123dd8e880ead3fa92c4cd7718bde55a255c52f16fef8d33c395c2511a9 SHA512 dbd441d0d7d5ba4fb352d64d150d163d4cdcf8340059457c291dc1fc69d1606ff6589732cb41a7fcfe106af0192977b243d7d68c4d95b90ece7abb620df360e3
 EBUILD libxkbcommon-0.8.2.ebuild 928 BLAKE2B 08e1d3188c38bc14a9ba866d530e1768a2b8f4b13d1ad7eed9e342d54049e7e4f2c3e39d666b9ecc95e4f325720cb66ada4ce7d485a46dddb5e8c6937d4e75de SHA512 6717271f5b12543c3a47bc53c2d181bef7e2552c5234de51c693dadfda3f6287e41755674720e9fb31df3002fa8357f74e711c4637be195b8626b62ff3121f71
 EBUILD libxkbcommon-0.8.3.ebuild 939 BLAKE2B a9d45b076253fa3757162f9652ef043404b08c94177326e77bc0a6d36da69e07916be6b04ee9f81a8025358f4760bfdc90abdfa92650273f3f4c2a3d074ef670 SHA512 d380a6b36bedca1f265b75ca9a51ae665daff47d6e8b2555b80d74bea490e040eb947e0f9c25b030631cc849306684c4112c9dca95a9dcea51200e70e36f23d9
+EBUILD libxkbcommon-0.8.4.ebuild 894 BLAKE2B 2c3a4720ae476da987dcb6412974d3448aa0fe3c74d256bd44238f6398c6e18cc647b4b2b78ea546af5a4b0e69be46cf44229bfd00046ffc5ec6752108ff5d14 SHA512 3bbe719b69a6e136c78fee5efdbd5e77d1606486b9d74abf239c71bedd6a5093eb8b6ab3cc7faa481fae871e0574d9faede88c4fb5118a84a677cb8e7fcf131b
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
new file mode 100644
index 000000000000..224ee5d3dce7
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+XORG_MULTILIB="yes"
+
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
+else
+	XORG_BASE_INDIVIDUAL_URI=""
+	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
+fi
+
+inherit xorg-3 ${GIT_ECLASS}
+
+DESCRIPTION="X.Org xkbcommon library"
+HOMEPAGE="https://xkbcommon.org/"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+IUSE="X doc test"
+
+BDEPEND="
+	sys-devel/bison
+	doc? ( app-doc/doxygen )"
+RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+		$(use X || use_enable X x11)
+		$(use_with doc doxygen)
+	)
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index da80a531d5de..ed9a3be6beec 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -8,6 +8,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.1.tar.xz 1083552 BLAKE2B 1e52275c953b5fbf51a1cc727dfca0bde3cc8f51a18055cd0c65c949479d0b4d926466016fa7d6f6dbebc9117c1b6fbde9a4bde38c5d82bb44ecce8612290de6 SHA512 5cb866e75c35e1b5728d17b0433641ceb4837495d59185a04fde9dd8c9849ab905a6b2718a50b27cc70323c7a6c5db31a808816576c30d7f18ece889a329fb61
 EBUILD vte-0.28.2-r208.ebuild 2962 BLAKE2B 7004c56381a05ed2c0c309736581f2e03478faae88903ca6eb2b74acfefaf37464fc8b1f1a077d3bff1344ad6a60383f4338b0a27ce2521bb0f68727eb252da6 SHA512 bf607001b0dd305cef30e4f1ae3389b73ae30c747a52915e4dd3df9bb051c44f29317c591a2d47add9bc0e95559ead75155338a69acd31fea9fb79c57f18577d
-EBUILD vte-0.48.4.ebuild 2311 BLAKE2B ab8a4a1113f242af86b006aa1030c7225df44639b3e1c4247b8f66584bbaf9b62db42969ca60d5b39df62da3c508aee1760f7c7023c033365d09fa6ef1796705 SHA512 0af0a71e7796cc2dfc60390800e8d8b8e3184533fdc0e091cd3567fb0496b38668d96c63548066d1f5ba5246de530570ea24157d07ffd9be8c6b367640fa94e5
-EBUILD vte-0.54.1.ebuild 2219 BLAKE2B 848523f5a310b0356c6475cfc7490220599a461a9ad2e545a9c917dc95bb2484f12756132a48e2c591005d738d865fc6cada08b2d624adc536b6f255810ff3ff SHA512 3a09c4180e067b24f9ac7a84f695ea71fe124cc27ce2124254cb3e8e743fe953b3185cc4ec733f61531a1f2084930a8cc09dc70579c26131ed3f1e2f0f501b04
+EBUILD vte-0.48.4.ebuild 2296 BLAKE2B 1ae75d444433f1c6ea478e69968ae1a369b96e6ff7410a22a7f110d157369f15aeb0b22662da1ca4574b60b6151932823e2866596cc45394a38b76eb89009fd0 SHA512 80c270a32cf543c2bb29a534ff07179c5897505132383862cab59ec203789dda70e3c62e6cd6dffe305a3e36113510f2f5b7dfb49bf1de1e476e87a685499315
+EBUILD vte-0.54.1.ebuild 2207 BLAKE2B d1584ceb316b68eea40b37231568ffdea1515ebcfecf711d2fc500f222ae2e1d5afe9b088cfbde13805f4295e34592da41ee742f022b1067e2ec1e856163adab SHA512 9e905622b2a4f0b07558802831d1df90622a061c4b64c77f17829d6e0814034ea672ff59f4aeae0a30607a50adace8537986de3df46314f3bc87c9b14eecd707
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index 386ce27988cf..23c0c8fdfbdb 100644
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ b/x11-libs/vte/vte-0.48.4.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="6"
@@ -8,7 +8,7 @@ VALA_MIN_API_VERSION="0.32"
 inherit gnome2 vala
 
 DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="2.91"
diff --git a/x11-libs/vte/vte-0.54.1.ebuild b/x11-libs/vte/vte-0.54.1.ebuild
index f8c6fcc8b2f8..61582d14a38e 100644
--- a/x11-libs/vte/vte-0.54.1.ebuild
+++ b/x11-libs/vte/vte-0.54.1.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"
@@ -8,7 +8,7 @@ VALA_MIN_API_VERSION="0.32"
 inherit gnome2 vala
 
 DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="2.91"