gentoo resync : 16.06.2019

19 files changed, 219 insertions, 39 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 672b14fd7f01..dce816b410b9 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index 993e230ee7b1..ee2f13c1ba0a 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,5 +1,5 @@
 DIST igt-gpu-tools-1.23.tar.xz 1045716 BLAKE2B f5e55ce9b682f2a9f2c6ab73c1e8e933ebea09b343f3af02df50b5bdce3e2ac313b1f92709c6de0d9fc7ffe2e2c9dfa95d2918ae9bd561cc285cff30fe59c6fd SHA512 8697265a978359e28983f483bf95819844597fc2080923d15d0587f6d648081af27e8ea318873e20103bbf8446b9f1005c6bc90a6276d3169837abd181f96839
 EBUILD igt-gpu-tools-1.23-r1.ebuild 2543 BLAKE2B 53e126ad1ff997fc352d502542caf53b186addba0794db766669e199b884a8102fa7252c59eb723c31c002105a5fd1b2c4c0090683b6d45d91e2252b9bb81161 SHA512 42a7178f56cd09440d2d535a0f9bfff6a30c1bc4562224c0d62bb1269a9dfaa787c1b791851cf7c630caa45c6debae6a926cd0cd9e1052406c4f7f96d4ad869d
 EBUILD igt-gpu-tools-1.23.ebuild 1480 BLAKE2B 96daf039d3e8d00c898c34fccfbf55254b954273dded0106b4585510d9a0f724553b40d4c3f6649cb008b80bcaad1975af6121e2198742e7c0cca0ead61a4e80 SHA512 b636e28baa9ae33bc971273c3cb165da041f36aff7eb2cd329d6e62d8b24938d749282674e072fb7a32e2220db068dea89258ae9b2554669bfd02968b79a8b87
-EBUILD igt-gpu-tools-9999.ebuild 2541 BLAKE2B 86dda1ac85c5e1dc4f2f186ab900f6e7baca930f863d1433727f76d8b6182cd0101bc76412d51019d893aa1dd9e961a6ee4afa30ec2813afe337a7224bc67504 SHA512 81a6499d0c32deee0b399e275adb80720f80432e4bab8e75329979dea97b4038a7414218d115e4dc14f30f2c45e08064f8f81ca90855087f56c4394eedc23ef7
+EBUILD igt-gpu-tools-9999.ebuild 2509 BLAKE2B e5d7344a2cc59a3fe6f6e72abe3433fdb88344faa20b00ab11e7499b5911e734a983ea6cf64637f3e3e56df57c8a9fd766eb0832854ad2f30fc34ccf873e46e0 SHA512 2d50a2db3f8dd94138b0c7479b7a6dc5839efe4ac4c5e1cf5956db79cbb721f789d660f4f6620c8c201687e25cc6309b112d9ff2b28bde69c7fe1b964ad161ff
 MISC metadata.xml 814 BLAKE2B 361429b06051651da503aaffc4dfd632f1eebc24a1968d7945b86e1a7410a78eb4ef50458dd8d42041b2ad2a18dda4a1b9c767a57c44fc3296717f27a2a64a9b SHA512 094b5cdc37051da14c48bae7a714a29b15a40488c10c0d997c168ee3da16a911186555130fcbd4592c9fb4b948af06a3a00afc2d36b7af9f194c7c801d80e2d0
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
index 81fff23b3e74..8662c0102ba5 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
@@ -88,16 +88,16 @@ src_configure() {
 	use overlay && use X && overlay_backends+="x,"
 
 	local emesonargs=(
-		-Dbuild_chamelium=$(usex chamelium true false)
-		-Dbuild_docs=$(usex doc true false)
-		-Dbuild_man=$(usex man true false)
-		-Dbuild_overlay=$(usex overlay true false)
-		-Dbuild_runner=$(usex runner true false)
-		-Dbuild_tests=$(usex doc true false) # Test build is required for docs
+		$(meson_feature chamelium build_chamelium)
+		$(meson_feature doc build_docs)
+		$(meson_feature man build_man)
+		$(meson_feature overlay build_overlay)
+		$(meson_feature runner build_runner)
+		$(meson_feature doc build_tests) # Test build is required for docs
+		$(meson_feature valgrind with_valgrind)
+		$(meson_feature unwind with_libunwind)
 		-Doverlay_backends=${overlay_backends%?}
 		-Dwith_libdrm=${gpus%?}
-		-Dwith_libunwind=$(usex unwind true false)
-		-Dwith_valgrind=$(usex valgrind true false)
 	)
 	meson_src_configure
 }
diff --git a/x11-apps/radeon-profile-daemon/Manifest b/x11-apps/radeon-profile-daemon/Manifest
index f1cef5692f3b..5850c6d325e6 100644
--- a/x11-apps/radeon-profile-daemon/Manifest
+++ b/x11-apps/radeon-profile-daemon/Manifest
@@ -1,6 +1,10 @@
 AUX radeon-profile-daemon-20190309-secure_socket.patch 1010 BLAKE2B a7fe01141aced2f3a93c31ea89127824292f2b21a5172ae49cace50914413bf32402e3a6f38203bb2cecded67439e7dd972ea8d1251488827638ec64c6c37152 SHA512 472091c63dffb474ffa98fa576128c404bc8a723de620b3147bb52ac0dbc2f7beec0a89a5c53b89ac3ecda19f5e3cbc7141a9d801c93c268cca793462f274bf9
+AUX radeon-profile-daemon-20190603-secure_socket.patch 1006 BLAKE2B 19ed7c899c32b7630d7c5c14b85d98f77ae2aab6d22b5717cb0af2b1192c774a701ec04e60e7c57f5278538ce7311735a11e17415598b39e6373f52b01530db0 SHA512 92c634b365f0bc1614dbc8fb8a463dc7a15b984ca700a05ecb1a765898baccc1032dc87277c436f91e61585b15e3126d3ce3599cb0e5d430e39cbdcae61e3bc4
 AUX radeon-profile-daemon.initd 539 BLAKE2B 20c80bdd61439f00500ee069f2f3be3d7d007908451c6521a67905b2cc0dca331d8bf0295faffabfb94de223ec4cc1501961da64351b68c1831156aa9e776526 SHA512 7f2418d021a3955571d8a5dfadf93b614c58f62dec5a2112ec6f2cb03b7fdcb69ea059fd57cb2ca5acc5d29891074b92e008e4df29794fa3276abec321d3f7d9
+AUX radeon-profile-daemon.initd-r1 473 BLAKE2B 039c48a1f16dad58942f709569805ed7102fef347d83771819c4bd0b3765bc453a0d28b85ccf2e6dd6d01fd4ec43d18f3b8e88acff8df5e5c67b8c26b009eab7 SHA512 b24bcdcafaf524f253e1052b910d001ac62014e128e786f69b5bf06dab63bada98823119d19a4040bf7062a8cbbb2d73f194a6fba6dba184eda3d6d09aec6a1e
 DIST radeon-profile-daemon-20190309.tar.gz 12178 BLAKE2B 931ce4bb123456e349a68c8fe0b18150ff988a83a5e58cf451f68025240a8b4c802e03a567ef41684e91442bf21c02cc00d31ef6c82a67ca7eb7587754c6f32e SHA512 f2bb6f7dc0bf322e5c43c5ca1f99501a4fd3f4532cc9c1686b5cfbc58bdd423e81c25d3ae03fcae9dc15dc92d8ad089b2357b27b0ff399de7ac27213e00b2f37
