Changing how tde-i18n is built

Signed-off-by: ormorph <[email protected]>

2 files changed, 24 insertions, 40 deletions

diff --git a/trinity-base/tde-i18n/tde-i18n-14.0.12.ebuild b/trinity-base/tde-i18n/tde-i18n-14.0.12.ebuild
index 23f50ba3..4b543ea4 100644
--- a/trinity-base/tde-i18n/tde-i18n-14.0.12.ebuild
+++ b/trinity-base/tde-i18n/tde-i18n-14.0.12.ebuild
@@ -26,33 +26,25 @@ for X in ${TRINITY_LANGS} ; do
 	IUSE="${IUSE} l10n_${X}"
 done
 
-run_phase() {
-	local lang dir phase;
-	phase=${1}
-	lang=${2}
-
-	dir="tde-i18n-${lang}"
-	pushd "${S}/${dir}" || die "No such dir: ${dir}"
-	CMAKE_USE_DIR="${S}/${dir}"
-	BUILD_DIR="${WORKDIR}/${dir}-build"
-	trinity-base-2_${phase}
-	popd || die
+LINGUAS="en"
+
+find_lang() {
+	local lang
+	lang=${1}
+	LINGUAS+=" ${lang}"
 }
 
 src_prepare() {
-	trinity_l10n_for_each_locale_do run_phase src_prepare
-	eapply_user
+	trinity_l10n_for_each_locale_do find_lang
+	trinity-base-2_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=( -DBUILD_ALL=ON )
-	trinity_l10n_for_each_locale_do run_phase src_configure
-}
-
-src_compile() {
-	trinity_l10n_for_each_locale_do run_phase src_compile
+	trinity-base-2_src_configure
 }
 
 src_install() {
-	trinity_l10n_for_each_locale_do run_phase src_install
+	[[ "${LINGUAS}" == "en" ]] && return 0
+	trinity-base-2_src_install
 }
diff --git a/trinity-base/tde-i18n/tde-i18n-9999.ebuild b/trinity-base/tde-i18n/tde-i18n-9999.ebuild
index 45e568b9..e0c88fe1 100644
--- a/trinity-base/tde-i18n/tde-i18n-9999.ebuild
+++ b/trinity-base/tde-i18n/tde-i18n-9999.ebuild
@@ -1,5 +1,5 @@
-# Copyright 1999-2020 Gentoo Authors
-# Copyright 2020 The Trinity Desktop Project
+# Copyright 1999-2022 Gentoo Authors
+# Copyright 2020-2022 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -26,33 +26,25 @@ for X in ${TRINITY_LANGS} ; do
 	IUSE="${IUSE} l10n_${X}"
 done
 
-run_phase() {
-	local lang dir phase;
-	phase=${1}
-	lang=${2}
-
-	dir="tde-i18n-${lang}"
-	pushd "${S}/${dir}" || die "No such dir: ${dir}"
-	CMAKE_USE_DIR="${S}/${dir}"
-	BUILD_DIR="${WORKDIR}/${dir}-build"
-	trinity-base-2_${phase}
-	popd || die
+LINGUAS="en"
+
+find_lang() {
+	local lang
+	lang=${1}
+	LINGUAS+=" ${lang}"
 }
 
 src_prepare() {
-	trinity_l10n_for_each_locale_do run_phase src_prepare
-	eapply_user
+	trinity_l10n_for_each_locale_do find_lang
+	trinity-base-2_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=( -DBUILD_ALL=ON )
-	trinity_l10n_for_each_locale_do run_phase src_configure
-}
-
-src_compile() {
-	trinity_l10n_for_each_locale_do run_phase src_compile
+	trinity-base-2_src_configure
 }
 
 src_install() {
-	trinity_l10n_for_each_locale_do run_phase src_install
+	[[ "${LINGUAS}" == "en" ]] && return 0
+	trinity-base-2_src_install
 }