sys-apps/systemd: check for FW_LOADER_USER_HELPER_FALLBACK

FW_LOADER_USER_HELPER is not directly configurable, so it's fairly
pointless to warn about it.

Closes: https://bugs.gentoo.org/643606
Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37

diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild
index fded2f5f4a08bbb666dc189423c6561ef4497b56..a9934d8199246f9dab4f313139f6bd0f0c11f912 100644 (file)
--- a/sys-apps/systemd/systemd-233-r6.ebuild
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -112,7 +112,7 @@ pkg_pretend() {
                        ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
                        ~TIMERFD ~TMPFS_XATTR ~UNIX
                        ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-                       ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+                       ~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
                        ~!SYSFS_DEPRECATED_V2"
 
                use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"

diff --git a/sys-apps/systemd/systemd-235-r1.ebuild b/sys-apps/systemd/systemd-235-r1.ebuild
index a0800a27a1d61884f1201fb6b7fcd7a881d9bb71..2727ae07b8b2af24ef17a86cc723f4ba95771933 100644 (file)
--- a/sys-apps/systemd/systemd-235-r1.ebuild
+++ b/sys-apps/systemd/systemd-235-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -110,7 +110,7 @@ pkg_pretend() {
                        ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
                        ~TIMERFD ~TMPFS_XATTR ~UNIX
                        ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-                       ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+                       ~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
                        ~!SYSFS_DEPRECATED_V2"
 
                use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"

diff --git a/sys-apps/systemd/systemd-236-r4.ebuild b/sys-apps/systemd/systemd-236-r4.ebuild
index 816c66a23733d5105917cf23a00d9e731d85e1ca..be31a53ad519975b33c010d91f04cc1a1a1f253a 100644 (file)
--- a/sys-apps/systemd/systemd-236-r4.ebuild
+++ b/sys-apps/systemd/systemd-236-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -109,7 +109,7 @@ pkg_pretend() {
                        ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
                        ~TIMERFD ~TMPFS_XATTR ~UNIX
                        ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-                       ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+                       ~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
                        ~!SYSFS_DEPRECATED_V2"
 
                use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7122881b52d1c20bb886086361dfec6126785323..7e7bcf41a4493a79f11ade3df5591138bb26b05f 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -108,7 +108,7 @@ pkg_pretend() {
                        ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
                        ~TIMERFD ~TMPFS_XATTR ~UNIX
                        ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-                       ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+                       ~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
                        ~!SYSFS_DEPRECATED_V2"
 
                use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"