Merge branch 'edge' into next

16 files changed, 77 insertions, 80 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 6c3811ffc2c1..4c3457aea7a3 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index ce306b239b17..abe90e7467a7 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,6 +1,6 @@
 AUX gl2ps-1.3.8-cmake.patch 2410 BLAKE2B 044a2b9cfd4b108e5e766f062123fec8ea9fe0ca51518419a76f70915501d5ba2e20301a80e92803dccdf90d33a086365e75b0b040bc5cd42ad0a7c9517e1b64 SHA512 9ae64f280ff72e88cccd8daedec283ffef3403a02dbfa5872ec8991a1b6f0c6e0afaa1ff5009ada99cf9a3bb051dccf61614a77947728140b516081de8a624bd
 DIST gl2ps-1.3.9.tgz 294907 BLAKE2B b8473f9f3fc6cefa2374f6fdd94fb98d73ea79b9c0087ccc573f6b66eafe11098fc4312d8ff121abe2a8d6c9a3474f69dcb321ef978f8777b6dc077e5504621f SHA512 e6770c27d4832a300b4e16a9f98deb8557e7875460e7aa7e655fdb796f5dfffd5eccdc8b15f5a3ae151713fc46f97dacad48ee7550c41373b6fc8cfd21a437cb
 DIST gl2ps-1.4.0.tgz 300339 BLAKE2B bda8742dea6c1b4eb3e3a3492e6f38229feb6480131ce69e3512e9c558f7817a34bc76985311c3879cfcec5f715f36f0b8300300dd26025cdb7e72478802aa7d SHA512 420b21a5b4397c9a9a2323a8686b8635c2683354c94762d2d0172c661fc36c4298042498dd8ef2323adf32f45aa4e0a3dba146058ccde597e5a46c2027cbf7ce
-EBUILD gl2ps-1.3.9.ebuild 1247 BLAKE2B ef60d1f74da711a1497ad44427e6c74b59f523ed306c3a844d4ccb0f8c2bbf2a807438b8181a46d94bc0eb784ea90d0a47a6bd318567b93051fc047a4d2583fe SHA512 02328e81109ab6dd6307174217d105f49de9dcc30fcba6ceeda219ae00927eee27e4991aff6dbf8cf5ac72344c210f3545a5cf75a7d2d445a3263d57a457b9fa
+EBUILD gl2ps-1.3.9.ebuild 1245 BLAKE2B 4aceedc95a5adb17de36248fff3cb41e4439e2ce3624c396c52667352630fb865fb09b56b13277fcb3e4bf2bcb22f33a9106710b9d702dfe76c29f0c50a9c7e2 SHA512 3a8d32deec6854b23401e3068cd1174c13951c71c918791b4c82a5b81e58e1ceb701474a9c6fbb1856c932aafc6dae5c4bfed6ac9150c89b1c46646dbdfa5d14
 EBUILD gl2ps-1.4.0.ebuild 1240 BLAKE2B f367ea59dae36e5406444df3a8e8160c614ee30e742a7a7e471cade787996ce4fd0aec6bec00267df983e2f2492979e78e71085638db3a3a1c05888834c29a55 SHA512 7e1f233e1f6ec156aa1c7b7cb93f69287b2a2793266aa2b8a6c17fe2c00313336ce73f3e80eb315433e5a68fcabf6a4a615cac06d3ee4bda52449e66544069a8
 MISC metadata.xml 722 BLAKE2B 357dece0405ffb4a0714a534246c0f119a6b19d08b0d9867695d178af5e68bdf40b55824d35817c44ae85094f1900368ddf167752bc97c184cde687fca631a84 SHA512 0cd6f7dc51149def7310418cf775980f8287b9e40bde438e03dde020623f19b49648662f12e06233be7686eda4a5b75f79e92730dfdfd1a3ae6da80d6413efc9
