diff options
| -rw-r--r-- | eclass/cmake.eclass | 14 | ||||
| -rw-r--r-- | net-im/kaidan/kaidan-9999.ebuild | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index eba47d2405d..f214ec36c2d 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -370,20 +370,26 @@ _cmake_minreqver-info() { case ${1} in 305) eqawarn "The following CMakeLists.txt files are causing errors:" - for info in ${_CMAKE_MINREQVER_CMAKE305[*]}; do eqawarn " ${info}"; done + for info in ${_CMAKE_MINREQVER_CMAKE305[*]}; do + eqawarn " ${info#"${CMAKE_USE_DIR}/"}"; + done eqawarn ;; 310) if [[ -n ${_CMAKE_MINREQVER_CMAKE310[@]} ]]; then eqawarn "The following CMakeLists.txt files are causing warnings:" - for info in ${_CMAKE_MINREQVER_CMAKE310[*]}; do eqawarn " ${info}"; done + for info in ${_CMAKE_MINREQVER_CMAKE310[*]}; do + eqawarn " ${info#"${CMAKE_USE_DIR}/"}"; + done eqawarn fi ;; 316) if [[ ${warnlvl} -ge 316 ]] && [[ -n ${_CMAKE_MINREQVER_CMAKE316[@]} ]]; then eqawarn "The following CMakeLists.txt files are causing warnings:" - for info in ${_CMAKE_MINREQVER_CMAKE316[*]}; do eqawarn " ${info}"; done + for info in ${_CMAKE_MINREQVER_CMAKE316[*]}; do + eqawarn " ${info#"${CMAKE_USE_DIR}/"}"; + done eqawarn fi ;; @@ -444,7 +450,7 @@ _cmake_modify-cmakelists() { fi # Detect unsupported minimum CMake versions unless CMAKE_QA_COMPAT_SKIP is set if ! [[ ${CMAKE_QA_COMPAT_SKIP} ]]; then - _cmake_minreqver-check "${file#"${CMAKE_USE_DIR}/"}" + _cmake_minreqver-check "${file}" fi done < <(find "${CMAKE_USE_DIR}" -type f -iname "CMakeLists.txt" -print0 || die) diff --git a/net-im/kaidan/kaidan-9999.ebuild b/net-im/kaidan/kaidan-9999.ebuild index 8c30078e0c1..8659881558c 100644 --- a/net-im/kaidan/kaidan-9999.ebuild +++ b/net-im/kaidan/kaidan-9999.ebuild @@ -39,7 +39,7 @@ RDEPEND=" >=kde-frameworks/prison-${KFMIN}:6[qml] >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 media-libs/kquickimageeditor:6 - >=net-libs/qxmpp-1.11.0[omemo] + >=net-libs/qxmpp-1.11.0:=[omemo] " DEPEND="${RDEPEND} >=dev-qt/qtbase-${QTMIN}:6[concurrent] |