Move KV funcs to bashrc-functions.sh.

diff --git a/bin/bashrc-functions.sh b/bin/bashrc-functions.sh
index 91ff6d7386138606c3543e8a39481eabd2ac22c3..4da55858192e73d0417d3d62852e6c1b03acd70b 100644 (file)
--- a/bin/bashrc-functions.sh
+++ b/bin/bashrc-functions.sh
@@ -87,3 +87,54 @@ unset_unless_changed() {
                fi
        done
 }
+
+KV_major() {
+       [[ -z $1 ]] && return 1
+
+       local KV=$@
+       echo "${KV%%.*}"
+}
+
+KV_minor() {
+       [[ -z $1 ]] && return 1
+
+       local KV=$@
+       KV=${KV#*.}
+       echo "${KV%%.*}"
+}
+
+KV_micro() {
+       [[ -z $1 ]] && return 1
+
+       local KV=$@
+       KV=${KV#*.*.}
+       echo "${KV%%[^[:digit:]]*}"
+}
+
+KV_to_int() {
+       [[ -z $1 ]] && return 1
+
+       local KV_MAJOR=$(KV_major "$1")
+       local KV_MINOR=$(KV_minor "$1")
+       local KV_MICRO=$(KV_micro "$1")
+       local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+       # We make version 2.2.0 the minimum version we will handle as
+       # a sanity check ... if its less, we fail ...
+       if [[ ${KV_int} -ge 131584 ]] ; then
+               echo "${KV_int}"
+               return 0
+       fi
+
+       return 1
+}
+
+_RC_GET_KV_CACHE=""
+get_KV() {
+       [[ -z ${_RC_GET_KV_CACHE} ]] \
+               && _RC_GET_KV_CACHE=$(uname -r)
+
+       echo $(KV_to_int "${_RC_GET_KV_CACHE}")
+
+       return $?
+}

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 1d014167a758e51c5decd493199fecea0ca3e67a..641d827034974012115d5a6eb13174de2c5b896d 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -27,8 +27,9 @@ else
        # These dummy functions are for things that are likely to be called
        # in global scope, even though they are completely useless during
        # the "depend" phase.
-       for x in diropts docompress exeopts insopts \
-               keepdir libopts register_die_hook register_success_hook \
+       for x in diropts docompress exeopts get_KV insopts \
+               keepdir KV_major KV_micro KV_minor KV_to_int \
+               libopts register_die_hook register_success_hook \
                remove_path_entry set_unless_changed strip_duplicate_slashes \
                unset_unless_changed use useq usev use_with use_enable ; do
                eval "${x}() { : ; }"

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 5247e7e268a5dec066f6a2dc4032812f8ccdffae..dbd653c41f9daaec68781055c0f4877ace13e93b 100644 (file)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -397,57 +397,6 @@ eend() {
        return ${retval}
 }
 
-KV_major() {
-       [[ -z $1 ]] && return 1
-
-       local KV=$@
-       echo "${KV%%.*}"
-}
-
-KV_minor() {
-       [[ -z $1 ]] && return 1
-
-       local KV=$@
-       KV=${KV#*.}
-       echo "${KV%%.*}"
-}
-
-KV_micro() {
-       [[ -z $1 ]] && return 1
-
-       local KV=$@
-       KV=${KV#*.*.}
-       echo "${KV%%[^[:digit:]]*}"
-}
-
-KV_to_int() {
-       [[ -z $1 ]] && return 1
-
-       local KV_MAJOR=$(KV_major "$1")
-       local KV_MINOR=$(KV_minor "$1")
-       local KV_MICRO=$(KV_micro "$1")
-       local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
-
-       # We make version 2.2.0 the minimum version we will handle as
-       # a sanity check ... if its less, we fail ...
-       if [[ ${KV_int} -ge 131584 ]] ; then
-               echo "${KV_int}"
-               return 0
-       fi
-
-       return 1
-}
-
-_RC_GET_KV_CACHE=""
-get_KV() {
-       [[ -z ${_RC_GET_KV_CACHE} ]] \
-               && _RC_GET_KV_CACHE=$(uname -r)
-
-       echo $(KV_to_int "${_RC_GET_KV_CACHE}")
-
-       return $?
-}
-
 unset_colors() {
        COLS=80
        ENDCOL=