gentoo auto-resync : 18:12:2024 - 06:30:11

9 files changed, 200 insertions, 8 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index fc13d8ac2c7d..46704ff0f06f 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 1366412643a6..10d105eb6f9a 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-proto-1.17.0.tar.xz 151748 BLAKE2B 0f46d040062fca4f6b598bdb7ab7a254b9aefce198812af82fd2112e06e88277e3c9e0a3bab161930b56688e71e1848bb859d4f33588f9496fe7399f9758b9a7 SHA512 34c3795e5a48a66d89b72ee1777fb0bede489d5ec07018e6c9ef3c13bdd60b0358fc2c04a1f0ed0acb5b681aeeb92033db579036e4f5edd967fe56714c03acdf
-EBUILD xcb-proto-1.17.0.ebuild 1144 BLAKE2B dec1ab880f41aa9077ec0880c8b55d0dc1fbb166eaedc8466f65c78695b23095b275d8425453485c5b6e2ac924d1e8e8d95475e740a0276beb5933d322426ae2 SHA512 122b61bbf93582805fa94370d7127018fa280f588b3f6f852c52d45813d6548c00025e80aae14154514a48f72430e5c344d70f1f0c836da39ba573b6f9ee86df
+EBUILD xcb-proto-1.17.0.ebuild 1119 BLAKE2B a26f40d0637e2c57600459f44342eb871a42bccb934a10249c8cce35fdd4fd2dc8da2fa9e16ba9f50b437e990799abaef5e0527a8fae227d9776571c72cd4786 SHA512 5f7b03f6bc8469305e5142c6f9990415d37e46d65a1c4435d5e4568eaee76021858860b4b8cf7746b5b00a95a342412487239a6a01c2e28c4fe7e17bd21cddb1
 MISC metadata.xml 341 BLAKE2B 96e3b6613178261ab586ecc15cb98a7de1f752c081744d02ce3b9976a07e22056ff5c564b418839486d106964daa7327bb3d4d57b469593ac1b4968fbfc3bf67 SHA512 1374a7a6fb6254afa291f3ed7fbc0ff5aa1e478ad2b6df17dcf6969cfcce7681eeb2fb82caa6cbcab5109d2ffd128d3d18819013855a2a338bde5dd93992b6f1
diff --git a/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild
index 952949cb82a1..f9127fd9ee57 100644
--- a/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-XORG_TARBALL_SUFFIX="xz"
 XORG_MODULE=proto/
 
 inherit python-r1 xorg-3
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 30153249ea93..a8ca352138ea 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -3,6 +3,8 @@ AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b
 AUX xorg-server-21.1.10-c99.patch 1508 BLAKE2B 7c4080924f5f5a8d4be2addae218bbc66e7532798bcd9bd5c43498afb09adfeb1d2238a0157add2e4f9ad49d5f00a80c1acb41001b08ccb509dd2da614276da6 SHA512 d5e5c33834966599df376d0ad3a425f4b56dc4dcc2ca549731dfcc1acfb3e20cf30644586daf590be90357e03d323f7d7d9e2efa8dff6a748a2ce0e1249b6bd3
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e SHA512 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973
-EBUILD xorg-server-21.1.14.ebuild 4625 BLAKE2B 3418d942a1ff255901f4f29453b9839cc6d7dc81b517d2d5c14809682600315ebf80a33ffa561767c85934a222a508b770285b5fec743c7cfd85a8ee822b8691 SHA512 80537772baddb24cdd9a2f817a16b530ad4bc487e628709fc6513160df7a3a8bdbf136fe7d3ee57d3e409747b84fb0d137350154c69abd87c48558df24c3ccfc
-EBUILD xorg-server-9999.ebuild 4500 BLAKE2B be7c232f09a90f1316da8024521aba26fd6bf18ee50735b5aaa614cc206575dcf6689574da899b38bcff6e11e6391ed8017fc504901beddfe904492d3c92fd27 SHA512 b89748b18bb62f38558d55ff5b59ef9d0641200ee4bf6a26989d0272104b265981edef1a01f58cf02d64f281c3fbd6720c8922c32c97b64c759e9c6e0e1d7164
+DIST xorg-server-21.1.15.tar.xz 5009756 BLAKE2B a7d5df70a4af98b903a306850a169879cf083b2c811f6e75e1e916f85441214541f7c9fa0e0089c4bf08c67597166d97ea194c6a0a511948568120e579d1104f SHA512 677bbec81ecdd1d14e1d289a00c40249988985ec636e5473b30c4f63bad03a6cc5f9168cea94969e1550370eee8863595bc9c064c3d218a96123afc7567bf363
+EBUILD xorg-server-21.1.14.ebuild 4600 BLAKE2B e533753b245e1cd8b8948ff2b599aa9d02e93066f78489e69a4422fc96b13c8146dcae361c173220267491291cb05af36507aeb123ce876c4543e453422af479 SHA512 f2c25601e7af019ac6a619312688ef01e8586ae9886c78985e74020c1e9abafd65fb5e87c33a5d1d08264109863266705f642e2eedbc53faf86e233546846e42
+EBUILD xorg-server-21.1.15.ebuild 4608 BLAKE2B f7fba32dcb40402de16f24bd316ecbd4a6ae383704626cd0a16c63d49f6850e97967f11b5f80041e5b21932ee044d7089d27567386f12576ac40a1b57ecd128a SHA512 f344cbd2dd9362465193279fc0acfc7c328522a8f9a4f0895ad503019653a870e22380447effb19eb06b8b96b94322b58e0b603022e6c6f383f9226e38d1d327
+EBUILD xorg-server-9999.ebuild 4475 BLAKE2B d4668495182b59b00b815379295893b4552be4635192593944d6930abf2d3048a05035c232a4e4c395d2059c45fd1221254ff897a3a6fc708d842c969f21663a SHA512 8169619db801301ffb4bff87d530e193d36f7aa797469b428b74821a421403eec7af91bf9b7fea9dbbbc22c2e49ca754085a663b386bbba0569efa942cd72cfd
 MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90
