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

diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild b/sys-apps/keyutils/keyutils-1.5.10.ebuild
index 658882242f2c34b22ee858d8bd1bc46a05d7b4b1..298b6bed808c85efcd77e4e4e549c91c78a86672 100644 (file)
--- 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 d032a53dabddb630792cfe8817a1b1a713d7d5bc..2526784ea7bcf40c34ec5f2409e718aad503f666 100644 (file)
--- 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
 }