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 185FC1382C5 for ; Sat, 26 Dec 2020 21:07:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65AA4E0AE8; Sat, 26 Dec 2020 21:07:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 38B3FE0AE8 for ; Sat, 26 Dec 2020 21:07:50 +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 18AEA341307 for ; Sat, 26 Dec 2020 21:07:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF1EE46F for ; Sat, 26 Dec 2020 21:07:47 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1609016861.a879915c57fae99b25fc1fab0d4e0d0a529d6995.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/texinfo/files/, sys-apps/texinfo/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/texinfo/files/texinfo-4.13-mint.patch sys-apps/texinfo/texinfo-6.7.ebuild X-VCS-Directories: sys-apps/texinfo/ sys-apps/texinfo/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a879915c57fae99b25fc1fab0d4e0d0a529d6995 X-VCS-Branch: master Date: Sat, 26 Dec 2020 21:07:47 +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: 9d663dda-0848-4750-adb9-2b382831ad4f X-Archives-Hash: 4ba211124a8f2ba2a8dc48160146fe86 commit: a879915c57fae99b25fc1fab0d4e0d0a529d6995 Author: Sam James gentoo org> AuthorDate: Sat Dec 26 21:07:41 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 26 21:07:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a879915c sys-apps/texinfo: drop ~m68k-mint (inc. patch) Deliberately included the patch in the previous commit in case we ever want to revive it, so that it's in the tree history. Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> sys-apps/texinfo/files/texinfo-4.13-mint.patch | 63 -------------------------- sys-apps/texinfo/texinfo-6.7.ebuild | 3 +- 2 files changed, 1 insertion(+), 65 deletions(-) diff --git a/sys-apps/texinfo/files/texinfo-4.13-mint.patch b/sys-apps/texinfo/files/texinfo-4.13-mint.patch deleted file mode 100644 index b4533939c47..00000000000 --- a/sys-apps/texinfo/files/texinfo-4.13-mint.patch +++ /dev/null @@ -1,63 +0,0 @@ -patch by Alan Hourihane for FreeMiNT -http://archives.gentoo.org/gentoo-alt/msg_d2ac4e586d9c51b1d4e46f555e899cc9.xml - -diff -u gnulib/lib/mbiter.h gnulib/lib/mbiter.h ---- gnulib/lib/mbiter.h 2008-05-12 12:38:21.000000000 +0000 -+++ gnulib/lib/mbiter.h 2008-11-19 21:13:17.000000000 +0000 -@@ -117,8 +117,10 @@ - { - if (iter->next_done) - return; -+#if (HAVE_MBSINIT && HAVE_MBRTOWC) - if (iter->in_shift) - goto with_shift; -+#endif - /* Handle most ASCII characters quickly, without calling mbrtowc(). */ - if (is_basic (*iter->cur.ptr)) - { -@@ -129,6 +131,7 @@ - iter->cur.wc = *iter->cur.ptr; - iter->cur.wc_valid = true; - } -+#if (HAVE_MBSINIT && HAVE_MBRTOWC) - else - { - assert (mbsinit (&iter->state)); -@@ -169,6 +172,7 @@ - iter->in_shift = false; - } - } -+#endif - iter->next_done = true; - } - -diff -u gnulib/lib/mbuiter.h gnulib/lib/mbuiter.h ---- gnulib/lib/mbuiter.h 2007-12-25 23:57:18.000000000 +0000 -+++ gnulib/lib/mbuiter.h 2008-11-19 21:15:12.000000000 +0000 -@@ -125,8 +125,10 @@ - { - if (iter->next_done) - return; -+#if (HAVE_MBSINIT && HAVE_MBRTOWC) - if (iter->in_shift) - goto with_shift; -+#endif - /* Handle most ASCII characters quickly, without calling mbrtowc(). */ - if (is_basic (*iter->cur.ptr)) - { -@@ -137,6 +139,7 @@ - iter->cur.wc = *iter->cur.ptr; - iter->cur.wc_valid = true; - } -+#if (HAVE_MBSINIT && HAVE_MBRTOWC) - else - { - assert (mbsinit (&iter->state)); -@@ -178,6 +181,7 @@ - iter->in_shift = false; - } - } -+#endif - iter->next_done = true; - } - diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild index 01d16d60a61..3302ea6162b 100644 --- a/sys-apps/texinfo/texinfo-6.7.ebuild +++ b/sys-apps/texinfo/texinfo-6.7.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls +standalone static" RDEPEND=" @@ -36,7 +36,6 @@ src_prepare() { default if use prefix ; then - eapply -p0 "${FILESDIR}"/${PN}-4.13-mint.patch sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 fi