From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E6C62138330 for ; Sat, 6 Jan 2018 18:09:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21E63E0930; Sat, 6 Jan 2018 18:09:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EF078E0930 for ; Sat, 6 Jan 2018 18:09:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C67B8335C07 for ; Sat, 6 Jan 2018 18:09:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A4E2195 for ; Sat, 6 Jan 2018 18:09:39 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1515262151.95a3df1f3fafdb8e2a7968583c11cb4f720d2c8d.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/a2ps/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/a2ps/a2ps-4.14-r6.ebuild X-VCS-Directories: app-text/a2ps/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 95a3df1f3fafdb8e2a7968583c11cb4f720d2c8d X-VCS-Branch: master Date: Sat, 6 Jan 2018 18:09:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 73a0d38c-e049-41e1-9e4b-3c62b60aa184 X-Archives-Hash: 7acd7cb9bdf1033266c8539b7e85cb08 commit: 95a3df1f3fafdb8e2a7968583c11cb4f720d2c8d Author: Ulrich Müller gentoo org> AuthorDate: Sat Jan 6 18:06:57 2018 +0000 Commit: Ulrich Müller gentoo 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