x11-base/xorg-server : version bump

5 files changed, 26 insertions, 36 deletions

diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r10.ebuild
index 18e58e5e..18e58e5e 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r10.ebuild
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 0b04317f..dd5b3cd6 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-DIST xorg-server-1.20.8.tar.bz2 6309640 BLAKE2B 0dadd3a7afdb768bcd79f99f3670f7efcb919c43ea88870c93df598b080fbbec48f88cfa996fb7bff2363cffe70d42d9b154855691a64ddb26156f1b378512a0 SHA512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805
+DIST xorg-server-1.20.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae
diff --git a/x11-base/xorg-server/files/xdm.confd-4 b/x11-base/xorg-server/files/xdm.confd-4
index e093bc4f..b4902f14 100644
--- a/x11-base/xorg-server/files/xdm.confd-4
+++ b/x11-base/xorg-server/files/xdm.confd-4
@@ -5,6 +5,6 @@
 # in your /etc/inittab file so that you don't get a dead keyboard.
 CHECKVT=7
 
-# What display manager do you use ?  [ xdm | gdm | kdm | gpe | entrance ]
+# What display manager do you use ?  [ xdm | gdm | sddm | gpe | lightdm | entrance ]
 # NOTE: If this is set in /etc/rc.conf, that setting will override this one.
 DISPLAYMANAGER="sddm"
diff --git a/x11-base/xorg-server/files/xdm.initd-11 b/x11-base/xorg-server/files/xdm.initd-11
index 02804008..5e234e40 100644
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ b/x11-base/xorg-server/files/xdm.initd-11
@@ -207,7 +207,7 @@ stop() {
 
 	ebegin "Stopping ${myservice}"
 
-	if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
+	if start-stop-daemon --quiet --test --stop --exec "${myexe}" 2>/dev/null; then
 		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
 			${mypidfile:+--pidfile} ${mypidfile} \
 			${myname:+--name} ${myname}
diff --git a/x11-base/xorg-server/xorg-server-1.20.8-r10.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r10.ebuild
index 1300f1fa..90204761 100644
--- a/x11-base/xorg-server/xorg-server-1.20.8-r10.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10-r10.ebuild
@@ -4,23 +4,20 @@
 EAPI=7
 
 XORG_DOC=doc
-inherit xorg-3 multilib flag-o-matic
+inherit xorg-3 multilib flag-o-matic toolchain-funcs
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity"
 
-CDEPEND="libglvnd? (
-		media-libs/libglvnd
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
+CDEPEND="
+	media-libs/libglvnd[X]
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	>=x11-apps/iceauth-1.0.2
@@ -83,10 +80,11 @@ CDEPEND="libglvnd? (
 	)
 	elogind? (
 		sys-apps/dbus
-		sys-auth/elogind
+		sys-auth/elogind[pam]
 		sys-auth/pambase[elogind]
 	)
-	"
+	!!x11-drivers/nvidia-drivers[-libglvnd(-)]
+"
 
 DEPEND="${CDEPEND}
 	sys-devel/flex
@@ -103,7 +101,6 @@ DEPEND="${CDEPEND}
 
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-xserver )
-	!x11-drivers/xf86-video-modesetting
 "
 
 PDEPEND="
@@ -122,10 +119,10 @@ UPSTREAMED_PATCHES=(
 
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/xserver-autobind-hotplug.patch
 	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
 	# needed for new eselect-opengl, bug #541232
 	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+	"${FILESDIR}"/xserver-autobind-hotplug.patch
 )
 
 pkg_setup() {
@@ -162,10 +159,7 @@ pkg_setup() {
 		$(use_enable udev config-udev)
 		$(use_with doc doxygen)
 		$(use_with doc xmlto)
-		$(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind')
 		$(use_with systemd systemd-daemon)
-		$(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper')
-		$(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid')
 		--enable-libdrm
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var
@@ -177,16 +171,22 @@ pkg_setup() {
 		--without-fop
 		--with-os-vendor=Gentoo
 		--with-sha1=libcrypto
+		CPP="$(tc-getPROG CPP cpp)"
 	)
-}
-
-src_configure() {
-	# Needed since commit 2a1a96d956f4 ("glamor: Add a function to get the
-	# driver name via EGL_MESA_query_driver") neglected to add autotools
-	# support
-	append-cflags -DGLAMOR_HAS_EGL_QUERY_DRIVER
 
-	xorg-3_src_configure
+	if use systemd || use elogind; then
+		XORG_CONFIGURE_OPTIONS+=(
+			"--enable-systemd-logind"
+			"--disable-install-setuid"
+			"$(use_enable suid suid-wrapper)"
+		)
+	else
+		XORG_CONFIGURE_OPTIONS+=(
+			"--disable-systemd-logind"
+			"--disable-suid-wrapper"
+			"$(use_enable suid install-setuid)"
+		)
+	fi
 }
 
 src_install() {
@@ -211,19 +211,9 @@ src_install() {
 	insinto /usr/share/X11/xorg.conf.d
 	doins "${FILESDIR}"/99-synaptics-overrides.conf
 
-
 	find "${ED}"/var -type d -empty -delete || die
 }
 
-pkg_postinst() {
-	if ! use minimal; then
-		# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-		if ! use libglvnd; then
-			eselect opengl set xorg-x11 --use-old
-		fi
-	fi
-}
-
 pkg_postrm() {
 	# Get rid of module dir to ensure opengl-update works properly
 	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then