gentoo auto-resync : 17:01:2024 - 20:06:58

4 files changed, 4 insertions, 264 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 93ecf3deca3d..0b75345e9608 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,12 +1,10 @@
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 AUX xorg-server-21.1.10-c99.patch 1508 BLAKE2B 7c4080924f5f5a8d4be2addae218bbc66e7532798bcd9bd5c43498afb09adfeb1d2238a0157add2e4f9ad49d5f00a80c1acb41001b08ccb509dd2da614276da6 SHA512 d5e5c33834966599df376d0ad3a425f4b56dc4dcc2ca549731dfcc1acfb3e20cf30644586daf590be90357e03d323f7d7d9e2efa8dff6a748a2ce0e1249b6bd3
-AUX xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch 2143 BLAKE2B f86ca339ac3f548864e89a85225fae5834edb7115a78d88d1c2456f2c6d4bf5e4ee407cc9ce25affa7d5fdff83e701fd20a8ceaa6eb7c8d61d2ba06abac729ac SHA512 5acdf35c09faf6d64bfe0c34d64f0481b605230112c9e0e1b3b32d9b0539413f8b62f0517f3edb7e1e328fcbb5a8782946b67bda89809da89f23a4770a799194
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-21.1.10.tar.xz 4935984 BLAKE2B c06d5f09e79b608d9e37f43ed05a0932d9e195cc0da418621c2db45be85ccceef38b14631a4b90e78468c845e4852dc07c65208138b93975f091b2139e437a60 SHA512 8135d9b7c0c71f427ba0a3b80741fee4f6ae195779399b73261a00858882f3516e367a08e2da1403734b04eacabae9aa231e5375eff23b57a3ff764e9caf8926
-DIST xorg-server-21.1.9.tar.xz 4935860 BLAKE2B 8e0a2e0f5fc4d06a08c1424fe618da9822e951f5b744b4cac1b1e14305ab598b162e4f08fb53ba5e60d0001257216755a576b470c961c26a909d66e9a46d1c77 SHA512 9044e1b9222616fb63aea444b75f4ca6582edb7d899018f8ea30359e57edf04b1555e69397ebc4d288f7e36d6b82a54dde3895f11d414573d229e908ac17bfe8
+DIST xorg-server-21.1.11.tar.xz 4985464 BLAKE2B 0a18840979bb8b20b02eca9d737f20ddcf92a4771386074c38692df8a1c9b0f471af2211f3006f845ad0dd887b3844b7e7aac761bc12fc4e4177f1ada32ec503 SHA512 ad5edacbe8c7e2ebe6b4a690af94c7ea5ebc781d00b0e58ae2d273c78ceee2fa00b86d10479ad69da1b3233490619bae5a33db64c967c24bbfc5d5d39ddce1cb
 EBUILD xorg-server-21.1.10-r1.ebuild 4597 BLAKE2B 542052bdedf6287ab13251ca04f6bf92511129eaeca2254630f05a3f22967e8f8c19ce0b8af148fa2a0b6172c48c6526d739984fb7f5df610b1887eab6f88933 SHA512 e98e8340a206d78d1ff68f13155be1ba87a2be1b325e30c8770c8f5717225a8802f723257435cdb951c963fb6ef9bb3aece8a0a2030a8e780f82eaf8d05b3a2f
