| 1 |
commit: d49fb7d7cba3535c064677d1b12fe9e9a37391e9 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 26 21:05:37 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 26 21:05:37 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d49fb7d7 |
| 7 |
|
| 8 |
sys-apps/texinfo: sync with ::prefix |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/texinfo/files/texinfo-4.13-mint.patch | 63 ++++++++++++++++++++++++++ |
| 14 |
sys-apps/texinfo/texinfo-6.7.ebuild | 13 +++++- |
| 15 |
2 files changed, 75 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/texinfo/files/texinfo-4.13-mint.patch b/sys-apps/texinfo/files/texinfo-4.13-mint.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..b4533939c47 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-apps/texinfo/files/texinfo-4.13-mint.patch |
| 22 |
@@ -0,0 +1,63 @@ |
| 23 |
+patch by Alan Hourihane for FreeMiNT |
| 24 |
+http://archives.gentoo.org/gentoo-alt/msg_d2ac4e586d9c51b1d4e46f555e899cc9.xml |
| 25 |
+ |
| 26 |
+diff -u gnulib/lib/mbiter.h gnulib/lib/mbiter.h |
| 27 |
+--- gnulib/lib/mbiter.h 2008-05-12 12:38:21.000000000 +0000 |
| 28 |
++++ gnulib/lib/mbiter.h 2008-11-19 21:13:17.000000000 +0000 |
| 29 |
+@@ -117,8 +117,10 @@ |
| 30 |
+ { |
| 31 |
+ if (iter->next_done) |
| 32 |
+ return; |
| 33 |
++#if (HAVE_MBSINIT && HAVE_MBRTOWC) |
| 34 |
+ if (iter->in_shift) |
| 35 |
+ goto with_shift; |
| 36 |
++#endif |
| 37 |
+ /* Handle most ASCII characters quickly, without calling mbrtowc(). */ |
| 38 |
+ if (is_basic (*iter->cur.ptr)) |
| 39 |
+ { |
| 40 |
+@@ -129,6 +131,7 @@ |
| 41 |
+ iter->cur.wc = *iter->cur.ptr; |
| 42 |
+ iter->cur.wc_valid = true; |
| 43 |
+ } |
| 44 |
++#if (HAVE_MBSINIT && HAVE_MBRTOWC) |
| 45 |
+ else |
| 46 |
+ { |
| 47 |
+ assert (mbsinit (&iter->state)); |
| 48 |
+@@ -169,6 +172,7 @@ |
| 49 |
+ iter->in_shift = false; |
| 50 |
+ } |
| 51 |
+ } |
| 52 |
++#endif |
| 53 |
+ iter->next_done = true; |
| 54 |
+ } |
| 55 |
+ |
| 56 |
+diff -u gnulib/lib/mbuiter.h gnulib/lib/mbuiter.h |
| 57 |
+--- gnulib/lib/mbuiter.h 2007-12-25 23:57:18.000000000 +0000 |
| 58 |
++++ gnulib/lib/mbuiter.h 2008-11-19 21:15:12.000000000 +0000 |
| 59 |
+@@ -125,8 +125,10 @@ |
| 60 |
+ { |
| 61 |
+ if (iter->next_done) |
| 62 |
+ return; |
| 63 |
++#if (HAVE_MBSINIT && HAVE_MBRTOWC) |
| 64 |
+ if (iter->in_shift) |
| 65 |
+ goto with_shift; |
| 66 |
++#endif |
| 67 |
+ /* Handle most ASCII characters quickly, without calling mbrtowc(). */ |
| 68 |
+ if (is_basic (*iter->cur.ptr)) |
| 69 |
+ { |
| 70 |
+@@ -137,6 +139,7 @@ |
| 71 |
+ iter->cur.wc = *iter->cur.ptr; |
| 72 |
+ iter->cur.wc_valid = true; |
| 73 |
+ } |
| 74 |
++#if (HAVE_MBSINIT && HAVE_MBRTOWC) |
| 75 |
+ else |
| 76 |
+ { |
| 77 |
+ assert (mbsinit (&iter->state)); |
| 78 |
+@@ -178,6 +181,7 @@ |
| 79 |
+ iter->in_shift = false; |
| 80 |
+ } |
| 81 |
+ } |
| 82 |
++#endif |
| 83 |
+ iter->next_done = true; |
| 84 |
+ } |
| 85 |
+ |
| 86 |
|
| 87 |
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild |
| 88 |
index cee372613a7..01d16d60a61 100644 |
| 89 |
--- a/sys-apps/texinfo/texinfo-6.7.ebuild |
| 90 |
+++ b/sys-apps/texinfo/texinfo-6.7.ebuild |
| 91 |
@@ -15,10 +15,11 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
| 92 |
|
| 93 |
LICENSE="GPL-3" |
| 94 |
SLOT="0" |
| 95 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos" |
| 96 |
+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" |
| 97 |
IUSE="nls +standalone static" |
| 98 |
|
| 99 |
RDEPEND=" |
| 100 |
+ !=app-text/tetex-2* |
| 101 |
>=sys-libs/ncurses-5.2-r2:0= |
| 102 |
standalone? ( dev-lang/perl ) |
| 103 |
!standalone? ( |
| 104 |
@@ -31,6 +32,16 @@ RDEPEND=" |
| 105 |
DEPEND="${RDEPEND}" |
| 106 |
BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )" |
| 107 |
|
| 108 |
+src_prepare() { |
| 109 |
+ default |
| 110 |
+ |
| 111 |
+ if use prefix ; then |
| 112 |
+ eapply -p0 "${FILESDIR}"/${PN}-4.13-mint.patch |
| 113 |
+ sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die |
| 114 |
+ touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 |
| 115 |
+ fi |
| 116 |
+} |
| 117 |
+ |
| 118 |
src_configure() { |
| 119 |
# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576 |
| 120 |
local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}" |
Archives