diff --git a/x11-libs/gl2ps/gl2ps-1.3.9.ebuild b/x11-libs/gl2ps/gl2ps-1.3.9.ebuild
index d46ef9b88279..e61f4896fc9f 100644
--- a/x11-libs/gl2ps/gl2ps-1.3.9.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc png zlib"
 
 RDEPEND="
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index bd939c558e33..b4f4a7cd383d 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -7,5 +7,5 @@ DIST gtksourceview-4.4.0.tar.xz 1105776 BLAKE2B ef4ed4ed15435daba60795598ba41624
 EBUILD gtksourceview-2.10.5-r3.ebuild 1347 BLAKE2B 906f89f5840c70e6b971f5ee4d4a84cdce5ad71081d1762c434d34ebf6534eff74450ae81bc796201fb74c20537eaec76a97774d9f5eb1a6cb2c65a20a29b4f0 SHA512 c864e339c432308d99a494da8a3366de9c299cad4c109fa2d96aea4ae82a3f7be9453a5c5ab1f8648233d922f90343fcf5ad85b33defb3f0e37f3937d1bbb7ef
 EBUILD gtksourceview-3.24.11.ebuild 1272 BLAKE2B d606bbfed3a72adf6478175516be05045a5ccdeace5b4f6e36c1f9cce337e01f27ab680f1da56462c187b5085a543cfe272088f3dc9ca385ee1c3b28af2ea2e1 SHA512 f54f0e0a88a3e5310c75f985eee92ff3cfe0db3b930c7eb520879b519d214394604c84155c3ee9fef23a12477b81d4de1848ee1c29aa6c352af986b0247b3489
 EBUILD gtksourceview-4.2.0.ebuild 1617 BLAKE2B 8d6bc885c6d14db37bd52b5f6b2b3a43451b9e8caee6a46dd2c6176da09752d1e2dfc108e8f4b6e37dae3e1151718b9390acdc11bfb8e5315ac14bbc6f1706bf SHA512 0244079fd5423b8ef8492e1f5aa1ca887783e0558301d602cb3def54e618b0a4ec7bd468e5f675683b1e4b0f11f66a5ef57201911621cbad3d955d5a2edb17cb
-EBUILD gtksourceview-4.4.0.ebuild 1735 BLAKE2B 5492f9b865213c8f07cd2aeb7ccf65cacfc0acd4bb87a046e49ae7cace8abee7226e1f661e555d3cfe149ffa3a4ef7bac8eb6dc02e18bd2fa44ec1106e38c48b SHA512 5056cdc4c0dfaca8d2c838c31ee5e8324e4860357c21d998127bc58a8876fc575276abd680aceb92220f8887a2600469d12e41ad439d77c430200ea35e271cce
+EBUILD gtksourceview-4.4.0.ebuild 1730 BLAKE2B c152be14c1c67b95bc8688fe9b12a330e29a3d388e4a21e3b0df8c254364d295feb42e6a7ba498f0dd906345302650bb982973b661463b518e3d22b00188d1b7 SHA512 76310d02c09dd3e352d3eba2a0b20fd6410ad5ea9bd6f165ec9b01e9ff3a03b79186eae9f7e88f07bbe9547dba79cb5896d06fb8427232b775f6134513f2adbd
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-4.4.0.ebuild b/x11-libs/gtksourceview/gtksourceview-4.4.0.ebuild
index 7de4201a29d2..ffbaf7e29848 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.4.0.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.4.0.ebuild
@@ -14,7 +14,7 @@ SLOT="4"
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index c1f5501ba989..fd0e6e5bd761 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,8 +1,8 @@
 DIST libvdpau-1.3.tar.bz2 139009 BLAKE2B d535c7723638339d4e67002721e9d0d8aae89a6001fccc41d9c3b21d52f0fae9237705bca448fbf1c244dd7eeb71f5fc74ed81f05c975bed798fce503a571c90 SHA512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330
