diff options
| -rw-r--r-- | eclass/trinity-functions-2.eclass | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/eclass/trinity-functions-2.eclass b/eclass/trinity-functions-2.eclass index eff5a0fa..ccca0b16 100644 --- a/eclass/trinity-functions-2.eclass +++ b/eclass/trinity-functions-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 @@ -125,7 +125,7 @@ need-trinity() { set-trinityver ${1} adjust-trinity-paths - my_depend="=trinity-base/tdelibs-${ETRINITY_VER}" + my_depend="~trinity-base/tdelibs-${ETRINITY_VER}" DEPEND+=" ${my_depend}" RDEPEND+=" ${my_depend}" @@ -154,12 +154,16 @@ 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}";; + "") 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 # Handle trinity-base/tdelibs in special way - if [[ "=${CATEGORY}/${P}" == "${tdelibs}" ]]; then + if [[ "~${CATEGORY}/${P}" == "${tdelibs}" ]]; then if [[ "${1}" == "optional" ]]; then my_depend=" arts? ( ${arts} )" IUSE+=" arts" @@ -194,4 +198,4 @@ trinity_l10n_for_each_locale_do() { for x in ${locs}; do "${@}" ${x} || die "failed to process enabled ${x} locale" done -}
\ No newline at end of file +} |