summaryrefslogtreecommitdiffstats
path: root/eclass
diff options
context:
space:
mode:
authorormorph <roma251078@mail.ru>2021-06-11 12:50:14 +0300
committerormorph <roma251078@mail.ru>2021-06-12 06:52:29 +0300
commit913291ea5e876b5d9c23009515e90658e307b91f (patch)
treed225171dffa264ab1f896f794825ea81ea339128 /eclass
parenta5249af258e7500113b5a9e1edb6a2d655f2dcab (diff)
downloadtde-packaging-gentoo-913291ea5e876b5d9c23009515e90658e307b91f.tar.gz
tde-packaging-gentoo-913291ea5e876b5d9c23009515e90658e307b91f.zip
Improved dependencies with trinity-cmake package.
Signed-off-by: ormorph <roma251078@mail.ru>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/trinity-base-2.eclass10
1 files changed, 6 insertions, 4 deletions
diff --git a/eclass/trinity-base-2.eclass b/eclass/trinity-base-2.eclass
index ebd529f2..7af8ed8a 100644
--- a/eclass/trinity-base-2.eclass
+++ b/eclass/trinity-base-2.eclass
@@ -197,10 +197,6 @@ if [[ ${BUILD_TYPE} == live ]]; then
trinity-base|trinity-apps)
[[ ${PN} != tdelibs ]] && [[ ${TRINITY_MODULE_TYPE} != "dependencies" ]] &&
COMMON_DEPEND+=" ~trinity-base/tdelibs-${PV}"
- [[ ${PN} == "14.0.1"[1-9] ]] || [[ "${BUILD_TYPE}" == "live" ]] &&
- [[ ${TRINITY_MODULE_NAME} != "tde-common-cmake" ]] &&
- [[ ${TRINITY_BUILD_ADMIN} != "yes" ]] &&
- COMMON_DEPEND+=" ~trinity-base/trinity-cmake-${PV}"
;;
*) ;;
esac
@@ -212,6 +208,12 @@ elif [[ ${CATEGORY} = trinity-base ]]; then
[[ ${PN} != tdelibs ]] && need-trinity
fi
+# Common dependencies
+[[ ${PN} == "14.0.1"[1-9] ]] || [[ "${BUILD_TYPE}" == "live" ]] &&
+[[ ${TRINITY_MODULE_NAME} != "tde-common-cmake" ]] &&
+[[ ${TRINITY_BUILD_ADMIN} != "yes" ]] &&
+BDEPEND+=" ~trinity-base/trinity-cmake-${PV}"
+
if [[ -n "${TRINITY_EXTRAGEAR_PACKAGING}" ]]; then
# @ECLASS-VARIABLE: TEG_PO_DIR
# @DESCRIPTION: