From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 330971581EE for ; Mon, 24 Mar 2025 12:03:57 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 1BE29343515 for ; Mon, 24 Mar 2025 12:03:57 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 57A361104AE; Mon, 24 Mar 2025 12:03:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 5231B1104AD for ; Mon, 24 Mar 2025 12:03:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01CED3434CF for ; Mon, 24 Mar 2025 12:03:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E8FB283B for ; Mon, 24 Mar 2025 12:03:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1742817793.a8287967b961c8ebfe474aad98d77741f8e88a69.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd-utils/systemd-utils-255.18.ebuild sys-apps/systemd-utils/systemd-utils-256.12.ebuild X-VCS-Directories: sys-apps/systemd-utils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a8287967b961c8ebfe474aad98d77741f8e88a69 X-VCS-Branch: master Date: Mon, 24 Mar 2025 12:03:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ebf250db-3a96-4010-bf3b-b5c30c2e2bbc X-Archives-Hash: 880a56ec134069aa5cba1c2095e80f00 commit: a8287967b961c8ebfe474aad98d77741f8e88a69 Author: Sam James gentoo org> AuthorDate: Mon Mar 24 12:02:52 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 24 12:03:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8287967 sys-apps/systemd-utils: handle option deprecations meson from git errors out on these deprecated names. No need to do 254 as the changes weren't in there upstream. Signed-off-by: Sam James gentoo.org> sys-apps/systemd-utils/systemd-utils-255.18.ebuild | 76 +++++++++++----------- sys-apps/systemd-utils/systemd-utils-256.12.ebuild | 76 +++++++++++----------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/sys-apps/systemd-utils/systemd-utils-255.18.ebuild b/sys-apps/systemd-utils/systemd-utils-255.18.ebuild index 94f49394cabf..0dc8b2ab3825 100644 --- a/sys-apps/systemd-utils/systemd-utils-255.18.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-255.18.ebuild @@ -154,33 +154,33 @@ multilib_src_configure() { # default is developer, bug 918671 -Dmode=release -Dsysvinit-path= - $(meson_native_use_bool boot bootloader) + $(meson_native_use_feature boot bootloader) $(meson_native_use_bool kernel-install) - $(meson_native_use_bool selinux) + $(meson_native_use_feature selinux) $(meson_native_use_bool sysusers) $(meson_use test tests) $(meson_native_use_bool tmpfiles) $(meson_use udev hwdb) - $(meson_native_use_bool ukify) + $(meson_native_use_feature ukify) # Disable all optional features -Dadm-group=false -Danalyze=false - -Dapparmor=false - -Daudit=false + -Dapparmor=disabled + -Daudit=disabled -Dbacklight=false -Dbinfmt=false - -Dbpf-framework=false - -Dbzip2=false + -Dbpf-framework=disabled + -Dbzip2=disabled -Dcoredump=false - -Ddbus=false - -Delfutils=false + -Ddbus=disabled + -Delfutils=disabled -Denvironment-d=false - -Dfdisk=false - -Dgcrypt=false - -Dglib=false + -Dfdisk=disabled + -Dgcrypt=disabled + -Dglib=disabled -Dgshadow=false - -Dgnutls=false + -Dgnutls=disabled -Dhibernate=false -Dhostnamed=false -Didn=false @@ -188,63 +188,63 @@ multilib_src_configure() { -Dinitrd=false -Dfirstboot=false -Dldconfig=false - -Dlibcryptsetup=false - -Dlibcurl=false - -Dlibfido2=false - -Dlibidn=false - -Dlibidn2=false - -Dlibiptc=false + -Dlibcryptsetup=disabled + -Dlibcurl=disabled + -Dlibfido2=disabled + -Dlibidn=disabled + -Dlibidn2=disabled + -Dlibiptc=disabled -Dlocaled=false -Dlogind=false - -Dlz4=false + -Dlz4=disabled -Dmachined=false - -Dmicrohttpd=false + -Dmicrohttpd=disabled -Dnetworkd=false -Dnscd=false -Dnss-myhostname=false - -Dnss-resolve=false + -Dnss-resolve=disabled -Dnss-systemd=false -Doomd=false - -Dopenssl=false - -Dp11kit=false - -Dpam=false - -Dpcre2=false - -Dpolkit=false + -Dopenssl=disabled + -Dp11kit=disabled + -Dpam=disabled + -Dpcre2=disabled + -Dpolkit=disabled -Dportabled=false -Dpstore=false - -Dpwquality=false + -Dpwquality=disabled -Drandomseed=false -Dresolve=false -Drfkill=false - -Dseccomp=false + -Dseccomp=disabled -Dsmack=false -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false - -Dqrencode=false + -Dqrencode=disabled -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false -Dxdg-autostart=false - -Dxkbcommon=false - -Dxz=false - -Dzlib=false - -Dzstd=false + -Dxkbcommon=disabled + -Dxz=disabled + -Dzlib=disabled + -Dzstd=disabled ) if use tmpfiles || use udev; then - emesonargs+=( $(meson_native_use_bool acl) ) + emesonargs+=( $(meson_native_use_feature acl) ) else - emesonargs+=( -Dacl=false ) + emesonargs+=( -Dacl=disabled ) fi if use udev; then - emesonargs+=( $(meson_native_use_bool kmod) ) + emesonargs+=( $(meson_native_use_feature kmod) ) else - emesonargs+=( -Dkmod=false ) + emesonargs+=( -Dkmod=disabled ) fi if use elibc_musl; then diff --git a/sys-apps/systemd-utils/systemd-utils-256.12.ebuild b/sys-apps/systemd-utils/systemd-utils-256.12.ebuild index c12f5a725307..c8195708e031 100644 --- a/sys-apps/systemd-utils/systemd-utils-256.12.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-256.12.ebuild @@ -145,33 +145,33 @@ multilib_src_configure() { # default is developer, bug 918671 -Dmode=release -Dsysvinit-path= - $(meson_native_use_bool boot bootloader) + $(meson_native_use_feature boot bootloader) $(meson_native_use_bool kernel-install) - $(meson_native_use_bool selinux) + $(meson_native_use_feature selinux) $(meson_native_use_bool sysusers) $(meson_use test tests) $(meson_native_use_bool tmpfiles) $(meson_use udev hwdb) - $(meson_native_use_bool ukify) + $(meson_native_use_feature ukify) # Disable all optional features -Dadm-group=false -Danalyze=false - -Dapparmor=false - -Daudit=false + -Dapparmor=disabled + -Daudit=disabled -Dbacklight=false -Dbinfmt=false - -Dbpf-framework=false - -Dbzip2=false + -Dbpf-framework=disabled + -Dbzip2=disabled -Dcoredump=false - -Ddbus=false - -Delfutils=false + -Ddbus=disabled + -Delfutils=disabled -Denvironment-d=false - -Dfdisk=false - -Dgcrypt=false - -Dglib=false + -Dfdisk=disabled + -Dgcrypt=disabled + -Dglib=disabled -Dgshadow=false - -Dgnutls=false + -Dgnutls=disabled -Dhibernate=false -Dhostnamed=false -Didn=false @@ -179,63 +179,63 @@ multilib_src_configure() { -Dinitrd=false -Dfirstboot=false -Dldconfig=false - -Dlibcryptsetup=false - -Dlibcurl=false - -Dlibfido2=false - -Dlibidn=false - -Dlibidn2=false - -Dlibiptc=false + -Dlibcryptsetup=disabled + -Dlibcurl=disabled + -Dlibfido2=disabled + -Dlibidn=disabled + -Dlibidn2=disabled + -Dlibiptc=disabled -Dlocaled=false -Dlogind=false - -Dlz4=false + -Dlz4=disabled -Dmachined=false - -Dmicrohttpd=false + -Dmicrohttpd=disabled -Dnetworkd=false -Dnscd=false -Dnss-myhostname=false - -Dnss-resolve=false + -Dnss-resolve=disabled -Dnss-systemd=false -Doomd=false - -Dopenssl=false - -Dp11kit=false - -Dpam=false - -Dpcre2=false - -Dpolkit=false + -Dopenssl=disabled + -Dp11kit=disabled + -Dpam=disabled + -Dpcre2=disabled + -Dpolkit=disabled -Dportabled=false -Dpstore=false - -Dpwquality=false + -Dpwquality=disabled -Drandomseed=false -Dresolve=false -Drfkill=false - -Dseccomp=false + -Dseccomp=disabled -Dsmack=false -Dsysext=false -Dtimedated=false -Dtimesyncd=false -Dtpm=false - -Dqrencode=false + -Dqrencode=disabled -Dquotacheck=false -Duserdb=false -Dutmp=false -Dvconsole=false -Dwheel-group=false -Dxdg-autostart=false - -Dxkbcommon=false - -Dxz=false - -Dzlib=false - -Dzstd=false + -Dxkbcommon=disabled + -Dxz=disabled + -Dzlib=disabled + -Dzstd=disabled ) if use tmpfiles || use udev; then - emesonargs+=( $(meson_native_use_bool acl) ) + emesonargs+=( $(meson_native_use_feature acl) ) else - emesonargs+=( -Dacl=false ) + emesonargs+=( -Dacl=disabled ) fi if use udev; then - emesonargs+=( $(meson_native_use_bool kmod) ) + emesonargs+=( $(meson_native_use_feature kmod) ) else - emesonargs+=( -Dkmod=false ) + emesonargs+=( -Dkmod=disabled ) fi if use elibc_musl; then