gentoo resync : 18.05.2019

20 files changed, 407 insertions, 44 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 175dc68ff1de..10be952300fb 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 af49c6b65fd4..993e230ee7b1 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,4 +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 1480 BLAKE2B 96daf039d3e8d00c898c34fccfbf55254b954273dded0106b4585510d9a0f724553b40d4c3f6649cb008b80bcaad1975af6121e2198742e7c0cca0ead61a4e80 SHA512 b636e28baa9ae33bc971273c3cb165da041f36aff7eb2cd329d6e62d8b24938d749282674e072fb7a32e2220db068dea89258ae9b2554669bfd02968b79a8b87
-MISC metadata.xml 519 BLAKE2B 6763311f36b9997f2599a385dc7d0978874bab850ca0d06a3620c4767c31e0b35b9173e37ef606559919b2ebda095ac48b846107a8c9b18e87f942b465be91a6 SHA512 77a0a295e8c82570da621c4631d171dbf6564c00a6aee0e9e0261f5217317d19f5cdac134320f486c89e26c84a2f0c1a21d3b1d42b32676a0fe1d48fbc752569
+EBUILD igt-gpu-tools-9999.ebuild 2541 BLAKE2B 86dda1ac85c5e1dc4f2f186ab900f6e7baca930f863d1433727f76d8b6182cd0101bc76412d51019d893aa1dd9e961a6ee4afa30ec2813afe337a7224bc67504 SHA512 81a6499d0c32deee0b399e275adb80720f80432e4bab8e75329979dea97b4038a7414218d115e4dc14f30f2c45e08064f8f81ca90855087f56c4394eedc23ef7
+MISC metadata.xml 814 BLAKE2B 361429b06051651da503aaffc4dfd632f1eebc24a1968d7945b86e1a7410a78eb4ef50458dd8d42041b2ad2a18dda4a1b9c767a57c44fc3296717f27a2a64a9b SHA512 094b5cdc37051da14c48bae7a714a29b15a40488c10c0d997c168ee3da16a911186555130fcbd4592c9fb4b948af06a3a00afc2d36b7af9f194c7c801d80e2d0
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23-r1.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23-r1.ebuild
new file mode 100644
index 000000000000..dd0926bf9fb1
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson
+
+DESCRIPTION="Intel GPU userland tools"
+
+HOMEPAGE="https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
+fi
+LICENSE="MIT"
+SLOT="0"
+IUSE="chamelium doc libressl man overlay sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
+REQUIRED_USE="
+	|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau )
+	overlay? (
+		video_cards_intel
+		|| ( X xv )
+	)
+"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/kmod:=
+	sys-libs/libunwind:=
+	sys-libs/zlib:=
+	sys-process/procps:=
+	virtual/libudev:=
+	>=x11-libs/cairo-1.12.0[X?]
+	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
+	>=x11-libs/libpciaccess-0.10
+	chamelium? (
+		dev-libs/xmlrpc-c
+		sci-libs/gsl
+		x11-libs/pixman
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	overlay? (
+		>=x11-libs/libXrandr-1.3
+		xv? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXv
+		)
+	)
+	sound? (
+		sci-libs/gsl
+		media-libs/alsa-lib:=
+	)
+	valgrind? ( dev-util/valgrind )
+	"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	man? ( dev-python/docutils )
+	overlay? (
+		>=dev-util/peg-0.1.18
+		x11-base/xorg-proto
+	)
+	video_cards_intel? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+
+src_prepare() {
+	sed -e "s/rst2man/rst2man.py/" -i man/rst2man.sh
+	sed -e "s/find_program('rst2man'/find_program('rst2man.py'/" -i man/meson.build
+	default_src_prepare
+}
+
+src_configure() {
+	local gpus=""
+	use video_cards_amdgpu  && gpus+="amdgpu,"
+	use video_cards_intel   && gpus+="intel,"
+	use video_cards_nouveau && gpus+="nouveau,"
+
+	local overlay_backends=""
+	use overlay && use xv && overlay_backends+="xv,"
+	use overlay && use X && overlay_backends+="x,"
+
+	local emesonargs=(
+		-Dbuild_audio=$(usex sound true false)
+		-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_tests=$(usex doc true false) # Test build is required for docs
+		-Doverlay_backends=${overlay_backends%?}
+		-Dwith_libdrm=${gpus%?}
+		-Dwith_valgrind=$(usex valgrind true false)
+	)
+	meson_src_configure
+}
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 65bdd0b60689..81fff23b3e74 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-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
@@ -20,35 +20,84 @@ else
 fi
 LICENSE="MIT"
 SLOT="0"
