From 6312429244678711295464c68ae5dfdf3db115ae Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 16 Nov 2020 00:05:27 +0100 Subject: trinity-meta-2.eclass: Move SLOT/TDEDIR/TRINITY_VER setup to trinity-base-2 By making it conditional on CATEGORY=trinity-base there is effectively no change for now with existing trinity-meta-2.eclass consumers. This is a better fit, since all the things set up here are actually being used inside trinity-base-2.eclass. This is important for the next step, when the functions used are being phased out in favor of meta vars. In trinity-base category, this affects the following trinity-base-2.eclass consumers: - trinity-base/arts - trinity-base/tde-i18n - trinity-base/tdelibs Of those, only trinity-base/tdelibs needs handling to not create a circular dependency on its own. Signed-off-by: Andreas Sturmlechner --- eclass/trinity-base-2.eclass | 9 ++++++++- eclass/trinity-meta-2.eclass | 9 +-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eclass/trinity-base-2.eclass b/eclass/trinity-base-2.eclass index e7604a6b..5446d005 100644 --- a/eclass/trinity-base-2.eclass +++ b/eclass/trinity-base-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 @@ -163,6 +163,13 @@ else die "Unknown BUILD_TYPE=${BUILD_TYPE}" fi +if [[ ${CATEGORY} = trinity-base ]]; then + # Set SLOT, TDEDIR, TRINITY_VER and PREFIX + set-trinityver + [[ -z ${SLOT} ]] && SLOT=${TRINITY_VER} + # Common dependencies + [[ ${PN} != tdelibs ]] && need-trinity +fi if [[ -n "${TRINITY_EXTRAGEAR_PACKAGING}" ]]; then # @ECLASS-VARIABLE: TEG_PO_DIR diff --git a/eclass/trinity-meta-2.eclass b/eclass/trinity-meta-2.eclass index d8f32ebe..13997a20 100644 --- a/eclass/trinity-meta-2.eclass +++ b/eclass/trinity-meta-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 @@ -13,13 +13,6 @@ inherit trinity-base-2 LICENSE="|| ( GPL-2 GPL-3 )" HOMEPAGE="http://www.trinitydesktop.org/" -# Set slot, TDEDIR, TRINITY_VER and PREFIX -set-trinityver -[[ -z "${SLOT}" ]] && SLOT="${TRINITY_VER}" - -# Common dependencies -need-trinity - # @FUNCTION: trinity-meta-2_set_trinity_submodule # @DESCRIPTION: # Sets the TRINITY_SUBMODULE variable to -- cgit v1.2.1