diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-15 18:22:23 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-29 23:10:16 +0100 |
| commit | aef085e1212ab8c6a08c3aae97fc5e51b074d269 (patch) | |
| tree | eca8ef08590164d2d6555b853aa18193375bb4df | |
| parent | d55ba647926b122143bc5728a9fa50eb922ee034 (diff) | |
| download | tde-packaging-gentoo-aef085e1212ab8c6a08c3aae97fc5e51b074d269.tar.gz tde-packaging-gentoo-aef085e1212ab8c6a08c3aae97fc5e51b074d269.zip | |
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>
| -rw-r--r-- | eclass/trinity-functions-2.eclass | 14 |
1 files 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" |