-IUSE="alsa chamelium doc glib gsl sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv"
-REQUIRED_USE="chamelium? ( glib gsl )"
+IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
+REQUIRED_USE="
+	|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau )
+	overlay? (
+		video_cards_intel
+		|| ( X xv )
+	)
+"
 RESTRICT="test"
 
-X86_RDEPEND="
-	xv? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv
-	)"
-X86_DEPEND="x11-base/xorg-proto
-	>=dev-util/peg-0.1.18"
-RDEPEND="sys-apps/kmod:=
+RDEPEND="
+	dev-libs/elfutils
+	dev-libs/glib:2
+	sys-apps/kmod:=
 	sys-libs/libunwind:=
+	sys-libs/zlib:=
 	sys-process/procps:=
 	virtual/libudev:=
 	>=x11-libs/cairo-1.12.0[X?]
 	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
 	>=x11-libs/libpciaccess-0.10
-	alsa? ( media-libs/alsa-lib:= )
-	chamelium? ( dev-libs/xmlrpc-c )
-	glib? ( dev-libs/glib:2 )
-	gsl? ( sci-libs/gsl )
+	x11-libs/pixman
+	chamelium? (
+		dev-libs/xmlrpc-c[curl]
+		sci-libs/gsl
+		media-libs/alsa-lib:=
+	)
+	overlay? (
+		>=x11-libs/libXrandr-1.3
+		xv? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXv
+		)
+	)
+	runner? ( dev-libs/json-c:= )
+	unwind? ( sys-libs/libunwind )
 	valgrind? ( dev-util/valgrind )
-	video_cards_intel? ( sys-libs/zlib:= )
-	xrandr? ( >=x11-libs/libXrandr-1.3 )
-	amd64? ( ${X86_RDEPEND} )
-	x86? ( ${X86_RDEPEND} )"
+	"
 DEPEND="${RDEPEND}
