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 F3CCD1381F3 for ; Tue, 12 May 2020 14:59:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C49D7E099C; Tue, 12 May 2020 14:59:52 +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 9B694E099C for ; Tue, 12 May 2020 14:59:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 56D5D3501E9 for ; Tue, 12 May 2020 14:59:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A5D11F2 for ; Tue, 12 May 2020 14:59:49 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1589295564.3b9037031dd5e022577842a92eada5e31fb50e91.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/c-wrapper/files/, dev-scheme/c-wrapper/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch X-VCS-Directories: dev-scheme/c-wrapper/ dev-scheme/c-wrapper/files/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 3b9037031dd5e022577842a92eada5e31fb50e91 X-VCS-Branch: master Date: Tue, 12 May 2020 14:59:49 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4a32a736-0127-4c06-9af4-00f7ee6a7847 X-Archives-Hash: 6c85937ea61f02545bf878831d1b26ee commit: 3b9037031dd5e022577842a92eada5e31fb50e91 Author: Akinori Hattori gentoo org> AuthorDate: Tue May 12 14:51:28 2020 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Tue May 12 14:59:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b903703 dev-scheme/c-wrapper: fix build with >=sys-apps/texinfo-6.7 Closes: https://bugs.gentoo.org/696044 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild | 3 +- .../c-wrapper/files/c-wrapper-texinfo-6.7.patch | 34 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild index 4bf3c117c0b..a5848a95ce2 100644 --- a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild +++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -24,6 +24,7 @@ PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch "${FILESDIR}"/${PN}-glibc-2.25.patch "${FILESDIR}"/${PN}-info.patch + "${FILESDIR}"/${PN}-texinfo-6.7.patch ) HTML_DOCS=( doc/${PN}-ref{e,j}.html ) diff --git a/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch b/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch new file mode 100644 index 00000000000..97acd86470e --- /dev/null +++ b/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch @@ -0,0 +1,34 @@ +--- a/doc/c-wrapper-ref.texi ++++ b/doc/c-wrapper-ref.texi +@@ -14,7 +14,7 @@ + @direntry + * c-wrapper reference: (c-wrapper-refj.info). A generic wrapper for C libraries. + @end direntry +-@documentencoding euc-jp ++@documentencoding UTF-8 + @c COMMON + @comment %**end of header + +--- a/doc/extract ++++ b/doc/extract +@@ -138,8 +138,6 @@ + ((en) (filter #/^@c EN$/ #/^@c JP$/)) + ((jp) (filter #/^@c JP$/ #/^@c EN$/)))) + +- (define outenc (if (eq? *lang* 'jp) 'euc-jp 'utf8)) +- + (unless (= (length a) 1) (usage)) + + (when (eq? *lang* 'jp) +@@ -148,9 +146,9 @@ + (with-input-from-file (car a) + (lambda () + (if *outfile* +- (with-output-to-file *outfile* do-it :encoding outenc) ++ (with-output-to-file *outfile* do-it :encoding 'utf8) + (let1 out (open-output-conversion-port +- (current-output-port) outenc) ++ (current-output-port) 'utf8) + (with-output-to-port out do-it) + (close-output-port out)))) + :encoding 'euc-jp)