summaryrefslogtreecommitdiffstats
path: root/eclass
diff options
context:
space:
mode:
authorormorph <roma251078@mail.ru>2021-11-15 15:46:28 +0300
committerormorph <roma251078@mail.ru>2021-11-15 20:29:06 +0300
commit4b77dfb10f54d18a9e88ea3bd582e71da7941e02 (patch)
tree4c733f1a4d778fa5e6e35251b26504763d77efe7 /eclass
parente86b549b4781890c002255f8751708010f53994f (diff)
downloadtde-packaging-gentoo-4b77dfb10f54d18a9e88ea3bd582e71da7941e02.tar.gz
tde-packaging-gentoo-4b77dfb10f54d18a9e88ea3bd582e71da7941e02.zip
Added solution for circular dependencies and bugs in eclass
Signed-off-by: ormorph <roma251078@mail.ru>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/trinity-base-2.eclass11
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}"