+DIST radeon-profile-daemon-20190603.tar.gz 12232 BLAKE2B 3ff02f76178c2a30c8f094a2589aaed7d9e2c8ecc4cd0c8d3b6be1e38dddad39bbb4996ef9b7f87ef999890fbdade6ba3c6bcc39de6ae84bf1c224152a8249f1 SHA512 1c58008400f5acc5bd39353c6e2c109adecc4eb2b5d7976ce240d372cc60996ee93ce50630292ce85b9a1ae92d82e6cce49fd0ccb28f574bc668d212c50a54ab
 EBUILD radeon-profile-daemon-20190309-r2.ebuild 1211 BLAKE2B 914c68ba217d0902c0292acdd60c8fdeef6ae1607e54f7e706a07e30d7fe34c4bf160833c943a7d7988d436c68a96f8ee314ad0fa7e748cf132d417a463f0494 SHA512 80eaba94080ecbccfb8cc31387013025c870295b13d8bce8652aef7c7c7f582f534ff15a2aa2dc723428859370c534fe7604caae365450ad82dce7f1f0049d47
-EBUILD radeon-profile-daemon-99999999.ebuild 1211 BLAKE2B 914c68ba217d0902c0292acdd60c8fdeef6ae1607e54f7e706a07e30d7fe34c4bf160833c943a7d7988d436c68a96f8ee314ad0fa7e748cf132d417a463f0494 SHA512 80eaba94080ecbccfb8cc31387013025c870295b13d8bce8652aef7c7c7f582f534ff15a2aa2dc723428859370c534fe7604caae365450ad82dce7f1f0049d47
+EBUILD radeon-profile-daemon-20190603.ebuild 1224 BLAKE2B 9c4b42cc95eb1828ab0ba3b5da384aaa1b17c0154a3d424f653132aafe5959e1427f6677d7a397af0fd5d4e866f53df9aa7849f0a52201eee36a4aafec90b8d1 SHA512 6aef53947d4f4c649167bbf9d660011e1bc65cf401c1e0b3a764150a8ad0a85b15d1bc01a450996edf8d7d870177efdd6a40bed123d0724d024d7f504c426f90
+EBUILD radeon-profile-daemon-99999999.ebuild 1224 BLAKE2B 9c4b42cc95eb1828ab0ba3b5da384aaa1b17c0154a3d424f653132aafe5959e1427f6677d7a397af0fd5d4e866f53df9aa7849f0a52201eee36a4aafec90b8d1 SHA512 6aef53947d4f4c649167bbf9d660011e1bc65cf401c1e0b3a764150a8ad0a85b15d1bc01a450996edf8d7d870177efdd6a40bed123d0724d024d7f504c426f90
 MISC metadata.xml 358 BLAKE2B 06e855ba85405499bf5eaf5908bdc1f4936021b0be784d647a6d48f5641badb3aa84687744ea834331ff33226b2588e57fbb53b225a9a249b92b1ce1e47426a5 SHA512 6d40ebc0fe08862dc3a2ff138f335ea02184d34f450858a3bc4f9939db147daf5e6d0c4507064fb262018edc74e1e90ed563f41e36a2b442f080556c3aed49f2
diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-secure_socket.patch b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-secure_socket.patch
new file mode 100644
index 000000000000..951e7d12e28f
--- /dev/null
+++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190603-secure_socket.patch
@@ -0,0 +1,26 @@
+From 47ddfbb7b85c3e99eb0d132078c989c0dfa2ea9b Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 13 Jun 2019 15:58:44 +0200
+Subject: [PATCH] Don't make the socket world writable
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ radeon-profile-daemon/rpdthread.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/radeon-profile-daemon/rpdthread.cpp b/radeon-profile-daemon/rpdthread.cpp
+index 8785efa..94a0d6f 100644
+--- a/radeon-profile-daemon/rpdthread.cpp
++++ b/radeon-profile-daemon/rpdthread.cpp
+@@ -47,7 +47,7 @@ void rpdThread::createServer()
+ 
+     QLocalServer::removeServer(serverSocketPath);
+     daemonServer.listen(serverSocketPath);
+-    QFile::setPermissions(serverSocketPath, QFile(serverSocketPath).permissions() | QFile::WriteOther | QFile::ReadOther);
++    QFile::setPermissions(serverSocketPath, QFile(serverSocketPath).permissions() | QFile::WriteGroup | QFile::ReadGroup);
+ }
+ 
+ void rpdThread::closeConnection()
+-- 
+2.22.0
+
diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r1 b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r1
new file mode 100644
index 000000000000..813ab9515aeb
--- /dev/null
+++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd-r1
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Daemon for radeon-profile GUI"
+
+command="/usr/sbin/radeon-profile-daemon"
+command_background="true"
+pidfile="/run/${SVCNAME}.pid"
+
+radeon_socket="/run/radeon-profile-daemon-server"
+
+start_post() {
+	if ewaitfile 10 ${radeon_socket} ; then
+		chgrp video ${radeon_socket}
+	else
+		eerror "Failed to find socket file ${radeon_socket}"
+	fi
+}
diff --git a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603.ebuild b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603.ebuild
new file mode 100644
index 000000000000..77f7239752b9
--- /dev/null
+++ b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils systemd
+
+DESCRIPTION="Daemon for radeon-profile GUI"
+HOMEPAGE="https://github.com/marazmista/radeon-profile-daemon"
+if [[ "${PV}" == 99999999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/marazmista/radeon-profile-daemon.git"
+else
+	SRC_URI="https://github.com/marazmista/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20190603-secure_socket.patch"
+)
+
+src_prepare() {
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
+
+	sed \
+		-e '/^bin\.path/s@/bin@/sbin@' \
+		-e "/^service\.path/s@=.*\$@= $(systemd_get_systemunitdir)@" \
+		-i radeon-profile-daemon.pro || die
+	sed \
+		-e '/^ExecStart/s@/bin/@/sbin/@' \
+		-i extra/${PN}.service || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+}
+
+pkg_postinst() {
+	elog "Users need to be in the \"video\" group if they want to change"
+	elog "video card settings via ${PN}"
+}
diff --git a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
index 924760fc9099..77f7239752b9 100644
--- a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
+++ b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}/${PN}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-secure_socket.patch"
+	"${FILESDIR}/${PN}-20190603-secure_socket.patch"
 )
 
 src_prepare() {
@@ -51,7 +51,7 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 }
 
 pkg_postinst() {
diff --git a/x11-apps/radeon-profile/Manifest b/x11-apps/radeon-profile/Manifest
index c74fdc6b14c7..1b95a861cc5d 100644
--- a/x11-apps/radeon-profile/Manifest
+++ b/x11-apps/radeon-profile/Manifest
@@ -1,4 +1,6 @@
 DIST radeon-profile-20190311.tar.gz 381505 BLAKE2B e15fbf60f9b790ef81f6b86f74cdada20fe232d2d1965c35248c33bead5f47503780804f0710c8627e4a487e6f95f6688d0dc52b325c278700f9539773547729 SHA512 285ff4fd9f4376135a38009e0e531ec9d9c727840284d9cb4135e0044134a778786559b4280e329be8b78d635928feacd1c0ccc15bce15297d15e4f065460463
+DIST radeon-profile-20190603.tar.gz 382652 BLAKE2B 60d22d59bcc0d91a70775579877300b6e2191187c295da2761b0be3bbac0d761e8a82a9bec958afabec652f6920439c48dedbeeb520849360f890e8205aa39ec SHA512 5def76cd69e347d3caf0ffbd6ae41982e516e72cb869b019f31316bcfaaa4487fd6ec87c7598d56e01640874f3e1d08febdb8e62362851bd6d7c3dc2f2cfb347
 EBUILD radeon-profile-20190311.ebuild 1104 BLAKE2B 5acf85a4fa64232f2720cac717de7a55772db485827e16222cb14c6c1bc08bf72acf5af694e2bfa3ea04723f95208056ed3cef670913928ef4417a71096e65e7 SHA512 0d8bb1271931bed15bd288e78d47bee234884dfad49dd3b5d5ccd199eebce5e47b0340dbaa9cb3a612b4155dfd2f609f9733a2c4e80633ac034ba8de115969f3
+EBUILD radeon-profile-20190603.ebuild 1104 BLAKE2B 5acf85a4fa64232f2720cac717de7a55772db485827e16222cb14c6c1bc08bf72acf5af694e2bfa3ea04723f95208056ed3cef670913928ef4417a71096e65e7 SHA512 0d8bb1271931bed15bd288e78d47bee234884dfad49dd3b5d5ccd199eebce5e47b0340dbaa9cb3a612b4155dfd2f609f9733a2c4e80633ac034ba8de115969f3
 EBUILD radeon-profile-99999999.ebuild 1104 BLAKE2B 5acf85a4fa64232f2720cac717de7a55772db485827e16222cb14c6c1bc08bf72acf5af694e2bfa3ea04723f95208056ed3cef670913928ef4417a71096e65e7 SHA512 0d8bb1271931bed15bd288e78d47bee234884dfad49dd3b5d5ccd199eebce5e47b0340dbaa9cb3a612b4155dfd2f609f9733a2c4e80633ac034ba8de115969f3
 MISC metadata.xml 351 BLAKE2B 9bd8e162fadd4298b4cad8421104f7a75fcbfd41afba232789443b55e7a0c5befa8da030dc2fdccddedcab6296f51963158bf822e272182d98bf47dde9e63936 SHA512 0dd848bf98523b34bfb961b5711314bfda5294b2e7292a2b9a38c45c3bbb8f3d71ee22640a00068aadf97ee6aec3bf393a288f9d0b0533b7d5c9fa83aeacc2b1
diff --git a/x11-apps/radeon-profile/radeon-profile-20190603.ebuild b/x11-apps/radeon-profile/radeon-profile-20190603.ebuild
new file mode 100644
index 000000000000..de8838c90ba8
--- /dev/null
+++ b/x11-apps/radeon-profile/radeon-profile-20190603.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Read current clocks of ATi/AMD Radeon cards"
+HOMEPAGE="https://github.com/marazmista/radeon-profile"
+if [[ "${PV}" == 99999999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/marazmista/radeon-profile.git"
+else
+	SRC_URI="https://github.com/marazmista/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+S="${WORKDIR}/${P}/${PN}"
+
+RDEPEND="
+	dev-qt/qtcharts:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	x11-libs/libX11
+	x11-libs/libXrandr
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/qtconcurrent:5
+	media-libs/mesa
+	x11-libs/libdrm
+"
+
+src_prepare() {
+	default
+	sed 's@TrayIcon;@@' -i extra/${PN}.desktop || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	elog "In order to run ${PN} as non-root user, the"
+	elog "  x11-apps/radeon-profile-daemon"
+	elog "package needs to be installed and the daemon must run."
+}
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
index 356a3a6590ba..f370dc05d592 100644
--- a/x11-apps/sessreg/Manifest
+++ b/x11-apps/sessreg/Manifest
@@ -1,3 +1,5 @@
 DIST sessreg-1.1.1.tar.bz2 136044 BLAKE2B 63cb285b82b1e47878b8e5165083efa320d8e13b2e8ca2e722df4d095fccc306d748966983d23833e2c4e9b31c0bcae62f10b5ed7da55eb5e32d46bab31061bf SHA512 92a21d31c5698212fa3d04360f4e931e018156ffed70ba03bee3f1ecd8540d5d54f07a0c7661e1077b73255eee4cc1afd1dda6907df109d3556626495ec08193
+DIST sessreg-1.1.2.tar.bz2 137612 BLAKE2B 0fe6484b83255bc2b917645ea841ad43b927131a8ef3fa9a47e7864984259140579c462c8d03645928ffd4667e7c46f36c5eb1aa35ce916ab65126c55f6bdde1 SHA512 7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c
 EBUILD sessreg-1.1.1.ebuild 355 BLAKE2B 259b1f9aaa92ebcfdbac654479ddd708bc5ac57cc4743985f3957ce7db0aa2bbb85fad7a01c373b8c516a628c320969164ac0c333330e038046721bcdad80536 SHA512 cb25d5f1b75d86e6938292efca47201a59d7dec37889d647391e858a1b7e7e83452363f72a0b0e118a478ec4f1f5c6e7629e39c9bcbcc39a00243354fca93d23
+EBUILD sessreg-1.1.2.ebuild 362 BLAKE2B 42d7307996a46e6c8c0d1142ef138fd784b0110d5b0d26fdef64509509543b761727e182fa9c273e84476d7f4b87e108b598385f26e9110bb50e75186afd2516 SHA512 6c0bf6879264fb0baf0849ac755f495d145d5cc1701194b4187efb2be722c456737a85f551f9c434bdf253ed8868bd6ca6dc9c15c229ae4e665a5bd3648bee5e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/sessreg/sessreg-1.1.2.ebuild b/x11-apps/sessreg/sessreg-1.1.2.ebuild
new file mode 100644
index 000000000000..ed318f56b066
--- /dev/null
+++ b/x11-apps/sessreg/sessreg-1.1.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="manage utmp/wtmp entries for non-init clients"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 01395e218d54..7f19696ea884 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,4 +1,4 @@
 DIST xauth-1.0.10.tar.bz2 162176 BLAKE2B 0a3a70360357f0f1a36a72e54b404526e62ddabbdc8b2e6ed992ceb56847fa983b9cec1ba23aab92f4b2fe0712f097a8721d7c50a4b4ead217a5704cda76ea82 SHA512 1ddcd80848c4efffc6d0a576177f92a3ce47eb871a6c7e2097d96491aec027404d437e0bd792714ef423989153a9644f5ff179bde4dfeb4b340636d642d5849f
-EBUILD xauth-1.0.10.ebuild 651 BLAKE2B 3bc7c1b6d167d12b297e56d340ede88e1ed61c15f0a7970a78857f5ee4ea21e4b041f1296f0ee6647e23a7d55b65b3602208f1a8eaac9f78ad70ba14e34aaace SHA512 d0d5cc6f0358893e658abe76a9f59a8225eff85626b4eb13416566ae44b5ddd955426aa234a41efc153228dd8155f4e337209717da0b0f7a9ef5c9fe51968c7c
+EBUILD xauth-1.0.10.ebuild 663 BLAKE2B 6776d89fede43d9b6d57328444c4a1ba9d261f4170cf1007c6b79af501b5c67cb46a361682a6046b23ccfed496a27f34f637f60a126fe4aad545abaf89b5d97c SHA512 0fd029a3cfe03e4a08da9147e1b856bedf8407c21299339fbd151038c5de3920c1ec305dc58ff720575e5c0e3de484fd169f3c3bf811d62c4d7ea34217e8b6f7
 EBUILD xauth-9999.ebuild 545 BLAKE2B 4b97293aa97ef5d05644508ab8bd6c055fb65d5c484981fa1cb786e5012e45e378d393b39c76d0744680e1385c36bc2da55a35192fdea22ff2e4b4ed18b23412 SHA512 99b1c10111900c48a7debdef3020905899018844fcc9b52b72e304e6a7f9702145565e2363bc8a7908cb7feb13e2bba0a62fd9afe64616ad14400e8e9c3c4c81
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xauth/xauth-1.0.10.ebuild b/x11-apps/xauth/xauth-1.0.10.ebuild
index b86fd802718d..2e63754dfe7a 100644
--- a/x11-apps/xauth/xauth-1.0.10.ebuild
+++ b/x11-apps/xauth/xauth-1.0.10.ebuild
@@ -7,7 +7,7 @@ inherit autotools-utils xorg-2
 
 DESCRIPTION="X authority file utility"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="ipv6 test"
 
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
index 85a7498e99e8..7d27d77d93ee 100644
--- a/x11-apps/xcalc/Manifest
+++ b/x11-apps/xcalc/Manifest
@@ -1,3 +1,5 @@
 DIST xcalc-1.0.7.tar.bz2 145644 BLAKE2B 54bf53e652a535db5d116f8a5193b4b165fd500d3943b83fc294ccb3df44b39b4774ab0d9f44c37ff1a915948879d815738bb9e4caf8e1ad18830cd4addc05e5 SHA512 890cb9399e3c55816318ab5f0152ddba05ee141cbae6032759a3b762742ab54df8fcf0394dacc539299f93f27cbbb17aee5cbda5dde8b169a7099f20a1a38388
+DIST xcalc-1.1.0.tar.bz2 148193 BLAKE2B 8643544d7871eca1e242b643f1e80fc76b7b2f64612a75ca2ec2537194df84862d9b86be515acea5114a8f2dc6cfad7c95cf40e396a0aeb26a6951198827755d SHA512 877aab7bb08f409a21c26b841f4d91eb6993914ed0d26512e47d6b3d2b3e0b231158901415a106cfb45de43f03f253bf2a8733f986538d4ee810afe0e54f98d5
 EBUILD xcalc-1.0.7.ebuild 385 BLAKE2B b98e169e049a828af4a8b518acfce338d80131d0dc58671906abf9dccc742ee2a0575fe796f6bed43849d3273442d7e9bc8a4c332087318b9b617817b7f12f93 SHA512 eb3f726c638685bcf5a223a5acf880f1e8ffca74e360eca7cb44c4ab2ef723f711253259ef63f88278d82614fbce78c89699884850adce1ad2b24a3a7792f3ed
+EBUILD xcalc-1.1.0.ebuild 413 BLAKE2B 839c6c4a2c60c23361e3c84328d3d843866e6b330f869f49bbea62952b076b006632d6897f7bc949fb7e46a7162c10440469e8f684c8fcdfcda4febf4a0a222c SHA512 579ef1534a3a8d0b22b58c384f6ef7ab1ca9aff3549ae116f8d9dd2860d8ddabc89120ad9d411b4a18da6c211dbbb1ccfe334823500e9e25909201ea701be9f5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcalc/xcalc-1.1.0.ebuild b/x11-apps/xcalc/xcalc-1.1.0.ebuild
new file mode 100644
index 000000000000..5cf7402a31f3
--- /dev/null
+++ b/x11-apps/xcalc/xcalc-1.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="scientific calculator for X"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xtrap/Manifest b/x11-apps/xtrap/Manifest
deleted file mode 100644
index 83752473841e..000000000000
--- a/x11-apps/xtrap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xtrap-1.0.3.tar.bz2 134065 BLAKE2B f0e67ff4436a2c7eafd2ed4e6fe5c1d41dbd397918cbffa81587c4b3276c206cc4b9e4e889d50588ffb2dd1b029f04304acf1f34c27b1dccc52c61342ed5be91 SHA512 cdb205859a96a64ede8ce1df119c318e5b6d35107425996c18be0ec56a6287a0564d768f93012f301cb91d517f67261de5c76441c0bfb796cc0190799aaf6c2f
-EBUILD xtrap-1.0.3.ebuild 344 BLAKE2B 49d1eece56d8b71026717e525a9c6da9911f7077ab71d6e2de5f714a5a11c57264f693f69cc613f53e48b13cd7a223799b78dc4795f178ed3c5fa33c2bdda7c1 SHA512 264dd4fe0efff3a02a9defe1dfa70b812957c93a2344aed4ee4f22a755e3f21939f693747a5580b4c16cf4d14146d89cebdf5a8c271fef7368a91ebac13ab9ae
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xtrap/metadata.xml b/x11-apps/xtrap/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-apps/xtrap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-apps/xtrap/xtrap-1.0.3.ebuild b/x11-apps/xtrap/xtrap-1.0.3.ebuild
deleted file mode 100644
index ddd13d4ff23e..000000000000
--- a/x11-apps/xtrap/xtrap-1.0.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit xorg-2
-
-DESCRIPTION="X.Org xtrap application"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXTrap"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"