commit: a8287967b961c8ebfe474aad98d77741f8e88a69
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 24 12:02:52 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
