diff options
| -rw-r--r-- | eclass/trinity-base-2.eclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/eclass/trinity-base-2.eclass b/eclass/trinity-base-2.eclass index d077d6e3..3916a1da 100644 --- a/eclass/trinity-base-2.eclass +++ b/eclass/trinity-base-2.eclass @@ -195,7 +195,8 @@ if [[ ${BUILD_TYPE} == live ]]; then case ${CATEGORY} in trinity-base|trinity-apps) - [[ ${PN} != tdelibs ]] && [[ ${TRINITY_MODULE_TYPE} != "dependencies" ]] && + [[ ${PN} != tdelibs ]] && [[ ${TRINITY_MODULE_TYPE} != "dependencies" ]] && [[ ${PN} != "arts" ]] && + [[ ${PN} != "trinity-cmake" ]] && COMMON_DEPEND+=" ~trinity-base/tdelibs-${PV}" ;; *) ;; @@ -205,12 +206,14 @@ elif [[ ${CATEGORY} = trinity-base ]]; then set-trinityver [[ -z ${SLOT} ]] && SLOT=${TRINITY_VER} # Common dependencies - [[ ${PN} != tdelibs ]] && need-trinity + [[ ${PN} != tdelibs ]] && [[ ${PN} != "arts" ]] && [[ ${PN} != "trinity-cmake" ]] && need-trinity +elif [[ ${CATEGORY} = "trinity-apps" ]]; then + need-trinity fi # Common dependencies -[[ ${PN} == "14.0.1"[1-9] ]] || [[ "${BUILD_TYPE}" == "live" ]] && -[[ ${TRINITY_MODULE_NAME} != "tde-common-cmake" ]] && +[[ ${PV} == "14.0.1"[1-9] ]] || [[ "${BUILD_TYPE}" == "live" ]] && +[[ ${PN} != "trinity-cmake" ]] && [[ ${TRINITY_BUILD_ADMIN} != "yes" ]] && BDEPEND+=" ~trinity-base/trinity-cmake-${PV}" |