gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /x11-libs
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
69 files changed, 827 insertions, 400 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 301651d9d7c3..e0660c016e80 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 4c04c8f58b7f..7f50293f905c 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,7 +3,6 @@ AUX cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch 751
 AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b4814253084c5ba7946b29ee5c5209c2c207721d9699d9fbab83e40f6d10394e89fe7a23ea5dc194cfcb2495e3ac2b075e22fa83bb SHA512 569cc28538333cdd907e3c9f26dd6512e48188dcb761284f2414936d60d4239d7ac15a5836f1f390d4881cce71bfb62a0679e097386116ecf807ecd03bf0f03f
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r2.ebuild 3681 BLAKE2B 6d28bd41c31fb0dfaeac9a8786cd40e2c6233a64706f9de0dd3e5278d2364083209c5678df75302f0e340b6e38efbcd83005e17b1b3e206180f9123f62538e1f SHA512 e950d8b0b93dd80191d76bed991cf511160cfb16e81bef2ef5a2209cd39fa943f43ba1ed2df11223b4c773cbca30fb505569cea1b8a60dc239402ef9dca84477
-EBUILD cairo-1.16.0-r3.ebuild 3813 BLAKE2B 4671bf8af5126607c6a31a0131be5e1817a989becdccac6e229aa7afa095353391d4bbd554749a96983a28b8f284be8947aaeb6d09b6c82d1684a50a9dbd68d0 SHA512 f3311e01f52fcb1401f06ef6b661930c189b199ab4bf1211bde4de203260677c6a42551659c744b9fa5784c5fa53e350684d4e83821df758c0fc35723e9cdf69
+EBUILD cairo-1.16.0-r3.ebuild 3808 BLAKE2B 197542ebf3a0b0d6309298b26caecb9e360a3645fe306aab046293070d0907f0db5f97016b4a9653e43f6e21c48771e3fef15059c8ae16e2204f6b304b3e7cb5 SHA512 46ef3fa23592fc554ed6433cadadb8683c0b60c359948d2c0a88425539f43b1111abdbf6bf12f344f71534d957ece4f105e18eca9775ce784dbc3b655b92c0f3
 EBUILD cairo-9999.ebuild 3692 BLAKE2B 95df8b4195124919a4e49485619e2fc550a0d267f86482c98dbffc473e4c44138f0d09e9879e240d46309b95faf02593cbd36f27f58ff1b17ab28b3dd18744a2 SHA512 c179e201e4a7e5ad1c61eea111e41b080f19d2f8cf0783064dd88e1bb276f5575ba91f09a4fc1bc17c069b399c8acbff667228f7d410e9c389535ff82d7c2fc4
 MISC metadata.xml 704 BLAKE2B 25cce9fa8743e9f12ee5f41d189dfdb8850673c129f0ee1089922aead08d50a0eca451f926a9f58fcfe7fee256764db2102364968971d7f971a026f8f29fcfd1 SHA512 4c2c54b38569197ebbcb8145017b77c4f77fed2f6b6b6c4198386ee1e3f067b3ca4539cbf239bd7f3ead1e3d428992bae67b3e80edfbf8bcf48fad43d14256b1
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
deleted file mode 100644
index 33d36a607036..000000000000
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
-	SRC_URI=""
-else
-	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
-	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
-	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	)
-	xcb? (
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-2
-	X? ( x11-base/xorg-proto )"
-#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
-#	doc? (
-#		>=dev-util/gtk-doc-1.6
-#		~app-text/docbook-xml-dtd-4.2
-#	)"
-
-REQUIRED_USE="
-	gles2? ( !opengl )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
-	"${FILESDIR}"/${PN}-respect-fontconfig.patch
-)
-
-src_prepare() {
-	default
-
-	# tests and perf tools require X, bug #483574
-	if ! use X; then
-		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
-	fi
-
-	# Slightly messed build system YAY
-	if [[ ${PV} == *9999* ]]; then
-		touch boilerplate/Makefile.am.features
-		touch src/Makefile.am.features
-		touch ChangeLog
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myopts
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
-	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-dependency-tracking \
-		$(use_with X x) \
-		$(use_enable X tee) \
-		$(use_enable X xlib) \
-		$(use_enable X xlib-xrender) \
-		$(use_enable aqua quartz) \
-		$(use_enable aqua quartz-image) \
-		$(use_enable debug test-surfaces) \
-		$(use_enable gles2 glesv2) \
-		$(use_enable glib gobject) \
-		$(use_enable opengl gl) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable utils trace) \
-		$(use_enable valgrind) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--enable-script \
-		--enable-interpreter \
-		--disable-drm \
-		--disable-directfb \
-		--disable-gallium \
-		--disable-qt \
-		--disable-vg \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 189a0e2b92e8..5b9b8adaa412 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~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"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 731a3daaa56e..859a23a08936 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -9,13 +9,15 @@ AUX fltk-1.3.3-makefile-dirs.patch 230 BLAKE2B 517999f39b9de4f1f4f447e1d394ad562
 AUX fltk-1.3.3-visibility.patch 781 BLAKE2B 7e909b6ec4ac6d915ac7dbab69a86b63166d002f23c51b770f6342d02cc0ea6d6bf1574aa40c25ed6cb5b2bc97c141f0787c67fa283ca8ef5b0753473d977713 SHA512 b9bf0ba24d27210702a98da3e5dbd4db7a36301a163ed8214362aaaa218bcc184d708fe1e249b5be4fd35e481dc5b85b2bf11db3e005436e57ad4436da2819df
 AUX fltk-1.3.3-xutf8-visibility.patch 4557 BLAKE2B 963c2dbc5d5466d3b5c35b411d53a59d4c8f08b186e9f14b67c5945ea3356ca697c804587b291fdee57c432d738106134dc12158230cc6236f4836fb39dc7e2d SHA512 621cedd0cb4516169f1c87e3286cad3ca9d1685509c7e944e3077243fbee57809d61c734757994d104630cee658d9962dc934cda82932a05e8d80611a1d5ac4d
 AUX fltk-1.3.4-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
-AUX fltk-1.3.4-freetype_pkgconfig.patch 1026 BLAKE2B c45e829acb7a8dd023f323205bad37377f6f08974a99a38e34d6ccff60071d1258b68e3b3f10443be4b60dc59037b4c495054e697514c415904aef12d235f698 SHA512 66c654ee00614123546e3e749736dd6333a4d4036c001b1a2469efe3c182546923593746e4eb1583b3ba6a2cf72ba9a838176be53ec320a5ec61277479cae620
+AUX fltk-1.3.4-freetype_pkgconfig.patch 1008 BLAKE2B ea91b4cf2b1a4cb26d7cb58d58b39e1851428fb2eacb13a30027cd315a7bb9c23109bc9abed954267d3d94494389ea8aad078a0d502cd1080cffacabec3c458e SHA512 8c13464b28639ae641e23aea799e23bfb6a4253fd8341ad656231116939f312e85b1117037089acbfce88c43a50a368493f311353b14dc0938444d56f49464f4
 AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
 DIST fltk-1.3.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b44674f55d019239ebc0cbf8d70e04d9d1bce7a7c8463740bcd4c4a8ffcc8ef5e44b3f0cb591358d53d513844605c868 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
 DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
+DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
 EBUILD fltk-1.3.3-r3.ebuild 3764 BLAKE2B cce233125a8acb054628bd5010b042a01466e2ab6dc1e517e4a0a134d97b4651d189131c7defaee2854198217744c99f124475b3853b9ff33bc37fa4410af994 SHA512 af7ff591f510a0e8632d6068b04fc7ddfdc1250bdb75e5186964f5794dbccf53d04d67942a75659b4dd4619560304334e8bafe05f5c40477390924452c99c5b1
 EBUILD fltk-1.3.3-r5.ebuild 4394 BLAKE2B 6f8bd3caf45111057a3accf768c4309de717bccf01194bee88b5092c76e9e57fdd744c65f9e7d901a732b6c5eeb2d84752df537d9c93738f4778758f6053187e SHA512 8741f09384adad101f7989a561faa494e6a1c87e95747f34094d2ce14a90d6db09bfd26efe0704a854b62cfe672d5c13e30c10e1551e6e2ae504b4ead64cb36c
 EBUILD fltk-1.3.4.ebuild 4322 BLAKE2B 672541f7904f649927e3d42e1293f08bc6d9b1dc50b7c30407f77ccd052839b0bca9f5e493d6861c6ea34f91c07aacfacc57677d83fb4c27c2066554381b79a2 SHA512 de1a3d347ddebaaa835e6355b4c47136548e1a2853624f95cd1eeed0b868e08b0cf0b60863e715c7dd65cf8a57c92952a3a3b53399842164282da48c71ff3d60
-EBUILD fltk-1.3.9999.ebuild 4275 BLAKE2B 1ee86c64628d8b4aa249a65eb3cf76c6c619a6381bb25b34c955bec956724b06fcfd308f17d06ec2f198c786a486767ff3749e2f2a5bce79ca226fe233feed90 SHA512 51aef9d9cdaea5689699b56ebca4fd1d721fbc673532138abe82c36157195f7d0d86be88ed208240dfe0b45daecfd844c51898d7944171a96c40e10a0da46c19
-EBUILD fltk-1.4.9999.ebuild 4228 BLAKE2B 720c093eb7305f106fbf48f5453d99205592bed757c630f95599554b5d30d75785b4dce3639875739daf5ae1ccba9b2f41823b73f0cbfe1834f6c00cbc7fedf3 SHA512 0c8468affe2ad9a7db2c098640dabeb7ed47b5863721b0a6ea325c8618908046d64dd06ed538c0189724d5148b6d718493d2c9444e12ba91e0a4e6e407449d80
+EBUILD fltk-1.3.5.ebuild 4426 BLAKE2B d98fe2e0530075e588dedad760ced0885ac9fd609f48054e8757fce4cc9443a84eed7db3feb01f5bf7e49d4357c16592ffd5721fd6ba2f978be10dde45f058ac SHA512 1b5fbc3a1885196564faf88d846af37af46624fd1c8d7a1148967151f87edcade526eef2e006a130b55cc332dd79ba68d9f8d59d4b6fd7c0374a92593d45ad39
+EBUILD fltk-1.3.9999.ebuild 4429 BLAKE2B a53e91a94d0e00c46083d2e19f7183fd181068d77d4d74625e229161427cbeeb51d263f11b55eb75989815ebbd4392a84109232f572919d0ada046b89b6492bf SHA512 fb9a084a0058229507823c4069e3228dc4d7191f398a37a9e3c5e52041784d31aa5b443eaf4845fda8726d540582c1ee806cabc861a751175cc09738f3d53842
+EBUILD fltk-1.4.9999.ebuild 4462 BLAKE2B 73e1dcf4ab86ce5d7b209ee6044fc07c6414f1e5095a5fae60cb183a805cd52161635dd34974b822aeafb17b8fae998b4f1e6c642c19ca3739eeee99c7c097df SHA512 fe67e96c4e82197b67e79288d2ca7528b929b22dc99f4177c7ac171346ccb1befba124827a41275911d1944a16a8521535c7b2086b6910f139610e222b12d908
 MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
diff --git a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
index 70183412229b..32dcd3016349 100644
--- a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
+++ b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch
@@ -1,5 +1,5 @@
---- fltk-1.3.4/configure.ac
-+++ fltk-1.3.4/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -1005,13 +1005,13 @@
  	AC_ARG_ENABLE(xft, [  --enable-xft            turn on Xft support [[default=yes]]])
  