-DIST libvdpau-1.4.tar.bz2 139525 BLAKE2B 74c56d8d26b0dc3eb0658ef4c61cb18a6b2008c65dd0ef63e7d244d90366c64842708e07b9b1ef28f8a2b67d1ebc331bd83ee1968d80489531d3e90c6197ebf2 SHA512 2eeb4cddf7ea58cb59a6ac6cc49094d47910f60035ceea752756d9d817a189c95b268ef6819bb5fd7af5addc4f6eb6482f1bf8ca7f25840ef522a79ddab96805
+DIST libvdpau-1.4.tar.bz2 139504 BLAKE2B de2b9251060f10e3126b59f44595c3b9cc65c3f5bc719133809414ed51362fb1f90fa67d0351007a178455329493f929d0983a2a7e67c29022ff351ea1f5adfc SHA512 68f502f53f4a95c9af571bd5a3f5048dd1afe30d7576f7e80751c7f29450ef8cb226c1281562b616079d6c177830ec67391d0fae33348a4627ca8c113990cd01
 DIST libvdpau-libvdpau-1.2.tar.bz2 140017 BLAKE2B 0420961c48fcd5c92e7e98f84f629946f6234c28781bd7d8c9eb4aa2ab11b76e89e05f50cc423a2935b3376ff3b919ad9e6ef1710ff3549369567f298b5efa50 SHA512 f76c2283a1bd2e854aa6b86a564f7f08c1ff7da34e971c7c39f36e77fbd51fe0440d1ba01bff0b80be6c0326817ee4e6bff719dbe8dbf5e1ec7a94fad5016b7e
 EBUILD libvdpau-1.2.ebuild 1073 BLAKE2B b6b30a1065a56c6c17ebe03db3667f3ee4098a26c6c8000c765afbabbd327c2b416d74c61c7f44e89ba5dd126935f43154d219c5f33bc1c972f2d24837218ffd SHA512 ad19038048c4ec1aafbc940912e6b5f214bdbe899b63d8c7ae2990be9d1d52c54d11ba1963afb187e8bc8da49deb7ca53e30c0eb58851ebd087c9b331bb70c1b
 EBUILD libvdpau-1.3.ebuild 1160 BLAKE2B f8b155db62eee4a49ceaf03d399052673ad39cd932fefa9ae77f1f00113a7c64eb5edf3adc467c35f7b83e7dfc19ed4224248b9fed1f7993c0368f555e856137 SHA512 b399f7ed6b67a88cd372921c34bce9e0f21b2e7d5b279e84275ea2a03f44994659fc8861660a44fe4c98cd4f5f3365815abefa892f4b583b6fd84f01565c5e09
-EBUILD libvdpau-1.4.ebuild 1207 BLAKE2B 3e1e9f9ff4ce8f7b7e39c5e0ebfadbe46ae7d5b032b311e114d4c3705033d22d6eb7f6dc9a35ed2d137e280a484dbda582d280e9bfeaa6c4b641b93fd2063380 SHA512 b1db8adae123ffe3183d653da07eb33c31d47badf02fbade6c120a0a6305409e22d45c69d8875c309b1c7c1b1cd4392cdf5699eaef10466372ae9955ffb1a13e
+EBUILD libvdpau-1.4.ebuild 1162 BLAKE2B 08a0544a4737c41f4605d35be93d590c4b1a851396360e87f5d8857654f9c85919b4efb07fb44f8eccc424769215bea0b10a1ff515e30593821dcb46d708221b SHA512 f74afcbccc4c7c52ce9915de0e0eaa4770fa4109658176a711eb3700bbadee5302e55b40d9ad35b835518e56fee89fb8e702845ea7aff777b8cc9c5bd875d7d4
 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.4.ebuild b/x11-libs/libvdpau/libvdpau-1.4.ebuild
index d971e801f496..e44442af1427 100644
--- a/x11-libs/libvdpau/libvdpau-1.4.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.4.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic meson 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 -> ${P}.tar.bz2"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
@@ -28,7 +28,6 @@ DEPEND="
 		)
 	dri? ( x11-base/xorg-proto )
 "