diff --git a/x11-base/xorg-server/xorg-server-21.1.14.ebuild b/x11-base/xorg-server/xorg-server-21.1.14.ebuild
index 7499070928a7..381cfde4eb11 100644
--- a/x11-base/xorg-server/xorg-server-21.1.14.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.14.ebuild
@@ -3,7 +3,6 @@
 
 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"
diff --git a/x11-base/xorg-server/xorg-server-21.1.15.ebuild b/x11-base/xorg-server/xorg-server-21.1.15.ebuild
new file mode 100644
index 000000000000..78236916640e
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-21.1.15.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~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
+	# pending upstream backport, bug #885763
+	"${FILESDIR}"/${PN}-21.1.10-c99.patch
+)
+
+src_configure() {
+	# bug #835653
+	use x86 && replace-flags -Os -O2
+	use x86 && replace-flags -Oz -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"
+		-Dbuildtype=$(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
+}
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index fbaefca8e5ce..b5b0e5a96c8e 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -3,7 +3,6 @@
 
 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"
diff --git a/x11-base/xorg-sgml-doctools/Manifest b/x11-base/xorg-sgml-doctools/Manifest
index e861af7ffc6c..7d9921cfd292 100644
--- a/x11-base/xorg-sgml-doctools/Manifest
+++ b/x11-base/xorg-sgml-doctools/Manifest
@@ -1,3 +1,3 @@
 DIST xorg-sgml-doctools-1.12.1.tar.xz 107832 BLAKE2B 5fc7b3e1b02cb650655831196c26cd1ec9f2b3b8ef32cecc2d4657a0358bc23a7e2be2bfbcbfc2a400cfbc821f4602279655c8e31968c5f3f41be15e560799a3 SHA512 82a202a97da4d705d70e3a1865c5cc47f1007d32a239513f52e6e63912ce0363fbeafabbec36ad008d3f7df15f03c27a4f004e9b1da93eed0f7e5b3f27f7c4cf
-EBUILD xorg-sgml-doctools-1.12.1.ebuild 421 BLAKE2B 86a94b0be37fb1b6c685b935175a719511d386801d924c1f1aff11f9bbd26879f3b380b854f94ef7d3eeedcb8d66c7d6148186e3b67a009d67bbe8ae1ab441bb SHA512 fd844c85ccc87783fd2517f18790991b4a3f9a5613d483caa0e6e2ea1048449a7616482ebcecb64b7a728a68624925da8108cd1c280ec07c4055c6deee17b324
+EBUILD xorg-sgml-doctools-1.12.1.ebuild 396 BLAKE2B 6a48e0c037f1ebf2a0e7ddda4906e7e6413db07028363b7befb9de858af6504269868d6f0015e9c4bc517e94500043e624a453b9c8ce0e71b6973e45e61922e9 SHA512 4ea3493319209edd8c4e50874244d51e1150f5802cd86790fd58c6d782d6b1e781f477839fc071259577519a83ddcf4076ed273cad090d28dc404f848aed0f61
 MISC metadata.xml 349 BLAKE2B e0eb6df07ea6a377cc049e39bb481b8e3545f55f975c2579503162c8fa47ae1b5dd53b02f8d7d44d97ac564c3034f44328b1648a8ece8286d442e379e30a2928 SHA512 23b7488c53a0450f35b854e9e369d11064cd3bfd085c5cac8e1bf67c7385af7d543269dc3a70e9e3de96afeab8cbaa3d0358ed05c59846b55affba63523ac558
diff --git a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild
index d72c219d99da..d515880cf193 100644
--- a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild
+++ b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 XORG_MODULE=doc/
-XORG_TARBALL_SUFFIX="xz"
 
 inherit xorg-3