gentoo resync : 25.11.2020

24 files changed, 61 insertions, 148 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 6e051fe15eb2..a0b9601ee33a 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/copyq/Manifest b/x11-apps/copyq/Manifest
deleted file mode 100644
index 080808cf0500..000000000000
--- a/x11-apps/copyq/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST CopyQ-3.10.0.tar.gz 2832904 BLAKE2B 78866a3ecbd1ed4d1ab06db552ef517234c1354609ef2bc18f8c4d8fa22342c7479a5bde79b9333f896dee4fe18543e47657c780b821f45121e0413c597b45aa SHA512 6cae338a144d7f92850ce88c991ed99222613c57540ced49dab719e43af884bbd9d15e6e8f074c6af94b0ac2ecd1b355eff8b83ec99f688c0f93fa19f253d653
-EBUILD copyq-3.10.0.ebuild 1251 BLAKE2B 7625f9f5019c664118d61c08e61c44c9a0d7e0e3b9f7f5502cba93aa712798b7d01532f6caa4aa540a5b528c88d701157ebb024df01c6f010a130d2f0b4dd2cd SHA512 3795857f32dde0059f08fdc20bbc743c84bb9a5335c9236547439fffc2cdd6b185f25a55f934d11e21c94c08d0aad5e03878ec034029cf4d40ae0ff0ca6fa98c
-MISC metadata.xml 583 BLAKE2B 9e4775c1555d5759d86b6fff357a02b15a8ec9f4fb177e4263c7a47ec5ea539f5d42c44371a79e0fcc96144b5b1fedd2844706d1c658d21f03a46854c8303821 SHA512 6b5df0cdd51515d5a2b03da10a8a7b794c92394858774dbd45bb0dd4e52f2722daf8ba4aa6954960eef592e061c53588b4c2c0bfa84225305f04553ba06b062e
diff --git a/x11-apps/copyq/copyq-3.10.0.ebuild b/x11-apps/copyq/copyq-3.10.0.ebuild
deleted file mode 100644
index 857bb8af4b57..000000000000
--- a/x11-apps/copyq/copyq-3.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-MY_P=CopyQ-${PV}
-
-DESCRIPTION="Clipboard manager with advanced features"
-HOMEPAGE="https://github.com/hluk/CopyQ"
-SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test webkit"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-S="${WORKDIR}/$MY_P"
-
-src_configure() {
-	# CMakeLists.txt concatenates INSTALL_PREFIX with INSTALL_MANDIR leading to /usr/usr
-	local mycmakeargs=(
-		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
-		-DWITH_QT5=ON
-		-DWITH_TESTS=$(usex test)
-		-DWITH_WEBKIT=$(usex webkit)
-		-DCMAKE_INSTALL_MANDIR="share/man"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-apps/copyq/metadata.xml b/x11-apps/copyq/metadata.xml
deleted file mode 100644
index d333752428c9..000000000000
--- a/x11-apps/copyq/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>onigino@protonmail.com</email>
-		<name>Gino</name>
-	</maintainer>
-	<maintainer type="project">
-			<email>proxy-maint@gentoo.org</email>
-			<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="webkit">
-	enables the application to use advanced HTML rendering and fetching 
-	remote images and other data
-	</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">hluk/CopyQ</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index 1e881ef3b502..34ad5606af51 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -1,3 +1,5 @@
 DIST fonttosfnt-1.1.0.tar.bz2 143545 BLAKE2B fd05a19ffc50306b747bbbc6ea692b6667c7ddd185feb31a21173cbf571e5c74ded0da8af305e3744d8db57eca909d271b153bfded2182e060d922e42395942d SHA512 f4fb9814c23bfd6f83771959444d2c37eb4ba32edee43c37cf21f0181be80c6e278307641b0f4dae4ee5d10db3289e95194f99757ea4bbca343fff15498e7173
+DIST fonttosfnt-1.2.0.tar.bz2 145904 BLAKE2B b9b25076126dbd412d69f4c9698f937009f620b55a06f8c55b621add2ed6d638e0b91d3e716ed276089986c1a0140e2bf7aadef021c21ac24ac23c3347ee081c SHA512 a360bd8535beaef89afa6c0678a40f7c554e9d631e0fcb80bb1363ab72288e27a5e106521610f61c95b8101f79c7f02492a2068411b5f5b695de780d8a1c1b25
 EBUILD fonttosfnt-1.1.0.ebuild 356 BLAKE2B e9d3f967a9627ddc95c971f99db33075a699b03340351821fba43022a81c0825a5831d45d1210c5c51be69ed4c5176ec193db214f50e1875d3f78b2bdbc271a5 SHA512 e43910fc1d262e11e982663ed0ae8284890f0aa3a2b441702b9263619ef575732176154860452cbd009c15330366a4ee877ea16508c2a1d5a02f5fc7dc85db23
+EBUILD fonttosfnt-1.2.0.ebuild 362 BLAKE2B 363996341db75c2778adb14b3aa20b6d4d012d1c337abe37c43e39668d7529973f5efae274b70b668b94ae83e8ef0f96071491cb9b58097858b2bb05a86cece3 SHA512 b7a5ab5a621a374a92da2e0a838c282e2619c07ef3bb1551e856ddee91b9fbb8e2f82ee91a22c044916162a50df2e834b57f46bb4642b2a702cb91e2b95ab005
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild
new file mode 100644
index 000000000000..1181f07fb2b4
--- /dev/null
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xorg-3
+
+DESCRIPTION="X.Org fonttosfnt application"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+RDEPEND="media-libs/freetype:2
+	x11-libs/libX11
+	x11-libs/libfontenc"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index 8a722165078e..956e13570ee3 100644
--- a/x11-apps/iceauth/Manifest
+++ b/x11-apps/iceauth/Manifest
@@ -1,4 +1,3 @@
 DIST iceauth-1.0.8.tar.bz2 137905 BLAKE2B 8fb2e29e5f4fee57e5c1f86eb78ce518519f04301e8aa81778e0de6589f62f32478a7cae05db831177f4425eb388f7b666f697314d5ab967ea3e2b6ac7b47d56 SHA512 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1
-EBUILD iceauth-1.0.8-r1.ebuild 409 BLAKE2B eb3690343a1eff5418c1d835aa7c44fd0292ce14f51396dc338ea44b6654cabe5c351c7c9f70977687a5f7ac195d4e073e07c30dc41ec6391d11ef75fc1fba72 SHA512 d0afef446e88c7e6e077c07b0059999c851c1d0c16b7adb08cb89d82e1a10bd9c450247c9a8d44cf46c2fd8642347c2a35ab2889bb4f58bceedeb7b80c267d0f
-EBUILD iceauth-1.0.8.ebuild 408 BLAKE2B 5e339e291fbb07a0b21c0ca60929bb7f842cc77b8ce2d8f0df68bf4978b561729fb15b670858d6f394259b9d26274b2c78114a380d22879b03aa60196db49ac1 SHA512 eab9ac01a7e3c6e6e4b98b56365b7d87769640b9a45cfa1e679b9e0b366c4b1a8dfec2efd22048a0922595a4d946ecade6a7b8111e55eb77de351bfe60c09d1d
+EBUILD iceauth-1.0.8-r1.ebuild 400 BLAKE2B ce2f3231b52d01120f29b4661da30c803f0565e4c96a8229498bde11e9d2746911bdb3e525d70e5c5160d900f2ee3bf25512f64f928776b76736a4226e6a54fe SHA512 5a8159299c8c943f005173ab9d957f48348d633e3f83006eb42e41a3d3f1472ffec046255f33c421655833cd08e5d53a4974105e9811f301971c1ad470a21343
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild b/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
index 80f59e141a9f..efb1da932bdb 100644
--- a/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="ICE authority file utility"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="x11-libs/libICE"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/iceauth/iceauth-1.0.8.ebuild b/x11-apps/iceauth/iceauth-1.0.8.ebuild
deleted file mode 100644
index f9e6715e7fac..000000000000
--- a/x11-apps/iceauth/iceauth-1.0.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="ICE authority file utility"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libICE"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 0e7015585a41..f0c9fcd1c289 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,5 +1,5 @@
 AUX mesa-progs-8.4.0-improve-printing.patch 11963 BLAKE2B ad2dd57bf0959da6253d0e5c19523e701d03b9d4465564ff3f7e1462e2f36db0ef6eca46ad847f8f92f44fb91c46e87425d430c47c13f7efc130540071fa3ac8 SHA512 31048947ba19b03277d5dabff8bf3209274e9c95da3b33d9e27c3c1cdf71c3027cc0591ee27bdc0e8dff506da2f0601911cdf5899594674d2dd178204db3085f
 DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4 SHA512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957
 EBUILD mesa-progs-8.4.0.ebuild 1709 BLAKE2B 6febe405e91813eb64ae1922151f4ed391cbc0bc612d5a0c958d7cdec80a41f23cf9b992f66ebf5e217eae802885b414d987223b0b87c0175ae3a7814faff08e SHA512 78acba58e03f4d2747a55157f769451a12f9d5ae56ae14762c4f3e5569875fd83b2ca2fa1482da39768aaf169fbd11a1445cad41d31115c5f19fc1ce14dc1fd7
-EBUILD mesa-progs-9999.ebuild 1659 BLAKE2B d5e7fa3a2676a990ccf40060f55034e57ebf47290817be0db9eeae8625ea0269eafb274fc21f5d68444d304e9b1042c71b5a24d78ba292ae4f31211a99d7e1dc SHA512 f7aa8192a09ce0d9b94afd522c8e76b93866440f1179b07c66cd763d57419e5357e725115c6c79c896b0a5bd78aee8cf5a657ba686b7604f4a7be7b373027c45
+EBUILD mesa-progs-9999.ebuild 1672 BLAKE2B f561d871fdd6689c48d9a11abafc0268c72e7e1340d301f00655512c7cf692ad36f38043510ddd061660af7d0c5c7f9bcbbbe6d4bc88b8d1994222a26cec5de6 SHA512 18e9b603aa29e034e4abe281589540bbeae9ee16f953ed36628ec23d566095db77cae38dc0761aab6d4724fcf2509da1d6ba624de773595d0f25ba627a1fbe7e
 MISC metadata.xml 475 BLAKE2B 4275e3d7871f0b092559ddf5c898bad781441267b093d55bdb14d7e9795ac070aa7d9a87cf7248d58b75798eb28a4413d588492bb6ab092ef79373434fb1652e SHA512 624480e9601ad6ad1cb996b25074c3e47a539113af39633de80c9eb0330322453f545ecfede9d602de7259d66047f507bf3a1cb115becb5f5e7d0613cb5bc675
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 4220c4004cb5..b57bf836064e 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -30,7 +30,6 @@ RDEPEND="
 	virtual/opengl
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	media-libs/glew
 	virtual/glu
 	x11-base/xorg-proto"
 
@@ -40,6 +39,7 @@ src_prepare() {
 }
 
 src_compile() {
+	emake -C src/glad libglad.la
 	emake -C src/xdemos glxgears glxinfo
 
 	if use egl; then
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index 2a269a426916..0bd72d8b1a0a 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,4 +1,3 @@
 DIST rgb-1.0.6.tar.bz2 139225 BLAKE2B 25e20d0be23a46d869869e47169d86dd50a99bc65551bf83800119c7f9cd242f41d5ecdb611467eaf9aeba909cebbfab8f578e0a5dc63380482f324124064bb4 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
-EBUILD rgb-1.0.6-r1.ebuild 447 BLAKE2B 3a821bd64ee5dfaeda6303283c4cc52490414f201b9eed5fce99c0d35b1cded2f6123a492123a0d0bcf8d63db385f8f8f25c9b5d02a9ed0ef9fba5962d3e6cd2 SHA512 195c4379cbdc734e0dd56becf5d11c48cfff7b5e7b02f9351989f19f045c793f5a1f43948393b2615d4e2653a70e7d6349ccf489f85e930e5d6c572c7622dd5f
-EBUILD rgb-1.0.6.ebuild 448 BLAKE2B 420cab1dc350afb4101f5a10a0ef0b017ea43a399bbf7f8882120ffb66073166755b9e14830b3353ad99d37900d62b3445af05d80df18d27fe361b73d583e91e SHA512 4ef1435859cd5769930ae9f01213a388054020ab1e0fb2f25c00313a3ca2c56c5f63a401f2161553534d6e195b8030366dd9cb76174f88cd087e5eeafa4499c1
+EBUILD rgb-1.0.6-r1.ebuild 438 BLAKE2B 70112e5cc89c04b2448f53bf2d9b68a4e1473d693ef4c20574421d0a537665ad6d2ffb68c0139de65f84c090ce0c16824b05cd712af57c3f78a0691557fcc159 SHA512 3b5a5cd46a66d90468bdc295afc18572735ca6aef1d8ae0ff0c65731971b0a01a7e25b9ca36d3e2036b5eb996dfdbae0db3418a515a764899feb5fe52ca66595
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rgb/rgb-1.0.6-r1.ebuild b/x11-apps/rgb/rgb-1.0.6-r1.ebuild
index 933c817596e0..b26c4fe1383c 100644
--- a/x11-apps/rgb/rgb-1.0.6-r1.ebuild
+++ b/x11-apps/rgb/rgb-1.0.6-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="uncompile an rgb color-name database"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="x11-misc/util-macros"
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild
deleted file mode 100644
index eacedba4da71..000000000000
--- a/x11-apps/rgb/rgb-1.0.6.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="uncompile an rgb color-name database"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/util-macros"
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index d0258899f8f8..d3b8ae8e2c99 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -2,5 +2,5 @@ AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7
 AUX xdm-1.1.12-consolekit.patch 7815 BLAKE2B 1ef67b15385c3cc9a74797fadc34e5701889bf669f70e9c3720a82db595472dcf8fc36011ce35cad763dc68580a7680a272c7617d9cf58db8314f788974031cd SHA512 e318ebe0e606964712db40cb70177d4aa275679ef6e2c0ca97cd5156434d037e8774bc75dad3584e8d13ad4577798fac6624bdb6359f1a57de9eb2961bfdc5f7
 AUX xdm-1.1.12-make-xinerama-optional.patch 978 BLAKE2B feb81c4815c61c62ebd25acec572de03450c4ee5fd7a634cb0444e17d35566548c0bc8dab05562264533676012410839f61b2e5cb5bc98d83bf9a36daa1b59cc SHA512 efddf2cd662cc4e1ca5cea2a9efe49b4ef8e98276f37def047091088a9deaaadc61646deeefbd8668286d08edabd245a532db84ddf938a2853bdcc1865c221c9
 DIST xdm-1.1.12.tar.bz2 512074 BLAKE2B a82d124f4b7ce3185d703fca3aade92e86094602aec5343566ba8c91c54b70cdedbaea2fa6fee330d7ed48d9138b04a998aa2dae06db2683bfcce6c7693edc82 SHA512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb
-EBUILD xdm-1.1.12.ebuild 1885 BLAKE2B e215d8aee0f28ab93ec6217000bb6e20e8dad32851ec57ece5836e7febe7f4b6ffce071094be0c09dcba895df3f787efe4f3ffffddf9fc42e51768a9307a66ee SHA512 f3f50ad1d6c6c66ec4678258fcd8fd2726121bd632214686c4d1748a39f20d68adbb426f547767d1fc6fa9e7b895e02ba568b95fffad1691dc2249c0f473b58e
-MISC metadata.xml 345 BLAKE2B 18769beab9cc2a2a845351093c2e356c62bff79141960846a980da0132fae2e761ef45822fcf7a5a563a794ac3449870ddba2600f3d60171e83319c1687a6dfb SHA512 114ab21e12a92854e6d676e84f439518480445aa06b7c9fa94dfba827b51732895f0b4a50c16994c87441ddefab01f2f50955767ca30305e8650df9789132c5a
+EBUILD xdm-1.1.12.ebuild 1825 BLAKE2B 35d722f087beb4ba32fa7093406adc866c88e4a90699c046f252d7037bd4c3b1048468aeaa3e59c068a73b1d8b59c27a011a3d1bc4aa65673193c642e5e7d0be SHA512 dc8255b4b8058ffe4836d15f3411d370b7302e30710fa8b536263c264e948a7936476077fe650cd1747245ce44d8c322cad23e29f7ff050bcf31727c5707075a
+MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/x11-apps/xdm/metadata.xml b/x11-apps/xdm/metadata.xml
index cb9dcdc919bd..3e36bc06aa43 100644
--- a/x11-apps/xdm/metadata.xml
+++ b/x11-apps/xdm/metadata.xml
@@ -5,7 +5,4 @@
     <email>x11@gentoo.org</email>
     <name>X11</name>
   </maintainer>
-  <use>
-    <flag name="consolekit">Enable native <pkg>sys-auth/consolekit</pkg> support</flag>
-  </use>
 </pkgmetadata>
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
index aded17291516..f3006984c8e0 100644
--- a/x11-apps/xdm/xdm-1.1.12.ebuild
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild
@@ -12,7 +12,7 @@ DEFAULTVT=vt7
 DESCRIPTION="X.Org xdm application"
 
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="consolekit ipv6 pam systemd truetype xinerama xpm"
+IUSE="ipv6 pam systemd truetype xinerama xpm"
 
 RDEPEND="
 	x11-apps/sessreg
@@ -25,7 +25,6 @@ RDEPEND="
 	x11-libs/libXdmcp
 	x11-libs/libXmu
 	x11-libs/libXt
-	consolekit? ( sys-auth/consolekit )
 	pam? ( sys-libs/pam )
 	systemd? ( >=sys-apps/systemd-209 )
 	truetype? (
@@ -40,13 +39,12 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	PATCHES=(
-		"${FILESDIR}"/${P}-consolekit.patch
+		"${FILESDIR}"/${P}-consolekit.patch # bug 747124
 		"${FILESDIR}"/${P}-make-xinerama-optional.patch
 	)
 
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
-		$(use_with consolekit)
 		$(use_with pam)
 		$(use_with systemd systemd-daemon)
 		$(use_with truetype xft)
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index d9435375bcca..d830c1e7bc7f 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,3 +1,5 @@
 DIST xkbcomp-1.4.3.tar.bz2 245658 BLAKE2B 306e30789bdbf6b5863252aa1f73c96f88c4086989eb5529dbde1e3f1f9e11200f67ad6446dfe912129acc1071074d2addf776a97d9d42a840eb62320ae47cf2 SHA512 827713c0413aecdcad2b61edb7b8c7c7a002e18505b9041f570e2f680907193cb5ff8a5b424695e21110b2d06c145cbf0e397e52347421ee946f06e2a51f135d
+DIST xkbcomp-1.4.4.tar.bz2 251224 BLAKE2B 965a6ad91029ff4934af443a5845386045a66796cfdb6181cd94bfc1e3ee746700b22e5db56d22cc95255d0dca4f5894cf9afd40cc6675308a4425d947c5ed61 SHA512 971eb06277a49083b42154472596f1452fa94cdee28bad345bbcd85b028441bfd975763c20ed92aa69d6605b3fb23d27fee89df91501963b77c863667bae41c4
 EBUILD xkbcomp-1.4.3.ebuild 437 BLAKE2B adbd8305a8a9fe9313df18434435448b9bfc13c2c5f476c72bd1f56a6449999da8d6b606393ec1e52efd7c1303bee726529ad220e5e76bf1ce66ec987b252acd SHA512 7f450334e8d2f02c55767ceb6b83fdfc4dc1c67e2efa3c76dad98ab04c4d0be689a3b95700c23d5ef6eb2b42c8b6faaab6208a3b2765a90fc871d8d66c75c93f
+EBUILD xkbcomp-1.4.4.ebuild 446 BLAKE2B 696f317c83396ca1ae816422ecd1fd5abec3c55a5d5057e9c45f763c899d66d0b9c9ae83265091376a079a8250188d9656fcce2ab417213de0e62d3be5625b86 SHA512 1b09a050a2a6c1accf38519598e79d74f5dc8b6ceafed7b438c9e85c14b9d49f0c9b309d9b53b73340e464fd0d9cd7b8568c877cd646b772a4522faba89fa75a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
new file mode 100644
index 000000000000..dae8ce05153e
--- /dev/null
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="XKB keyboard description compiler"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+DEPEND="
+	>=x11-libs/libX11-1.6.9
+	x11-libs/libxkbfile"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/bison"
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index 3d2830f079e1..d6b28b15f312 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,4 +1,3 @@
 DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
-EBUILD xmessage-1.0.5-r1.ebuild 466 BLAKE2B da8d63b5ca87054ad3dd0281ea29d3d5b38ab074fe665662c2b7798ad3d2933bc9a6cbc47266a45a0b1fa7b084ac1fc6c3a06466ee6f810f798f000a68a13bf5 SHA512 6ef414f5fa4fbbcc0921b14c2baed35e10e4117b1c0b0a01e2a959021f3261ea0d0c54bbe25ea27bd8807206ee891ac1edff1d4da0a6737754a820ca71506300
-EBUILD xmessage-1.0.5.ebuild 465 BLAKE2B d1a59adab2833e5f41f30199f6248803c1afa2cd92e8450670be1793ff91615eab4fec15c513fb4b4c116b0c115c8334ebf59d562f5754525d493d9bbf2daf38 SHA512 3bfe38dfb10ec1a58565fe93bbaeecd67f56bf99479612e77b946b8021e0d106455e09c4d23d7779ee29b6347f894fe7e7d1628767be32a9d48c66f4ac9f4e4a
+EBUILD xmessage-1.0.5-r1.ebuild 457 BLAKE2B 04a85183235e60d5b104c05dc3d654ae7ebd5d2461f3b5bf43038be5234f3d24d6a11a29c3d342e21dc1ecb3aa5a264d663fa1ebd25f0c08d05166b59dd1fbad SHA512 e944856c2bef6ba396328b372143d6a73298a290ad01f81b949b18d0b3d28ff51868a9f9dffe0e8f5782363b1db94376c0291183ef1e8f2d7b696962054a0ce5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild b/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
index 105102080dd2..16f7afb30a76 100644
--- a/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXt"
diff --git a/x11-apps/xmessage/xmessage-1.0.5.ebuild b/x11-apps/xmessage/xmessage-1.0.5.ebuild
deleted file mode 100644
index 85c7a1a2fde4..000000000000
--- a/x11-apps/xmessage/xmessage-1.0.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index 2d1357d2f996..509648faecb0 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,3 +1,5 @@
 DIST xprop-1.2.4.tar.bz2 149930 BLAKE2B 93bd20c7c91d6abd9e2fdeca7864b9885ae7248c7ee3ef80a5efa1706bfef2220244b1443764fdbc042f66be8d589b111fd942c732922f05f4143e1c893da183 SHA512 6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7
+DIST xprop-1.2.5.tar.bz2 151216 BLAKE2B c676a1a733f4f897bc207cd1d7ec1a6022d48d2bb9615072e2ce19c1fec7737a8c9bc0444c97f4972d85a8ec8bc1e990f559a0815eb3656f2378915095c1f85c SHA512 93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559
 EBUILD xprop-1.2.4.ebuild 397 BLAKE2B 073f70d7e383c02285af7e14d2c71d2d212d6a02f9f0e060822a40132ad93fc27c2119a9fb06d201f5d885fd4585658e21395fbb586280d5806cb23acf0c7039 SHA512 f7f3fa68a0c33093ac27e7e0ca2490ce5fde54c2bc6a2e17931555bdc482c87881795488f90d37efb4e78af06b5e9447786ee91a413bfc56463ba751cb50d104
+EBUILD xprop-1.2.5.ebuild 398 BLAKE2B cc25b6cf5be9113f7b7fe38b11609d07ed22f882ca2d72fa26d2dc731af1bfc3df162cd373f80ca18f4527e9757c9fb084876afc84e316e176c339dc6bafb11a SHA512 2f7a2cec448d6403e0941c5ef5155d3b5e1e9adc73c71040e9f5e1b4956a39429f980f8c1527ccbf0ef9e1eb0b6f21f94cadc895aed36d813e0495aa0b139c32
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xprop/xprop-1.2.5.ebuild b/x11-apps/xprop/xprop-1.2.5.ebuild
new file mode 100644
index 000000000000..8f6bae892ffd
--- /dev/null
+++ b/x11-apps/xprop/xprop-1.2.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="property displayer for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"