app-doc/gnucash-docs: Backport L10N updates to old versions

Signed-off-by: Michał Górny <mgorny@gentoo.org>

5 files changed, 26 insertions, 105 deletions

diff --git a/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.2-r2.ebuild
index b82237e7a151..4582197df338 100644
--- a/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.2-r2.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PLOCALES="C de it ja pt ru"
-PLOCALE_BACKUP="C"
-
-inherit autotools gnome2 l10n
+inherit autotools gnome2
 
 DESCRIPTION="Documentation package for GnuCash"
 HOMEPAGE="http://www.gnucash.org/"
@@ -15,10 +12,8 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-for my_locale in ${PLOCALES}; do
-	IUSE+=" l10n_${my_locale}"
-done
+LOCALES=( de it ja pt ru )
+IUSE="${LOCALES[*]/#/l10n_}"
 
 DEPEND="
 	app-text/docbook-xml-dtd
@@ -28,18 +23,6 @@ DEPEND="
 	dev-libs/libxslt
 "
 
-my_l10n_get_locales() {
-	local l locales
-	for l in ${PLOCALES[@]}; do
-		use "l10n_${l}" && locales+=( $l )
-	done
-	if [[ ${#locales[@]} -gt 0 ]]; then
-		echo ${locales[@]}
-	else
-		echo $PLOCALE_BACKUP
-	fi
-}
-
 src_prepare() {
 	default
 	eautoreconf
@@ -53,7 +36,7 @@ src_install() {
 	local doc_type my_lang
 
 	for doc_type in help guide; do
-		for my_lang in $(my_l10n_get_locales); do
+		for my_lang in C ${L10N}; do
 			case $my_lang in
 				# Both help and guides translated
 				C|de|it|pt) ;;
@@ -61,7 +44,7 @@ src_install() {
 					if [[ ${doc_type} = "help" ]] ; then
 						elog "Help documentation hasn't been translated for $my_lang"
 						elog "Will do English instead."
-						my_lang=C
+						continue
 					fi
 					;;
 				*)
@@ -69,12 +52,10 @@ src_install() {
 					;;
 			esac
 
-			cd "${S}/${doc_type}/${my_lang}" || die
-			emake DESTDIR="${D}" install
+			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
 		done
 	done
 
-	cd "${S}" || die
 	einstalldocs
 }
 
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.3.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.3-r1.ebuild
index 1faefbd6ed41..da27ce8d5de0 100644
--- a/app-doc/gnucash-docs/gnucash-docs-3.3.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.3-r1.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PLOCALES="C de it ja pt ru"
-PLOCALE_BACKUP="C"
-
-inherit autotools gnome2 l10n
+inherit autotools gnome2
 
 DESCRIPTION="Documentation package for GnuCash"
 HOMEPAGE="http://www.gnucash.org/"
@@ -15,10 +12,8 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
 KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-
-for my_locale in ${PLOCALES}; do
-	IUSE+=" l10n_${my_locale}"
-done
+LOCALES=( de it ja pt ru )
+IUSE="${LOCALES[*]/#/l10n_}"
 
 DEPEND="
 	app-text/docbook-xml-dtd
@@ -28,18 +23,6 @@ DEPEND="
 	dev-libs/libxslt
 "
 
-my_l10n_get_locales() {
-	local l locales
-	for l in ${PLOCALES[@]}; do
-		use "l10n_${l}" && locales+=( $l )
-	done
-	if [[ ${#locales[@]} -gt 0 ]]; then
-		echo ${locales[@]}
-	else
-		echo $PLOCALE_BACKUP
-	fi
-}
-
 src_prepare() {
 	default
 	eautoreconf
@@ -53,7 +36,7 @@ src_install() {
 	local doc_type my_lang
 
 	for doc_type in help guide; do
-		for my_lang in $(my_l10n_get_locales); do
+		for my_lang in C ${L10N}; do
 			case $my_lang in
 				# Both help and guides translated
 				C|de|it|pt) ;;
@@ -61,7 +44,7 @@ src_install() {
 					if [[ ${doc_type} = "help" ]] ; then
 						elog "Help documentation hasn't been translated for $my_lang"
 						elog "Will do English instead."
-						my_lang=C
+						continue
 					fi
 					;;
 				*)
@@ -69,12 +52,10 @@ src_install() {
 					;;
 			esac
 
-			cd "${S}/${doc_type}/${my_lang}" || die
-			emake DESTDIR="${D}" install
+			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
 		done
 	done
 
-	cd "${S}" || die
 	einstalldocs
 }
 
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.4.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.4-r1.ebuild
index 2fd86099fbde..505a73b78785 100644
--- a/app-doc/gnucash-docs/gnucash-docs-3.4.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.4-r1.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=6
 
-PLOCALES="C de it ja pt ru"
-PLOCALE_BACKUP="C"
-
-inherit autotools gnome2 l10n
+inherit autotools gnome2
 
 DESCRIPTION="Documentation package for GnuCash"
 HOMEPAGE="http://www.gnucash.org/"
@@ -15,10 +12,8 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-for my_locale in ${PLOCALES}; do
-	IUSE+=" l10n_${my_locale}"
-done
+LOCALES=( de it ja pt ru )
+IUSE="${LOCALES[*]/#/l10n_}"
 
 DEPEND="
 	app-text/docbook-xml-dtd
@@ -28,18 +23,6 @@ DEPEND="
 	dev-libs/libxslt
 "
 
-my_l10n_get_locales() {
-	local l locales
-	for l in ${PLOCALES[@]}; do
-		use "l10n_${l}" && locales+=( $l )
-	done
-	if [[ ${#locales[@]} -gt 0 ]]; then
-		echo ${locales[@]}
-	else
-		echo $PLOCALE_BACKUP
-	fi
-}
-
 src_prepare() {
 	default
 	eautoreconf
@@ -53,7 +36,7 @@ src_install() {
 	local doc_type my_lang
 
 	for doc_type in help guide; do
-		for my_lang in $(my_l10n_get_locales); do
+		for my_lang in C ${L10N}; do
 			case $my_lang in
 				# Both help and guides translated
 				C|de|it|pt) ;;
@@ -61,7 +44,7 @@ src_install() {
 					if [[ ${doc_type} = "help" ]] ; then
 						elog "Help documentation hasn't been translated for $my_lang"
 						elog "Will do English instead."
-						my_lang=C
+						continue
 					fi
 					;;
 				*)
@@ -69,12 +52,10 @@ src_install() {
 					;;
 			esac
 
-			cd "${S}/${doc_type}/${my_lang}" || die
-			emake DESTDIR="${D}" install
+			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
 		done
 	done
 
-	cd "${S}" || die
 	einstalldocs
 }
 
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
index 2fd86099fbde..505a73b78785 100644
--- a/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=6
 
-PLOCALES="C de it ja pt ru"
-PLOCALE_BACKUP="C"
-
-inherit autotools gnome2 l10n
+inherit autotools gnome2
 
 DESCRIPTION="Documentation package for GnuCash"
 HOMEPAGE="http://www.gnucash.org/"
@@ -15,10 +12,8 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-for my_locale in ${PLOCALES}; do
-	IUSE+=" l10n_${my_locale}"
-done
+LOCALES=( de it ja pt ru )
+IUSE="${LOCALES[*]/#/l10n_}"
 
 DEPEND="
 	app-text/docbook-xml-dtd
@@ -28,18 +23,6 @@ DEPEND="
 	dev-libs/libxslt
 "
 
-my_l10n_get_locales() {
-	local l locales
-	for l in ${PLOCALES[@]}; do
-		use "l10n_${l}" && locales+=( $l )
-	done
-	if [[ ${#locales[@]} -gt 0 ]]; then
-		echo ${locales[@]}
-	else
-		echo $PLOCALE_BACKUP
-	fi
-}
-
 src_prepare() {
 	default
 	eautoreconf
@@ -53,7 +36,7 @@ src_install() {
 	local doc_type my_lang
 
 	for doc_type in help guide; do
-		for my_lang in $(my_l10n_get_locales); do
+		for my_lang in C ${L10N}; do
 			case $my_lang in
 				# Both help and guides translated
 				C|de|it|pt) ;;
@@ -61,7 +44,7 @@ src_install() {
 					if [[ ${doc_type} = "help" ]] ; then
 						elog "Help documentation hasn't been translated for $my_lang"
 						elog "Will do English instead."
-						my_lang=C
+						continue
 					fi
 					;;
 				*)
@@ -69,12 +52,10 @@ src_install() {
 					;;
 			esac
 
-			cd "${S}/${doc_type}/${my_lang}" || die
-			emake DESTDIR="${D}" install
+			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
 		done
 	done
 
-	cd "${S}" || die
 	einstalldocs
 }
 
diff --git a/app-doc/gnucash-docs/metadata.xml b/app-doc/gnucash-docs/metadata.xml
index e0724f47e4bb..dc94f737b786 100644
--- a/app-doc/gnucash-docs/metadata.xml
+++ b/app-doc/gnucash-docs/metadata.xml
@@ -9,9 +9,6 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="l10n_C">English</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">gnucash</remote-id>
 	</upstream>