Added solution for circular dependencies and bugs in eclass

Signed-off-by: ormorph <roma251078@mail.ru>

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" ]] &&
+[[ ${PV} == "14.0.1"[1-9] ]] || [[ "${BUILD_TYPE}" == "live" ]] &&
-[[ ${TRINITY_MODULE_NAME} != "tde-common-cmake" ]] &&
+[[ ${PN} != "trinity-cmake" ]] && 
 [[ ${TRINITY_BUILD_ADMIN} != "yes" ]] &&
 BDEPEND+=" ~trinity-base/trinity-cmake-${PV}"