| 1 |
commit: 893017730e5189c09ad38083286b7ee1ed2613b2 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 18 06:58:40 2019 +0000 |
| 4 |
Commit: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 18 12:55:59 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89301773 |
| 7 |
|
| 8 |
app-doc/gnucash-docs: Sanitize L10N handling |
| 9 |
|
| 10 |
- remove L10N=C, C locale is now installed unconditionally |
| 11 |
- remove unused l10n.eclass |
| 12 |
- simplify the code |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/689474 |
| 15 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/12465 |
| 17 |
Closes: https://bugs.gentoo.org/689474 |
| 18 |
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org> |
| 19 |
|
| 20 |
...-docs-3.6.ebuild => gnucash-docs-3.6-r1.ebuild} | 31 +++++----------------- |
| 21 |
1 file changed, 6 insertions(+), 25 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.6.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.6-r1.ebuild |
| 24 |
similarity index 69% |
| 25 |
rename from app-doc/gnucash-docs/gnucash-docs-3.6.ebuild |
| 26 |
rename to app-doc/gnucash-docs/gnucash-docs-3.6-r1.ebuild |
| 27 |
index 2fd86099fbd..505a73b7878 100644 |
| 28 |
--- a/app-doc/gnucash-docs/gnucash-docs-3.6.ebuild |
| 29 |
+++ b/app-doc/gnucash-docs/gnucash-docs-3.6-r1.ebuild |
| 30 |
@@ -3,10 +3,7 @@ |
| 31 |
|
| 32 |
EAPI=6 |
| 33 |
|
| 34 |
-PLOCALES="C de it ja pt ru" |
| 35 |
-PLOCALE_BACKUP="C" |
| 36 |
- |
| 37 |
-inherit autotools gnome2 l10n |
| 38 |
+inherit autotools gnome2 |
| 39 |
|
| 40 |
DESCRIPTION="Documentation package for GnuCash" |
| 41 |
HOMEPAGE="http://www.gnucash.org/" |
| 42 |
@@ -15,10 +12,8 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 43 |
SLOT="0" |
| 44 |
LICENSE="GPL-2 FDL-1.1" |
| 45 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 46 |
- |
| 47 |
-for my_locale in ${PLOCALES}; do |
| 48 |
- IUSE+=" l10n_${my_locale}" |
| 49 |
-done |
| 50 |
+LOCALES=( de it ja pt ru ) |
| 51 |
+IUSE="${LOCALES[*]/#/l10n_}" |
| 52 |
|
| 53 |
DEPEND=" |
| 54 |
app-text/docbook-xml-dtd |
| 55 |
@@ -28,18 +23,6 @@ DEPEND=" |
| 56 |
dev-libs/libxslt |
| 57 |
" |
| 58 |
|
| 59 |
-my_l10n_get_locales() { |
| 60 |
- local l locales |
| 61 |
- for l in ${PLOCALES[@]}; do |
| 62 |
- use "l10n_${l}" && locales+=( $l ) |
| 63 |
- done |
| 64 |
- if [[ ${#locales[@]} -gt 0 ]]; then |
| 65 |
- echo ${locales[@]} |
| 66 |
- else |
| 67 |
- echo $PLOCALE_BACKUP |
| 68 |
- fi |
| 69 |
-} |
| 70 |
- |
| 71 |
src_prepare() { |
| 72 |
default |
| 73 |
eautoreconf |
| 74 |
@@ -53,7 +36,7 @@ src_install() { |
| 75 |
local doc_type my_lang |
| 76 |
|
| 77 |
for doc_type in help guide; do |
| 78 |
- for my_lang in $(my_l10n_get_locales); do |
| 79 |
+ for my_lang in C ${L10N}; do |
| 80 |
case $my_lang in |
| 81 |
# Both help and guides translated |
| 82 |
C|de|it|pt) ;; |
| 83 |
@@ -61,7 +44,7 @@ src_install() { |
| 84 |
if [[ ${doc_type} = "help" ]] ; then |
| 85 |
elog "Help documentation hasn't been translated for $my_lang" |
| 86 |
elog "Will do English instead." |
| 87 |
- my_lang=C |
| 88 |
+ continue |
| 89 |
fi |
| 90 |
;; |
| 91 |
*) |
| 92 |
@@ -69,12 +52,10 @@ src_install() { |
| 93 |
;; |
| 94 |
esac |
| 95 |
|
| 96 |
- cd "${S}/${doc_type}/${my_lang}" || die |
| 97 |
- emake DESTDIR="${D}" install |
| 98 |
+ emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install |
| 99 |
done |
| 100 |
done |
| 101 |
|
| 102 |
- cd "${S}" || die |
| 103 |
einstalldocs |
| 104 |
} |
Archives