Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/
Date: Sat, 02 Sep 2017 09:33:01
Message-Id: 1504344688.0aaf72027909a79fbd65145451b5a03f33ae99cf.mgorny@gentoo
1 commit: 0aaf72027909a79fbd65145451b5a03f33ae99cf
2 Author: Virgil Dupras <hsoft <AT> hardcoded <DOT> net>
3 AuthorDate: Tue Aug 22 12:13:41 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 2 09:31:28 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aaf7202
7
8 app-emulation/lxd: Remove PLOCALES definition
9
10 as per mgorny's suggestion in https://github.com/gentoo/gentoo/pull/5483
11
12 I have tested that, after a merge of that ebuild, localizations still worked (at least the `fr` one).
13
14 Closes: https://github.com/gentoo/gentoo/pull/5503
15 Package-Manager: Portage-2.3.6, Repoman-2.3.1
16
17 app-emulation/lxd/lxd-2.16.ebuild | 20 ++------------------
18 1 file changed, 2 insertions(+), 18 deletions(-)
19
20 diff --git a/app-emulation/lxd/lxd-2.16.ebuild b/app-emulation/lxd/lxd-2.16.ebuild
21 index 60e19a973a2..17d8d477ef3 100644
22 --- a/app-emulation/lxd/lxd-2.16.ebuild
23 +++ b/app-emulation/lxd/lxd-2.16.ebuild
24 @@ -45,12 +45,9 @@ LICENSE="Apache-2.0"
25 SLOT="0"
26 KEYWORDS="~amd64"
27
28 -# Portage complains about zh_Hans missing, but repoman doesn't like it when it's there.
29 -PLOCALES="de el fr it ja nl ru sr sv tr zh"
30 IUSE="+daemon nls test"
31
32 -# IUSE and PLOCALES must be defined before l10n inherited
33 -inherit bash-completion-r1 golang-build l10n linux-info systemd user golang-vcs-snapshot
34 +inherit bash-completion-r1 golang-build linux-info systemd user golang-vcs-snapshot
35
36 SRC_URI="${ARCHIVE_URI}
37 ${EGO_VENDOR_URI}"
38 @@ -117,17 +114,9 @@ PATCHES=(
39 "${FILESDIR}/${P}-dont-go-get.patch"
40 )
41
42 -# KNOWN ISSUES:
43 -# - Translations may not work. I've been unsuccessful in forcing
44 -# localized output. Anyway, upstream (Canonical) doesn't install the
45 -# message files.
46 -
47 src_prepare() {
48 default_src_prepare
49
50 - # Warn on unhandled locale changes
51 - l10n_find_plocales_changes "${S}/src/${EGO_PN}/po" "" .po
52 -
53 # Examples in go-lxc make our build fail.
54 rm -rf "${S}/src/${EGO_PN}/vendor/gopkg.in/lxc/go-lxc.v2/examples" || die
55 }
56 @@ -170,12 +159,7 @@ src_install() {
57 cd "src/${EGO_PN}" || die "can't cd into ${S}/src/${EGO_PN}"
58
59 if use nls; then
60 - local lingua
61 - for lingua in ${PLOCALES}; do
62 - if use linguas_${lingua}; then
63 - domo po/${lingua}.mo
64 - fi
65 - done
66 + domo po/*.mo
67 fi
68
69 if use daemon; then