-	amd64? ( ${X86_DEPEND} )
-	x86? ( ${X86_DEPEND} )
-	doc? ( >=dev-util/gtk-doc-1.25-r1 )"
+	doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	man? ( dev-python/docutils )
+	overlay? (
+		>=dev-util/peg-0.1.18
+		x11-base/xorg-proto
+	)
+	video_cards_intel? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+
+src_prepare() {
+	sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
+	default_src_prepare
+}
+
+src_configure() {
+	local gpus=""
+	use video_cards_amdgpu  && gpus+="amdgpu,"
+	use video_cards_intel   && gpus+="intel,"
+	use video_cards_nouveau && gpus+="nouveau,"
+
+	local overlay_backends=""
+	use overlay && use xv && overlay_backends+="xv,"
+	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
+		-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/igt-gpu-tools/metadata.xml b/x11-apps/igt-gpu-tools/metadata.xml
index df5e45209705..d1c1f29fe122 100644
--- a/x11-apps/igt-gpu-tools/metadata.xml
+++ b/x11-apps/igt-gpu-tools/metadata.xml
@@ -8,7 +8,12 @@
 <use>
  <flag name="chamelium">Enables support for building Chamelium tests</flag>
  <flag name="glib">Support reading config files via glib helpers</flag>
+ <flag name="man">Build and install man pages</flag>
+ <flag name="overlay">Build the intel-gpu-overlay utility</flag>
+ <flag name="runner">Build the test runner</flag>
  <flag name="valgrind">Support valgrind annotations</flag>
  <flag name="xrandr">Enable support for the X RandR extension</flag>
+ <flag name="xv">Enable intel-gpu-overlay xv backend</flag>
+ <flag name="X">Enable intel-gpu-overlay xlib/cairo backend</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-apps/radeon-profile-daemon/Manifest b/x11-apps/radeon-profile-daemon/Manifest
index 423ad2ab58c4..f1cef5692f3b 100644
--- a/x11-apps/radeon-profile-daemon/Manifest
+++ b/x11-apps/radeon-profile-daemon/Manifest
@@ -1,5 +1,6 @@
-AUX radeon-profile-daemon.initd 267 BLAKE2B 6212dc16512d1f153924a40889b9702629bcc385416f02296d383e18c0a713ed9018ffcdd043b8d465e10dc964a7639616bee201c3818d686493cba40368203f SHA512 216d971c0116b4037774c00be8fb5435d23ad25b2ebe7b909b6e4f0a7a605aa0d4d205586a2f9d770bee392aa2b97810915a40b9f9dee019ce303cce18d371da
+AUX radeon-profile-daemon-20190309-secure_socket.patch 1010 BLAKE2B a7fe01141aced2f3a93c31ea89127824292f2b21a5172ae49cace50914413bf32402e3a6f38203bb2cecded67439e7dd972ea8d1251488827638ec64c6c37152 SHA512 472091c63dffb474ffa98fa576128c404bc8a723de620b3147bb52ac0dbc2f7beec0a89a5c53b89ac3ecda19f5e3cbc7141a9d801c93c268cca793462f274bf9
+AUX radeon-profile-daemon.initd 539 BLAKE2B 20c80bdd61439f00500ee069f2f3be3d7d007908451c6521a67905b2cc0dca331d8bf0295faffabfb94de223ec4cc1501961da64351b68c1831156aa9e776526 SHA512 7f2418d021a3955571d8a5dfadf93b614c58f62dec5a2112ec6f2cb03b7fdcb69ea059fd57cb2ca5acc5d29891074b92e008e4df29794fa3276abec321d3f7d9
 DIST radeon-profile-daemon-20190309.tar.gz 12178 BLAKE2B 931ce4bb123456e349a68c8fe0b18150ff988a83a5e58cf451f68025240a8b4c802e03a567ef41684e91442bf21c02cc00d31ef6c82a67ca7eb7587754c6f32e SHA512 f2bb6f7dc0bf322e5c43c5ca1f99501a4fd3f4532cc9c1686b5cfbc58bdd423e81c25d3ae03fcae9dc15dc92d8ad089b2357b27b0ff399de7ac27213e00b2f37
-EBUILD radeon-profile-daemon-20190309-r1.ebuild 996 BLAKE2B 51d3db209e189552026221ac143d2fcb3f39f9bbbfbd6c201007c6d7587b3358c14159e2abf67f4ff3165c68aeb36d9d6c57bf37f10d4156ad49d7bd299117a6 SHA512 0400a6728d3449499f35e47275430ff613db456dac6afcf226bfc7f3ec38413826c150f461b094e076051fd1c181e7ae841044db946302027e8248ee55dae380
-EBUILD radeon-profile-daemon-99999999.ebuild 996 BLAKE2B 51d3db209e189552026221ac143d2fcb3f39f9bbbfbd6c201007c6d7587b3358c14159e2abf67f4ff3165c68aeb36d9d6c57bf37f10d4156ad49d7bd299117a6 SHA512 0400a6728d3449499f35e47275430ff613db456dac6afcf226bfc7f3ec38413826c150f461b094e076051fd1c181e7ae841044db946302027e8248ee55dae380
+EBUILD radeon-profile-daemon-20190309-r2.ebuild 1211 BLAKE2B 914c68ba217d0902c0292acdd60c8fdeef6ae1607e54f7e706a07e30d7fe34c4bf160833c943a7d7988d436c68a96f8ee314ad0fa7e748cf132d417a463f0494 SHA512 80eaba94080ecbccfb8cc31387013025c870295b13d8bce8652aef7c7c7f582f534ff15a2aa2dc723428859370c534fe7604caae365450ad82dce7f1f0049d47
+EBUILD radeon-profile-daemon-99999999.ebuild 1211 BLAKE2B 914c68ba217d0902c0292acdd60c8fdeef6ae1607e54f7e706a07e30d7fe34c4bf160833c943a7d7988d436c68a96f8ee314ad0fa7e748cf132d417a463f0494 SHA512 80eaba94080ecbccfb8cc31387013025c870295b13d8bce8652aef7c7c7f582f534ff15a2aa2dc723428859370c534fe7604caae365450ad82dce7f1f0049d47
 MISC metadata.xml 358 BLAKE2B 06e855ba85405499bf5eaf5908bdc1f4936021b0be784d647a6d48f5641badb3aa84687744ea834331ff33226b2588e57fbb53b225a9a249b92b1ce1e47426a5 SHA512 6d40ebc0fe08862dc3a2ff138f335ea02184d34f450858a3bc4f9939db147daf5e6d0c4507064fb262018edc74e1e90ed563f41e36a2b442f080556c3aed49f2
diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190309-secure_socket.patch b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190309-secure_socket.patch
new file mode 100644
index 000000000000..5d7132b90b75
--- /dev/null
+++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon-20190309-secure_socket.patch
@@ -0,0 +1,26 @@
+From 8e75c8678b874c6813e590634943166daa98124b Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 10 May 2019 11:01:21 +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 4cf0ac0..137d5b2 100644
+--- a/radeon-profile-daemon/rpdthread.cpp
++++ b/radeon-profile-daemon/rpdthread.cpp
+@@ -47,7 +47,7 @@ void rpdThread::createServer()
+ 
+     QLocalServer::removeServer(serverName);
+     daemonServer.listen(serverName);
+-    QFile::setPermissions("/tmp/" + serverName, QFile("/tmp/" + serverName).permissions() | QFile::WriteOther | QFile::ReadOther);
++    QFile::setPermissions("/tmp/" + serverName, QFile("/tmp/" + serverName).permissions() | QFile::WriteGroup | QFile::ReadGroup);
+ }
+ 
+ void rpdThread::closeConnection()
+-- 
+2.21.0
+
diff --git a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd
index e4e7afb04c5c..adbc0195e4b0 100644
--- a/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd
+++ b/x11-apps/radeon-profile-daemon/files/radeon-profile-daemon.initd
@@ -7,3 +7,21 @@ description="Daemon for radeon-profile GUI"
 command="/usr/sbin/radeon-profile-daemon"
 command_background="true"
 pidfile="/run/${SVCNAME}.pid"
