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