diff --git a/x11-libs/fltk/fltk-1.3.5.ebuild b/x11-libs/fltk/fltk-1.3.5.ebuild
new file mode 100644
index 000000000000..008a5a20c956
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.5.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools fdo-mime flag-o-matic multilib-minimal
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
+
+RDEPEND="
+	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	x11-libs/libICE[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( app-doc/doxygen )
+"
+DOCS=(
+	ANNOUNCEMENT
+	CHANGES
+	CHANGES_1.0
+	CHANGES_1.1
+	CREDITS
+	README
+	README.abi-version.txt
+	README.Cairo.txt
+	README.CMake.txt
+	README.MSWindows.txt
+	README.OSX.txt
+	README.Unix.txt
+)
+FLTK_GAMES="
+	blocks
+	checkers
+	sudoku
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-share.patch
+	"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
+	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
+	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
+	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+)
+
+src_prepare() {
+	default
+
+	rm -rf zlib jpeg png || die
+
+	sed -i \
+		-e 's:@HLINKS@::g' FL/Makefile.in || die
+	# docs in proper docdir
+	sed -i \
+		-e "/^docdir/s:fltk:${PF}/html:" \
+		-e "/SILENT:/d" \
+		makeinclude.in || die
+	sed -e "s/7/${PV}/" \
+		< "${FILESDIR}"/FLTKConfig.cmake \
+		> CMake/FLTKConfig.cmake || die
+	sed -e 's:-Os::g' -i configure.ac || die
+
+	# also in Makefile:config.guess config.sub:
+	cp misc/config.{guess,sub} . || die
+
+	cp fluid/{,x-}fluid.desktop || die
+
+	eaclocal
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset FLTK_LIBDIRS
+
+	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
+
+	multilib_is_native_abi && use prefix &&
+		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
+
+	econf \
+		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable opengl gl) \
+		$(use_enable threads) \
+		$(use_enable xft) \
+		$(use_enable xinerama) \
+		--disable-localjpeg \
+		--disable-localpng \
+		--disable-localzlib \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-largefile \
+		--enable-shared \
+		--enable-xcursor \
+		--enable-xdbe \
+		--enable-xfixes \
+		--includedir=${FLTK_INCDIR} \
+		--libdir=${FLTK_LIBDIR}
+}
+
+multilib_src_compile() {
+	# Prevent reconfigure on non-native ABIs.
+	touch -r makeinclude config.{guess,sub} || die
+
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid
+		use doc && emake -C documentation html
+		use games && emake -C test ${FLTK_GAMES}
+	fi
+}
+
+multilib_src_test() {
+	emake -C fluid
+	emake -C test
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		emake -C fluid DESTDIR="${D}" install-linux install
+
+		use doc && \
+			emake -C documentation DESTDIR="${D}" install
+
+		use games && \
+			emake -C test DESTDIR="${D}" install-linux
+	fi
+}
+
+multilib_src_install_all() {
+	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
+		dosym \
+			/usr/share/icons/hicolor/32x32/apps/${app}.png \
+			/usr/share/pixmaps/${app}.png
+	done
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*.{h,cxx,fl} test/demo.menu
+	fi
+
+	insinto /usr/share/cmake/Modules
+	doins CMake/FLTK*.cmake
+
+	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
+	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
+	doenvd 99fltk
+
+	# FIXME: This is bad, but building only shared libraries is hardly supported
+	# FIXME: The executables in test/ are linking statically against libfltk
+	if ! use static-libs; then
+		rm "${ED}"/usr/lib*/fltk/*.a || die
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index cf4958abf3db..4171029d334a 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools fdo-mime flag-o-matic multilib-minimal subversion
+EAPI=7
+inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org/"
-ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.3/"
-ESVN_USER=""
-ESVN_PASSWORD=""
+EGIT_REPO_URI="https://github.com/fltk/fltk"
+EGIT_OVERRIDE_BRANCH_FLTK_FLTK="branch-1.3"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
@@ -35,23 +34,29 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	virtual/pkgconfig
 	x11-base/xorg-proto
 	doc? ( app-doc/doxygen )
 "
-
 DOCS=(
 	ANNOUNCEMENT
 	CHANGES
+	CHANGES_1.0
+	CHANGES_1.1
 	CREDITS
 	README
+	README.abi-version.txt
+	README.Cairo.txt
+	README.CMake.txt
+	README.MSWindows.txt
+	README.OSX.txt
+	README.Unix.txt
 )
-
 FLTK_GAMES="
 	blocks
 	checkers
 	sudoku
 "
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-share.patch
 	"${FILESDIR}"/${PN}-1.3.9999-conf-tests.patch
@@ -144,22 +149,23 @@ multilib_src_install() {
 
 	if multilib_is_native_abi; then
 		emake -C fluid \
-			  DESTDIR="${D}" install-linux
+			DESTDIR="${D}" install-linux
 
 		use doc &&
 			emake -C documentation \
-				  DESTDIR="${D}" install
+				DESTDIR="${D}" install
 
 		use games &&
 			emake -C test \
-				  DESTDIR="${D}" install-linux
+				DESTDIR="${D}" install-linux
 	fi
 }
 
 multilib_src_install_all() {
 	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
-		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
-			  /usr/share/pixmaps/${app}.png
+		dosym \
+			/usr/share/icons/hicolor/32x32/apps/${app}.png \
+			/usr/share/pixmaps/${app}.png
 	done
 
 	if use examples; then
@@ -180,7 +186,7 @@ multilib_src_install_all() {
 		rm "${ED}"/usr/lib*/fltk/*.a || die
 	fi
 
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
index 97500930d118..708271c605b5 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools fdo-mime flag-o-matic multilib-minimal subversion
+EAPI=7
+inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org/"
-ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.4/"
-ESVN_USER=""
-ESVN_PASSWORD=""
+EGIT_REPO_URI="https://github.com/fltk/fltk"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
@@ -35,23 +33,35 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	virtual/pkgconfig
 	x11-base/xorg-proto
 	doc? ( app-doc/doxygen )
 "
-
 DOCS=(
 	ANNOUNCEMENT
-	CHANGES
-	CREDITS
-	README
+	CHANGES.txt
+	CHANGES_1.0.txt
+	CHANGES_1.1.txt
+	CHANGES_1.3.txt
+	CREDITS.txt
+	README.Android.md
+	README.CMake.txt
+	README.Cairo.txt
+	README.IDE.txt
+	README.Pico.txt
+	README.Unix.txt
+	README.Windows.txt
+	README.abi-version.txt
+	README.bundled-libs.txt
+	README.macOS.md
+	README.md
+	README.txt
 )
-
 FLTK_GAMES="
 	blocks
 	checkers
 	sudoku
 "
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-share.patch
 	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
@@ -143,22 +153,23 @@ multilib_src_install() {
 
 	if multilib_is_native_abi; then
 		emake -C fluid \
-			  DESTDIR="${D}" install-linux
+			DESTDIR="${D}" install-linux
 
 		use doc &&
 			emake -C documentation \
-				  DESTDIR="${D}" install
+				DESTDIR="${D}" install
 
 		use games &&
 			emake -C test \
-				  DESTDIR="${D}" install-linux
+				DESTDIR="${D}" install-linux
 	fi
 }
 
 multilib_src_install_all() {
 	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
-		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
-			  /usr/share/pixmaps/${app}.png
+		dosym \
+			/usr/share/icons/hicolor/32x32/apps/${app}.png \
+			/usr/share/pixmaps/${app}.png
 	done
 
 	if use examples; then
@@ -179,7 +190,7 @@ multilib_src_install_all() {
 		rm "${ED}"/usr/lib*/fltk/*.a || die
 	fi
 
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 079f8e15d17f..f907ae9a96f7 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -3,6 +3,7 @@ AUX gtk+-2.24.24-out-of-source.patch 1487 BLAKE2B f322f3872c8e1f02f6d1d52cdfdb4b
 AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e355117aabd9c3e9dfd1a810eaa8dc7e60dbe3fb65a73719c272dc1ba2058dae95b3988d86f09fa8587963df34a7486b50e68e79732 SHA512 c2a55a410019502b0af3fa5152fc372ce8a555bd63b5cf7f9574ebe5058f3b95e21dc5f14b5b8867d52105e4f6ebca3336a59935c3a7269bfd41aa91edadab48
 AUX gtk+-3.22.2-update-icon-cache.patch 5474 BLAKE2B fe374a5f50ffc69df0d09e5b50d8b5c22ec57eb8709d13270b53cc389f2a14a4fa145051e5c0d80e7eb0c9e6778a240fbd64e4299d36736500ca6695a1345b13 SHA512 46ac52f18c0e74f5e35101ef978d7708c42abb05985894b65e8a7f7a76f1934015ff35a912628a5ae2c6333916ffd00570aa19230108aabe3a20adc5e31d958e
 AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f
+AUX gtk+-3.24.8-update-icon-cache.patch 5523 BLAKE2B 648018f807cb1f3d057e986a1422e3fbeb0cf1c050f19569f4a93a9d7e71577370b79f01133e0be048282259af8218f03511c39c8e73b3b912c2c86e91ab935b SHA512 70fa68b08dd140eea1dfa80f2b67d4c6d3d5bd1b5374eda57bd827f9727e89bbd0e2d775676da2dc5d852d3c2f55cbb07d9d791a99a6d90f5f63864a0479fe13
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
@@ -10,8 +11,11 @@ DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169
 DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ecd021817e34e71b101a7d222604b395c850c559f3ff0c38e0848abdffc483efe65f086357532be85db872028e7 SHA512 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d
 DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1
 DIST gtk+-3.24.7.tar.xz 19375708 BLAKE2B 28ec4106258a7ecfa78d2f3dd8d2145cdf8ecbb55167bf22002e38186721e2e1658885032630eb306785bfe36486834c40e34fd5ac20d1c30d4f5de58cba7fae SHA512 2605087c3e09c81192769e6c4bcc4374e0fadbc4d05433edeaefd9915e128ff925c64fb3d07799bacccb16d85d31e53936ac09c696a09349efa6e21d886074c5
+DIST gtk+-3.24.8-patchset.tar.xz 3684 BLAKE2B 686356993b95f5342942764af5f92ab52b17fcd326ee3fd0de5179ed2a55b6e0192e16707ee882866d39ede7d28150b8b8bc6945355f04a4b191b671ae70fb7d SHA512 31f9b982592a81095afad91f16ad96e72a7a2b0e2bf812f0b719da56d70235bc06bc991b5f619fefded3e1634efc5b7e8ef00053929c89e967351d8625518428
+DIST gtk+-3.24.8.tar.xz 22419364 BLAKE2B 262384d0bf1d843edfcb13007eae3584235fa166286f071b8b98803d452df3f4f8934f2b1830427d0c0cd956b67170e576f8c3f733e9b6323b8f89f6d0ddea71 SHA512 a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5
 EBUILD gtk+-2.24.32-r1.ebuild 10008 BLAKE2B 8bceca83e3a73a2565cd980c80d1baa5fa2a79de61b4b8cb984738bbf6740c59a5df4b04e878fa2282d46642970e11dc4db8dadbf479447576b854f597b274cc SHA512 f3dca376a7794bc8ecdc47362a09dc58d46de7636dc0fec7dda86727ed47cb0d2105d5901884b60ae0601159ba1a79d0da2e05d725e0d119d9382a7771369ad2
 EBUILD gtk+-3.24.1.ebuild 6868 BLAKE2B e602a63f626d30650b4ffdec0b7e5f21447646bd5cfc3c179aabbbe7c0447fa4714774e929becd35986dd39c4f800858721212945cc609f769aa451c39efa9c2 SHA512 779d1a44e18d00cb6051df289fc413bb9766ea4be932fd6207f83ac0d71c9a15883d585f778c1752460e5957a326f9d2b16550c1009230623c8561381bd51b6d
-EBUILD gtk+-3.24.4-r1.ebuild 7243 BLAKE2B 7aa81f0092387dce46b8fd55aa24f14c6e50bb7efbf903be4d64f9b703d2ebfea80c561fd426848aef69d445597283186a372f27c9c77ce1d7db3ffe2afcc6d9 SHA512 30b537ae298815f42c8faafc492b222849209903039ffa24bf004821411c7853d95d3de279535b4e1ec9e053a3b83a8df34121e8910af447090313af336a8583
+EBUILD gtk+-3.24.4-r1.ebuild 7235 BLAKE2B a7341eac595ae6b8c8d4c90e621dd6d7bb48211c633c0ffe4cdb176fe0a4494fa54f41f112313da0c619f19c8eb5fe3a4cc6f383a77f55644a99ecfa796c6f75 SHA512 23dbf1f650a2a4e9f92b2cd01632891d17f731c944e748b2b95207035fa30afb6bc63a23137eb3e7e375b90e46a8848d854dcc5aac076a4d95e4aecd703993d5
 EBUILD gtk+-3.24.7.ebuild 6926 BLAKE2B 8ff7447cb823bf90058d425523fdba79eb550084505245526143e857947d816a74cf6001f140b5145f10d8fb99fd671b0a4d190a65311e3e23a140f537b2cc33 SHA512 bed669e8776dc1476f6448f0a717d2a45140a8ff9401ce88fa80f7ec56fe92357bdde2d2683388a2c4e7b57c72cbe9c5fb64cd2f6f0aa8f2618b8fe7552c432c
+EBUILD gtk+-3.24.8.ebuild 7073 BLAKE2B 687e8cf25648de0c4c197447fdeeff224588d63d88d6a173a8333a07b64efe22aff077ea6c5f463bb66bf443b245bf2e7a2db5da503df06360efdc263f0c75b3 SHA512 65f337f810e2db5d34be5e1fba30c4466bf971061d390e918ce01f3836969112071ac5e737800c120c2ff05c8a7cc438b40c54caaac1786871486ae160c8f2a5
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
new file mode 100644
index 000000000000..6fcbb5c07ba4
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
@@ -0,0 +1,138 @@
+From 87693de873b15194b122e98438b3bc1bf37f6d0b Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 1 Nov 2016 15:24:22 +0100
+Subject: [PATCH] Always use external gtk-update-icon-cache
+
+Check for gtk-update-icon-cache to install demos, otherwise it is not
+used when building.
+---
+ configure.ac                     |  2 ++
+ demos/gtk-demo/Makefile.am       |  2 +-
+ demos/widget-factory/Makefile.am |  2 +-
+ docs/reference/gtk/Makefile.am   |  1 -
+ gtk/Makefile.am                  | 44 --------------------------------
+ 5 files changed, 4 insertions(+), 47 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f700616649..e3604fef05 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1003,6 +1003,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+ 
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+ 
++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no])
++
+ ########################################
+ # Windowing system checks
+ ########################################
+diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
+index c8529e5bf7..b2924fc081 100644
+--- a/demos/gtk-demo/Makefile.am
++++ b/demos/gtk-demo/Makefile.am
+@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
+ dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
+ dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
+ 
+-update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
++update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
+ 
+ install-data-hook: install-update-icon-cache
+ uninstall-hook: uninstall-update-icon-cache
+diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
+index 62c156aa09..7aad079dcd 100644
+--- a/demos/widget-factory/Makefile.am
++++ b/demos/widget-factory/Makefile.am
+@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
+ dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
+ dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
+ 
+-update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
++update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
+ 
+ install-data-hook: install-update-icon-cache
+ uninstall-hook: uninstall-update-icon-cache
+diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
+index abdea7fb59..0ee826c31e 100644
+--- a/docs/reference/gtk/Makefile.am
++++ b/docs/reference/gtk/Makefile.am
+@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in
+ 
+ man_MANS = 				\
+ 	gtk-query-immodules-3.0.1	\
+-	gtk-update-icon-cache.1		\
+ 	gtk-encode-symbolic-svg.1	\
+ 	gtk-launch.1			\
+ 	gtk3-demo.1			\
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index e556e9d3af..4d7973f3b1 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1653,7 +1653,6 @@ endif
+ #
+ bin_PROGRAMS = \
+ 	gtk-query-immodules-3.0	\
+-	gtk-update-icon-cache \
+ 	gtk-encode-symbolic-svg \
+ 	gtk-builder-tool \
+ 	gtk-query-settings \
+@@ -1666,9 +1665,6 @@ gtk_query_immodules_3_0_LDADD = 		\
+ 	$(GMODULE_LIBS)				\
+ 	$(GTK_DEP_LIBS)
+ 
+-gtk_update_icon_cache_SOURCES = updateiconcache.c
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
+-
+ gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
+ gtk_encode_symbolic_svg_LDADD =			\
+ 	$(GDK_PIXBUF_LIBS)			\
+@@ -1693,46 +1689,6 @@ gtk_launch_LDADD =				\
+ 	$(top_builddir)/gdk/libgdk-3.la		\
+ 	$(GTK_DEP_LIBS)
+ 
+-if OS_WIN32
+-
+-# Workaround for UAC silliness: programs with "update" in their name
+-# are believed to be installers and require elevated privileges to be
+-# used... Embed a manifest file into executable to tell Windows that
+-# gtk-update-icon-cache.exe doesn't require any special privileges.
+-
+-GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
+-GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
+-GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
+-
+-$(GTK_UPDATE_ICON_CACHE_MANIFEST):
+-	(echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
+-	 echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
+-	 echo '  <assemblyIdentity version="1.0.0.0"' ; \
+-	 echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
+-	 echo '     name="gtk-update-icon-cache.exe"' ; \
+-	 echo '     type="win32"/>' ; \
+-	 echo '  <!-- Identify the application security requirements. -->' ; \
+-	 echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
+-	 echo '    <security>' ; \
+-	 echo '      <requestedPrivileges>' ; \
+-	 echo '        <requestedExecutionLevel' ; \
+-	 echo '          level="asInvoker"' ; \
+-	 echo '          uiAccess="false"/>' ; \
+-	 echo '        </requestedPrivileges>' ; \
+-	 echo '       </security>' ; \
+-	 echo '  </trustInfo>' ; \
+-	 echo '</assembly>' ) >$@
+-
+-$(GTK_UPDATE_ICON_CACHE_RC):
+-	(echo -e '#include <winuser.h>\nCREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
+-
+-$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+-	$(WINDRES) --input $< --output $@ --output-format=coff
+-
+-gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
+-
+-endif
+-
+ .PHONY: files
+ 
+ files:
+-- 
+2.17.0
+
diff --git a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
index adee45f1b141..f790e163ce78 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
new file mode 100644
index 000000000000..2044ec67b36e
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.8.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	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"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-0.9:=
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	wayland? (
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.12
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? ( x11-base/xorg-proto )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	>=x11-themes/adwaita-icon-theme-3.14
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	# Select patches from origin/gtk-3-24 on 2019-04-20
+	eapply "${WORKDIR}"/patches
+
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	eapply "${FILESDIR}"/${P}-update-icon-cache.patch
+
+	# Fix broken autotools logic
+	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	# cloudprovider is not packaged in Gentoo
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable broadway broadway-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable gtk-doc) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-cloudproviders \
+		--disable-mir-backend \
+		--disable-papi \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
+	DOCS=( AUTHORS NEWS README )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/hippo-canvas/Manifest b/x11-libs/hippo-canvas/Manifest
deleted file mode 100644
index c8a335961df0..000000000000
--- a/x11-libs/hippo-canvas/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX hippo-canvas-python-override.patch 349 BLAKE2B 92912d75c47e78adf8129d85c963709dbf8200bf30c197e2da3c02837e5e2afcce050d4c4ce94f17a4ac53ad84167acabce2ae0ec3afae4fbd66c309b46b92f0 SHA512 58bb19ed76a4ef07cbebb7b7fad46b931ba7e81ea2e38a6596ea0247ea38bca96c392b13db9673a43f973b67b3297ae7d6a4656772105db688a34ef3be7847f4
-DIST hippo-canvas-0.3.0.tar.bz2 376859 BLAKE2B f224aab41c0cd34c2e65e30a36f0ce58969a20d911c7d63ec488634879206a4b02fa246f6540f5b3fce4a7ffa6a5953aec8b6f93501c9fd711211d1182386206 SHA512 8290f6ab1875eed606ea152f12741ec4ebd8839091a9c258b8c4fa39f395adf94217576c6c689c5ab22b62c65e37d82991c7b8942815cb2030bd45616528f4f3
-EBUILD hippo-canvas-0.3.0-r2.ebuild 1039 BLAKE2B 35b9f9585bed04c6bf7fbcc5f8d9491d93e70285e16c1260ecdf2987ba3cbb0d1a1c52b4e0e0238eca1b84fd17058a017ad290f2fe59e9f4acf476768d0a083f SHA512 ec0c767752fb6df100fca88b04d3f777dea7a61f0651a5c90daa79058a70676f38dcf7c54fa4a5c3550f51e76b7086708aacbfa3771bf1545b26f78c1f8eb68c
-MISC metadata.xml 487 BLAKE2B 922f057e5ea68f201e92d05f8cda6e5e4ca5a2f551f21e10d05f7027940fbd6ca4005cea99559261b8f0b0859d6e985508f84b6c2e63a4ace39ed2d218ac1005 SHA512 4fcbed02fb004fdde36668aa8c089a0180f38355103720d55f94687868189f1583f09d29c8c071f5151fa24695491044445f6444c5af4776b8e8517307388e8e
diff --git a/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch b/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch
deleted file mode 100644
index bcbae474160b..000000000000
--- a/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- hippo.override	2008-05-21 16:22:02.000000000 -0700
-+++ hippo.override-new	2010-04-13 13:11:20.826177339 -0700
-@@ -19,6 +19,7 @@
- #include "hippo/hippo-canvas-widget.h"
- #include "hippo/hippo-canvas-window.h"
- #include "hippo/hippo-canvas-widgets.h"
-+#include "common/hippo/hippo-canvas-test.h"
- 
- #include "hippo/hippo-canvas-type-builtins.h"
- 
diff --git a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
deleted file mode 100644
index 5def06c083aa..000000000000
--- a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="A canvas library based on GTK+ 2, Cairo, and Pango"
-HOMEPAGE="https://wiki.gnome.org/Projects/HippoCanvas"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.6:2
-	dev-libs/libcroco
-	>=x11-libs/gtk+-2.6:2
-	x11-libs/pango
-	gnome-base/librsvg:2
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cd "${S}/python"
-	epatch "${FILESDIR}/${PN}-python-override.patch"
-	cd "${S}"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable python)
-}
diff --git a/x11-libs/hippo-canvas/metadata.xml b/x11-libs/hippo-canvas/metadata.xml
deleted file mode 100644
index 65b0f97626e6..000000000000
--- a/x11-libs/hippo-canvas/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-	HippoCanvas is a generic user interface element that can draw Cairo graphics, respond to key and mouse events,
-	and lay out other widgets. It is currently used to implement a number of Sugar's custom widgets (toolbars,
-	rounded buttons, etc.) and to lay out the screen.
-	</longdescription>
-</pkgmetadata>
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index 8f34a56b4c18..8939d894843c 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1,5 +1,5 @@
 DIST libFS-1.0.7.tar.bz2 315569 BLAKE2B ea629c9d935e4e2f159edd6e3513a571d4a145fcd3030605babd2b931aff3377509e8476859e4278bfbbe48cfe94444d9daa85628e9fcdfa384c4ac0a46dc01b SHA512 3596e87710c14706ab345377799e9b2dbab79500fd75b4213f9615bf7db7df3265b4dbc65fdeca9d32343b848013780cfa1a43e76229665ce80246332bb8b96f
 DIST libFS-1.0.8.tar.bz2 347880 BLAKE2B 74f9079f4ac98ad8cc83e73a162f4e308c49b643dc11ab6d68d36afe5f70b9326023fafb7a17ab14a083bbda20f99d6e140bf85facc4a3177d356b7c5dd6e126 SHA512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f
 EBUILD libFS-1.0.7-r1.ebuild 419 BLAKE2B cb445c4d687e39bd563d8c11250c41f0b0975be0f49255b1b06426e595d960e6c648a3b2d98b4e119c7942dc3cfba403495911975672b25193b4547e67d1c52a SHA512 de2fec0b2fd48a25f47c2813bf28bd2392d5b3a3e37c694911b3bbe81503508799495850ee42d06f3a680bf4d32b638e52f2cce909673c31555c242d0ad07d24
-EBUILD libFS-1.0.8.ebuild 390 BLAKE2B 07ab99a933439b9e45f3277f62cbaa5eef937c9629748a3cea029185b4bce29ad320ffc9310a47104c42721d6afa4706a43bda001d08b417b623e643d8a06f52 SHA512 623ac8d86e62f950caffea741d3e23a6632b791599ab48450f7a76ca3668150183af84f753e9b10388cbcf1a4e0a02eb1ecfbb4b3d4fd9fee8e4c8f25b8a13fe
+EBUILD libFS-1.0.8.ebuild 383 BLAKE2B 61d5e276c714fc3e3690281991222d316b435a1d00d1b2ee118117e1262a87f3a65b2514d9bcf6dad45449adf691cfc173c2fed0bed7dcbe7d45fad9258d9a91 SHA512 fd83f346d16da3aca825df8518b1269649d9cc031438249bd7ae2b37ba419a59d01b5d65bcac9929a19036a697fd0cd2a1997b02dbd8197483516320f8980375
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libFS/libFS-1.0.8.ebuild b/x11-libs/libFS/libFS-1.0.8.ebuild
index 21b0de0eed9d..66b11bc4a776 100644
--- a/x11-libs/libFS/libFS-1.0.8.ebuild
+++ b/x11-libs/libFS/libFS-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org FS library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
 DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index a5a3b05c3585..b45449c301f3 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,5 +1,5 @@
 DIST libXau-1.0.8.tar.bz2 295297 BLAKE2B 46c0cdf3382a75e197e48d556d44494dc8a91483fa27c86ae1b4264deb63320637232fe94d1286b38ba8f4efa5405f4b5c476266963ee3ee43b934af2e0a0e53 SHA512 9f933d22f8f2411ae770094589cbe170c631a1437d572664e0fa6b9608e6ec39deef752f2dd6408ab45acdf01bf1827ef3ced640a33da787d9cfb546f12397b5
 DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
 EBUILD libXau-1.0.8-r1.ebuild 489 BLAKE2B e6e62286ebd46e04c217f933d6ff1b45f7e506f2738ce353bcf53583467317e480562519dbafe1b37a231050d4d1e663e3900c96d99e22619c13339dea81b91c SHA512 b9ca291f2c834fe4890b3f99f840be609615a1a41c555ad54f24d7c8c157b00c827c5f77bad0442970e36295dbed27fde328764e19b4a107aa6190285d519e34
-EBUILD libXau-1.0.9.ebuild 497 BLAKE2B dddfec346ec91530b0f9527bdae45f773d9363e436130847d91599d9b5eab2b7a1c9949e1cb927e540b134db6cedf67148a7cb3e1d9538f9f9de78da6735857d SHA512 3b09560b408539afd32ef876645490f95efe4d34206bf2807187af166153553ed6a445512193b61ed0eb124c01a6240ffa53d9964a0f5523ca3a310f7f668781
+EBUILD libXau-1.0.9.ebuild 489 BLAKE2B d42f8fc926badac6e9eb9486a638c21466745500c2cb8d191c51a5036a007bfe8f7677133e962dfe5fd0ec97e82d5bb107569ac42b02faa0fb55294167071350 SHA512 373b4f5181f1f831142be802d5b312cb0ba2717e967f23269e82278652a87bd0e0da65d606e1a7c874a2f128cace73bf601ea9c05bf827c47f7263d972f34619
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXau/libXau-1.0.9.ebuild b/x11-libs/libXau/libXau-1.0.9.ebuild
index a75660eb26fd..bd0324e1c3a1 100644
--- a/x11-libs/libXau/libXau-1.0.9.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org X authorization 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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index e220876afb58..3ee5bc3e429b 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,5 +1,5 @@
 DIST libXcomposite-0.4.4.tar.bz2 283746 BLAKE2B d72781ee1352027fab3c6dd543b367757c63d878235e324098c65a47bcafcf9b3404343be0af15743a40c092146493360b661bdc42367502f97667d7cedbb2a9 SHA512 b15f8fdbe4cb7488bdad161d73ef8e59ef603c5af92d7b573110ba136d7d4ce3749aac45972bce87662b0310b67e831cffad72c45c15bfff988b5b555d4c884b
 DIST libXcomposite-0.4.5.tar.bz2 316993 BLAKE2B 4dc01b4c3fd85bdaad1ab9d9da0668caa162957056284fe864dacfcad302ddacf32a3ca233efe191592121a42783e04d5844277ef8ede21951e890114120ba22 SHA512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5
 EBUILD libXcomposite-0.4.4-r2.ebuild 652 BLAKE2B 8f1ce4cf97bbbf5f348bbfc789302a5a151d720c57f06c446f85658f3109307c9439c048bfe1445263d8f9ffb63914f0b15785a6575474e183abd011600a87bb SHA512 aff44cb5660f2dbd1e3d4af73af57b3c0074d31271e6db26bcdf462acd4957cc1996ee1133ae835fc640f6399c57a314aae7ab3256cd45d16e721db170dca5d7
-EBUILD libXcomposite-0.4.5.ebuild 639 BLAKE2B a93a0ad3fa21495dd861e1c11d21491fb681f4d9e6672928efc94cc1a061a17bd5e7071083f098f3e74157831070a2aa13a99315ae22cfa9bdddd6a2bd50c52c SHA512 46b729af319daf9a1769cb2f9cab4b7d9f889f8053c7aea1435b965ce02d2586e077a7b7ebd225051e4852c9221c709be1d845b1b7659695b509781fa68ffd06
+EBUILD libXcomposite-0.4.5.ebuild 631 BLAKE2B bcd1986d68df8251151ae916fa4a6cb7f68a87c754b959b19dfe6b605c4b46b9673e024ab33846fa3bf1faae42b18d8441ff73d657ec36edd826ce8c688bb89b SHA512 8084d59db2da6b4439f0ffcc485f974361b7b8c66b1e44da975b47c589a8b5fead9835a82a105fedf4a51179f16128f604507b227b282bb9665dc55b2123deb1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
index d50d9baf579a..f17c60a29d1b 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcomposite 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 ~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"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 49302a2ffdae..670eb1456740 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,5 +1,5 @@
 DIST libXcursor-1.1.15.tar.bz2 331607 BLAKE2B e39179902bf0a7c1b8c32f8c5fe856b51113a0c7fe98158f04d019df4737afb7d42b02ea509df66753d128c38c68dc976b2dfad8f6c8899002ecce9396fc4d8d SHA512 53ad0fa2afd7b4cf1108b560e44ea71abdf5c55a18df243d7123942513589c927f5c105395f790d8769959e0129db54264e6aac7efd51a5f1aec270379b1f2f5
 DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
 EBUILD libXcursor-1.1.15.ebuild 893 BLAKE2B b5faf01d58308ce71a746862a5e8b7a36cb4045e76ae3e020cb110f5cf769aa9f7867c035a93185fe85b72ae2268531bc5e77746782a2961cc838ce68770ddd0 SHA512 7784aa763260620de0090b04669d8aee49b81433aee71ff49ae356c5ff0827a941e66bb3e241c115e45016ab47a8ad0ef2841e4e5862e8e8f8c61e90b24227ab
-EBUILD libXcursor-1.2.0.ebuild 907 BLAKE2B 74140458df81e91e5b411532793bc4cf2e3e01acc986c66d64c6de5741af01692c0deefc75eead7250940d7b59ff72850629e123082f92c04886e20e4943f6af SHA512 a2e1701c49bb077c22f85bcf213cb7a6721f9115ae898dc65b2a99843f30ec3c0249e0359fa085c92f92c65fba1a032a90fd61b329b39ba8fb607190ee0d49b7
+EBUILD libXcursor-1.2.0.ebuild 899 BLAKE2B b81dec8fd52c916feaa6f8d3946b0bab794f10aeefc894808ed3ac03558027b68864721312fca36be59ccb326c9b69cbb36749a6bac439cde17c72bf300e059f SHA512 130d423fb91eb2bd88f72edc263fe274f23aae90bab4184bfc67b6a70b6fb1ae7ad3217b3e148fd7e351de2f88568463099276a09f614fbe38a0c9d1fe47c62b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
index 4e48fbaca81a..9d764b6b5071 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcursor 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"
+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"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index bf2f05ff3acc..4afd0da3f351 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,5 +1,5 @@
 DIST libXdamage-1.1.4.tar.bz2 278937 BLAKE2B eff95312ae989893904fca167075c10a784222db1ba4850d941f26c4235ae39ddfa242037e48ccc4b7912c27bb5e92b58eb61d7ac1ee6185d0b872b0be3e0ed1 SHA512 1058cef11a8f0edfcae7265837369e492b007c34d56ae04145b558e5f02a163827aba1d0b80656f4c8e5d1e9a40f5077d93b7ff4f5e704f7409060dceba03904
 DIST libXdamage-1.1.5.tar.bz2 303750 BLAKE2B 78cb593365cc842cbc6fcb4dec94aa28293c385ad7ecfef032117d19e98c7b3f252c53b79559096b1c0b259d24a59220e9af7fb60d55c55f4474a33d117958de SHA512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124
 EBUILD libXdamage-1.1.4-r2.ebuild 534 BLAKE2B 5065cfdaa923f7e8b28ce657d34e84e5806d54a1b781a352a4d8a3e8bb1fabadf5c823a375a2ca9090fa516713d00b8562053e2004c05bb1bb918e143f11dce6 SHA512 c3407dc97ba81df8c69bb11bc92ceb13c2c3652ef4d7669c1cb5407d2cef45957c9bb9d03ee52c771ceb4c0771c62edd8ccdc4374d93b82869ddd6c9b711326e
-EBUILD libXdamage-1.1.5.ebuild 547 BLAKE2B 483ec879f6fc9307171e3fdc572a0769359359643ced82361210d5a8f578d95195f1cf425240ca73c8638d923e47ad7e494fab730bb2cd60488c631b19aadbad SHA512 123aaf1b94067035ba4d63529bbd0477da05a1a38c77acbc6a514c8beaaa987b48b94bb77ec8ef3c3d64bcd11398166b944d8ee286bd92c2a1e242c3ea3a3f5f
+EBUILD libXdamage-1.1.5.ebuild 539 BLAKE2B a0940d1117b79f803ede83d715d145e62d517876c2ae333f582c771a324b09f0c05a04709ae1c901e349ffc3fd16ae8723646ee9e75dd422a88b3fdc865abd5b SHA512 5f6b042cb1f604e847e28309e632c80f6505b62517acdb6387aca692429c164cbf88368663bf1c9f3521fa62cab5b6f8961bfd72f63bd87826e72f6d11cba8b7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
index 646138cdd936..4a6df1638fbc 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xdamage 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 03d253f70036..f541fec79f43 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,5 +1,5 @@
 DIST libXdmcp-1.1.2.tar.bz2 331518 BLAKE2B 1a6f98d03a2bce62cdf34be641096e0628ea133a1d2ce33d4cf35550c6cabddbe3519265644d44bec491bc246d7e1d361c86595b56d1d59fb72baaf6d1919316 SHA512 f96005934b8bc752059106f8caf7df0574f5ef3c7a83bd797497b56ca556a7ff4dc1d28195e421259e82ea027b5c738094add3ec107a22544c9070725d8d46bb
 DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
 EBUILD libXdmcp-1.1.2-r2.ebuild 685 BLAKE2B be687e3a7b1b78fac3c84b45523c3e4ed3f36a1d3c50637adce258e8a3fea4be0b4f13c45ea211f8cf418574bb9280a4f46d886a0a5f4bd050240bd816c12fe1 SHA512 66f7b3772682c81d047c65c670cc0993f111999d041436fb1dcc86400e319be836d49b087a9a600466ad55307e3abe30eb74cbaa779aee205b7bdfe1a70f71e0
-EBUILD libXdmcp-1.1.3.ebuild 674 BLAKE2B f7e58ee61ad88e80ead70a8d3ef3a49e8be5b74a26d40c65bb342acad924aa20222c822bd306129c23e1a60030bd7813615e64e140b8c103dcb7b431358f1b4f SHA512 797a12d5988b854281d2a8b0184b0342cd79f8efc830dc759bc474f846571c73019bf317c3c0b4486cd4d97c6b7d6dd05e9a708f36327cfb10641d7747c5232f
+EBUILD libXdmcp-1.1.3.ebuild 666 BLAKE2B 4329df4b878f4730bd94f243490f0d80814912a12c896b2abda865de3d03ba5773972461b622845918ea75dd24c26f9ecae1b14481f7fec37a70395ccf232789 SHA512 442c8210ff8920a85b75c4de63f7413f21aea606d86b71688bb4dcd5fad2c355c01d4e1730be8e2e37f4e42ec485ed677a2b3124ea6679e1d525f87c0f0bdbcb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
index d817cd293ef7..36bb97b6f3fe 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Display Manager Control Protocol 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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index a7f7b5a31379..679dd54648bc 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,5 +1,5 @@
 DIST libXext-1.3.3.tar.bz2 389523 BLAKE2B 5f187b85bcc4736c57011964821ca7fafc4ef44caefcafe60fd4c14fd8f60df8e9bd67136d067b62aa1b16e43ee1ab158f0931f9c1120fb4e391dc40ad9a0468 SHA512 669d61545d10b999872addbf5628127840a221cbeaafb5ffa4328e0e0e1823583ece973bcafd5f13852ed58d4b0fe313a35f304ac80c6ed2b382cbbca977761a
 DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a
 EBUILD libXext-1.3.3-r1.ebuild 676 BLAKE2B be1c3db0252893768f8a3be19467e9a05749951636c9f9eedbce5d29125ff51df9c89d20794b6cf35f7697d311c284019d2a369125194bc8e0f5d24c62070574 SHA512 247e2f6c5f496a499f327ea9d7b34fe6ec46da8140e50e8e887d94b7a3e69d6b6bd41460ce8be3a970f441181fcf8400cb8bcc031180efeac08bcb3c0f1744ac
-EBUILD libXext-1.3.4.ebuild 658 BLAKE2B 9da3ea535bcf6b8ea7f2baefd70361ce2c6ff70383d620b2ee70f2faa863bbac62b5673bc63884da536c703036911520e578e12762831b691955e258a40c0f42 SHA512 061a449e1ac66e025602d5232be508eda1f7632e5c34a0a211188ee3615ececf87d0578def2181dccc952d963c137b8d162385fc127e335cbed2167b92dfc7bb
+EBUILD libXext-1.3.4.ebuild 650 BLAKE2B 586799d1de4c27641bd908ad2ce8a61ea6c06d20c6f4b860d7f47ea99ea3adfde55d36c102aac15f7948479377912615c3856d97ee56466a5a6c33878223090d SHA512 01f61fb5f80670e14373357dc7b4b85d5469465c42f8f25d0e29d28a222442959b01624bbb65aadaff5cf2f030a00ca825ac859186a8ff1631b50e7d870287ff
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
index 51d23c7df9ba..c84b7063ed1a 100644
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xext 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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 28c0ee9393e0..e9ea10d19ddf 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,5 +1,5 @@
 DIST libXft-2.3.2.tar.bz2 335495 BLAKE2B 9592e82449d3253fc71cb93866275bfbea37988ad7bf05c1d17de14038e48099cbc2569e329daba9354bab1d522dac03077d94e82f561e0747f08bbc08f6a737 SHA512 eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398
 DIST libXft-2.3.3.tar.bz2 353465 BLAKE2B 05a91225d09b5e1800a8272c72f7220d9987e3828591bf73d8307a9c4fca1ce7c4c62b36805f44e385c3a4269ebaafdaed70d3b2006208e860f8e982b53c975f SHA512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8
 EBUILD libXft-2.3.2-r1.ebuild 744 BLAKE2B 03dd006dabbb23349fdc3700bd6e6cf2b0d39f394f143f1bd15a67ab6f0159eb4359f78d031d9c2daca449196b1a55214148f4b7394099a496f80e5628b8ce61 SHA512 047fee7da75a91b71e9f77d8cd9f0242e9e1bab9de1eb0ebd56c0c36b6e1d3ca72d4302dbb6fde25bb9beb9ccc8b3b0e0a761124b328720d68ca27416f41d531
-EBUILD libXft-2.3.3.ebuild 739 BLAKE2B 56662a25b9a3720cf4b057c8dbb5640620e863b79183ae14a8833efbbf4c840ef5f11405956250348e9358c353b2610a9a5ef94c752cd4ddda98ae50aa9fbb22 SHA512 40910bb901c3d56c32ac04423c63e04b273da41de84d42387ee25e577bb6e6772b9f637ac51c39393247a4e071fcdc5b443e55105d2fd9e86bc05ae025453108
+EBUILD libXft-2.3.3.ebuild 734 BLAKE2B bbdb8cc3327310652e735697b17f772f875bb5fe14f540bb8d93727d2b484870b43ff69a0682da7b72d2e3e3d55c10f279e42e80ed8999af36bf8a0d03f29c1e SHA512 907280343110624fbe9ea64cbc30a65931edb5afe899ac89634086ba43f36055172ddf041249f9d398f28a29aeb36661660d471a19455b224f79d1b1277e0f29
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXft/libXft-2.3.3.ebuild b/x11-libs/libXft/libXft-2.3.3.ebuild
index 8f1db029239f..edf889018a0f 100644
--- a/x11-libs/libXft/libXft-2.3.3.ebuild
+++ b/x11-libs/libXft/libXft-2.3.3.ebuild
@@ -8,8 +8,8 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xft 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
+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 ~x86-winnt"
+IUSE="doc"
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 258724fb8534..ad6fcc2c2bf7 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,5 +1,5 @@
 DIST libXmu-1.1.2.tar.bz2 396230 BLAKE2B adcea6ff4c9874b8f7022b236f9c0f76f6291b61ad2bc3ef16f9021d49c2cdee01b07e0bfa46afe3636bdbf2802f2c63f7e01854c1e0ca7acdaa274d348b2eb1 SHA512 eba4e3d10f7d75ba8464881fb69f295a89774a4b37793197d75f3312e3a342b2df8b7e13e3f5c887962704329b5347ff2f3395e229af9dadf46a93b1e8613cfc
 DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762
 EBUILD libXmu-1.1.2-r1.ebuild 776 BLAKE2B b60176763dbeb092bf2633c953bb43a08148a512acf4178504b7ceefb41565acee26d1105782e8cab0e2f3b4ee939eae8e510942f28ac7e3587195eed561c14b SHA512 e1215d6808338ddf17a0f3f5e2a1ab6578f203e236baa381f65bd898e9bcfc55642a149f0b755d93aa3fabdff888b0c77b9bcdbfc94a983085937851764683a6
-EBUILD libXmu-1.1.3.ebuild 760 BLAKE2B 5b8aed6691426002cf0a577366178476d76097e564c2e40d5681d0afea5286b3365553796e277d08d98b0a9dd22e62ef2068e35437a3b57f0fa7134c1bd021dd SHA512 7e61e0cf3bd94d35ba1688e8fffb7f16a5cbe0692f875ba58d97873738e811e1d52f034ec60dec048412be510fbe13592107dfa15624bf604657ae0d1eb72bc9
+EBUILD libXmu-1.1.3.ebuild 752 BLAKE2B 440a99c5a907b195bb847248361b7bd782e950eb88562c1c85738c7465225466e3cc9c6f7b00b49c5e5cc34916456172b0af8e9495fafd8ae6a7aabdf3d1ce51 SHA512 8a655d92583843572adf33ed664f10c41363ab3ccbb9a69dcf4bf545b6498c0dbf00eb886a0de5d3a05462a58fe65cc4b46475bd26049234113c60880970808a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index 8879951ab2d9..842e4ca7c33f 100644
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xmu 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 ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index e7d7dcd07aaa..e3c2a9a137e0 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1,5 +1,5 @@
 DIST libXrandr-1.5.1.tar.bz2 315769 BLAKE2B 5cdf69656ac804cf8732e35d8e46d5f29b5959851a0313d17d6c767b4cce0e55a1e137f074b7f7029e031397572ad934aa2649ea7d8e2719a69f16cc1c3e172e SHA512 ddcee1c50da8810412fd747b05a073ee5522b2f3b0a74e6a9b48b489ce9712356d1bc3009f8898aeee85671cdb44e2dafa04c8caf23d97963b36b1af9174445a
 DIST libXrandr-1.5.2.tar.bz2 330726 BLAKE2B 2d91e4cd2d7af6b79ee952a0d51b0c61d64251c61f862677b47065f2eda811650a5e3bb3185d09a6401291b5a8bb30e8d29cf7aaf1699ac3f49b838ef7b1208d SHA512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87
 EBUILD libXrandr-1.5.1-r1.ebuild 611 BLAKE2B 06fc667d8e66764bc37abad74f6445deec1ca70147cab1080c32e7c26f241bfb3b22dc44bf6ff95056d1cb2ab4d6f4f26f57a09b8be309a221068ea3f29f5b77 SHA512 0d5275e585b7b8cf645e39ccc556b80fe5420c4ed37dbf27ed6498291b8b0e532dabf34d62d4057f54e41b379d83ea9fd90deeaa6866e4bc77a74e15b2b82561
-EBUILD libXrandr-1.5.2.ebuild 621 BLAKE2B 7863732b58467ab6e2157fe7fb14682737deff47a6833b46a34f2c7ee2880c8987f2f3a48e62f5919554f6e917ada6481ad13d74f04bcceb00ec93499462153a SHA512 e2ebb2f3ac681651ad7f2eaf827feb22a8ed8e27d6b01b65c792088653cb09908618ff83583a31da5cc3eb725aca0d766a754b730c53e5aae34e8f79ae8ad45c
+EBUILD libXrandr-1.5.2.ebuild 616 BLAKE2B 5a4eb2a5385393baeede1cb027d1ee671d1933bd48b6060a24b1a869c33b48934fe4ef7a35e90071c06d9247434db998a2e5a02f1fc9c4e58554802a988fdf13 SHA512 ed52cd2e0f5551c03563bbdc1b44f580a7558afbad008a9f5c3aa5012554eb68bb536517ebb056e0abc306eb5fb00d488c448c26afd010cc4978142b65dea1c2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
index d0f3168cf49f..0260ce681230 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
@@ -8,8 +8,8 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrandr 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
+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 ~x86-winnt"
+IUSE="doc"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index e3f5a00f6b76..0dfc6bb627f9 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,5 +1,5 @@
 DIST libXvMC-1.0.10.tar.bz2 313887 BLAKE2B f5440e60c29e83be8945d215e484a995547411fa8e96b2fbf757b93bc618b5d1083f41ccc770c9e8f4b0e13e6230968575aa7054f036ed2443b85b6301078930 SHA512 db979627eda2e58dbc95f0705681aa4acf51dc375a078467ea0b1c78414963e52417e525bcf224b4642eab2e540619c168c1e4757fad97bac7d07b60b23b3e19
 DIST libXvMC-1.0.11.tar.bz2 303516 BLAKE2B df1a34ead982c9b88428143d1c6250ef7d4353a6fc4e151c587f62ab91195e3e2c3b320beb1817b5e0b8a6db485aa0b839084361ec60a798ac1476b684542af3 SHA512 4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476
 EBUILD libXvMC-1.0.10-r1.ebuild 562 BLAKE2B d414cbce81c1f625685b9684d17e6c568b659222ad12bdda3469c193ec6d7472305d1f0db8133a2b3fb4684a9e2351e6f775fd2d3679fc266a30c412dfa68f3d SHA512 5b9daa16cf33ca27e14219a81d83222c644c2ca6938ba2e2d2c20e7ce1dac32e1aa6fdf44299e0c40435dbca00770d3742c1fe90e3bcd032177b4bea3ac2c8d3
-EBUILD libXvMC-1.0.11.ebuild 572 BLAKE2B 55ea00c93304e27424d491951048c6b1f1ccdec48debef77f16f04e3bda4ec1a92df69f74339256acc0abe790b7dfc517675fcd6874c895c5835d12d00fa1c2d SHA512 6eb785778d93e81b398d207215a52a1159a589f91e79b591ef2068db5fbd42586d705eca7b7facf4ae9e6846216135fb5a57ff9128d0d8a7a51205ac1f8bf0ff
+EBUILD libXvMC-1.0.11.ebuild 564 BLAKE2B 6294b3495554b806c7521b252d776b46be7885dbe231b5fde473df652fd99ab454fd0bd9bf964b9289692789c612274d36ac3d24ad165471f21c692b3fce3692 SHA512 f7a229dce65be6ef562d8d3c0e102167f77134af7c4e1afeb46eacfe4d7608a9e3bafe13f83958e9670590b449ad20820c736bbaa4b7cdc957a09f39e0140c57
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXvMC/libXvMC-1.0.11.ebuild b/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
index bc60b8a91c31..558799d0a327 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XvMC 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 ~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-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index 21443d368708..aef515991932 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,5 +1,5 @@
 DIST libXxf86dga-1.1.4.tar.bz2 280216 BLAKE2B e67a1e2fafc91cdce5b1d4f4ad2083080656f27fceaf167fcf6626c641f1dd7fa14ebe4f8508042ef0489e0fd689b05f6088487b9eda65995888158452898546 SHA512 58d81a7850275fc8382018bcc56dbc65b4200828b1f1379dcee3da1878f12a83ee681a9d474bcd564d99bf93bedfeb7b243370e0ebb89177652b37cee158a3f2
 DIST libXxf86dga-1.1.5.tar.bz2 301685 BLAKE2B 8c70299e52cd2f34b4dbfa0d56707df20f7b368ab92321cf9e8c0fe15402a3b4e1b8eb62d0e53fd3321e95521bb4f35479493e412710a74779ac98ffaef966bd SHA512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89
 EBUILD libXxf86dga-1.1.4-r1.ebuild 500 BLAKE2B 21c0be8f011be2de53a59f3300757086e8f59089460091f0557203edac6c80a108249482d3ffb5f8c544cb116640fd58a7f5a6eb1d092bb9111f8bd43e00d16c SHA512 b5f69baa57f912ebe24a153cc74549fac5640fa919b0703a9e6780da11a7278d6ccfa6c1c3692c08f1c95e2e78702d90b92d3d62336221cbd428c252be349463
-EBUILD libXxf86dga-1.1.5.ebuild 509 BLAKE2B a36704a5a4b87177e3396010fff7f737ff73ea3a7be4345f48808b8d660ba08b707ea3a2b80470211d858103d508e8699e8ab3eda624a3455304a9a9d008f1d0 SHA512 c845480b3da811521bc07cdef0c2df8a40832854c4b64ac000beaaa2ba893b87849c32bea1d6b82e863c2cb3437596b677969087f608248ae27ed8fa786acc3a
+EBUILD libXxf86dga-1.1.5.ebuild 505 BLAKE2B 742e828d1db1f4e3bf9bca538783aeb938c2a23ea44f3c40ecda0e54358d45d938f2c82726f745ff93585001f4328c2bbafb2204ef718a609e85f9f7f6ca6b8a SHA512 fbfbeb200d6baeffe7ddaa3923d8279fc94204722bf6fb283da06c49bc315cc3273576471da944f4418313b8b82faf79930c64aa81140c11887367dcbe1d5bb7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
index 07bf27147689..0d6f5909b7aa 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
@@ -8,8 +8,8 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86dga 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 ~x86-macos ~sparc-solaris"
-IUSE=""
+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"
+IUSE="doc"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdlo/Manifest b/x11-libs/libdlo/Manifest
index 38a00325d4d6..894a840e5bb2 100644
--- a/x11-libs/libdlo/Manifest
+++ b/x11-libs/libdlo/Manifest
@@ -1,5 +1,5 @@
 AUX disable-testprogram.patch 832 BLAKE2B d0658618b0042f51e0f85efbff77933e62efc2acf571bbc539f908a771d290834d5b60f3840cac317d56f378f0c3b1c457fb966782df417d8d3af33c6dee88c5 SHA512 b07a0ddd5eca10f13e82039690c3d310981cdafebc38a9e632a55be38c5c8ff22b7dddffcf0ab0f9795e650e61f9079ff1d9c12b3ddaad8d018f060c377aecd3
 DIST libdlo-0.1.2.tar.gz 476865 BLAKE2B b2391b58046e1f403b7e0d1eb915a46aa17c47e8ad804246f12f3b94f9ffb4dbc811e5d08aac29c2f4196b5d384e7244bddad3193adff5d5e890a7463a503fbb SHA512 6df69bebcf3142e0a87f66bb9d690fd78b96e08c2ae5d46fe0f3d91bc135364d5f5dd0c3a481705c3cd90c78a0a076757220fbcc3b0ad4343cdddb54501e3f2f
-EBUILD libdlo-0.1.2-r1.ebuild 1154 BLAKE2B 7415cef0331b79837a4eee615fa201e03cbb464cbe81c39260f2ce7d3df3a70315e4b141e83b3fb90a95b3f615ba3b7693a2d521f2bec74efd06de60b33f0f72 SHA512 cbc10ff4f8fec4c446f7e28ee32d8817ea9dd03aa63a8e6ae9d16ebdbc104a6b9202a6c3777d9d2db64f916620e254af3ba904274127cd5f5a2450050ca5f584
+EBUILD libdlo-0.1.2-r1.ebuild 1153 BLAKE2B 11b836ffd111d7fd7aa2194aa81f168507ebfd2091f2929c37d2974826a135dcc201828c61d5bb20fdf7b23a358486d96dd5fc35ad82926d00af701a40ebdcfc SHA512 cc74d35a0b9ad1be69fbeb4c94b0d58bc4f5d51e96926ff559d9b9fa5450f343489d3db29cabf75cfbc342cefc9a214ef420ac07851106bba50a9fc6f7e3439d
 EBUILD libdlo-0.1.2.ebuild 1156 BLAKE2B 365edc96e982b7117522e2e7c7a919df0902cde231cc4a2620251267f9099668ac5686c735588e6ce144a5cc1098466f722a09914ba43e209056009d48db7633 SHA512 15ad7c1e7169480830b882f5172d3f70a941b707d8f62578ef036873b42649b85c1db2a36d06b8c58b37135834fe3720c0fb1695b01b44195280ccb0b824abc4
 MISC metadata.xml 807 BLAKE2B 84e05485afa5f0e78ea57310124a541c4f1855c36ae9b49568fa9a4d672484e6fe5d02b71e4325c3a07cf5edda074b02410c4b7b52a967840bb695b98e135546 SHA512 56c18fe35f8c672f9d694fc2c62ffd864774baeeeb9cfd8f75118cf7e51376ee7a4280933d53aa5ed5e85dd605ecca737a70a37c4b82b7293bc2963d250a4c96
diff --git a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild b/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
index c193c73cc440..11fe4b5d4f30 100644
--- a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
+++ b/x11-libs/libdlo/libdlo-0.1.2-r1.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~berniet/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="static-libs test-program"
 
 RDEPEND="virtual/libusb:0="
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 0a7691179e64..0714e2fd2dc6 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,8 @@
 DIST libdrm-2.4.96.tar.bz2 829518 BLAKE2B d9a21ce31af65812c1b23968ef6c1901aea106b4cc68d76d3641a17b98423024b804bfda509862174eba98271bd7156c7f08d81bc0a520ea4a25c8e2e0bfd598 SHA512 008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b
 DIST libdrm-2.4.97.tar.bz2 837329 BLAKE2B b47393d81917a0b43c22f7798ff2e1c21a05fc716a63092dbe0e49cda0fe3bd899d5cc4d703ae49f781e283f5067c62cd37a4931362427e21c3356584cb5e810 SHA512 3e08ee9d6c9ce265d783a59b51e22449905ea73aa27f25a082a1e9e1532f7c99e1c9f7cb966eb0970be2a08e2e5993dc9aa55093b1bff548689fdb465e7145ed
+DIST libdrm-2.4.98.tar.bz2 833295 BLAKE2B abcb51046d95dd0620d8ae705a731c4a0b9db817cc897c6bf2063c3c25c13f45019b5c016248fe93269b77252de96724c3215eaf5be990b925a38034bfe4a4e4 SHA512 3d333d060ceb14fa8e204ef468ca2c95d6f07205185ca90a044b685832b9b2d7256faa5e81d5871ce8b70aa1fdf9fb1ade18b4e582ff0c7ef5551da8506eb27b
 EBUILD libdrm-2.4.96.ebuild 2143 BLAKE2B 3e2c8d221b892ec17c3f36036be0398061ac3aa50b05259ef89acc2b86309953a5c87382cdda95df152a603ff624216b3108c9754a6bfe88b6c6053ccd24a06f SHA512 30cfc0c66b0a8b6b303e68c891ed02239a9a9767289523d7cbb74b37ed7b592975450d0f130ed47ed67ff82e0ea32250a7d4e3d07706ae1030e32096e8e0a108
-EBUILD libdrm-2.4.97.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
+EBUILD libdrm-2.4.97.ebuild 2143 BLAKE2B 3e2c8d221b892ec17c3f36036be0398061ac3aa50b05259ef89acc2b86309953a5c87382cdda95df152a603ff624216b3108c9754a6bfe88b6c6053ccd24a06f SHA512 30cfc0c66b0a8b6b303e68c891ed02239a9a9767289523d7cbb74b37ed7b592975450d0f130ed47ed67ff82e0ea32250a7d4e3d07706ae1030e32096e8e0a108
+EBUILD libdrm-2.4.98.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
 EBUILD libdrm-9999.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.97.ebuild b/x11-libs/libdrm/libdrm-2.4.97.ebuild
index 29daf988738c..76499a8ff61b 100644
--- a/x11-libs/libdrm/libdrm-2.4.97.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.97.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-2.4.98.ebuild b/x11-libs/libdrm/libdrm-2.4.98.ebuild
new file mode 100644
index 000000000000..29daf988738c
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.98.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Udev is only used by tests now.
+		-Dudev=false
+		-Dcairo-tests=false
+		-Damdgpu=$(usex video_cards_amdgpu true false)
+		-Dexynos=$(usex video_cards_exynos true false)
+		-Dfreedreno=$(usex video_cards_freedreno true false)
+		-Dintel=$(usex video_cards_intel true false)
+		-Dnouveau=$(usex video_cards_nouveau true false)
+		-Domap=$(usex video_cards_omap true false)
+		-Dradeon=$(usex video_cards_radeon true false)
+		-Dtegra=$(usex video_cards_tegra true false)
+		-Dvc4=$(usex video_cards_vc4 true false)
+		-Detnaviv=$(usex video_cards_vivante true false)
+		-Dvmwgfx=$(usex video_cards_vmware true false)
+		-Dlibkms=$(usex libkms true false)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 02ee5ba087e3..ef7308e01ed9 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,5 +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
+EBUILD libfontenc-1.1.4.ebuild 540 BLAKE2B 30d8ddec3ffce144ccf6cf6f1d2e7d94dafa784d8e7fdceb336116c2e62673cc6ed7bace91adef098bf0355c21e781180a139aa2e8fa9e5dca234d4a26e49d90 SHA512 db1307bb1fd9ed648adc71e690aef902dfc0ba53ea3d98e28c3709ebdf4497145b38c182e1f1ec1c33b2a282d3ce11802ef163eaa418ff32599581aa22270b29
 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
index 15246b281cd5..780869d7c306 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
@@ -7,7 +7,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"
+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"
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 28886c6327cf..9bcd82af1f78 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,3 +1,5 @@
 DIST libnotify-0.7.7.tar.xz 285356 BLAKE2B ace0eedb1beecfbb89726960e441821d64f5ac456dfc6294b051479078726aed6fbacbd1e8cb17578933adbc4c94711b0d69a292778ba4bce096552a5197722b SHA512 133874114407bf12267ef609f5941657181760bc7cf115c5973b1810cb72bf55072b621c143e32be1e7e8b49f244851925d14bc3f9f26457747b8a8695ee9954
+DIST libnotify-0.7.8.tar.xz 108436 BLAKE2B 0a73eabe58faca55e16774cda6f649ab3187bd73a1f87b538d5098f390571a6a34078883dbd2447731d6e4cae315d8286e9e8acc06e85590c8b05a693a83e7f7 SHA512 9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94
 EBUILD libnotify-0.7.7-r1.ebuild 1513 BLAKE2B 89fb44f85bbe8f928ece85952fc8c9a8e34690f8df7d6f241b2c8db9347c9d14d51aa063753a9b0535bd768a4aa9f8f2e0dbcccb38357bdf4541ef18c32439dc SHA512 ae9cdf1c771c51ef00bbbe750be45b92d571526a8aee568aedb62e8b9de4f6a7343d092554c078ceea0f127649105c22832f62d7e20c4a3273cc7acebab49fd2
+EBUILD libnotify-0.7.8.ebuild 1384 BLAKE2B 73af3c2f90aa1622c129f989a917f068de916747ed484d3a828386d147eb0c8fa711abdd59f72e5a7a28bdf94970fdb7f8b3195a974143236f3daefc03bc2fd6 SHA512 f3cf46429083c857de5be24898f6da633424b87f3c969bae06ff56cffce94153fdeef3a835c6b8534a687ab350bddbf989731e8afd2ccaa76c81a207d66ce081
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.8.ebuild b/x11-libs/libnotify/libnotify-0.7.8.ebuild
new file mode 100644
index 000000000000..ff9add88c106
--- /dev/null
+++ b/x11-libs/libnotify/libnotify-0.7.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson multilib-minimal xdg-utils
+
+DESCRIPTION="A library for sending desktop notifications"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="+introspection test"
+
+RDEPEND="
+	app-eselect/eselect-notify-send
+	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-libs/gobject-introspection-common-1.32
+	dev-util/glib-utils
+	virtual/pkgconfig
+	test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+"
+PDEPEND="virtual/notification-daemon"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dtests="$(usex test true false)"
+		-Dintrospection="$(multilib_native_usex introspection enabled disabled)"
+		-Dgtk_doc=false
+		-Ddocbook_docs=disabled
+	)
+	meson_src_configure
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941
+}
+
+pkg_postinst() {
+	eselect notify-send update ifunset
+}
+
+pkg_postrm() {
+	eselect notify-send update ifunset
+}
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index f82c6bc50de3..549aaff10fef 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,3 @@
 DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
-EBUILD libxcb-1.13.1.ebuild 1449 BLAKE2B 4a0d967f7eb985f3f565e6b688d11eeab072e344e1708433560e194d9fa802e98926626aadd1a23f9a1ff52b933ec70fa1ba8b809a4a3e86c4278fcae5a7b9c1 SHA512 5f4f44b90f7a4b05ff46077e84167e94b0cf5331d53d2e2ee745ad48015c0165084526f51046e689e9478f2999137c6453c22236ba405bcbc51cf9455cddad70
+EBUILD libxcb-1.13.1.ebuild 1445 BLAKE2B 8910c821f95d3a969f5ab97765447c80d2daf8422ce755a8740492ab5df4f62aacb30a424030b50137aa7883894e7ebb9cf27e1ad26f4aac84b1c2326aa6dbb3 SHA512 aaec432f10e77231375485a29c79d64a8e77d546609963c968516fb5c5b9751388fd7b59e547fc316d046f6c5706bc0ac7835f87aa75b5a67b10cda898cfa26d
 MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
index 2f4bf436ec4f..a54f3294f9ec 100644
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE=xml
 
 XORG_DOC=doc
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index b0ec6d077f1c..8503603c7e10 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -3,5 +3,5 @@ DIST libxkbcommon-0.8.3.tar.xz 646124 BLAKE2B c80d5065395ee8adec436243cf42fa82a0
 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
+EBUILD libxkbcommon-0.8.4.ebuild 886 BLAKE2B d75685ea2523577a68aa857cc41ee38553f6dd499247f340e23969f7737e0caf8b2b6e03f294fdd06a6a61e6c59c31002a64ef665bcc84ea48e1c7bd201176fc SHA512 d4c5ac673393cbb8a63306d2d05f3243d4c80bb3c6945989a2120e0656b29c2a7164f5fc6f9a7f813bedb91e0f599b5b094782462ed0f42a46aee7843f445a03
 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
index 224ee5d3dce7..e81f7cc5c56b 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
 IUSE="X doc test"
 
 BDEPEND="
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 98a0c236a187..0f5be0d2c1c6 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,5 +1,5 @@
 DIST libxkbfile-1.0.9.tar.bz2 348009 BLAKE2B 2b4f398c7ef35ae6fcae8491733669408db98a27c2351514ea1cd0332a34cd995a34d18013c0ed2a70977935ee1dec527f744bd3a01530e6eefcf715752be9e1 SHA512 5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1
 DIST libxkbfile-1.1.0.tar.bz2 364678 BLAKE2B 577da1c43e6ce681630676f3f52f40b1f31d01862a891d4c1bd853056d90b03d9993299714c5e63a903b243165a1e299e1e014cd94614eacb50aeef363be8990 SHA512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826
 EBUILD libxkbfile-1.0.9-r2.ebuild 505 BLAKE2B cca836f2f61bcacdaaab12c2a3c441ce79788acb124fcbb2b69f4582c5e2d9659979ffce730912a4f174d2b464cc1dde7b0eae5ff624b9b9cc94cfe3217597a0 SHA512 652743dc378993a03bf281df0da9da023b0227e31fa37e14cc340376e3b73c5881fdaf6f1e365159102cc53ed93de9997c97f13c6ce8666a5c2d3f3234077e65
-EBUILD libxkbfile-1.1.0.ebuild 516 BLAKE2B 98faec5dc3930b3419f924d1d96570cf959b06fceb3f03fe2f19d4cbd9b0a8123c77e032c06e7482c566ea473b110aa1f0754eb690a0de54d3c0f4e8c6a5f8c9 SHA512 b8c9fbe0b95407ad2a72e49f9f97e04f6b7f490b385d8e0a79a15b93374a152e827acb1284e39067574907390aa14a4b61047d836ea74a068e694248882955bc
+EBUILD libxkbfile-1.1.0.ebuild 508 BLAKE2B b8ec40658c3b1a2e6612a78710a1c20c87fef66d83293b47a514d7ea5eb12cdbc08bdb9fe2b54671af8aa016d4a0bb9f84b4b14210a8d4bcc3d1949f472258a8 SHA512 97810c2e2f5f3e06be3afee496b43ac4214ae1c285ced5e416b23f972da2dc8edbafb271ed1cc667bb36c4d2a8e66419098914b781923be75963dfb5ea37d38e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
index 770dd9184630..330d08e566f8 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbfile 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index 693abcbc78c3..19a4368472fc 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,3 +1,3 @@
 DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
-EBUILD neXtaw-0.15.1-r3.ebuild 743 BLAKE2B 3712991b9d8cecf44be34be3124897815a995b2c8bf4aa29d9881001a847d8ed0e42bb3732b839a4f3cfa6826d651395ab53bc047dfd1d42756eb508e061e1e3 SHA512 96183c10e6218bd56b56e2545344a4b2fa7179b7c1983f91760f2dfec0e5834d043d44845234ce42a146e972384622a926c18bbfa3185eeac135a90527e41087
+EBUILD neXtaw-0.15.1-r3.ebuild 739 BLAKE2B a7e92358f276f85a740067483cf8564fbb53a5992db8edab7da434ebfc9d9a78857c2ed5954c338e11fa505015b952108986680f73eaa741b4ec3d45bbe3fc15 SHA512 117919d141a9745d2e1c37c912990b2c4896bb22a83886424efaad74a1ab11c79c0740b386f7a6875299fe3a4e1f9ab74f373921eaae70ee88cad50f7f9a8f76
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index 5c20aa1d5f06..158f386e9c36 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-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=6
@@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index ec3a45744cda..4e385d352ba6 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 2296 BLAKE2B c7854de793ba07eb255d48722a02bbd8a75499f96b1db15bd46dee2bec06452b7e4427b0433569602aaa026509e314200750c0bde22b0a27366c6da878b466b0 SHA512 499a9e0d82d931b12b817a61e3a59df6a150e78281e2f834176edf85320ccf57124a9d232b8dcc7fb084afd87e6019c67b270a2d29801ef42b1d86889ec9fc54
-EBUILD pango-1.42.4.ebuild 2046 BLAKE2B 23b124957c056dcefef238d6066ee8c2ef36a5ed5f2a7aa5f30530aac482af61f220261f8eb7bdc1d9e2e073bfcc154e40d659902a408bc87cb6d3fad96aefa9 SHA512 e23638c8c3cd188ca413178999d407c1a967b3ee97834a5b190ddf6b2f14164727bc9b7559954dc031e4f94ef5b04eed509f3f1d9180221ce718f58aeee617d6
+EBUILD pango-1.42.4-r1.ebuild 2297 BLAKE2B 1a1b837fb751f1cb663ef6b6831ddacefa500e4cb7494ce410bab8519720b59b19e7fdc4e5bcb0b3c42e2e8d48faa5385390fdf503841f88de286f30d610e08e SHA512 714e15e151257264f710d7d7bc0e66a08a01d72dde9c6c2eaec0c111ba8e0815de6741d6810b1582a58097b2f5e9d3ccb1d4843251606531950b17b85e7b1974
+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 676a13a07419..6d39dcbd4297 100644
--- a/x11-libs/pango/pango-1.42.4-r1.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r1.ebuild
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes"
 inherit gnome2 multilib-minimal toolchain-funcs
 
 DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
+HOMEPAGE="https://www.pango.org/"
 SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2+ FTL"
diff --git a/x11-libs/pango/pango-1.42.4.ebuild b/x11-libs/pango/pango-1.42.4.ebuild
index c987f5eaae74..43b3643e7dc6 100644
--- a/x11-libs/pango/pango-1.42.4.ebuild
+++ b/x11-libs/pango/pango-1.42.4.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
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes"
 inherit gnome2 multilib-minimal toolchain-funcs
 
 DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
+HOMEPAGE="https://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 66b3e436dfc3..4e0cfe17ab52 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,6 +1,6 @@
 DIST pixman-0.36.0.tar.bz2 739957 BLAKE2B 05834dbed8a5bfed607a20f78523e7441f5b78a7a01c7d302c48b8f15dcda37111a8a99e7119b84a0a8a26b55fa93db1c2af316359095cb7db0d8a9e263a1eb7 SHA512 ed99c85a8ce11f52659da61bff599c0405ae0069c30434bdef7238bc9f18e83e6d534cddf38c14d753943edbaeba580c5005ad7575f27e469ca7be7878678d21
-DIST pixman-0.38.0.tar.gz 891291 BLAKE2B 8d057fba6d85ab4d2bb83903e8f1a6ac05659be4d0645782f5cf4c190e7b27fa0e7d6b2718ab111bd8ded9b617c7aad42dbfdf2169d49816b7eaf6e6673c6a5f SHA512 1b0205dbe9d9185c68813ce577a889f3c83e83fbd9955c3a72d411c3b476e6be93fc246b5b6ef4ee17e2bb8eb6fb5559e01dff7feb6a6c4c6314f980e960d690
+DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
 EBUILD pixman-0.36.0.ebuild 1011 BLAKE2B 39bdaceeb38639ce856d207792a88ee7f1237cb2b0ac8ca34d93503f3ce3b69146ea015657e7a9b55481f59a438d29ba491711716d7820ede4620d9dc56e7118 SHA512 034b0716e27095c89beeaa0bfcc12032a1d629800d91b308fea8de21e5c1f369fdf62d1ab14188126c8eaf7b3f802d5e007cf1fd7e0b0f1e5cf9f7673c5e8978
-EBUILD pixman-0.38.0.ebuild 1536 BLAKE2B b989e0b34a2592b748f15bd845f6b4a2c0ef5e57d0a2dd47b89ff4681a5661d3aab185d02d5112e5408843022997f474611e6536f0611ac064ee5c6d305c664e SHA512 242b48a9e2f4d56309b2aaf08d4e91b91b5c4efaa235dfba0292fc591bfbadfe12b5f6bc1fe91f6a83d845d5339b943381aeefec1aa760826ea2265ef1a72e13
-EBUILD pixman-9999.ebuild 1536 BLAKE2B b989e0b34a2592b748f15bd845f6b4a2c0ef5e57d0a2dd47b89ff4681a5661d3aab185d02d5112e5408843022997f474611e6536f0611ac064ee5c6d305c664e SHA512 242b48a9e2f4d56309b2aaf08d4e91b91b5c4efaa235dfba0292fc591bfbadfe12b5f6bc1fe91f6a83d845d5339b943381aeefec1aa760826ea2265ef1a72e13
+EBUILD pixman-0.38.4.ebuild 1623 BLAKE2B 11cb9273c2a62526645c957ab6a652a8a3e0e1a6af157e0bc067dfd1cfb67e375367f5254259c56ad694fcc63f0bf7fd05db19df9853ffefbe2a2208bbd6ca11 SHA512 85f0a56b2b757bfdb98d49ba803fe8a65077fc86063afbe3188299db8ce98c60dcf15c994626ed999a8f01bbf32e598dbcd69bb936e3ec2a655dc7b63803e832
+EBUILD pixman-9999.ebuild 1631 BLAKE2B 9d7f4de4ba2af8d0f5ab6b6e1112380897e82ad46bf8ba8345ccb5cfe8007a307b1ec7cb4550a220bfaa3332ea90122a29f0eb95e66dfee9aa70c668b2a5e0a9 SHA512 005dd50814a4f8d6ddfa399f573ca92f3e7825f2ad02f3a8e6950353b532aa5c21063568ddd5bb0713bbb6cffda6a9e0ecf4a308068ed4e1126fa9ec377a626f
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.38.0.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild
index 9af2c222cf3f..d8a7e4dbca4f 100644
--- a/x11-libs/pixman/pixman-0.38.0.ebuild
+++ b/x11-libs/pixman/pixman-0.38.4.ebuild
@@ -16,13 +16,13 @@ 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 ~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 ~x86-winnt"
+	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 ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="altivec cpu_flags_arm_iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 
 src_unpack() {
 	default
@@ -32,6 +32,7 @@ src_unpack() {
 multilib_src_configure() {
 	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)
@@ -50,7 +51,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	meson_src_test
+	meson test -v -C "${BUILD_DIR}" -t 100
 }
 
 multilib_src_install() {
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 9af2c222cf3f..58862e4166be 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="altivec cpu_flags_arm_iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 
 src_unpack() {
 	default
@@ -32,6 +32,7 @@ src_unpack() {
 multilib_src_configure() {
 	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)
@@ -50,7 +51,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	meson_src_test
+	meson test -v -C "${BUILD_DIR}" -t 100
 }
 
 multilib_src_install() {
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index b72415af9b74..d75bc39f53ed 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -6,10 +6,8 @@ DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a
 DIST vte-0.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b173fece305af35f51b20f9d4811b33265b5a6eb83441e0b978539de501d118a8431c4a9a9a69a111a03c45adc87763b15b09fd2 SHA512 b8ba202aedb5d821962a7cdc89e6ef8ac8a3480dd7681bf8ce708ce511598f3335ba153750d40cb06e9a2c5bab5888b3daef9096458c2889d94028feaa394575
 DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
 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
-DIST vte-0.54.3.tar.xz 1087424 BLAKE2B becb668d6b3f56ebd1eb6d076c5cac2fc9623bfa012c877d8d3cf374cfbded6ff16ef1e0b1fc9e92ba1255f9653be25df1b81c7c85f42749449e5df12c530411 SHA512 dd7d2ac361ed9ac0550599bb3164a3bd6ba95535275c9b559c81ce0af1bbf4b3d150a7489f987b2e626b32d4a8adc82d1ff78e8c8640e5b1c036fe4076c5d8ce
+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.1.ebuild 2207 BLAKE2B d1584ceb316b68eea40b37231568ffdea1515ebcfecf711d2fc500f222ae2e1d5afe9b088cfbde13805f4295e34592da41ee742f022b1067e2ec1e856163adab SHA512 9e905622b2a4f0b07558802831d1df90622a061c4b64c77f17829d6e0814034ea672ff59f4aeae0a30607a50adace8537986de3df46314f3bc87c9b14eecd707
-EBUILD vte-0.54.3.ebuild 2223 BLAKE2B f66e8f6d02e07e4ec980d5103485196b48c091f2ac2a48030de905e6afd6cd77f9aa832ec898fad53622ce39e2888b3251baf935335683f95c55483611fdb183 SHA512 2effd18c71a048c75c3b1884f2317c81b539363a8d5b77d860ede9489da58bc83774832f24d61d92e12a4929094763349aed1febeb1ce4dc4503b45f33b88f4a
+EBUILD vte-0.54.4.ebuild 2223 BLAKE2B f66e8f6d02e07e4ec980d5103485196b48c091f2ac2a48030de905e6afd6cd77f9aa832ec898fad53622ce39e2888b3251baf935335683f95c55483611fdb183 SHA512 2effd18c71a048c75c3b1884f2317c81b539363a8d5b77d860ede9489da58bc83774832f24d61d92e12a4929094763349aed1febeb1ce4dc4503b45f33b88f4a
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.54.1.ebuild b/x11-libs/vte/vte-0.54.1.ebuild
deleted file mode 100644
index 61582d14a38e..000000000000
--- a/x11-libs/vte/vte-0.54.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-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"
-REQUIRED_USE="vala? ( introspection )"
-
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-command-notify.patch.xz )"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libpcre2-10.21
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	>=x11-libs/pango-1.22.0
-
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${RDEPEND}
-	!x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
-	if ! use vanilla; then
-		# First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${P}-command-notify.patch
-	fi
-
-	use vala && vala_src_prepare
-
-	# build fails because of -Werror with gcc-5.x
-	sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
-
-		# interix stropts.h is empty...
-		export ac_cv_header_stropts_h=no
-	fi
-
-	gnome2_src_configure \
-		--disable-static \
-		--with-gtk=3.0 \
-		--with-iconv \
-		$(use_enable debug) \
-		$(use_enable glade glade-catalogue) \
-		$(use_with crypt gnutls) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}
diff --git a/x11-libs/vte/vte-0.54.3.ebuild b/x11-libs/vte/vte-0.54.4.ebuild
index c992365299a9..c992365299a9 100644
--- a/x11-libs/vte/vte-0.54.3.ebuild
+++ b/x11-libs/vte/vte-0.54.4.ebuild
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index 907fed8996c7..16d08aa44d1c 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,5 +1,5 @@
 DIST xtrans-1.3.5.tar.bz2 186833 BLAKE2B 890506df749d9a1e873ff626614bfd0989115916a896baaf811d0e1568fc939073f8226b096dfda86f5c917b7af72478560fcfaa7d8fb160107f9adddd0091d7 SHA512 049fb996313e8a1625b66e1645a5f56d8a26c5dd91afe5869269716fce05f6c97c84f8ce4a6df2057106b47982c8291cecc223bef241f694174434c981a7029b
 DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214
 EBUILD xtrans-1.3.5.ebuild 695 BLAKE2B 9433835133efffe7a141f536e3ec894339200253ff12236ad04079791c924d172f44ced45a3cb67d009802d0b39a00e50b9212e462e02d02f4818465092d8809 SHA512 a87771ea8b4d07565d4e5c595a7a7723cd5489ffe2b5ad1164adac7fb242e69dbeab8f1d776bca9862be35a6dbe7c2f8ec6f80ce39a78a36db6ea4601d74ce9d
-EBUILD xtrans-1.4.0.ebuild 667 BLAKE2B cc4f401a2e1423cba7e41e9b88bf916bf546cac8911eba0b7679520e80df3fa98bbc6a9674db0b2cfb733c3d4b4078aef25ad8b85e6c20e1c10c6486238646a9 SHA512 52e320d662171e5eb60b420bf5a8b3a8be28178e10e1685a1347372af0f94da98eaa208b8f3ddf10a31e8ccdff9238ab8668301e927ad5e9ea64e9b107f8f919
+EBUILD xtrans-1.4.0.ebuild 659 BLAKE2B 8281ba9a6fc1f6a87bb664f65d4cbad1414ec637eeafb2d5997185161a5f8677ceac2f1000f93f19cd08331815487e4b2f12b160eb1efade9bfe4f6b06d1f78e SHA512 87010f2d4662b0d8e6fdbd90c0627d584e3c7914c349477e3c42e26da8211e281b0ce67287126f128ff0829744b396f9746a1ca365ded3890533601036309bac
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
index b767aff35815..7290d4569957 100644
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -10,7 +10,7 @@ XORG_DOC=doc
 inherit xorg-3
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /x11-libs
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)