gentoo resync : 12.08.2018

4 files changed, 86 insertions, 59 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 88b53bd0bfc5..c971a18e801d 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 53febd0f3480..3d9b53f9361f 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -3,5 +3,5 @@ DIST gnucash-docs-3.1.tar.gz 92421041 BLAKE2B b169d26cb9fb07a265fb5b8fc492fa8b0e
 DIST gnucash-docs-3.2.tar.gz 92387447 BLAKE2B dac502975f885b777c1e91a7ea574789947e1dddfd3239c05973ce57fec41a6d78e605ef37aaf721db4aa4d2bc8f2dda7ed76cc4dc97dd49e30618414e262f15 SHA512 a58a583a457377f529223ced083fb64460b3b0c75a423db08c7f9542711be98fd59bd776bf77309ff91d1c46f22a5ae882d8c0a8ec3fc834d7a8028a95028aad
 EBUILD gnucash-docs-3.0.ebuild 861 BLAKE2B 16e5e35a8c624de231dab411108eb463f1d151312c5e33eec0f4b78f3efaec73a505149373297ee0376ea6576e83982325254c19a3e808f733a70c748e4451ac SHA512 33c547e298a0f2d601977e59ad3a19af7036ec4af5aef73de8f0d5fde47e1c4a878b34abd56e6e9fcfa4cfea7ddd9c9c8324ad17b1145a29c80236d55e022497
 EBUILD gnucash-docs-3.1.ebuild 861 BLAKE2B 16e5e35a8c624de231dab411108eb463f1d151312c5e33eec0f4b78f3efaec73a505149373297ee0376ea6576e83982325254c19a3e808f733a70c748e4451ac SHA512 33c547e298a0f2d601977e59ad3a19af7036ec4af5aef73de8f0d5fde47e1c4a878b34abd56e6e9fcfa4cfea7ddd9c9c8324ad17b1145a29c80236d55e022497
-EBUILD gnucash-docs-3.2.ebuild 1117 BLAKE2B f68483cfdb850d339e4f76e9cce3b82ce32da8f8b2337231e82a39961bcf81248afbfdbf73d83dbc16d48951866d2a98efbe9695d3ee47147d90708a362944e9 SHA512 59114685ef55798b79420eb595f621048223c30bd0e31ab977bd01ce7b96dc544bafd306eb3ac7da361ab52145c6f13239db8147af88f07b829b5d52e0c73dd5
+EBUILD gnucash-docs-3.2-r1.ebuild 1670 BLAKE2B f13f7fc2d51ee3c91c07d577c9245b8851ea3891ade3ee4e09756f793bf5babf469f1eb764c7cfa466790d894ce3b1add0ec93f184ccff9d6844380955ad38e9 SHA512 0fc4e16167f525c5aa1d9a6666cc23143b8068bd82c288e828c573554ec6a94d0fcaf41a6973d1eeecf31cbb51bc1041f57be456f04c55a21063711e2f1d59e7
 MISC metadata.xml 496 BLAKE2B a668cda0f44d550b086c539edbd5eeb93092fee992621cbd655b5c30e3bfd658fcd0a65d4140f2f9ba4d368438c224bac887e86e6d36b730afd4a24c195fc448 SHA512 19e5631659fe0153e6f2de3bcc8dc5eb1615dc3e6a3493d71ea0d5e18df48fe64fef31819883add93cd1da425ebea0aa82f62b0052bdc328773b8a3c0bfca26a
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild
new file mode 100644
index 000000000000..186406585218
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+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
+
+DEPEND="
+	app-text/docbook-xml-dtd
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	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
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in help guide; do
+		for my_lang in $(my_l10n_get_locales); do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ru|ja) # Only guides translated
+					if [[ ${doc_type} = "help" ]] ; then
+						elog "Help documentation hasn't been translated for $my_lang"
+						elog "Will do English instead."
+						my_lang=C
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			cd "${S}/${doc_type}/${my_lang}" || die
+			emake DESTDIR="${D}" install
+		done
+	done
+
+	cd "${S}" || die
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.2.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.2.ebuild
deleted file mode 100644
index 2c74afab6f13..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-3.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-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
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type lang
-
-	for doc_type in help guide ; do
-		for lang in $(l10n_get_locales); do
-			cd "${S}/${doc_type}/${lang}" || die
-			emake DESTDIR="${D}" install
-		done
-	done
-
-	cd "${S}" || die
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-java/fop || elog "You need dev-java/fop to generate pdf files."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}