[gentoo-portage-dev] use* cleanup

[Marijn Schouten (hkBst)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

The purpose of this patch is to expose a generic function, namely _use, which
can be used to build your own use* variant if you need that. I reimplemented
all other current use function using _use (and _if) to cut out duplicate and
verbose code. Comments expected. I didn't test this code.

Marijn

diff -uw /usr/lib64/portage/bin/ebuild.sh ~/ebuild.sh
@@ -150,40 +150,68 @@
        return 0
 }

- -use() {
- -       useq ${1}
+_if() {
+    $1 && echo $2 || echo $3
 }

- -usev() {
- -       if useq ${1}; then
- -               echo "${1}"
- -               return 0
- -       fi
+# Fully generic conditional use flag function.
+# $1: calling function
+# $2: use flag to check
+# $3: string to echo on success
+# $4: string to echo on failure
+_use() {
+       if [[ $# = 1 ]]; then
+               echo "!!! $1() called without a parameter." >&2
+               echo "!!! $1 <USEFLAG> [<flagname> [value]]" >&2
        return 1
- -}
+       fi

- -useq() {
- -       local u=$1
+       local flag=$2
+       local string_success=$3
+       local string_failure=$4
        local found=0

- -       # if we got something like '!flag', then invert the return value
- -       if [[ ${u:0:1} == "!" ]] ; then
- -               u=${u:1}
- -               found=1
- -       fi
+    # when $flag is '!blah', invert the return value and strip the '!' from flag
+       [[ ${flag} = !* ]] && { found=1 ; flag=${flag:1} }

        # Make sure we have this USE flag in IUSE
- -       if ! hasq "${u}" ${IUSE} ${E_IUSE} && ! hasq "${u}"
${PORTAGE_ARCHLIST} selinux; then
- -               eqawarn "QA Notice: USE Flag '${u}' not in IUSE for
${CATEGORY}/${PF}"
+       if ! hasq "${flag}" ${IUSE} ${E_IUSE} && ! hasq "${u}"
${PORTAGE_ARCHLIST} selinux; then
+           eqawarn "QA Notice: USE Flag '${flag}' not in IUSE for
${CATEGORY}/${PF}"
        fi

- -       if hasq ${u} ${USE} ; then
- -               return ${found}
+       if hasq ${flag} ${USE} ; then
+           echo ${string_success}; return ${found}
        else
- -               return $((!found))
+           echo ${string_failure}; return $((!found))
        fi
 }

+use() {
+       _use ${FUNCNAME[0]} ${1}
+}
+
+useq() {
+       _use ${FUNCNAME[0]} ${1}
+}
+
+usev() {
+    _use ${FUNCNAME[0]} ${1} ${1}
+}
+
+use_with() {
+       local SUFFIX="$(_if [ -z $3 ] "" "=$3")"
+       local WORD="$(_if [ -z $2 ] $1 $2)"
+
+       _use ${FUNCNAME[0]} $1 "--with-${WORD}${SUFFIX}" "--without-${WORD}"
+}
+
+use_enable() {
+       local SUFFIX="$(_if [ -z $3 ] "" "=$3")"
+       local WORD="$(_if [ -z $2 ] $1 $2)"
+
+       _use ${FUNCNAME[0]} $1 "--enable-${WORD}${SUFFIX}" "--disable-${WORD}"
+}
+
 has_version() {
        if [ "${EBUILD_PHASE}" == "depend" ]; then
                die "portageq calls (has_version calls portageq) are not
allowed in the global scope"
@@ -227,56 +255,6 @@
        "${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1"
 }

- -use_with() {
- -       if [ -z "$1" ]; then
- -               echo "!!! use_with() called without a parameter." >&2
- -               echo "!!! use_with <USEFLAG> [<flagname> [value]]" >&2
- -               return 1
- -       fi
- -
- -       local UW_SUFFIX=""
- -       if [ ! -z "${3}" ]; then
- -               UW_SUFFIX="=${3}"
- -       fi
- -
- -       local UWORD="$2"
- -       if [ -z "${UWORD}" ]; then
- -               UWORD="$1"
- -       fi
- -
- -       if useq $1; then
- -               echo "--with-${UWORD}${UW_SUFFIX}"
- -       else
- -               echo "--without-${UWORD}"
- -       fi
- -       return 0
- -}
- -
- -use_enable() {
- -       if [ -z "$1" ]; then
- -               echo "!!! use_enable() called without a parameter." >&2
- -               echo "!!! use_enable <USEFLAG> [<flagname> [value]]" >&2
- -               return 1
- -       fi
- -
- -       local UE_SUFFIX=""
- -       if [ ! -z "${3}" ]; then
- -               UE_SUFFIX="=${3}"
- -       fi
- -
- -       local UWORD="$2"
- -       if [ -z "${UWORD}" ]; then
- -               UWORD="$1"
- -       fi
- -
- -       if useq $1; then
- -               echo "--enable-${UWORD}${UE_SUFFIX}"
- -       else
- -               echo "--disable-${UWORD}"
- -       fi
- -       return 0
- -}
- -

- --
Marijn Schouten (hkBst), Gentoo Lisp project
<http://www.gentoo.org/proj/en/lisp/>, #gentoo-lisp on FreeNode
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHJ3jUp/VmCx0OL2wRAnduAJ9BkYDzf7ROLUeVVOQ4m5oVZ3TNoQCeIlQ9
9XN6WDbj4CtojnRX9Zc9ny8=
=4pj9
-----END PGP SIGNATURE-----
-- 
gentoo-portage-dev@g.o mailing list