[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ulrich Müller]

commit:     132baffc6b897052858258081c4276d2ea0dc647
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 27 18:05:59 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 18:05:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132baffc

Revert "kernel-2.eclass: Replace bit-shift arithmetic by ver_test"

This reverts commit 1646e870d312060d7920869eec8416a8753724b6.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 eclass/kernel-2.eclass | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 4597da4c96b..8c174099827 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -560,7 +560,7 @@ kernel_is() {
        [[ ${n} -eq 1 ]] && detect_version
 
        # Now we can continue
-       local operator
+       local operator test value
 
        case ${1#-} in
          lt) operator="-lt"; shift;;
@@ -572,10 +572,9 @@ kernel_is() {
        esac
        [[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many 
parameters"
 
-       ver_test \
-               "${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" \
-               "${operator}" \
-               "${1:-${KV_MAJOR}}.${2:-${KV_MINOR}}.${3:-${KV_PATCH}}"
+       : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH ))
+       : $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + 
${3:-${KV_PATCH}} ))
+       [ ${test} ${operator} ${value} ]
 }
 
 # Capture the sources type and set DEPENDs