-S=${WORKDIR}/${PN}-${P}
 
 src_prepare() {
 	sed -i -e "/^docdir/s|${PN}|${PF}|g" doc/meson.build || die
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 18e4624640e5..cd529c9c3c82 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,5 +1,5 @@
 DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
 DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
 EBUILD libxcb-1.13.1.ebuild 1456 BLAKE2B 926fe40639249315fc0c91c019ca8369f2aa5ddd87e5ac23818f17e76054c0c672af94298fb78307544f305712080a33180727b5437e7042c60eba5dae5a6ad1 SHA512 f2932a09d32d3685e447c5813f532a53b905b9c4b360ae814b2b285eac19290a936b61c79d2ff476ee997ac2b1fda9c3733534802c3a1c57c2ededa98f6b9d0e
-EBUILD libxcb-1.14.ebuild 1258 BLAKE2B 97156d6f2496113a2f21ef322a0efce3ff07d8824fa14652d8e4f0f45e22d397b465a6dd1bc3a08de7fabd3f0408213e5c451b11a6e9ee46c6e109b4891efecd SHA512 b2286d3191e1618dad4c78936cc07c2486396379eb0a96d5aa73e3aadb6f4520a7c60032247a53657b3a96d3426d8d24eade12e5f4e1ca2d251cab80ae802a45
+EBUILD libxcb-1.14.ebuild 1257 BLAKE2B c67b646a5c4a19363af81afb341fe8e6a7c57e0df26b76d7da6f52507224f9a224c7f53516466b1547edf138edd990c6d3312834e824ba421ebb9e9735692541 SHA512 ee5293494dbc06b09a91e36544d75abcb0e1f5012801525a4df4e58940d9f3bb5121ba8b75489ffb2ed618b045cd3c4e845662d818ea847bc9c34c98246cec1b
 MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index b6a3e1743883..6c9cecc9c186 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -15,7 +15,7 @@ inherit python-any-r1 xorg-3
 DESCRIPTION="X C-language Bindings library"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc selinux test +xkb"
 RESTRICT="!test? ( test )"
 SLOT="0/1.12"
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 768e69760241..0bfec6e64b5d 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,6 @@
 DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
+DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
 EBUILD pixman-0.38.4.ebuild 1729 BLAKE2B ce0f18be74b4586a2227b3b517af19aa0029d478c9a50a1d83c2d07a222dfc70395316853366a3a4f22395ccde57b4faff6488755c7046877b671fb5b5cfefb6 SHA512 412d23d206071fc1357940328f4f8697cbcf7bf0d5cc9d20e033304d376dff3b92a0e8256af0e5d5bced1e30a8af8101a3d00cb4088ad7cd341f64a05eaa2e3d
-EBUILD pixman-9999.ebuild 1727 BLAKE2B fcb7154fb5f18e0bfbcae19ea8af13c9ef88a5b9f20d21baac2d0444fb75eced412aebf07d03d145835df06ff76ea7b7c9e8c8857f6c713cfbc9da11dbc9b195 SHA512 5b8f6171e540b07e41a8b40ca6c1d0ae277f9ba6b3f912e303ff09f6e75f2cc961130ecb27beb0a0995b94217bdca890e9440860324f87afe77f800a7db35df8
+EBUILD pixman-0.40.0.ebuild 1791 BLAKE2B 269eebe1da7f127311d09a4e0fae271324a51deb494123a35a44d4b3b1d5c4f166bda201d40f318115045942213605cf4fba6049027fef18818e9bea3cb59464 SHA512 e3c4e3374dc265f3d92f0eddeb142eb6c194103ec69f63c877182cf762b8021d836c06e8fb7b951e43c5ed690aa25e47630cea8657488c0b338179a63502abf1
+EBUILD pixman-9999.ebuild 1791 BLAKE2B 269eebe1da7f127311d09a4e0fae271324a51deb494123a35a44d4b3b1d5c4f166bda201d40f318115045942213605cf4fba6049027fef18818e9bea3cb59464 SHA512 e3c4e3374dc265f3d92f0eddeb142eb6c194103ec69f63c877182cf762b8021d836c06e8fb7b951e43c5ed690aa25e47630cea8657488c0b338179a63502abf1
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
new file mode 100644
index 000000000000..9c15b1e09657
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs
+
+DESCRIPTION="Low-level pixel manipulation routines"
+HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs"
+
+multilib_src_configure() {
+	local openmp=disabled
+	tc-has-openmp && openmp=enabled
+
+	local emesonargs=(
+		$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
+		$(meson_use     cpu_flags_arm_iwmmxt2 iwmmxt2)
+		$(meson_feature cpu_flags_x86_mmxext mmx)
+		$(meson_feature cpu_flags_x86_sse2 sse2)
+		$(meson_feature cpu_flags_x86_ssse3 ssse3)
+		$(meson_feature cpu_flags_ppc_altivec vmx)
+		$(meson_feature cpu_flags_arm_neon neon)
+		$(meson_feature loongson2f loongson-mmi)
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dgtk=disabled
+		-Dlibpng=disabled
+		-Dopenmp=$openmp # only used in unit tests
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	export OMP_NUM_THREADS=$(makeopts_jobs)
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index ee4a7b6b0de5..9c15b1e09657 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -17,12 +17,12 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
+	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs"
 
 multilib_src_configure() {
 	local openmp=disabled
@@ -37,6 +37,7 @@ multilib_src_configure() {
 		$(meson_feature cpu_flags_ppc_altivec vmx)
 		$(meson_feature cpu_flags_arm_neon neon)
 		$(meson_feature loongson2f loongson-mmi)
+		-Ddefault_library=$(usex static-libs both shared)
 		-Dgtk=disabled
 		-Dlibpng=disabled
 		-Dopenmp=$openmp # only used in unit tests
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 4b9d109dfc3a..450d4e771b40 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -9,5 +9,5 @@ DIST vte-0.58.3-command-notify.patch.xz 4964 BLAKE2B f8414d3bf124bd3de4c08e22a05
 DIST vte-0.58.3.tar.xz 514844 BLAKE2B 1f48e95ec81397937c8a5a3d34ea9a7d1835d6cacec6e1b90b78568505d509b375f55678462428dd01da00e7290e4543bbab2dbb0aea46a322788fbaf022427b SHA512 b0a38eb1cd7d923b0431af943dbdb89932833f9a2b0b8fc1fa9ee728c87418c1f5a424b2ccee661721093a80c569f3b41c721b0ba2302ba0c3a42d4c5e31aa9a
 EBUILD vte-0.28.2-r208.ebuild 2948 BLAKE2B 24401f7eb05692d9e546e11e5f47862a43a7e86664078a6210c0f2f1899e4d5dcddcef89a1da5014adbcbaa57739d006bfe003a4163b9bf7672ad13e218cdd1b SHA512 73bcd40d14e4d7443af62f104865002c6a3938d62473da99fffa455dd0dbd231eadfa2618ba4a335b1c63eb8d0a4d13cf3264694b78116653832e3b878f30a9c
 EBUILD vte-0.56.4.ebuild 2278 BLAKE2B 347a664688e8445ff35923e39a11db7910959b5430622da6c950b7f1c9b83a182fe12d596106a38e149ad3b96fffaefaeef77b1b138b964bf795d1410a6a9dd4 SHA512 04a3aa68daabc18b652d29cd4438f863121900761964c6553bcb4e36e978e5d0138ebb45f892690cd2c8ae2ced98aa1e1aa54f54420f385ef5f8ed3765625a27
-EBUILD vte-0.58.3.ebuild 2079 BLAKE2B 98de36c557eafdb8088686c4bff7abc9cee545ddcbf94643630abb5f3ce25becaf83aefd9b641a55dde58e8218b7e187b9e48d1c32e5f1d8e5aa87ab2b6637b8 SHA512 9e7ff50a0e716d2e1228c4ffa76f097d110fb29170d5e2f317167e9de44ca0bca23daccbe85757174b1a2742edc7ee6de69b473280c68f4129cf4a6b89210de6
+EBUILD vte-0.58.3.ebuild 2074 BLAKE2B c18f90ec97a5937f664074687a5ac5825822b393fa80874ea4cb48f78dffd348529c5462d540a0ef0ba43d3c4e5c43a4aaa25167339dc2af2d754148766cbf6c SHA512 991fccd4bdd4041417fbfd0c424eabdf3a5999ea06f27d41290fac7dd4ed5edc1ef025cbcf3345630b44bcdff6fa13ff66d38aad266eb1b9e6a3bd128c888f38
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.58.3.ebuild b/x11-libs/vte/vte-0.58.3.ebuild
index 386611ee38a8..338067e35d3e 100644
--- a/x11-libs/vte/vte-0.58.3.ebuild
+++ b/x11-libs/vte/vte-0.58.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91"
 IUSE="+crypt debug gtk-doc +introspection +vala vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~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.58.3-command-notify.patch.xz )"
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 7100f11944a0..12924832fad5 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,5 +1,3 @@
-DIST xapps-1.0.4.tar.gz 129497 BLAKE2B d668ff840fa83b4a037c4b0f1c502e1851236d7998c4e5c7161a779e170eee6f6f47a2a17e71f332edf3f42f6ccb88c20379ad3b12847277f5e57a3b3765f2ef SHA512 1b735167f8edf15be1093255691c67ee1ae99664a714b75d46b1b782b00a6d1da72befc484ee66f070a829b6b8fd4dfa50bec5033220f66a1a4b577363b673b7
 DIST xapps-1.4.2.tar.gz 69709 BLAKE2B 514e4cb2e614ccd9fa303625eb5ffb818847447b29d6d989c2abdc90b6b9840dac6124d8484b71ffc2e489a925f83dae597c0904aa79cd5d5a0c27d44420da96 SHA512 2d16bd893a16876270c41d755c62ca454f561931750acc719c480e63036b70dca8dae25e6a313f13ed0daae09fd650e0efcef9d272c405ccd9c04147aaf59fe2
-EBUILD xapps-1.0.4.ebuild 1186 BLAKE2B e207f0937b415d8c2adb357c4b170e3e1613c4859a82f1b8bc488caa9370343dae1be41352d02ab8b729fafd4934a9c488d1236792af9db4b953b86e7249e29f SHA512 e70d855da7293f8aefd5bdf10f0d43e7cd489d34852333b391a485d03a10006d8d6840562c13e72992370b6f617c55cc431df00bc2a94211e105af2ac5bd0948
 EBUILD xapps-1.4.2.ebuild 1160 BLAKE2B d086673cc4e148393b122af0ac0ee1b9b2561b732095e0e622766e9719bec529af134586ff6934b56b50cbfddfc67ef8dce7e7473480869b934d9645ba24c088 SHA512 ac27b0e47ae63463599cf0a72cce821a47541118d47234349c2cedc2f68398c381669308be9916126bad857a12d358bf39ba9a456b72a7742f46d9a76d995a78
 MISC metadata.xml 332 BLAKE2B 63c6409ca74c859140b77f0075049a181a636bf7179d4d6f5ca508740ae75009d9dcd4472e33bde6c66033400670f5a730ffc975d30d798a865c6e1228686892 SHA512 fe3c09b76536049881c6c9de9c0ebe702a7fc29400649eb5f4b7d26a4642a08ff07bb69bb4020aa552c594ee5942bbf5e6c2df9a7754f485a97c5f5bfd6d8aa2
diff --git a/x11-libs/xapps/xapps-1.0.4.ebuild b/x11-libs/xapps/xapps-1.0.4.ebuild
deleted file mode 100644
index b7f4f76e989a..000000000000
--- a/x11-libs/xapps/xapps-1.0.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg-utils
-
-DESCRIPTION="Cross-desktop libraries and common resources"
-HOMEPAGE="https://github.com/linuxmint/xapps/"
-LICENSE="GPL-3"
-
-SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
-
-SLOT="0"
-IUSE="introspection static-libs"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	dev-libs/gobject-introspection:0=
-	gnome-base/libgnomekbd
-	gnome-base/gnome-common
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
-	>=x11-libs/gtk+-3.3.16:3[introspection?]
-	x11-libs/libxkbfile
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-"
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-gtk-doc \
-		--enable-gtk-doc-html \
-		$(use_enable introspection) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	rm -rf "${ED%/}"/usr/bin || die
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}