gentoo resync : 06.08.2019

6 files changed, 31 insertions, 110 deletions

diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 4a9b5fb3742c..3fcfb775df29 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -3,9 +3,9 @@ DIST gnucash-docs-3.3.tar.gz 92417386 BLAKE2B 200f9b8d3006589eac5f0d66300d658f69
 DIST gnucash-docs-3.4.tar.gz 92762652 BLAKE2B 1aad3f1e7fe5b6ec11b38dc778e8994544d50f9549450b4632e5fcbd370332f05c7c68f9f6bf0e274b654dee6304924d17089b61318e0e4356bf01133ad47508 SHA512 0a64c8fcc88988a08d5b2f7c472356c580dff17b1a2a37b66a6bed790fba9d7bb437955050656656a0be399b2ce1635902f4548f44b62233c1fcd1d75fbb38ec
 DIST gnucash-docs-3.5.tar.gz 97187415 BLAKE2B f35a3a25a120d3807771d74ee1c97713e21617f7ac7b4fdc1f58b9d12f7c0cc899a9af6abca21bd4f91a0978ebf5b93604deaae29f39c8ab86bd83ec93e32642 SHA512 aa832a1929ae91b9fe2a6a4ada0c7dbd8c1a4cf76086ec3ab0b82c7396d45aabbb6971f2db788bbdde71a68c8faca5f4621429819ef6c0d1156bcefdc5d289b5
 DIST gnucash-docs-3.6.tar.gz 96986567 BLAKE2B 753ee011cadec37320fafe3c0973bc5772c300dcf641ba34f05d03b9c13ec159c10f8571876adecfd7816956f2dfa9e83ad5879387536c15e7d1b138f7e38a47 SHA512 1fd36c74633ba699116914eaef245d4b84ab85a6e65578c602db8b2e3150f7fb97b549c12068a691e38b90ae0fa5cc22f8026b6d50de1ac967eb52b8296eb135
-EBUILD gnucash-docs-3.2-r1.ebuild 1665 BLAKE2B 16ad7acf14b9e37dafded93957de6c3246be6902ccea2198832b6dc5409f93ae06bcaf52e091f88d6df6b8327a77198140b67671b0f7a242a0e2bdccfb510222 SHA512 e95eab369275cfac0b5944ae8a0659e5743f44e76c650b78c055246d66c0b953ff8398070b87c3e1f341722b7d51ceaa6896b27b2dc8e424bc9a5e5ae40c3406
-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.2-r2.ebuild 1347 BLAKE2B c6e0b8869682edb5bb8af7d2e18c83ee7cf42f2e99590cb5f5474a369f7a9040ecc301dda70ec3e2e46a2c39322d681484a00abc5f73d4bd5dfe6eb4ed3cca65 SHA512 44bd23ae64ed96efc0b2c7d3b0547cd8a8f02250bde1d8579b118f403c2e9b831703f5651b396ddf0868df9f3500229f29d18ee394504f02424a2c5c5eddefe2
+EBUILD gnucash-docs-3.3-r1.ebuild 1348 BLAKE2B 8f8ba12abedf43cc5d26ec871ce017778cde7532d791eb902f8c084da980015accc6a04f301f4fbfe6201cd114743c0f35a88c42796ff59ea3a30a7960399e02 SHA512 ec36f57e7f890e0f9a3ba1ed760218b1108ecad611c98f89cc427d744ceb8567c0d8818da9d1a4d468ca60357e494d7e83d91797e647ac15b4a79fb0c19b5808
+EBUILD gnucash-docs-3.4-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
+EBUILD gnucash-docs-3.5-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
 EBUILD gnucash-docs-3.6-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
-MISC metadata.xml 496 BLAKE2B a668cda0f44d550b086c539edbd5eeb93092fee992621cbd655b5c30e3bfd658fcd0a65d4140f2f9ba4d368438c224bac887e86e6d36b730afd4a24c195fc448 SHA512 19e5631659fe0153e6f2de3bcc8dc5eb1615dc3e6a3493d71ea0d5e18df48fe64fef31819883add93cd1da425ebea0aa82f62b0052bdc328773b8a3c0bfca26a
+MISC metadata.xml 444 BLAKE2B d5ab61b0738eb3124b32f94da3b3f38ef8993039a4797eab95f0c2c2af427c6262cdb2b5885d0e4dfc659e15bad9c492db706f134f8128595eeef6afbcd4b663 SHA512 7a97c9139b410b8054093bd666c6043e6383e5b3ad9f19a52e7b4d2aaafa1b915082408d575064e7be1f0c4b14eae660837d608e88956a4e51fa1c647a19b5b2
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>