gentoo resync : 04.05.2019

39 files changed, 357 insertions, 390 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 6800f633acb2..715579dcd029 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 0806cd91cdeb..7e5743ca8fa8 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,6 +1,3 @@
-AUX imake-1.0.7-sun-compiler.patch 462 BLAKE2B a1b0ce3d7776e855a9fc0d819f9338c4a4adab3f2491e52c7bfe674de1509120104ea7f042b2a6a61fa30ce1d5573289c01bfa63ff0826c9d76281ed927ada61 SHA512 c6eba0da6cc37702293273d762481b522467f3cd5ae7d216f397ff47657762db78deaa0780706c2e13d0010b739067e65d09b235ab9df379430a826c95e6fed8
-DIST imake-1.0.7.tar.bz2 156543 BLAKE2B 63e7f2fcd907ba5508e9e592602bd455d66ce134f82a3387ae9cee66a6b65190e38a0207980df62c2603d060acb5f380446dc6f117c75edc9c5c6f611d98dbe2 SHA512 b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
-EBUILD imake-1.0.7-r1.ebuild 1169 BLAKE2B 9a7b575c8bcef987da07ebcfa6e8d9aea73d474dded2ef0898ed414b99e40f011b4687478f346be4eb7851d168c4ed1f7ee294905021b63540d1eb74d5890b33 SHA512 674bf165c5be1520af53e7876aa45603191e80fe3a4b418c6e551e6112db3405bdb4b05525e7ab18ab2eb9164a1555070ceaf7391c113424c1ef9c0a995c0f47
-EBUILD imake-1.0.8.ebuild 488 BLAKE2B 4a83a07b4738b9f9cbe39dacb2c106ae574c8aecf0677efc0e44415992429008d662f7257ce4a947bb5f1620ffc8eb7b521fc8100b1660d027d266c930df9cde SHA512 62024bf6406b37b97f9eca10022a5259e4120139d71dd553f8a6b1568dd8375da8accaf1e28a886efe8bd302845ec3b189396974297918b423ee84cfa3e64427
+EBUILD imake-1.0.8.ebuild 485 BLAKE2B ab9a0d08589a10d0123a3d5beeeb82575078850ecd35164ba4b6a090d2d84b47f295fc6da48e00ef9bf5b1cdfcd999a6b6268108b78df05231be64c474a5c35f SHA512 887073fbc522e06e446b4e987ed55162f2146959dd83f75dc82725c6fda179e717dfb36ebdd92545759a852ba58bd37b25fc2f2ea59836d198a1335353379adf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/files/imake-1.0.7-sun-compiler.patch b/x11-misc/imake/files/imake-1.0.7-sun-compiler.patch
deleted file mode 100644
index 27fe234f99ac..000000000000
--- a/x11-misc/imake/files/imake-1.0.7-sun-compiler.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/imake.c
-+++ b/imake.c
-@@ -1,4 +1,6 @@
--
-+#if defined(sun)
-+#undef sun
-+#endif
- /***************************************************************************
-  *                                                                         *
-  *                                Porting Note                             *
---- a/imakemdep.h
-+++ b/imakemdep.h
-@@ -1,3 +1,6 @@
-+#if defined(sun)
-+#undef sun
-+#endif
- /*
- 
- Copyright (c) 1993, 1994, 1998  The Open Group
diff --git a/x11-misc/imake/imake-1.0.7-r1.ebuild b/x11-misc/imake/imake-1.0.7-r1.ebuild
deleted file mode 100644
index 4d2194fb2387..000000000000
--- a/x11-misc/imake/imake-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C preprocessor interface to the make utility"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/imake"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/imake.git"
-	inherit autotools git-r3
-	# x11-misc-util/macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/util/${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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	x11-misc/xorg-cf-files
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	# don't use Sun compilers on Solaris, we want GCC from prefix
-	"${FILESDIR}"/${PN}-1.0.7-sun-compiler.patch
-)
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index 2c4382704c3e..dfa4ff1d736c 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -7,7 +7,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-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=""
 
 RDEPEND="x11-misc/xorg-cf-files"
diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index 335118445f74..18e07f5bfdc4 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -11,4 +11,5 @@ DIST macopix-mascot-pia2-euc-ja-1.02.tar.gz 191520 BLAKE2B 7fa81c34df02751563fff
 DIST macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz 310099 BLAKE2B f52f2ad14cd9c76f32eb8c582bd07886f50eb6ae2615766306081ea1850b51b205b5177831ca30ab4049fd07081ff42d5dc7c9858efa49ab79a6acf2135ff9b1 SHA512 133a3446a3713192ffef84cd381065b2a99db2eb0dd18692d54e7974eb26aa63eef6d051466ddf89152f6baa8e4625ae6e7e975cf944dd12e0b6cc17c56e5673
 DIST macopix-mascot-tsukihime-euc-ja-1.02.tar.gz 616138 BLAKE2B 8616fb0f3b8e4b72c6576dfada3794dc3e387d250e3a6f64eb2b290ef793f62c43f20ef9c03d2b309f4fd3860ce828a562f28ec37ca55ce8e2831315ccbd8a63 SHA512 226a175846a1f81a5aeedab6d7b85e38903d3b85a88a4a2c9a91365ba8a149a9ee54d6174bf8c4595cbe6542d3afcebd440a4185402c2139310664059515a2c5
 EBUILD macopix-1.7.4-r1.ebuild 1820 BLAKE2B c9fa77abbfbbde5c4ec3b2b09ec078223bb3ed20dc44b4ca7ea05bdb5f83310d82320b2599510eb5c4157ae3be48503b117db1fb65a0fad9fd48e8769e5aef5b SHA512 1d11c0d2c98b16f5544d4a8895d539dfa9a191f64d4ca55f5f4d1bc2e49f42af13b92e7fd15c5ef29f1fd64d8e6bee93fe31ab64cdf52c0255efd53dba393cca
+EBUILD macopix-1.7.4-r2.ebuild 1770 BLAKE2B f707f59869697cb0650f4ea63571fa7ca71730bda7131b4b43adc4272bcd073f745f96544bcd30263f43646ee434c7df46689a10c3af07c1793ded2ae9a621d1 SHA512 35e71d8325425b5e7be9303ca0a822e8f46b2a36fe1470e7bbfd215f0227b8a5dbe4b0ca19d07c92110e760a086c9c41d09f5827efa2c7b937d04c5e987c3642
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/macopix/macopix-1.7.4-r2.ebuild b/x11-misc/macopix/macopix-1.7.4-r2.ebuild
new file mode 100644
index 000000000000..a862222fef25
--- /dev/null
+++ b/x11-misc/macopix/macopix-1.7.4-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
+HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
+
+BASE_URI="http://rosegray.sakura.ne.jp/macopix"
+SRC_URI="${BASE_URI}/${P}.tar.bz2"
+
+# NOTE: These mascots are not redistributable on commercial CD-ROM.
+# The author granted to use them under Gentoo Linux.
+MACOPIX_MASCOTS="
+	macopix-mascot-HxB-euc-ja-0.30
+	macopix-mascot-marimite-euc-ja-2.20
+	macopix-mascot-cosmos-euc-ja-1.02
+	macopix-mascot-mizuiro-euc-ja-1.02
+	macopix-mascot-pia2-euc-ja-1.02
+	macopix-mascot-tsukihime-euc-ja-1.02
+	macopix-mascot-triangle_heart-euc-ja-1.02
+	macopix-mascot-comic_party-euc-ja-1.02
+	macopix-mascot-kanon-euc-ja-1.02
+	macopix-mascot-one-euc-ja-1.02
+"
+
+for i in ${MACOPIX_MASCOTS} ; do
+	SRC_URI+=" ${BASE_URI}/${i}.tar.gz"
+done
+
+# programme itself is GPL-2, and mascots are free-noncomm
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnutls nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libpng:0=
+	sys-devel/gettext
+	x11-libs/gtk+:2
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-windres.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	append-libs -lX11
+
+	econf $(use_with gnutls)
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog* NEWS *README*
+
+	# install mascots
+	for d in ${MACOPIX_MASCOTS} ; do
+		einfo "Installing ${d}..."
+		cd "${WORKDIR}/${d}" || die
+		insinto /usr/share/"${PN}"
+		doins *.mcpx *.menu
+		insinto /usr/share/"${PN}"/pixmap
+		doins *.png
+		docinto "${d}"
+		dodoc README.jp
+	done
+}
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 61a7dfab255e..5c857fe2e8d0 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,5 +1,3 @@
-DIST makedepend-1.0.5.tar.bz2 143498 BLAKE2B 78a7911e1a433bd2839c2d1372883928dc018a2576781cc8e01ffea3d06ecaab494c11a9eb36045b36091f51c6363d4a903562431256abbab26dfbe7b3fb8289 SHA512 e28d71c3ce4f74ca6479771fcdd123c19ab18e3f2aa690a7798237f21f13fca4c4d66d7b7b1d708c2c214b8e17f8fe37e6cf5b75a4d2b88514c50addea2600cb
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
-EBUILD makedepend-1.0.5-r1.ebuild 1009 BLAKE2B c1b1dd08ebb9e2eab8f5abcc6a146c57e437798d650cb9258b8842cfc900975c00988b913e747799b7bf14a1296d7044a9fdc5f94e85fdeeb3b2252049bfef0c SHA512 47f120c4e76b28a0e7c5e1edac6ba5c60c7122def70a13cfd436afa6a1026cb908b3532baf5cb492875b33f1c0b2e560c5f0490e05a9b9c9f0c7ceddd9e3614a
-EBUILD makedepend-1.0.6.ebuild 441 BLAKE2B 35b74d8c4c5a402f48d118119813714b37be876ca0e68968e04ee807772c042e5bb94f47d8b0ca2ecc9e83ccdb2d00fc51968a471fb36ba8964ffc5b179b6249 SHA512 387575bc27fa5bfb6c38a7989aebf3486bc42766608346e9e67c85f3b81a92052ae1896d436bc47c2394f8a05a3e3101d52ca7017ef19265752e1fc8487d5e24
+EBUILD makedepend-1.0.6.ebuild 438 BLAKE2B a5846b4c23cf93d392b95c7157bc20bf5c8304ddfe25524b4535bdd56f2de9afb9bd01487a7c2ba6d222a536bdbcc1e1b257d2c213d2094cb8541a19b96ecccf SHA512 4ec9434da71002de86cb6f0bda41151136558298d9be9a420152f656eeddf1a486c1783ba4e123a860468e50ca771ec3ffb880297a5a837fa5725e8db548e154
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild b/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
deleted file mode 100644
index 6dcb3c505d78..000000000000
--- a/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="create dependencies in makefiles"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/makedepend"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/makedepend.git"
-	inherit autotools git-r3
-	# x11-misc-util/macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/util/${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 ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND=""
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index 63e6f46c4964..7a08a112104e 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-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"
+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"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index c4953e0a769a..6e443d79cf65 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.18.tar.gz 313465 BLAKE2B 4a24de8ad0622ebd508d0896c5aff462a4fea716da5678de68525f70e462cc7d51c7a3a1dd62f678ba75d91d857aa1c039864d8a2a2ae42c2301243c402c6909 SHA512 bde32110284ab1454b0ff16ec58337a4295327a3b9f5cd40029607a4001e5f399746da3e66cc3bddd4448421fc3bc8dc5d961b354531a6cf536842e5115d4cda
-EBUILD py3status-3.18.ebuild 723 BLAKE2B 6f46c99890c6dbeb4095c7ef14e7ec49679d79ed784d4b9be735bc12aad01d76b75103348fba9f18da684bf3c60c671ab3dd87c8c55ed26a35b19baddbb1af22 SHA512 65c77e5fe021b4be7bfdd1f6b16e3f587d28590f9c31428feec27ac49a9718c192006510e2163948a4d99d571014ac67a501325423746e743e1b8c7a668f9060
+DIST py3status-3.19.tar.gz 391159 BLAKE2B 6ccf84d1970449e28c932f03bf4208de10d32bf8e4d5dca402f4ef11fc606773624826b123961e8c9b238ac14da6c386008a6ea3bc2abaa611b566fa212c5af4 SHA512 171aeaf5777a375209665542529efc0d294ec0756ec6293813bbfd6bdc6b5616fcaf0c568b8e620c872d0692891c2825e99d5c0ff613e52cc9df1393188b7e62
+EBUILD py3status-3.19.ebuild 727 BLAKE2B bb056869027dd91f5608fde7b83ee4771bace3171bec976007b436ff84ee09d21f198dc354120655faa7cbbefdd949519140a09803c3069e7dd022eda0ce3456 SHA512 b93f5666683892101224570bc15e63ab77cb8430c892c3dab13aa1a095d0886bc67c230ccafe00e7175f7403241df98fd191731c15c52c80568c00d8f7947ac9
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.18.ebuild b/x11-misc/py3status/py3status-3.19.ebuild
index 308d67dd7903..e0e182b53d5d 100644
--- a/x11-misc/py3status/py3status-3.18.ebuild
+++ b/x11-misc/py3status/py3status-3.19.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index eaf85d92318a..26d371b58079 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -1,6 +1,8 @@
+AUX revelation-0.4.14-gnome-python.patch 925 BLAKE2B 83bf8889d0de3a6d6077929ef76e9dc7ce96f750ae485ff064a6ae95b73d5b1853bb26e80cc9a24578b17436167c5498389f2a192f22a6544d15434ba6ecdca6 SHA512 679fd27df6b73d4a5003db791165bf02f7ded6d998e78a760412e5fc4b0ccf94b3d55cbb0be1a47c1e0bc0756f3f97cbdf738025a86cf2fe86ea452121a4fbb1
 AUX revelation-0.4.14-random.patch 2127 BLAKE2B 9fa01845124172e9544679c144cc49f23104aed615a1e1087f7f6b63051027136435ef51e8ac794c78c7e554211a5f125a4641e9572c52a1279b8eaef3170738 SHA512 be5e805e58d04c0be29ad9c30a6aa867a869a4d0a8df31ce234fbe331d0191cc3bf7b82e11ec6a7c1c8306b68ddbc5ed29d9f5e8c9e3838b293896adb69c5d13
 AUX revelation-0.4.14-xor.patch 1874 BLAKE2B 44b4e6b6f1323201818c55ecedb464304dc5265a7d356224dff41021554f8611f05fabc2fc353bf7a43b7bc4e2afe32f16c7b57ef30539abeb307de50f7b270d SHA512 c4b76a92f0b6e4e1856948e1c1d4bb118bc8f2383e9ec778515fd87949814b60dd51b8dc814a070665c0138111b3ffd9d8fdad03c43bdbb0320ad19ddea23ddc
 DIST revelation-0.4.14.tar.xz 316096 BLAKE2B 163fe15fe9ae1f35613390cec6d67b7b0193aea1d613d8ed0b237c190680b700fe509e076911cf28233194c3e82917ae0772d9fbe842eada0ac8bffae256dd4d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145
 EBUILD revelation-0.4.14-r1.ebuild 958 BLAKE2B 405c6fd1723cf31a4b00763b8f102e88716e8130a2f5b146184bfd64fa5cbb700aa230ff1176f002b7ed16179cd7037da504c57ba0e7826e1abe65a4435c0b87 SHA512 31dc4c383c5992570206f779f9bec62c6ea2511d2997c19eb5e758ef2f422e00bdd4f8c8172583e983b573c97bd944cf2e4ef8f5e376ea64ed342f049d13841d
 EBUILD revelation-0.4.14-r2.ebuild 1053 BLAKE2B 480c69cf01fde86f00102b0a0a5ceece8debd8574b519d3861757186692b8580b04840be01350a4e87a5c122f1b576e09fb3eb696af0568b9d798a77ba799046 SHA512 a41a193fa0f0e6ec10b97c9d6f03f5816efd3844d82fc8693fc7f3a10f54d9d5ab7e1e5430a32f9a9bb821abc423286710769ce04a7f7f58e4fcd31bc54b2427
+EBUILD revelation-0.4.14-r3.ebuild 1075 BLAKE2B f9cae379d0830aba04751b0b36778bd61debd2d1d53bc6071f0da0743c7c09c8fbdc5449523b50794bc2b535f111dac4926704515f653d2f42c7a271fb2eeb0c SHA512 b1ff62fc65dac095d165ce82e8ff39b4a34331d136dc31e02453e8c546cc396237badbecd96e6e344e3a14ac2c34238440acab735efeeac02b50674e9b42b9fc
 MISC metadata.xml 221 BLAKE2B 62f515310d9bccb1e3747264848ac800fc9489f83567f3e23f1b3a2f6636f6a499652435e153728de911f47a8534279f3ade767815414523f15077584397a632 SHA512 9ca3dafa7e44ec0f210681f8f524549f103695d57d0f8463a9044ac9456e6bf99ad6c7448e62a672471b7e82535b76214b924e3b336f186bced032750e68754b
diff --git a/x11-misc/revelation/files/revelation-0.4.14-gnome-python.patch b/x11-misc/revelation/files/revelation-0.4.14-gnome-python.patch
new file mode 100644
index 000000000000..82a02fb259bd
--- /dev/null
+++ b/x11-misc/revelation/files/revelation-0.4.14-gnome-python.patch
@@ -0,0 +1,28 @@
+From dffb8b7722865a82c3a5d7ce9615b6da2313d583 Mon Sep 17 00:00:00 2001
+Message-Id: <dffb8b7722865a82c3a5d7ce9615b6da2313d583.1486417682.git.tommyhebb@gmail.com>
+From: Thomas Hebb <tommyhebb@gmail.com>
+Date: Mon, 6 Feb 2017 21:44:06 +0000
+Subject: [PATCH] Remove deprecated gnome-python dependency from configure.ac
+
+The code has not depended on the module for many years (the module was
+removed in 125cf9dc28f95617fc3b37bc29a714f708b7d2ef); however, the
+configure script was never updated to match.
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index bdfae2a..5b6ad72 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,6 @@ RVL_FDO_MIME()
+ RVL_PYTHON_MODULE(Crypto, yes)
+ RVL_PYTHON_MODULE(gconf, yes)
+ RVL_PYTHON_MODULE(gtk, yes)
+-RVL_PYTHON_MODULE(gnome, yes)
+ RVL_PYTHON_MODULE(gio, yes)
+ RVL_PYTHON_MODULE(gobject, yes)
+ RVL_PYTHON_MODULE(pango, yes)
+-- 
+2.11.1
+
diff --git a/x11-misc/revelation/revelation-0.4.14-r3.ebuild b/x11-misc/revelation/revelation-0.4.14-r3.ebuild
new file mode 100644
index 000000000000..268f3053c26c
--- /dev/null
+++ b/x11-misc/revelation/revelation-0.4.14-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 autotools gnome2
+
+DESCRIPTION="A password manager for GNOME"
+HOMEPAGE="https://revelation.olasagasti.info/"
+SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	sys-libs/cracklib[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-random.patch" \
+		   "${FILESDIR}/${P}-xor.patch" \
+		   "${FILESDIR}/${P}-gnome-python.patch"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--without-applet \
+		--disable-desktop-update \
+		--disable-mime-update
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 24660c1435ca..2f1af3dc89d1 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,8 +1,6 @@
 AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a39eb80a871f8c0e21268302dc7baf5bfa13c9d1fe0c832ce008649764896c9ddab6dff1cd66c2c6d933e08e227a SHA512 b26d190bdaccca3cf761599a6e3f938a8f9106c9ee395c5f0bf3e58f5c151674621e66ad61891ec4e764424e42f315caa352761923d5c3b45ca326850e369ad9
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
-DIST rofi-1.5.1.tar.xz 355912 BLAKE2B 710a35ab82bf960b331431be3cc3acfb5cc27b42d7fa8b02e8c070918679b90612d89f600a6e58215bc0a08dcb60087ea37a5498fa8c4ac39d246d5967f0b314 SHA512 32074e931199ff1529ebab8fef53d339eab09843888f862953b7d661323484ebe66d820feecc42604a16bd683a5af1ec4d1a2e7f097f408efed6cfe91c4eb5ff
 DIST rofi-1.5.2.tar.xz 377732 BLAKE2B 560c5a4d30d143cbb5ca9030086d614a8f56a5e17b75c1b3f3a2e57bbd16de304b733bc4fd6093e716c993051e238811e9e65ffbf165d2ae4723f0bde1b15b42 SHA512 8fbbcaa040148d204878380f7cb96fa31228f72b68a97a5bcf8d8cd69740f6b185f5e5d2bc2e1d35e267a84b21576eb356c33be827fd1b767460665493360c16
-EBUILD rofi-1.5.1.ebuild 1141 BLAKE2B 744b846139aad4bb1e4a3bd38b072b665f2451726a9120c70afdeaac7b027a53f1bf312824a7835377f4296e437ee1a92ce03bb41db33cd603a8dafa7067b2d6 SHA512 226ed3974f22ff8c754754085df120096910294be283253c2f77ee3dfa89f7984a4a001b58148c2fe9798017137b0e373a8e82fc6e8385d2641c3457b4a89ff9
-EBUILD rofi-1.5.2.ebuild 1028 BLAKE2B fd3c587b7a3dfe641b349de61853e74cd4113e9bcb3b6dd065ff1e52819ba15bd7cb1baa70b47cd0538dceedfc908ba18c122b2ece9b77cc3f36adf970559773 SHA512 33afb70c3c6b34977fa9f85a33ec0ff7bc93bb7bc086a9e2c3f557f9064097a8a510b4e891aad020ac3503103c6d785a40b994a6777432ef660b00b75769cf9b
+EBUILD rofi-1.5.2.ebuild 1026 BLAKE2B 09114dd10d8c217a679290e931d7379248e041a8eb8d80ab0edcc473f2313bbe222be7bcb50193021043e9a84c877a7375cf8845ac925f23061a45126117c85e SHA512 d790bef15510cfebce3e9bd4bd11e7975c7759cbe1ff4b11fbcab67b2fc3feb5e87b485c180dce1241ea2a5e0775a7c1e985d4da7ac06c48fd37345c834c3a4a
 EBUILD rofi-99999.ebuild 987 BLAKE2B 285f9b609c87ba1fbf1ffaff7321c01cade1fa23fd9537d185df6c6e207b692fa42b9d356826afe2e9ec31d7e71e5bc71db95b303d2a126b268b59176a637a37 SHA512 bc3fa1c97c0995c49836a753b7b2fe53f342009bca7f79310c121d8da431e74fd4f1aa786a583c4cea1fa5d66218923a355af092a9d418559b33361e77dc2841
 MISC metadata.xml 495 BLAKE2B 0a6c59c1d1db2ae103cf8165f39dfda9beb4dad681379f6f6bed7cf3f0a44f06e9cbd77457dfea4bcb0c42e3df8c6e2c7c83ea4a9185e1a4131db214d26058cd SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f
diff --git a/x11-misc/rofi/rofi-1.5.1.ebuild b/x11-misc/rofi/rofi-1.5.1.ebuild
deleted file mode 100644
index 0bce2c86cd25..000000000000
--- a/x11-misc/rofi/rofi-1.5.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/davatorium/rofi"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test windowmode"
-
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/librsvg:2
-	media-libs/freetype
-	x11-libs/cairo[xcb]
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.11 )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-)
-
-src_prepare() {
-	if use test; then
-		sed -i -e 's|"/tmp/rofi-test.pid"|"'"$T"'/rofi-test.pid"|g' test/helper-pidfile.c || die
-	fi
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-
-	econf \
-		$(use_enable test check) \
-		$(use_enable windowmode)
-}
diff --git a/x11-misc/rofi/rofi-1.5.2.ebuild b/x11-misc/rofi/rofi-1.5.2.ebuild
index 5c664f0c427f..28358e44e207 100644
--- a/x11-misc/rofi/rofi-1.5.2.ebuild
+++ b/x11-misc/rofi/rofi-1.5.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test windowmode"
 
 RDEPEND="
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 8996e372571e..802b631c9134 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,5 +1,4 @@
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
-DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491
+EBUILD shared-mime-info-1.10-r1.ebuild 1774 BLAKE2B 6f839bc739e55b8888479d81d0460efee2b1bcd0038173877fe3de075c7ee612a1d4724ea1ea5fdccd564024d2d9b338b5a82d6c6ea90de1f88302d79bbbca10 SHA512 4c81df64a3050f24a95e8fa0e357f46c67612f38e15a41f2745a2b743850963e9b5382979b4fa6f022fdcd2893e8043b25de8710d9e802b7783763b3327a8fe3
 EBUILD shared-mime-info-1.10.ebuild 1494 BLAKE2B f958e53f7f581f9b081a16f962e82a4f56c31056b9203bd1969be5f97e393505018c37efd3502f95b64a95ec03d434e107e934ba8ca8af6fa0793c79ce568e01 SHA512 9ac4861ae32f3bc9120b1a84d318f0ebdf5b026a4bb899a538833ac365a46958637f7698cd4d7db561a7a26cbb003e0c09208ae535a34f69258b12092a9c2880
-EBUILD shared-mime-info-1.9.ebuild 1457 BLAKE2B 582d75bcee9c267dc39f7120cd734085a963621e82fa4ba91288420f3390767c03672aca23f1b367aba252f8ae24396be44084f8a90cbb3da213f081de2aad3a SHA512 112646b17c088c2e0f34f8bce8255738ebc5881f404437d2eacb3dc101bf3362b2409a2923dd33ee9198da804d0a4f9b24c052b87499081621131e751f6c8070
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
index 2349bbffbd2a..1529b9bf6c71 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit xdg-utils
+inherit flag-o-matic xdg-utils
 
 DESCRIPTION="The Shared MIME-info Database specification"
 HOMEPAGE="https://freedesktop.org/wiki/Software/shared-mime-info"
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
@@ -25,9 +25,20 @@ DOCS=( ChangeLog HACKING NEWS README )
 src_configure() {
 	export ac_cv_func_fdatasync=no #487504
 
-	econf \
-		$(use_enable test default-make-check) \
+	if [[ ${PV} == 1.10 ]]; then
+		# https://bugs.gentoo.org/684884
+		append-lfs-flags
+	else
+		eerror "LFS support merged upstream."
+		eerror "https://gitlab.freedesktop.org/xdg/shared-mime-info/merge_requests/20"
+		die "Please remove LFS workaround."
+	fi
+
+	local myeconfargs=(
+		$(use_enable test default-make-check)
 		--disable-update-mimedb
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index cd182577921b..8d90036f92b8 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -7,6 +7,7 @@ DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 2aac9db4fdbec49c5251f9ba85fda81efd50
 DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
 EBUILD virtualgl-2.5.2-r1.ebuild 2616 BLAKE2B 36f0a927e0663913194c94c42d8e0f88f6cbae7bafe46dd5f7aa304377904c5b289743f62acb52660a36cce054885c552e6625c696b8f09c99bcab0dbc942380 SHA512 1dab9b93693e26a3cf3823237a377a72b177ef0ab9c038570d7bfb5ae2e7352f23d5e0cb0972b751f2457607839498022586adcec2ef98fece098fd5336dacd2
 EBUILD virtualgl-2.5.2.ebuild 2507 BLAKE2B 70374ee9d5ac16a917e3755d3fa2e6228a045e502d57d7060f2a63a7e457524422e588a693870a3ea3da15462925e1a4f761a8a7de868090436afbaccd9b9c17 SHA512 c30fa84d7876b8389a81d52f4f6981419ef3630acbd54ffe8263b5c9beec71c59e14a270a6138e7be10de668b2aaf9c6054e70eb57ac22d9f8b86de905c37f81
+EBUILD virtualgl-2.6.1-r1.ebuild 2712 BLAKE2B d5ae149a1bfa905ff96a6caa40d0daea92e825b70303591595834bb43948bf2994ea6c56c33fc3cf47cec890bbefa7d95b623d2b6bda568dec56f8f897a695fa SHA512 ff1fda99385b88521420c738b0b2467b76dd4b2a6be47b13e8351e246d01cc923b4b87eed53a81e23d72826f27fb24f8b23e86eb9b3541325a25446006649d55
 EBUILD virtualgl-2.6.1.ebuild 2625 BLAKE2B 58e25d1fc1235b4b560aebf2b9fc5fe95521a2a1cbc34a4a60eec583fa4251bbe5347cd44c56712a2c5e19e8e5282596197021b031cad2e3f35bc716deadd697 SHA512 731403a3fdd9630e634ada1b0f73d7a5ac75522e9fc313bf0b63ff5bb51165f9d1aea10910f3656168b381a6786c97be1e8e9aeb9af0d661a1bd21f00cda8db0
-EBUILD virtualgl-9999.ebuild 2625 BLAKE2B 58e25d1fc1235b4b560aebf2b9fc5fe95521a2a1cbc34a4a60eec583fa4251bbe5347cd44c56712a2c5e19e8e5282596197021b031cad2e3f35bc716deadd697 SHA512 731403a3fdd9630e634ada1b0f73d7a5ac75522e9fc313bf0b63ff5bb51165f9d1aea10910f3656168b381a6786c97be1e8e9aeb9af0d661a1bd21f00cda8db0
+EBUILD virtualgl-9999.ebuild 2712 BLAKE2B d5ae149a1bfa905ff96a6caa40d0daea92e825b70303591595834bb43948bf2994ea6c56c33fc3cf47cec890bbefa7d95b623d2b6bda568dec56f8f897a695fa SHA512 ff1fda99385b88521420c738b0b2467b76dd4b2a6be47b13e8351e246d01cc923b4b87eed53a81e23d72826f27fb24f8b23e86eb9b3541325a25446006649d55
 MISC metadata.xml 736 BLAKE2B b0fef33f453e573f7742dff774acdd66aae3a8ed586718eb2c88fb5776c8c8040a94285971022ea52a47a702911a6d0f0f669e0cc8facac09d127a73ab6d083d SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600
diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..baca3aa94532
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-multilib flag-o-matic multilib systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
+	inherit git-r3
+else
+	MY_PN="VirtualGL"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="https://www.virtualgl.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libXv[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	amd64? ( abi_x86_32? (
+		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+		>=x11-libs/libX11-1.6.2[abi_x86_32]
+		>=x11-libs/libXext-1.3.2[abi_x86_32]
+		>=x11-libs/libXtst-1.2.3[abi_x86_32]
+		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		>=virtual/glu-9.0-r1[abi_x86_32]
+		>=virtual/opengl-7.0-r1[abi_x86_32]
+	) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# Completely breaks steam/wine for discrete graphics otherwise
+	# see https://github.com/VirtualGL/virtualgl/issues/16
+	append-ldflags "-Wl,--no-as-needed"
+
+	abi_configure() {
+		local mycmakeargs=(
+			-DVGL_USESSL="$(usex ssl)"
+			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+			-DTJPEG_INCLUDE_DIR=/usr/include
+			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+		)
+		cmake-utils_src_configure
+	}
+	multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# Make config dir
+	dodir /var/lib/VirtualGL
+	fowners root:video /var/lib/VirtualGL
+	fperms 0750 /var/lib/VirtualGL
+	newinitd "${FILESDIR}/vgl.initd-r3" vgl
+	newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vgl-helper.sh"
+	systemd_dounit "${FILESDIR}/vgl.service"
+
+	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+
+	# Remove license files, bug 536284
+	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}
diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild
index 05ef6a703773..baca3aa94532 100644
--- a/x11-misc/virtualgl/virtualgl-9999.ebuild
+++ b/x11-misc/virtualgl/virtualgl-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit cmake-multilib flag-o-matic multilib systemd
 
 if [[ ${PV} == *9999 ]] ; then
@@ -30,6 +30,7 @@ RDEPEND="
 	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
 	x11-libs/libXv[${MULTILIB_USEDEP}]
 	virtual/glu[${MULTILIB_USEDEP}]
 	virtual/opengl[${MULTILIB_USEDEP}]
@@ -37,6 +38,7 @@ RDEPEND="
 		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
 		>=x11-libs/libX11-1.6.2[abi_x86_32]
 		>=x11-libs/libXext-1.3.2[abi_x86_32]
+		>=x11-libs/libXtst-1.2.3[abi_x86_32]
 		>=x11-libs/libXv-1.0.10[abi_x86_32]
 		>=virtual/glu-9.0-r1[abi_x86_32]
 		>=virtual/opengl-7.0-r1[abi_x86_32]
@@ -62,7 +64,7 @@ src_configure() {
 			-DVGL_USESSL="$(usex ssl)"
 			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
 			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
+			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
 			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
 			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
 		)
diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index 0a28801dda27..bc2845c7f04c 100644
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1,5 +1,3 @@
-DIST xcompmgr-1.1.7.tar.bz2 136667 BLAKE2B 3231cca0cebc13aade6f008414d77461913d274303289c28b8eb366640905cf9bbb4715d5aa7ad8eb897ac94db099b040e408b2e3867dd2ad46940b3bcfe518f SHA512 f93a6be78169dd41ff08d71409e28746fd62902810a2f6930c0ac44f1415bc7391a8fb885b074fd40afedd7f1c1590aa7c67fc101c3b6488ddaa74495b42149c
 DIST xcompmgr-1.1.8.tar.bz2 138806 BLAKE2B 85a7cd04c97c3594ab9acf7888aa0024b60027654dc8fa609c8f2fb801b5cd58105aa50c2afe9c322a02657eeea6e57da3f35720ac63c191a81c62fbf9ee4468 SHA512 ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d
-EBUILD xcompmgr-1.1.7-r1.ebuild 925 BLAKE2B 7e60d31646a305ce57ea6139e78519d6d0a1e222653e71b4deddd84936ed7642e17b0f3760fe6c48a20b19b608a902ccd2574ca432104b6b865a954b84d7011e SHA512 c77097b068b1a6913bae00aaf5ea207a6a8162bd70dd0e6c04c6e389a91ef341b595db99b43f6203078eb6e0b444ec255d848f7cf74eb51cb90727d9c43e2ef8
-EBUILD xcompmgr-1.1.8.ebuild 416 BLAKE2B 04a4b8a7c34925582f4dfbe46bc4fdd34c7eef8482b0ae8388d839e2504da536955cefeebbfff7299f0910bcae1131a3c66143c344b370e4a3c639a1a5fea1d6 SHA512 29dfa74a8e4f1ae64ce39f147eecc806dcf3cc0d5ec814b6a0bb7677c0ba184c1e0bbfbc91eafc9adc4ed025eee471c2202acb9ef26c751b0ac01b2efaf196a2
+EBUILD xcompmgr-1.1.8.ebuild 415 BLAKE2B 3f51a4d05113a84fed66ddd4b9eebefd4a516a4d62f1487a2ea68b6c9f706f129fffc557b7448ac4cdfe885adbcfb8236640ac4fd1dad56f4a004a0675d4c4cf SHA512 9ca5febb86bdc02de115c769d5430104244e061fd4d5735610fa9272113a8aec6425f5a727fd9c4d029854c6a201aeaa0b112cdf0ce305fa8e6b6fdedda583de
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild
deleted file mode 100644
index 1934ad373f37..000000000000
--- a/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X Compositing manager"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xcompmgr"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/app/xcompmgr.git"
-	inherit autotools git-r3
-	# x11-misc-util/macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/app/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc ppc64 sparc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXcomposite
-	x11-libs/libXext
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
index edaf48fbd64b..5d3be298debd 100644
--- a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X Compositing manager"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index d0861a1c0532..9155efa647db 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -2,6 +2,6 @@ AUX xkeyboard-config-2.26-Fixed-broken-pt-layout.patch 5000 BLAKE2B a535925839ee
 DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
 DIST xkeyboard-config-2.26.tar.bz2 1061733 BLAKE2B d07bbe28d5621aa146fdca089f60ebf293aa9b39b60fb6f7335cef934ff9edc6a11475ff00b7279a960cd9941f91260f25b7502fbe421bd8bf5c0da53f7a3471 SHA512 5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef
 EBUILD xkeyboard-config-2.25.ebuild 1255 BLAKE2B f1883e83820a59cfccdef343cbd001eb85583542421d4f13b4814c421e7c9f651bf68a41334e43f567d21866061938e957e16e92ee9091cf8fe6a3f9bdf62971 SHA512 71e9921d25b4578bf7ef268fbb5927d2d896f15756b5d4348aa5ad3a86c33be54f717d7106efa59572a82eb9542f6cb1260f65a09ae59ab2d1fe5df35eaee921
-EBUILD xkeyboard-config-2.26-r1.ebuild 1320 BLAKE2B 130eff90e5249b0d31274002452e770cd67468198ea27f8756f84627b1e60f8cbd8953afdca98859aa27504207ed8c7502487798b42dbe79e759de9203356f7e SHA512 6247d2ca9442b713d9ed15107aa39e18dbf8a5e483c84583d040fe499a506caf20201890841f39257b53ee5b83908c803fab0358387c01df31a97be54f8cfe24
+EBUILD xkeyboard-config-2.26-r1.ebuild 1317 BLAKE2B 6479546b1af2d15f8f8f6492fa82003b02d10d748a0eb3803f5ce19bef0d84dc2b69733a5c0ded4d163b6c38d994457473c7793bf7cf8817f3fe89079b39aeb6 SHA512 9fdcb75bfa3176b7de13f9b6bb72951fe06648aaaab4412641477f30f91ff5ead6d325f26b8771fe20e6a022fb90a6785578cd8d350aa0851b81c94f85452d03
 EBUILD xkeyboard-config-9999.ebuild 1266 BLAKE2B 16798865be0a1659f706780c07c79caabb51f1cb9b2079e595122ec9afc49dcce769e784fd0e7ff0ea8f3581c7a03aff30fe773cbe7803a2a9f7ef627994efa4 SHA512 ec7096942471274e3ac0b78e5bfe8fe569259d3571ce83a4dd92cf5de2f52999b3d05e11a6aa8f31f8c9994d8c8dc77829ce3b65863ebf2c8d1e7bdc26d4cac5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
index 36813e407261..42d76fa397a9 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/data/${PN}/${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 ~ppc-macos ~x86-macos ~sparc-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 ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 160f116de233..1a7061b6fec2 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -1,7 +1,3 @@
-DIST xtermcontrol-3.4.tar.gz 140662 BLAKE2B 8d151cf323899363e094a9d64776a80b700e959601b6c95d81fe251527187a7f5589c000b8593e059e230d46e3286732869b5d0134efdcf893eb7f4fe434e026 SHA512 a3666fc78cd8276443c8b5027ea04fec01f469e44d8b97bb9cff4159e5906e0a6b8b56069aa8d134a9d76fc19de2a7e9bd802e0d1fce6a46e164142766aef513
-DIST xtermcontrol-3.6.tar.gz 151916 BLAKE2B d5ade1c89d0bb45b401b59e5e13586d54c55226e1c647cbb60d047bdd0e0a61e871b0c405adac8a4bb71d5addd5a8bb11d1ac45aff9cf456a17600f099e04d02 SHA512 f59e729a9bd6739604c0c687ca93fb9091d69d7c28624d514baecf6839db9897a919adeda6e6d02e368b5f8a980c3f616155da955d5581415625a5757df650c1
 DIST xtermcontrol-3.7.tar.gz 151984 BLAKE2B 246b17e0b38540cfe022321129d76ae196c8d0b50b2a2fffbb523029321c5e8fde093fc5af16e5a550fc39eb2fcaf1fca4882de2948c45397c9bd4a9a11a06cb SHA512 b23da5dd07ea8fc59717752e937cffb36038870f3ad486d43b8d0477826916255ae8f00f894293efb2dead46ff9122c7e27200d5fc15b7bd91d9df1b649e2081
-EBUILD xtermcontrol-3.4.ebuild 373 BLAKE2B 836d55e50d4021a1d005c4b111cb88e11498b36ad837233e3dad2ac2424f1a4398647818674122c7ba39a5b79996e5e7ad2f650039bfc7c6e4abf46c7c55e61f SHA512 f02e93b2c590a6f4d9a70b896eeccaab5d42e383b64252baa1be51c6de53362f91704ca6491b16af3a6c4333d15920c20baaef20275319e28d35eae4637d22bc
-EBUILD xtermcontrol-3.6.ebuild 370 BLAKE2B 3887e3c1d10d8ade6ac8ccae6697cf61f971c9e3ea70a165c99e048b1a5ced4b989938a725e294fae7d813a7d9daf109e412224cd3fc8ee92c3f322f413a1eca SHA512 bc06f3c76354a529020800fc1d25e6796d8f3f2ee89aab13709f680ab910d1f6e8cc085aeba54c018b42756b26144993d192182b43bbb4d2ec41d31582a0f464
-EBUILD xtermcontrol-3.7.ebuild 371 BLAKE2B c6b1d1758071d2a4d7baffc72467bd3741d04cecab94f8027e80df12930ddcf35d8eeace16ef7e7083d4470db3a460fb614d8de42905841214cf550f94b073bc SHA512 19d6af48afac14d245f9e418f92093fc554705b5c8f04fb9131a024452704177659090c57e3f4c8c3dd207942717714f98a33af54b232899d591876c56ad2393
+EBUILD xtermcontrol-3.7.ebuild 370 BLAKE2B 0e55dbc82660db653840c812a47e3d3183551502e3fa4336239f56c54d0a06d728dcb0e1e1d99823f143c90d330333aed48218adedf1f8b73ddbdff4cdc10d1c SHA512 ffb6634b1cfd7036765afcf75c263128460f2001ac71df8898297b63c05fb059e50b612799bd1f6c68acfd0b3481458e61fbb728d78fb2a58057580ceae0ea92
 MISC metadata.xml 689 BLAKE2B fce013dc9ec9488e94202966a807b7e28491fc553fc243008846f845462034a8645a68a2122832c2118a3911856c0e0fce13c563ead4da707375eaa16cc81fe4 SHA512 ee635786fb7c6876636390fac2aa50cf01946dcbead809021f7bb795ef713bf21ee04123f574d4d7d12402f93c9262f3bcae46fdd0580dd316321cb42421687e
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.4.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.4.ebuild
deleted file mode 100644
index 83ec6ba6a177..000000000000
--- a/x11-misc/xtermcontrol/xtermcontrol-3.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="xtermcontrol enables dynamic control of XFree86 xterm properties"
-HOMEPAGE="https://www.thrysoee.dk/xtermcontrol/"
-SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE=""
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
deleted file mode 100644
index c52b89e79a50..000000000000
--- a/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="xtermcontrol enables dynamic control of XFree86 xterm properties"
-HOMEPAGE="https://www.thrysoee.dk/xtermcontrol/"
-SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE=""
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
index a70fccc5c3a1..ad070f650616 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE=""
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index bcca3ab37425..24c2ec2432bd 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,6 +1,8 @@
 DIST xwallpaper-0.3.0.tar.gz 104300 BLAKE2B 23ec3b4ccbaf910c9ba4afbd1d9237223654a85c90b0a147141b017a9b3917316f745e1dd70a89e385110d380d5bbba8ee7c2d1ed4188d87a98ba0e94c5a7b6c SHA512 c73583fdbd573329951178d7db36fb1ae18a4294207de85dfb93e367be0ed103e8de7e2dd8ec61a0a23541457c930e8b0e5eb12dd5024808de3e02ddefb6b4a3
 DIST xwallpaper-0.4.1.tar.gz 106110 BLAKE2B 13d40274910b5a82271207292ef7b5d5aeb21fe015c0f3a9780d164d805b9f212a017b4aea8cc8c92ad3a9392eb01c3ea5cddf66888ac4ec146d12109675bdd8 SHA512 febfca202d3356c5a2f584921eace61a6f16e19bf0b0812604bccb441b11a0748c997d0818fb8d9f6a37f502a0a38f13b78f7f61c2de2768a85807a8725c070c
+DIST xwallpaper-0.5.0.tar.xz 81000 BLAKE2B bb30871d24538b3fb04e1158df75bc82701ed184d3b8f60179990f60d91e03eb974ab3c72446c8f0bacbf3aa27d0cbe4446cf38e34d484a46dcaa66fcfe9682c SHA512 92cf424fb90dbdbe8e47ea7cc3650200da9f480afaef605e2ddbd7a828361f61754c2ed93c9be099c340f80eb60f8c1aa2f44004512cbe846401cb8ef73403a2
 EBUILD xwallpaper-0.3.0.ebuild 984 BLAKE2B 57285f28d6321e391eb65d1263dc41e65d6a393451aa25ae1601b7ae0ac89d56e3c756e5967eee7ade1b1cc1e7b219b9b99046a6a2e544663ca65bd3d9c475aa SHA512 64b915f529ce987bceac1d59b86dbfec49dd4b7e67725beb7b11c5607de5213ea6743af0d1f24225a35405557eb0e808b3c2f07ea188a6a7508a073a63490299
-EBUILD xwallpaper-0.4.1.ebuild 1007 BLAKE2B 5455f935a2be3830aed06b8b6ad6de82cb7fccde7a0730a5a9963667d21805ac9a0ffa96e7cdf78caa1f32f358d20204970b7b28d2f6091c255e4c5d27ab285c SHA512 8056fef55ea35da5f24523174b24d0fbce21233881101b89edba64d5f8685c5e783f09446d4cca7e97105638ba43b89b89586c7d410064c9cd48beb28a8ca50f
-EBUILD xwallpaper-9999.ebuild 1007 BLAKE2B 5455f935a2be3830aed06b8b6ad6de82cb7fccde7a0730a5a9963667d21805ac9a0ffa96e7cdf78caa1f32f358d20204970b7b28d2f6091c255e4c5d27ab285c SHA512 8056fef55ea35da5f24523174b24d0fbce21233881101b89edba64d5f8685c5e783f09446d4cca7e97105638ba43b89b89586c7d410064c9cd48beb28a8ca50f
+EBUILD xwallpaper-0.4.1.ebuild 1005 BLAKE2B e053f2c80c6f2c7cc798d50fcf6bba88bba1010eea6ec835d68ae755d606b94478c2d3e64a92e17255acb1b2b65aa0c1423724e17f78c4f3c706ca001f8c95e9 SHA512 3bf25c83d68210492483489e315c6d05c3197bc7dad49c3b76172516b5adb14b8037f370cecdcbd4d79b08fae53470a3918dc47532660b48fc29453363287b06
+EBUILD xwallpaper-0.5.0.ebuild 1007 BLAKE2B c05b3bc12edd182d58435d736fec6c0e124823e28497be48e66e1ad5cb43b407c7caea5ea2c8a97bf4780e5f070360340c2196c4c9f38347fb857d6d2996894d SHA512 70645eb1d04c6393032394cb983c7b5f255cc93b5308e4a23cb890fd6429a79642827720836c5fb9575a7ca4399b657732eff1047c80c54e15e3fcdb5e479e67
+EBUILD xwallpaper-9999.ebuild 1007 BLAKE2B c05b3bc12edd182d58435d736fec6c0e124823e28497be48e66e1ad5cb43b407c7caea5ea2c8a97bf4780e5f070360340c2196c4c9f38347fb857d6d2996894d SHA512 70645eb1d04c6393032394cb983c7b5f255cc93b5308e4a23cb890fd6429a79642827720836c5fb9575a7ca4399b657732eff1047c80c54e15e3fcdb5e479e67
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild
index 6fdbe38a6273..f6075177a910 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild b/x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild
new file mode 100644
index 000000000000..bcf9073e961d
--- /dev/null
+++ b/x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Wallpaper setting utility for X"
+HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
+else
+	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="jpeg png seccomp xpm"
+
+RDEPEND="
+	x11-libs/pixman
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	jpeg? ( virtual/jpeg:0= )
+	png? ( media-libs/libpng:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	xpm? ( x11-libs/libXpm )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+src_configure() {
+	local myconf=(
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with seccomp)
+		$(use_with xpm)
+		--with-randr
+		--with-zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+	)
+	econf "${myconf[@]}"
+}
diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index 6fdbe38a6273..bcf9073e961d 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.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
@@ -12,7 +12,7 @@ if [ ${PV} == "9999" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
-	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 70e1614fa753..8f8e95aa5832 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,10 +1,8 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
 DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
 DIST zim-0.69.tar.gz 2044631 BLAKE2B 447fa4fb2d11b1399668ec6b627e23150577b574afb1e5c33738cb690779f49adb2d60e0b01eb82d2cf0dfd4a430099c1ae4b52186b60a2564c501b93aa01822 SHA512 452b2119d63927765c3807dbbdfadea94be31ee7fd3eb9b8cf79e8699c57478ec9cd392299a6e1dc3690dbe520925cddf5fca4596db809a2cc296bb6669d12af
-DIST zim-0.70_rc1.tar.gz 2889546 BLAKE2B ca0c2274472f7e3f50e2b51ba59a75ae1422e7bad86a8fdc55474c150b1ac227ad785c3484d1255079a8aa169bc437e6016254ed8d4691d8e8d78a5112d71038 SHA512 fca61ea5c249ba33187d48a6794c11f30afd664e07462c738ca2b64f7d970e95628ecbcdb9c19a23b70c1609993d4111a9976cdddbf2fd5ad3029014a8a01339
-DIST zim-0.70_rc3.tar.gz 2877315 BLAKE2B 1467bbd6bbd11e53120193a5f77dc7ab52eb8f1478c3dbc98e229d784f4432e862ab578277b79058eae43943bfbe8812b45153130779f7c84f14b342d3ba7357 SHA512 32fcad48c2deb9739cb7d3214138cdac7c6499008f884ba61aeb51ec387d600b87c7848abf7982fa165c4130446c307e57ee1762f7107894b70d96ded528bc0e
+DIST zim-0.71.0.tar.gz 2882942 BLAKE2B f1701baf547d43d7a9687e6a1d72313649064f1d3927e14bffd5c8e348fa7a311e307f9b1704c19058bfad07d6715c79399acfdc5701efa9291db3e68065175a SHA512 7c82e19d547795f57c563383aca04a51da02463df71cfe18c4cab0307f46fb425ff0f348b43ae0ab26cb29037bc9d99aed63dbf721a542d071f9674f17f0a64a
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
 EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
-EBUILD zim-0.70_rc1.ebuild 1973 BLAKE2B efa0216cb6d684b8bf80ac222314b6b82451952400bc52ebd6f929d64b277bf66ce4579ccafb982959811042671149171d716b0ae298ea6d0a0ea097938936ef SHA512 8513f71ce97cfe4dd3f88cae73606532ae43d990b01081fe380918f382649f992a4fb6ece0408d7c9d9e5ba066bc2bc25672dd9058f55e8a3dbbc28f4381b7cf
-EBUILD zim-0.70_rc3.ebuild 1997 BLAKE2B 3519ed057e64d10dd82543fd5220b425cb184f83eb1ae2c9e96d4573ca36b7655ffa5f3afc844e48ffed91c80e3b04391e495a429f8e0c07fc7d1323b0dbf547 SHA512 9717ae89253b7ff0410243d0c1ca9f98fa80b8fc58b4d76a7f92d0f9f2ffb55626db58e722205507213fa8e3e36266b1c64992959673f41ea814df80f2c65e8b
+EBUILD zim-0.71.0.ebuild 1897 BLAKE2B e13582f180fa5ff958f31b70be3be0fb672b27fecba7e096c301cd2c8c53865f3c5e6d22e983816116429f973486d9de89b22db64d24a4a27470782fa1c580af SHA512 a37fbb05b2277d32a6adff6f0e1d96e8dbb9bbca3aafc75ebb1e0907377b68a1fb703df0838291b6cac7a90096ec5f2fa25e1491ccae56acca257b8c19275cc1
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.70_rc1.ebuild b/x11-misc/zim/zim-0.70_rc1.ebuild
deleted file mode 100644
index a5588627e697..000000000000
--- a/x11-misc/zim/zim-0.70_rc1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-inherit xdg-utils distutils-r1 gnome2-utils virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
-	http://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-misc/xdg-utils
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/bzr
-		dev-vcs/git
-		dev-vcs/mercurial
-	)
-"
-DOCS=( CHANGELOG.txt README.txt HACKING )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	virtx ${PYTHON} test.py
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Please install these packages for additional functionality"
-		elog "    dev-lang/R"
-		elog "    dev-python/gtkspell-python"
-		elog "    dev-vcs/bzr"
-		elog "    media-gfx/graphviz"
-		elog "    media-gfx/imagemagick"
-		elog "    media-gfx/scrot"
-		elog "    media-sound/lilypond"
-		elog "    sci-visualization/gnuplot"
-		elog "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/zim/zim-0.70_rc3.ebuild b/x11-misc/zim/zim-0.71.0.ebuild
index 2b4aa0e45ed7..e9579e77339b 100644
--- a/x11-misc/zim/zim-0.70_rc3.ebuild
+++ b/x11-misc/zim/zim-0.71.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 LICENSE="BSD GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+RESTRICT="test"
 
 RDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
@@ -27,11 +27,6 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	test? (
-		dev-vcs/bzr
-		dev-vcs/git
-		dev-vcs/mercurial
-	)
 "
 DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
 PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
@@ -53,10 +48,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_test() {
-	virtx ${PYTHON} test.py
-}
-
 python_install() {
 	distutils-r1_python_install
 }