From aef085e1212ab8c6a08c3aae97fc5e51b074d269 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 15 Nov 2020 18:22:23 +0100
Subject: [PATCH] trinity-functions-2.eclass: need-trinity/need-arts: Do not
 use ETRINITY_VER

This depends on an undocumented variable set inside a function set-trinityver()
that may or may not be run before.

In reality, that string only ever contained ${PV} anyway.

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 eclass/trinity-functions-2.eclass | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/eclass/trinity-functions-2.eclass b/eclass/trinity-functions-2.eclass
index 252ef1b4..17eb1c5c 100644
--- a/eclass/trinity-functions-2.eclass
+++ b/eclass/trinity-functions-2.eclass
@@ -125,7 +125,7 @@ need-trinity() {
 	set-trinityver ${1}
 	adjust-trinity-paths
 
-	my_depend="~trinity-base/tdelibs-${ETRINITY_VER}"
+	my_depend="~trinity-base/tdelibs-${PV}"
 
 	DEPEND+=" ${my_depend}"
 	RDEPEND+=" ${my_depend}"
@@ -153,17 +153,11 @@ need-arts() {
 
 	TRINITY_NEED_ARTS="${1}"
 
-	case "${TRINITY_VER}" in
-		"") die "You must call the set-trinityver function to set TRINITY_VER before calling ${FUNCNAME}."
-			;;
-		*)
-			tdelibs="~trinity-base/tdelibs-${ETRINITY_VER}"
-			arts="~trinity-base/arts-${ETRINITY_VER}"
-			;;
-	esac
+	tdelibs="~trinity-base/tdelibs-${PV}"
+	arts="~trinity-base/arts-${PV}"
 
 	# Handle trinity-base/tdelibs in special way
-	if [[ "~${CATEGORY}/${P}" == "${tdelibs}" ]]; then
+	if [[ "${CATEGORY}/${PN}" == "trinity-base/tdelibs" ]]; then
 		if [[ "${1}" == "optional" ]]; then
 			my_depend=" arts? ( ${arts} )"
 			IUSE+=" arts"