dev-libs/liborcus: Fix build with GCC-11, python3_9

Upstream commits:
50506d534230d90de2b0a2af3fb072428c942a4e
3bfa1a000e4639fe68781c584356ceea7c6b1a72
5e8fb255dc6bc9b7084a05b8dc24f31417542e5e

Reported-by: Geoff Leach <gl@cs.rmit.edu.au>
Thanks-to: andy <hedmoo@yahoo.com>
Closes: https://bugs.gentoo.org/764035
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

2 files changed, 78 insertions, 3 deletions

diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch b/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
new file mode 100644
index 000000000000..f1dda1390539
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
@@ -0,0 +1,72 @@
+From 50506d534230d90de2b0a2af3fb072428c942a4e Mon Sep 17 00:00:00 2001
+From: hedmo <hedmoo@yahoo.com>
+Date: Fri, 8 Jan 2021 07:30:16 +0000
+Subject: [PATCH] Update orcus_xlsx.cpp to build with gcc-11
+
+---
+ src/liborcus/orcus_xlsx.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/liborcus/orcus_xlsx.cpp b/src/liborcus/orcus_xlsx.cpp
+index 6df72a32..a59b2b9d 100644
+--- a/src/liborcus/orcus_xlsx.cpp
++++ b/src/liborcus/orcus_xlsx.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include <cstdlib>
+ #include <iostream>
++#include <limits>
+ #include <string>
+ #include <cstring>
+ #include <sstream>
+-- 
+GitLab
+
+From 3bfa1a000e4639fe68781c584356ceea7c6b1a72 Mon Sep 17 00:00:00 2001
+From: hedmo <hedmoo@yahoo.com>
+Date: Fri, 8 Jan 2021 07:32:53 +0000
+Subject: [PATCH] Update xls_xml_context.cpp to build with gcc-11
+
+---
+ src/liborcus/xls_xml_context.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp
+index 538f5607..ca3dc4d0 100644
+--- a/src/liborcus/xls_xml_context.cpp
++++ b/src/liborcus/xls_xml_context.cpp
+@@ -16,6 +16,7 @@
+ #include <mdds/sorted_string_map.hpp>
+ 
+ #include <iostream>
++#include <limits>
+ 
+ using namespace std;
+ namespace ss = orcus::spreadsheet;
+-- 
+GitLab
+
+From 5e8fb255dc6bc9b7084a05b8dc24f31417542e5e Mon Sep 17 00:00:00 2001
+From: hedmo <hedmoo@yahoo.com>
+Date: Fri, 8 Jan 2021 07:34:17 +0000
+Subject: [PATCH] Update xlsx_revision_context.cpp to build with gcc-11
+
+---
+ src/liborcus/xlsx_revision_context.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/liborcus/xlsx_revision_context.cpp b/src/liborcus/xlsx_revision_context.cpp
+index edfd9eed..0b6ec0af 100644
+--- a/src/liborcus/xlsx_revision_context.cpp
++++ b/src/liborcus/xlsx_revision_context.cpp
+@@ -16,6 +16,7 @@
+ #include "orcus/global.hpp"
+ 
+ #include <iostream>
++#include <limits>
+ 
+ using namespace std;
+ 
+-- 
+GitLab
+
diff --git a/dev-libs/liborcus/liborcus-0.15.4.ebuild b/dev-libs/liborcus/liborcus-0.15.4.ebuild
index 4ed618d5956c..d0e8089f3075 100644
--- a/dev-libs/liborcus/liborcus-0.15.4.ebuild
+++ b/dev-libs/liborcus/liborcus-0.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
@@ -33,7 +33,10 @@ DEPEND="${RDEPEND}
 	dev-util/mdds:1/1.5
 "
 
-PATCHES=( "${FILESDIR}/${P}-bashism.patch" ) # bug 723130
+PATCHES=(
+	"${FILESDIR}/${P}-bashism.patch" # bug 723130
+	"${FILESDIR}/${P}-gcc11.patch" # bug 764035
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup