From b8cbd39c0e0d3c04e31d8545b6efd6cea85f896c Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 16 Nov 2020 11:15:10 +0100
Subject: [PATCH] trinity-base-2.eclass: Begin to make
 set-trinityver/need-trinity obsolete

This remains conditional on BUILD_TYPE=live for now as this is where we can
experiment with things.

Set only relevant bits we need from these functions directly in here:
- TRINITY_VER
- TDEDIR
- TDEDIRS
- Dependency on trinity-base/tdelibs

In a follow-up commit, set-trinityver() and need-trinity() will become no-ops
for BUILD_TYPE=live.

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 eclass/trinity-base-2.eclass | 43 +++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/eclass/trinity-base-2.eclass b/eclass/trinity-base-2.eclass
index 5446d005..3c5a213d 100644
--- a/eclass/trinity-base-2.eclass
+++ b/eclass/trinity-base-2.eclass
@@ -163,7 +163,44 @@ else
 	die "Unknown BUILD_TYPE=${BUILD_TYPE}"
 fi
 
-if [[ ${CATEGORY} = trinity-base ]]; then
+if [[ ${BUILD_TYPE} == live ]]; then
+# @ECLASS-VARIABLE: TRINITY_VER
+# @DEPRECATED
+# @DESCRIPTION:
+# Synonymous with SLOT, this was used as a clutch between eclass and ebuilds to
+# set SLOT for release and live ebuilds by some means of version detection. But
+# for live it was really only using a hardcoded value inside trinity-functions-2
+# that we may as well hardcode here.
+# The *only* use in ebuilds is SLOT="${TRINITY_VER}" so this remains a fallback.
+	TRINITY_VER=14
+	if [[ ${CATEGORY} = trinity-base ]]; then
+		[[ -z ${SLOT} ]] && SLOT=${TRINITY_VER}
+	fi
+
+# @ECLASS-VARIABLE: TDEDIR
+# @DESCRIPTION:
+# Location of tdelibs to link against.
+# TODO: Rethink prefixing
+	export TDEDIR="/usr/trinity/${TRINITY_VER}"
+
+# @ECLASS-VARIABLE: TDEDIRS
+# @DESCRIPTION:
+# TDE expects that the install path is listed first in TDEDIRS
+# Reference: More information inside trinity-base/tdelibs package
+# TODO: Rethink prefixing
+	export TDEDIRS="/usr/trinity/${TRINITY_VER}"
+
+	# TODO: get rid of these hacks re prefixing
+	adjust-trinity-paths
+
+	case ${CATEGORY} in
+		trinity-base|trinity-apps)
+			[[ ${PN} != tdelibs ]] &&
+			COMMON_DEPEND+=" ~trinity-base/tdelibs-${PV}"
+			;;
+		*) ;;
+	esac
+elif [[ ${CATEGORY} = trinity-base ]]; then
 	# Set SLOT, TDEDIR, TRINITY_VER and PREFIX
 	set-trinityver
 	[[ -z ${SLOT} ]] && SLOT=${TRINITY_VER}
@@ -204,6 +241,10 @@ if [[ -n "${TRINITY_EXTRAGEAR_PACKAGING}" ]]; then
 	fi
 fi
 
+DEPEND+=" ${COMMON_DEPEND}"
+RDEPEND+=" ${COMMON_DEPEND}"
+unset COMMON_DEPEND
+
 # @FUNCTION: trinity-base-2_src_unpack
 # @DESCRIPTION:
 # A default src unpack function to call git-v3_src_unpack if necessary