commit: 58592e0d68a7a5aa500d5eda1e5d780d77778428 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Jun 17 15:10:23 2025 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Jun 17 15:15:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58592e0d
x11-base/xorg-server: Port to xorg-meson.eclass Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-base/xorg-server/xorg-server-9999.ebuild | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index b5b0e5a96c8e..a95ac63e8f27 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 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 +inherit flag-o-matic xorg-meson EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"; DESCRIPTION="X.Org X servers" @@ -110,7 +109,7 @@ src_configure() { # 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=( + local XORG_CONFIGURE_OPTIONS=( --localstatedir "${EPREFIX}/var" --sysconfdir "${EPREFIX}/etc/X11" -Db_ndebug=$(usex debug false true) @@ -141,26 +140,26 @@ src_configure() { if [[ ${PV} == 9999 ]] ; then # Gone in 21.1.x, but not in master. - emesonargs+=( -Dxwayland=false ) + XORG_CONFIGURE_OPTIONS+=( -Dxwayland=false ) fi if use systemd || use elogind; then - emesonargs+=( + XORG_CONFIGURE_OPTIONS+=( -Dsystemd_logind=true $(meson_use suid suid_wrapper) ) else - emesonargs+=( + XORG_CONFIGURE_OPTIONS+=( -Dsystemd_logind=false -Dsuid_wrapper=false ) fi - meson_src_configure + xorg-meson_src_configure } src_install() { - meson_src_install + xorg-meson_src_install # The meson build system does not support install-setuid if ! use systemd && ! use elogind; then
