From d862a010c8875bb1dc4614881bb6835f2e10bf0d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 17 Mar 2020 18:38:55 +0100
Subject: [PATCH] texinfo: bump version.

---
 ...info-6.5.patchset => texinfo-6.7.patchset} | 24 +++++++++----------
 ...{texinfo-6.5.recipe => texinfo-6.7.recipe} |  7 +++---
 2 files changed, 15 insertions(+), 16 deletions(-)
 rename sys-apps/texinfo/patches/{texinfo-6.5.patchset => texinfo-6.7.patchset} (62%)
 rename sys-apps/texinfo/{texinfo-6.5.recipe => texinfo-6.7.recipe} (85%)

diff --git a/sys-apps/texinfo/patches/texinfo-6.5.patchset b/sys-apps/texinfo/patches/texinfo-6.7.patchset
similarity index 62%
rename from sys-apps/texinfo/patches/texinfo-6.5.patchset
rename to sys-apps/texinfo/patches/texinfo-6.7.patchset
index 4b8619e26..89d5dcfc9 100644
--- a/sys-apps/texinfo/patches/texinfo-6.5.patchset
+++ b/sys-apps/texinfo/patches/texinfo-6.7.patchset
@@ -1,14 +1,14 @@
-From becfe6a5d9bbf0041cc6f287bd0409f605987756 Mon Sep 17 00:00:00 2001
+From 6e83e938550563738f6d2adc24dccc3c209b3692 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 22 Dec 2015 11:52:48 +0000
 Subject: Haiku patch
 
 
 diff --git a/system.h b/system.h
-index 11cac6d..7ce87ab 100644
+index 047d794..c9c6a0e 100644
 --- a/system.h
 +++ b/system.h
-@@ -204,6 +204,10 @@ extern int kill (pid_t, int);
+@@ -182,6 +182,10 @@ extern int kill (pid_t, int);
  # define PIPE_USE_FORK	1
  #endif /* not O_BINARY */
  
@@ -20,20 +20,20 @@ index 11cac6d..7ce87ab 100644
  #ifndef ALSO_NULL_DEVICE
  # define ALSO_NULL_DEVICE  ""
 -- 
-2.7.0
+2.24.0
 
 
-From a53a2c5bd82c983db75433f6ada98bcceecb9f11 Mon Sep 17 00:00:00 2001
+From be44dc414443daf2275e18bbad12a2ecbdb21267 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sat, 5 Mar 2016 08:51:25 +0100
 Subject: Fix gcc2 build.
 
 
-diff --git a/tp/Texinfo/Convert/XSParagraph/xspara.c b/tp/Texinfo/Convert/XSParagraph/xspara.c
-index 47b2e4f..bc4fe12 100644
---- a/tp/Texinfo/Convert/XSParagraph/xspara.c
-+++ b/tp/Texinfo/Convert/XSParagraph/xspara.c
-@@ -389,6 +389,7 @@ xspara_get_state (HV *hash)
+diff --git a/tp/Texinfo/XS/xspara.c b/tp/Texinfo/XS/xspara.c
+index ee666a1..64773f1 100644
+--- a/tp/Texinfo/XS/xspara.c
++++ b/tp/Texinfo/XS/xspara.c
+@@ -479,6 +479,7 @@ xspara_get_state (HV *hash)
    /* Don't do anything. */
    return;
  
@@ -41,7 +41,7 @@ index 47b2e4f..bc4fe12 100644
    dTHX; /* Perl boilerplate. */
  
    val = newSViv (state.end_sentence);
-@@ -402,7 +403,7 @@ xspara_get_state (HV *hash)
+@@ -492,7 +493,7 @@ xspara_get_state (HV *hash)
  
    val = newSViv (state.lines_counter);
    STORE("lines_counter");
@@ -51,5 +51,5 @@ index 47b2e4f..bc4fe12 100644
  
  
 -- 
-2.7.0
+2.24.0
 
diff --git a/sys-apps/texinfo/texinfo-6.5.recipe b/sys-apps/texinfo/texinfo-6.7.recipe
similarity index 85%
rename from sys-apps/texinfo/texinfo-6.5.recipe
rename to sys-apps/texinfo/texinfo-6.7.recipe
index 1916ec613..94970e2bd 100644
--- a/sys-apps/texinfo/texinfo-6.5.recipe
+++ b/sys-apps/texinfo/texinfo-6.7.recipe
@@ -4,11 +4,10 @@ Texinfo is the official documentation format of the GNU project."
 HOMEPAGE="http://www.gnu.org/software/texinfo/"
 COPYRIGHT="1992-2008 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-$portVersion.tar.gz"
-CHECKSUM_SHA256="d34272e4042c46186ddcd66bd5d980c0ca14ff734444686ccf8131f6ec8b1427"
-PATCHES="texinfo-$portVersion.patchset
-	0001-Fix-unescaped-left-braces-in-regexps-deprecated-sinc.patch"
+CHECKSUM_SHA256="a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e"
+PATCHES="texinfo-$portVersion.patchset"
 
 ARCHITECTURES="?x86_gcc2 ?x86 x86_64 ?arm"