+
+radeon_socket="/tmp/radeon-profile-daemon-server"
+
+wait_for_socket() {
+	local i=0
+	while [ ${i} -lt 10 ]; do
+		[ -S "${radeon_socket}" ] && return 0
+		i=$((${i}+1))
+		sleep 1
+	done
+
+	return 1
+}
+
+start_post() {
+	wait_for_socket || return 1
+	chgrp video ${radeon_socket}
+}
diff --git a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190309-r1.ebuild b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190309-r2.ebuild
index ca74330cfd3c..924760fc9099 100644
--- a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190309-r1.ebuild
+++ b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190309-r2.ebuild
@@ -27,8 +27,14 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-secure_socket.patch"
+)
+
 src_prepare() {
-	default
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
+
 	sed \
 		-e '/^bin\.path/s@/bin@/sbin@' \
 		-e "/^service\.path/s@=.*\$@= $(systemd_get_systemunitdir)@" \
@@ -47,3 +53,8 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd ${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 ca74330cfd3c..924760fc9099 100644
--- a/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
+++ b/x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
@@ -27,8 +27,14 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-secure_socket.patch"
+)
+
 src_prepare() {
-	default
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
+
 	sed \
 		-e '/^bin\.path/s@/bin@/sbin@' \
 		-e "/^service\.path/s@=.*\$@= $(systemd_get_systemunitdir)@" \
@@ -47,3 +53,8 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd ${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/Manifest b/x11-apps/radeon-profile/Manifest
index 4037e9d63f03..c74fdc6b14c7 100644
--- a/x11-apps/radeon-profile/Manifest
+++ b/x11-apps/radeon-profile/Manifest
@@ -1,4 +1,4 @@
 DIST radeon-profile-20190311.tar.gz 381505 BLAKE2B e15fbf60f9b790ef81f6b86f74cdada20fe232d2d1965c35248c33bead5f47503780804f0710c8627e4a487e6f95f6688d0dc52b325c278700f9539773547729 SHA512 285ff4fd9f4376135a38009e0e531ec9d9c727840284d9cb4135e0044134a778786559b4280e329be8b78d635928feacd1c0ccc15bce15297d15e4f065460463
-EBUILD radeon-profile-20190311.ebuild 1131 BLAKE2B 778fcd09a31b5169971ec9478ec5796f87fa5f353e3da2503f305720ca15dbd15cc6c3ca41839367ddad71530f49c6ced0277818d0f49ae9a1deee80d674fe57 SHA512 6356218665e24939c9706dc70e680548367709994b3d33018513a96d1b832155302fb33c2c5f5df78aa75dabfaefcc09011b797ee72722a2658ac7547e5ed87a
-EBUILD radeon-profile-99999999.ebuild 1131 BLAKE2B 778fcd09a31b5169971ec9478ec5796f87fa5f353e3da2503f305720ca15dbd15cc6c3ca41839367ddad71530f49c6ced0277818d0f49ae9a1deee80d674fe57 SHA512 6356218665e24939c9706dc70e680548367709994b3d33018513a96d1b832155302fb33c2c5f5df78aa75dabfaefcc09011b797ee72722a2658ac7547e5ed87a
+EBUILD radeon-profile-20190311.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-20190311.ebuild b/x11-apps/radeon-profile/radeon-profile-20190311.ebuild
index 9221aca4ad86..de8838c90ba8 100644
--- a/x11-apps/radeon-profile/radeon-profile-20190311.ebuild
+++ b/x11-apps/radeon-profile/radeon-profile-20190311.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 77337142ec368ef43c179461f5ca0beb09d5cd21 $
 
 EAPI=7
 
@@ -34,6 +33,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
+	dev-qt/qtconcurrent:5
 	media-libs/mesa
 	x11-libs/libdrm
 "
diff --git a/x11-apps/radeon-profile/radeon-profile-99999999.ebuild b/x11-apps/radeon-profile/radeon-profile-99999999.ebuild
index 9221aca4ad86..de8838c90ba8 100644
--- a/x11-apps/radeon-profile/radeon-profile-99999999.ebuild
+++ b/x11-apps/radeon-profile/radeon-profile-99999999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 77337142ec368ef43c179461f5ca0beb09d5cd21 $
 
 EAPI=7
 
@@ -34,6 +33,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
+	dev-qt/qtconcurrent:5
 	media-libs/mesa
 	x11-libs/libdrm
 "
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 32757065a2c1..0e0b7dab2795 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -2,10 +2,14 @@ AUX 00-xhost 255 BLAKE2B 78ccf786ceae797177342b77fb675068786815818796a04087a8f52
 AUX Xsession 2187 BLAKE2B d6df80e9d0faecd9286be70b2639b7bb993d363a7834cd63b108be2ed35457faf8d5069803fb80275cd7f0afc155ffbc359bb7e3184c5468b2e00e63b4605a99 SHA512 a20e12f338ead48f4758268506fe899a0123c25babb1366678e643b4101ece8c913305b44c9395897a82e65ee0dd402edc0adf99adf74b3c6085bf39dd12f048
 AUX Xsession.desktop 229 BLAKE2B f1daf7f0ef98a3be220195fb64bc057180db20016ef991e5d2000c60b74cb729a962270ff342e29088e9e928a163732c7b1f7aafc1c056e85d73b6ca8ba9e96c SHA512 2d2fea82972d77ac925e6edcd488c730b678dd74635cc3a06536413ec8bdff63be915161139f12636214023926dded9fa549f053f9a2b916ef905be79591093d
 AUX chooser.sh 1192 BLAKE2B d0afaaed792dae06c4716ea33924568aca5da3251b15067fc5ba92b2dd5651185ce64329a69ae588f5a4532b8e4b123f7f29bd2db7352df1b496a6e4e03191a8 SHA512 6149a5dc19104773d3500d2e89e8be5c9da49fad8b38148d511af237c6fef84c3223a94d4c0451296e7b27c86c513c5f4fd425a738d94c30d26f1ac888bbc255
-AUX startDM.sh 821 BLAKE2B 2705e4a5fdadc1d7da7ef9d9df1b1c56ce3e36170658b49d3129ffd25f02339524547a5764b4d72e7b94c20f292f88137515ed775029a24102789b4955d29189 SHA512 11a21170c0db92d5f0bf40b07158f9781df611737cca5bc6a4ca8be376e179dab68e9579b112e8f8ce423af7e651e502aadd3b3d425465f7a15103777b647110
+AUX startDM.sh 865 BLAKE2B 3ce0d56b0e9dda5ca9db024204414f250887d1a42059148e0fdcd3441f126ff8230e0e1822d8cb4e80fce4f64ea1dc20d06baa993850aae55ecf090461f8854f SHA512 27326fca0aae7a1cda0e1c8d84c4de2c69999b3a334c4cc31c6cca9da4b5c5294486af5992278088e05046b44abb20d0c87aee2bfb9e5aa35c9cdb2c9c2852f4
+AUX startDM.sh.1 821 BLAKE2B 2705e4a5fdadc1d7da7ef9d9df1b1c56ce3e36170658b49d3129ffd25f02339524547a5764b4d72e7b94c20f292f88137515ed775029a24102789b4955d29189 SHA512 11a21170c0db92d5f0bf40b07158f9781df611737cca5bc6a4ca8be376e179dab68e9579b112e8f8ce423af7e651e502aadd3b3d425465f7a15103777b647110
 AUX xinit-1.3.3-gentoo-customizations.patch 1494 BLAKE2B 1a67f486324e07aee07078648101a3f82b10d5953084c6afe6564530132fb92d299c44559e4d6d3ab74554139be02c285b2076b959413ec248b57cc2aafbc733 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b
 AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f935afbb757908d0c94f6f5b9c7e6b8055841fcdf4de44af964fe3703d2599b9097fca300551bb4a3dce003e20c266d619eb49 SHA512 97e0ac72c49a9a5ac29a09f169076f0bcec48978f645be01f3b40b6c32b4af4d188f96662c0cf62bab0a6b356ae80c25e0614c0b87a368d7a01a11e603ecdd15
+AUX xinit-1.4.1-move-serverauthfile-into-tmp.patch 745 BLAKE2B 6a964926b4f5eda566be4ff5c0f015ca2d3a9f39f16ba5af0cf3816c56cf458e616645ace1b8be9873c604322ab56b118a7a9e531533f8617cb647a57cf0cf3e SHA512 0fb93f0cebfd4091d7e58139ef375fec931392159b3b060d699d118c89d4403fd5cee82cd35582aedf7dd752aee495724119f864b17988d0dd9a5dfe76c88ce0
 AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5
 DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
-EBUILD xinit-1.4.0-r1.ebuild 1810 BLAKE2B 623cbe4d86624fefa0d71cca672e5936fda35f73372c71b8683899a3fa3d3c4b923b80302112a02aeb22d2a9fe04ad6ecf1f763dde0e7b4b81a45c9225136b7d SHA512 05ab5c2a75271a87587621aeab62542501872115ff5fa29fd819bb69dbf57df47de52d6573f9cb586b10056e21c398918c70032567a6648f1b4deb17534e10c9
-MISC metadata.xml 480 BLAKE2B 190a0b3a84e4d0d85e0928b964cb820599510c6c09a1a7c385b2f9b402a44478e08b48fce2d88216fe2fd52a3f35ec02d99cb7d738caf8a2d8dd6418e36f6125 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55
+DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B 1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a SHA512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340
+EBUILD xinit-1.4.0-r1.ebuild 1831 BLAKE2B dbd073e60166dfe8a4be89dd1ac3fb9521b4f26b441f8dae835127e45533c93c5fac61673b49991612c0b4f8ab8ab96b50020b154db515976b7d7a20a3a3a067 SHA512 25639916b11982c789d061a4ea9a47ff92724c8412a8fb0290fa50ffbc9d17a4252843b8fc94abaa90adda8df6e400e933788e1c3e3508ceaf7cc61ddebbadde
+EBUILD xinit-1.4.1.ebuild 2264 BLAKE2B c7ecb9b5a87c559fc67eb7a186823f9d16135d12e3c37f8c6219313b69141b4df9eb78d74b033f1b38f822baefbbfec3878d9af6c849cbf6c6a5acdea93b826e SHA512 0a970b34c0939d96c6d8ef4d8fb7454bd9f18e5dc44b9cb2bfd83f85d394c4a9e3ab4345f7234f1229fb70028cfbcbb0eb8e5c09ea468497fe0d8e146256b42c
+MISC metadata.xml 628 BLAKE2B 15035295f88d4214959761156b63c4ec3997b06306c5e1cf61e33cd976c857564185abdc0cf7ead35688cbffa620e7d8da69c019281bd5efedccece6b42e3e05 SHA512 505e7ab74b57b8e137347a7a204f49548d4316e1c238f5c916ebc4d8d87666f854b188819259c6529bdedf1113c113c9088591e16abe4fe22f62d7d0a329054d
diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index e2da6098d6a0..640bb24b7a26 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -1,22 +1,23 @@
 #!/bin/sh
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
 # We need to source /etc/profile for stuff like $LANG to work
 # bug #10190.
 . /etc/profile
 
-. /etc/init.d/functions.sh
+. /lib/rc/sh/functions.sh
+
+# Bail out early if on a non-OpenRC system:
+if [ ! -d /run/openrc ]; then
+	eerror "$0 should only be used on OpenRC systems"
+fi
 
 # baselayout-1 compat
 if ! type get_options >/dev/null 2>/dev/null ; then
 	[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
 fi
 
-# Great new Gnome2 feature, AA
-# We enable this by default
-export GDK_USE_XFT=1
-
 export RC_SVCNAME=xdm
 EXEC="$(get_options service)"
 NAME="$(get_options name)"
diff --git a/x11-apps/xinit/files/startDM.sh.1 b/x11-apps/xinit/files/startDM.sh.1
new file mode 100644
index 000000000000..e2da6098d6a0
--- /dev/null
+++ b/x11-apps/xinit/files/startDM.sh.1
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+
+# We need to source /etc/profile for stuff like $LANG to work
+# bug #10190.
+. /etc/profile
+
+. /etc/init.d/functions.sh
+
+# baselayout-1 compat
+if ! type get_options >/dev/null 2>/dev/null ; then
+	[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
+fi
+
+# Great new Gnome2 feature, AA
+# We enable this by default
+export GDK_USE_XFT=1
+
+export RC_SVCNAME=xdm
+EXEC="$(get_options service)"
+NAME="$(get_options name)"
+PIDFILE="$(get_options pidfile)"
+START_STOP_ARGS="$(get_options start_stop_args)"
+
+start-stop-daemon --start --exec ${EXEC} \
+${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \
+eerror "ERROR: could not start the Display Manager"
+
+# vim:ts=4
diff --git a/x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch b/x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch
new file mode 100644
index 000000000000..339b65311712
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.4.1-move-serverauthfile-into-tmp.patch
@@ -0,0 +1,22 @@
+Move startx auth files in /tmp so they are removed on reboot.
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
+The trap patch didn't seem to work on reboot.
+---
+ startx.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/startx.cpp
++++ b/startx.cpp
+@@ -278,11 +278,11 @@ if [ x"$enable_xauth" = x1 ] ; then
+         exit 1
+     fi
+     dummy=0
+ 
+     XCOMM create a file with auth information for the server. ':0' is a dummy.
+-    xserverauthfile=$HOME/.serverauth.$$
++    xserverauthfile=`mktemp --tmpdir serverauth.XXXXXXXXXX`
+     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
+     xauth -q -f "$xserverauthfile" << EOF
+ add :$dummy . $mcookie
+ EOF
+ #if defined(__APPLE__) || defined(__CYGWIN__)
diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml
index dce3523a34df..f944f7012d76 100644
--- a/x11-apps/xinit/metadata.xml
+++ b/x11-apps/xinit/metadata.xml
@@ -10,6 +10,10 @@
 			Control dependencies on legacy apps (xterm, twm, ...). Safe to
 			enable if you use a modern desktop environment.
 		</flag>
+		<flag name="twm">
+			Control dependencies on legacy apps (xterm, twm, ...). Safe to
+			disable if you use a modern desktop environment.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:x.org:xinit</remote-id>
diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index f8dedbb1ce77..e069d3d3c92e 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -42,7 +42,8 @@ src_install() {
 	xorg-2_src_install
 
 	exeinto /etc/X11
-	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
+	doexe "${FILESDIR}"/chooser.sh
+	newexe "${FILESDIR}"/startDM.sh.1 startDM.sh
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}"/Xsession
 	exeinto /etc/X11/xinit
diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild b/x11-apps/xinit/xinit-1.4.1.ebuild
new file mode 100644
index 000000000000..5548d9324892
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="twm"
+
+RDEPEND="
+	!<x11-base/xorg-server-1.8.0
+	x11-apps/xauth
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+	twm? (
+		x11-apps/xclock
+		x11-apps/xsm
+		x11-terms/xterm
+		x11-wm/twm
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
+	"${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch"
+	"${FILESDIR}/${PN}-1.4.1-move-serverauthfile-into-tmp.patch"
+)
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-xinitdir="${EPREFIX}"/etc/X11/xinit
+)
+
+src_install() {
+	xorg-3_src_install
+
+	exeinto /etc/X11
+	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/Xsession
+	exeinto /etc/X11/xinit
+	newexe "${FILESDIR}"/xserverrc.2 xserverrc
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}"/00-xhost
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/Xsession.desktop
+}
+
+pkg_postinst() {
+	if ! has_version 'x11-apps/xinit'; then
+		ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+		ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+		ewarn "any executable. When you run startx, it will run this as the login session."
+		ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+		ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+		ewarn "Here's an example of setting it for the whole system:"
+		ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+		ewarn "    env-update && source /etc/profile"
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-1.4.1"; then
+		ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the"
+		ewarn "home directory but rather are created in \$TMPDIR (typically /tmp).  The change"
+		ewarn "is transparent for most of users, however those that use runtime temporary"
+		ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them"
+		ewarn "not to remove the 'serverauth.*' files."
+	fi
+}