gentoo resync : 19.07.2019

2 files changed, 7 insertions, 26 deletions

diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 95e6798c886d..4a9b5fb3742c 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -7,5 +7,5 @@ EBUILD gnucash-docs-3.2-r1.ebuild 1665 BLAKE2B 16ad7acf14b9e37dafded93957de6c324
 EBUILD gnucash-docs-3.3.ebuild 1666 BLAKE2B 83ab7ebba3c17425df70be4e85f9c26032faf67bd88d16f42dc65cee0486ede8bf50b8bd8eecfbbb5a2d7e2d552cea6ec48370edf8b8c3ed0505abad0cb9e544 SHA512 38f8145072110b0611563ad592113d5f60a96a43986c8ec819ad3a66f6064406f5e929e37090e9bfcd3dae4ffe387ac6fb7dbf2e4610bde6b80a7bc14f6d4e8c
 EBUILD gnucash-docs-3.4.ebuild 1667 BLAKE2B c232b46024f80a9ff86833431ff983722a72d3f9953dff610cc5e86e8a9c22174d168a5d5ae32d5ff942bc2b7c8f1424c04f3012e83765af02446a2fe3266194 SHA512 026d7aae62cb09b435de0c50e4e3b1decf32a863fee0c11791a098e5847795b4467a63cfd80fa2bf52c1659bcf63d3426b1e4f3e160d7e13bdb54c7c4adb7ab0
 EBUILD gnucash-docs-3.5.ebuild 1667 BLAKE2B c232b46024f80a9ff86833431ff983722a72d3f9953dff610cc5e86e8a9c22174d168a5d5ae32d5ff942bc2b7c8f1424c04f3012e83765af02446a2fe3266194 SHA512 026d7aae62cb09b435de0c50e4e3b1decf32a863fee0c11791a098e5847795b4467a63cfd80fa2bf52c1659bcf63d3426b1e4f3e160d7e13bdb54c7c4adb7ab0
-EBUILD gnucash-docs-3.6.ebuild 1667 BLAKE2B c232b46024f80a9ff86833431ff983722a72d3f9953dff610cc5e86e8a9c22174d168a5d5ae32d5ff942bc2b7c8f1424c04f3012e83765af02446a2fe3266194 SHA512 026d7aae62cb09b435de0c50e4e3b1decf32a863fee0c11791a098e5847795b4467a63cfd80fa2bf52c1659bcf63d3426b1e4f3e160d7e13bdb54c7c4adb7ab0
+EBUILD gnucash-docs-3.6-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
 MISC metadata.xml 496 BLAKE2B a668cda0f44d550b086c539edbd5eeb93092fee992621cbd655b5c30e3bfd658fcd0a65d4140f2f9ba4d368438c224bac887e86e6d36b730afd4a24c195fc448 SHA512 19e5631659fe0153e6f2de3bcc8dc5eb1615dc3e6a3493d71ea0d5e18df48fe64fef31819883add93cd1da425ebea0aa82f62b0052bdc328773b8a3c0bfca26a
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.6.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.6-r1.ebuild
index 2fd86099fbde..505a73b78785 100644
--- a/app-doc/gnucash-docs/gnucash-docs-3.6.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.6-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
 }