1 |
commit: 95a3df1f3fafdb8e2a7968583c11cb4f720d2c8d |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 6 18:06:57 2018 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 6 18:09:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a3df1f |
7 |
|
8 |
app-text/a2ps: Revert from linguas_ja to cjk USE flag. |
9 |
|
10 |
The ebuild applies patches depending on the flag setting. However, |
11 |
these are intrusive, as they change defaults in other locales too |
12 |
(e.g., "tex" is changed to "ptex" in texi2dvia2ps). Therefore this |
13 |
patching should neither depend on LINGUAS, nor on L10N, nor be done |
14 |
unconditionally. |
15 |
|
16 |
For now, change it to be conditional on the cjk flag, which was the |
17 |
solution already used in a previous version of the ebuild. |
18 |
|
19 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
20 |
|
21 |
app-text/a2ps/a2ps-4.14-r6.ebuild | 8 ++++---- |
22 |
1 file changed, 4 insertions(+), 4 deletions(-) |
23 |
|
24 |
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild |
25 |
index 0094fa4318f..8d73b88d066 100644 |
26 |
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild |
27 |
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild |
28 |
@@ -1,4 +1,4 @@ |
29 |
-# Copyright 1999-2017 Gentoo Foundation |
30 |
+# Copyright 1999-2018 Gentoo Foundation |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
|
33 |
EAPI=6 |
34 |
@@ -7,12 +7,12 @@ inherit autotools elisp-common flag-o-matic |
35 |
DESCRIPTION="Any to PostScript filter" |
36 |
HOMEPAGE="https://www.gnu.org/software/a2ps/" |
37 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz |
38 |
- linguas_ja? ( mirror://gentoo/${P}-ja_nls.patch.gz )" |
39 |
+ cjk? ( mirror://gentoo/${P}-ja_nls.patch.gz )" |
40 |
|
41 |
LICENSE="GPL-3" |
42 |
SLOT="0" |
43 |
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
44 |
-IUSE="emacs latex linguas_ja nls static-libs userland_BSD userland_GNU vanilla" |
45 |
+IUSE="cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla" |
46 |
|
47 |
RESTRICT=test |
48 |
|
49 |
@@ -39,7 +39,7 @@ src_prepare() { |
50 |
|
51 |
eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff |
52 |
use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff |
53 |
- if use linguas_ja; then |
54 |
+ if use cjk; then |
55 |
eapply "${WORKDIR}"/${P}-ja_nls.patch |
56 |
# bug #335803 |
57 |
eapply -p0 "${FILESDIR}"/${P}-ja-cleanup.patch |