-EBUILD xorg-server-21.1.10.ebuild 4524 BLAKE2B 470cf11643620da9e944173a051c7b993452a6c86f723fc6e05008e553066f4082bc05fc5c8f9bfca3c7566ae1ea2dcb22f9973d992b7cc7c15ddce6c06c20b0 SHA512 737311d93ab024f9f649d21a44670a47077be018c02f8191439b80645b374b70cba801d83a91fa0c84ea987f1a01043450ec134476b3e6c74f5bb3247e00f894
-EBUILD xorg-server-21.1.9.ebuild 4581 BLAKE2B c88897640a2a7784dda9d9acea925170802ef4d8243d741ee64aba99be5d39c4877b2ce25562e42a1e0ff16f1803bca0f52923d9fcd2cbd4c3bd8f8392cc9411 SHA512 a2e342b51404a8c643f9f9761a371be8a9aa44718ea73101adef5a33560604b88b1877327c3c7a95bfd14d784fdd4d0bec9e350062610270aeee04d6ffd3456c
+EBUILD xorg-server-21.1.11.ebuild 4605 BLAKE2B b678b9e73fd0400031af545da127fa3ae697e81f1306fc3ac4e18455a409747dff79bddc7ba7528ec1e4cc6106b293ca6386f8b1e121e59787b3e9e3b34d8c71 SHA512 4b0668a1307cec9acf903fe598ed58fa1cc71a3f45ebabd8ca2e5573f20f9aae0fc7b314c23bb8c7ef0a6f32d4b713953e637b8e921f22d12121e9d6c05a855a
 EBUILD xorg-server-9999.ebuild 4500 BLAKE2B c8418bb7588aba586b530becf16e5fecfe49b1537de2dd96c2637f5ec49cea91bab1fb69d44c25f1ca4e605b28823dd57454d0afb467913a92772e7471a9c423 SHA512 54bfbb6b71ac41707c359581ce13f9cbae59dfffea0499296ff666a252faf8e39da6b1751ef2458cb59d894c7c4c059d79eee7796afbf28aef2fed1430669f9f
 MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90
diff --git a/x11-base/xorg-server/files/xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch b/x11-base/xorg-server/files/xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch
deleted file mode 100644
index 64581c9d0a18..000000000000
--- a/x11-base/xorg-server/files/xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/884221
-https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1192
-
-From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001
-From: nerdopolis <bluescreen_avenger@verizon.net>
-Date: Tue, 11 Jan 2022 18:41:42 -0500
-Subject: [PATCH xserver] xephyr: Don't check for SeatId anymore
-
-After a change for the xserver to automatically determine the seat
-based on the XDG_SEAT variable, xephyr stopped working. This was
-because of an old feature where xephyr used to handle evdev
-directly. This was dropped some time ago, and now this check is
-not needed
----
- hw/kdrive/ephyr/ephyrinit.c | 34 ++++++++++++++++------------------
- 1 file changed, 16 insertions(+), 18 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
-index 020461db2..09cd28cb3 100644
---- a/hw/kdrive/ephyr/ephyrinit.c
-+++ b/hw/kdrive/ephyr/ephyrinit.c
-@@ -70,25 +70,23 @@ InitInput(int argc, char **argv)
-     KdKeyboardInfo *ki;
-     KdPointerInfo *pi;
- 
--    if (!SeatId) {
--        KdAddKeyboardDriver(&EphyrKeyboardDriver);
--        KdAddPointerDriver(&EphyrMouseDriver);
--
--        if (!kdHasKbd) {
--            ki = KdNewKeyboard();
--            if (!ki)
--                FatalError("Couldn't create Xephyr keyboard\n");
--            ki->driver = &EphyrKeyboardDriver;
--            KdAddKeyboard(ki);
--        }
-+    KdAddKeyboardDriver(&EphyrKeyboardDriver);
-+    KdAddPointerDriver(&EphyrMouseDriver);
-+
-+    if (!kdHasKbd) {
-+        ki = KdNewKeyboard();
-+        if (!ki)
-+            FatalError("Couldn't create Xephyr keyboard\n");
-+        ki->driver = &EphyrKeyboardDriver;
-+        KdAddKeyboard(ki);
-+    }
- 
--        if (!kdHasPointer) {
--            pi = KdNewPointer();
--            if (!pi)
--                FatalError("Couldn't create Xephyr pointer\n");
--            pi->driver = &EphyrMouseDriver;
--            KdAddPointer(pi);
--        }
-+    if (!kdHasPointer) {
-+        pi = KdNewPointer();
-+        if (!pi)
-+            FatalError("Couldn't create Xephyr pointer\n");
-+        pi->driver = &EphyrMouseDriver;
-+        KdAddPointer(pi);
-     }
- 
-     KdInitInput();
--- 
-2.41.0
-
diff --git a/x11-base/xorg-server/xorg-server-21.1.10.ebuild b/x11-base/xorg-server/xorg-server-21.1.11.ebuild
index 3d6ab7fc6830..d0803ee99ef0 100644
--- a/x11-base/xorg-server/xorg-server-21.1.10.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.11.ebuild
@@ -102,6 +102,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
 	# needed for new eselect-opengl, bug #541232
 	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+	# pending upstream backport, bug #885763
+	"${FILESDIR}"/${PN}-21.1.10-c99.patch
 )
 
 src_configure() {
diff --git a/x11-base/xorg-server/xorg-server-21.1.9.ebuild b/x11-base/xorg-server/xorg-server-21.1.9.ebuild
deleted file mode 100644
index 525f5a0f366b..000000000000
--- a/x11-base/xorg-server/xorg-server-21.1.9.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_EAUTORECONF="no"
-inherit flag-o-matic xorg-3 meson
-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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	media-libs/libglvnd[X]
-	dev-libs/libbsd
-	dev-libs/openssl:0=
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	xorg? (
-		>=x11-libs/libxcvt-0.1.0
-	)
-	xnest? (
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libX11-1.1.5
-	)
-	xephyr? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
-		>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	)
-	udev? ( virtual/libudev:= )
-	unwind? ( sys-libs/libunwind:= )
-	selinux? (
-		sys-process/audit
-		sys-libs/libselinux:=
-	)
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)
-	elogind? (
-		sys-apps/dbus
-		sys-auth/elogind[pam]
-		sys-auth/pambase[elogind]
-	)
-	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
-"
-DEPEND="${CDEPEND}
-	>=x11-base/xorg-proto-2021.4.99.2
-	>=x11-libs/xtrans-1.3.5
-	media-fonts/font-util
-	test? ( >=x11-libs/libxcvt-0.1.0 )
-"
-RDEPEND="${CDEPEND}
-	!systemd? ( gui-libs/display-manager-init )
-	selinux? ( sec-policy/selinux-xserver )
-	xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-"
-BDEPEND="
-	app-alternatives/lex
-"
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	elogind? ( udev )
-	?? ( elogind systemd )"
-
-UPSTREAMED_PATCHES=(
-)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-
-	"${FILESDIR}"/${P}-xephyr-Don-t-check-for-SeatId-anymore.patch
-)
-
-src_configure() {
-	# bug #835653
-	use x86 && replace-flags -Os -O2
-
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-		--sysconfdir "${EPREFIX}/etc/X11"
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-		$(meson_use !minimal dri1)
-		$(meson_use !minimal dri2)
-		$(meson_use !minimal dri3)
-		$(meson_use !minimal glamor)
-		$(meson_use !minimal glx)
-		$(meson_use udev)
-		$(meson_use udev udev_kms)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use selinux xselinux)
-		$(meson_use xephyr)
-		$(meson_use xnest)
-		$(meson_use xorg)
-		$(meson_use xvfb)
-		-Ddocs=false
-		-Ddrm=true
-		-Ddtrace=false
-		-Dipv6=true
-		-Dhal=false
-		-Dlinux_acpi=false
-		-Dlinux_apm=false
-		-Dsecure-rpc=false
-		-Dsha1=libcrypto
-		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
-	)
-
-	if [[ ${PV} == 9999 ]] ; then
-		# Gone in 21.1.x, but not in master.
-		emesonargs+=( -Dxwayland=false )
-	fi
-
-	if use systemd || use elogind; then
-		emesonargs+=(
-			-Dsystemd_logind=true
-			$(meson_use suid suid_wrapper)
-		)
-	else
-		emesonargs+=(
-			-Dsystemd_logind=false
-			-Dsuid_wrapper=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# The meson build system does not support install-setuid
-	if ! use systemd && ! use elogind; then
-		if use suid; then
-			chmod u+s "${ED}"/usr/bin/Xorg
-		fi
-	fi
-
-	if ! use xorg; then
-		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x || die
-	fi
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-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
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}