commit: 5ba206c24738022e96693a5591fb3a6227f51a6a Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Mar 11 06:24:06 2018 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Mar 11 06:24:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba206c2
sys-apps/keyutils: Don't check for KEYS_DEBUG_PROC_KEYS after Linux 4.0 Closes: https://bugs.gentoo.org/552512 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-apps/keyutils/keyutils-1.5.10.ebuild | 9 ++++++--- sys-apps/keyutils/keyutils-1.5.9-r4.ebuild | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild b/sys-apps/keyutils/keyutils-1.5.10.ebuild index 658882242f2..298b6bed808 100644 --- a/sys-apps/keyutils/keyutils-1.5.10.ebuild +++ b/sys-apps/keyutils/keyutils-1.5.10.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=5 @@ -25,9 +25,12 @@ PATCHES=( pkg_setup() { CONFIG_CHECK="~KEYS" - use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS" ERROR_KEYS="You must have CONFIG_KEYS to use this package!" - ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!" + + if use test && kernel_is lt 4 0 0; then + CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS" + ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!" + fi linux-info_pkg_setup } diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild index d032a53dabd..2526784ea7b 100644 --- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild +++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild @@ -19,9 +19,12 @@ DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" pkg_setup() { CONFIG_CHECK="~KEYS" - use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS" ERROR_KEYS="You must have CONFIG_KEYS to use this package!" - ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!" + + if use test && kernel_is lt 4 0 0; then + CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS" + ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!" + fi linux-info_pkg_setup }
