depend.apache.eclass: Replace build_with_use with has_version, disallow for EAPIs...

There are no EAPI=0 / EAPI=1 ebuilds in the tree that are affected.

diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index b69c2ec55b5787ac5f564db2b4742afa1598b4b2..f0848a63d1814cbea934ce446d8e696ec9d90c4f 100644 (file)
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -290,7 +290,13 @@ has_apache() {
 has_apache_threads() {
        debug-print-function $FUNCNAME $*
 
-       if ! built_with_use www-servers/apache threads; then
+       case ${EAPI:-0} in
+               0|1)
+                       die "depend.apache.eclass: has_apache_threads is not supported for EAPI=${EAPI:-0}"
+                       ;;
+       esac
+
+       if ! has_version 'www-servers/apache[threads]'; then
                return
        fi
 
@@ -313,14 +319,20 @@ has_apache_threads() {
 has_apache_threads_in() {
        debug-print-function $FUNCNAME $*
 
-       if ! built_with_use www-servers/apache threads; then
+       case ${EAPI:-0} in
+               0|1)
+                       die "depend.apache.eclass: has_apache_threads_in is not supported for EAPI=${EAPI:-0}"
+                       ;;
+       esac
+
+       if ! has_version 'www-servers/apache[threads]'; then
                return
        fi
 
        local myforeign="$1"
        local myflag="${2:-threads}"
 
-       if ! built_with_use ${myforeign} ${myflag}; then
+       if ! has_version "${myforeign}[${myflag}]"; then
                echo
                eerror "You need to enable USE flag '${myflag}' in ${myforeign} to"
                eerror "build a thread-safe version of ${CATEGORY}/${PN} for use"