trinity-functions-2.eclass: Fix MissingPackageRevision by using ~

Style: One line per dependency, add missing newline at end of file

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
pull/180/head
Andreas Sturmlechner 4 years ago
parent f83d2c937f
commit 41c700ca11

@ -1,4 +1,4 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2020 Gentoo Authors
# Copyright 2020 The Trinity Desktop Project # Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
@ -125,7 +125,7 @@ need-trinity() {
set-trinityver ${1} set-trinityver ${1}
adjust-trinity-paths adjust-trinity-paths
my_depend="=trinity-base/tdelibs-${ETRINITY_VER}" my_depend="~trinity-base/tdelibs-${ETRINITY_VER}"
DEPEND+=" ${my_depend}" DEPEND+=" ${my_depend}"
RDEPEND+=" ${my_depend}" RDEPEND+=" ${my_depend}"
@ -154,12 +154,16 @@ need-arts() {
TRINITY_NEED_ARTS="${1}" TRINITY_NEED_ARTS="${1}"
case "${TRINITY_VER}" in case "${TRINITY_VER}" in
"") die "You must call the set-trinityver function to set TRINITY_VER before calling ${FUNCNAME}.";; "") 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}";; ;;
*)
tdelibs="~trinity-base/tdelibs-${ETRINITY_VER}"
arts="~trinity-base/arts-${ETRINITY_VER}"
;;
esac esac
# Handle trinity-base/tdelibs in special way # Handle trinity-base/tdelibs in special way
if [[ "=${CATEGORY}/${P}" == "${tdelibs}" ]]; then if [[ "~${CATEGORY}/${P}" == "${tdelibs}" ]]; then
if [[ "${1}" == "optional" ]]; then if [[ "${1}" == "optional" ]]; then
my_depend=" arts? ( ${arts} )" my_depend=" arts? ( ${arts} )"
IUSE+=" arts" IUSE+=" arts"
@ -194,4 +198,4 @@ trinity_l10n_for_each_locale_do() {
for x in ${locs}; do for x in ${locs}; do
"${@}" ${x} || die "failed to process enabled ${x} locale" "${@}" ${x} || die "failed to process enabled ${x} locale"
done done
} }

Loading…
Cancel
Save