gentoo resync : 15.06.2021

5 files changed, 25 insertions, 5 deletions

diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 73394339889a..55778f3e1459 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,7 +1,8 @@
+AUX xapian-1.4.17-gcc11-missing-include.patch 185 BLAKE2B b06ab13c3fa91ed34e98c8d91f8d6921f9a897188991e518f78e402b48c013e9659438be65f558157fec0bc214238f64010b428f3e3642586931d561a2ebc7ef SHA512 a2c9c30bbfe1217dd185bf547cf637784b73180f1346b97564c760c2a6cb67eef28766b0829f6dba04483c9bff8d6faeb58d2daddc9c541d6a2df62e9d4a9684
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
 DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
-EBUILD xapian-1.2.25.ebuild 1846 BLAKE2B 4ff9216abc501a2f4f517074317d06e2bdc44d2828971c66c6e756b3a03770485eb5788c2cccc1f59bd4370f13712db70d8a33ab11edf67010e9e474e390d2b0 SHA512 63c427797d5d374164f176f60e0a38f42ad2d9b1ae5b0aead552a79302c692424ae788779112f44229b7d32db6d2a9da65af5dc9ffeae70500ee610e122084b5
-EBUILD xapian-1.4.17.ebuild 1811 BLAKE2B 3f94c8906bc29c3bc221616b80578eda444cb3b2f56bef639aaf03a22b86e938aa2b3a8cf66afa1dddc7fd243865c9fc704cef181699af1465a3775ea65a3af3 SHA512 0cf9f291f252f8871229e5e7705e4bf34a1c868de50b8e591ce888897ceeb19af8f75bf0dbb96762443ab6c8855ece59a30b79f4b167c5dc566b95f29ac87349
-EBUILD xapian-1.4.18.ebuild 1818 BLAKE2B 1d0f89fa2f4e92ab049e0e63d2974ecf8e538f2870090164272eae4b2d8df60defaf0e848ce12306d1ab19a31da96a4dadbf8d0a8fc6f688dfbfcac240e97069 SHA512 2f9786eb876caf81b091c3d80eec0a474332e771099bc0926bb84bcec58ea37d2b70ba05d3071619fc4e073d937f97610660031d5a8a8ff8307af1ca023b2e68
+EBUILD xapian-1.2.25.ebuild 1974 BLAKE2B 9d9fc21e0f06e17af35b0c3fa26408c247ce1517bb12c21074ce63bd4fef7f384bec6ff34829aac8449a267d2c4975a0387e4264991ec2dbae993eb0c2784257 SHA512 e015e54b13c1a2b6f3a40ed40bfcb6494264896106bf3b6a69aafdda2748be9a3fbacd8c1ffae5cb7a3492de6da75b0654499a7330ec38f671d6f94a1337df49
+EBUILD xapian-1.4.17.ebuild 1880 BLAKE2B 368ba58fc611bf232f8a91da11a18b069699374bbd001eef86459a9b2158f87588b8ca46fcab5d6807619e08a5aa126995d8fb48e57c5a8c9b2832ca914d3156 SHA512 9d8de077dc2d2d8a2507e24561a16df38870893a486ff9df917c54bfb7cf63d460cbee945eaa50e129b929f4da988f109f51c9a2180eac1060993ee8db748be6
+EBUILD xapian-1.4.18.ebuild 1815 BLAKE2B e21bf3ad34a8fb74953764c938ed335061d24562b939fc1ebca54606db1f4180c9cd75d30038d2944ab76ce56be71d45b95fd583575aa1222097911c13ad4487 SHA512 a2aaf52d01b415f9330feffc27c75ff15295eb113fe88b3a3815f5b71bef64697559b1a08caae9e47e962ccbb86f3760dec7bc4ce0e04087c76348dfc0a0cdf1
 MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch b/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
new file mode 100644
index 000000000000..67693e968dff
--- /dev/null
+++ b/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/788046
+--- a/api/omdocument.cc
++++ b/api/omdocument.cc
+@@ -39,6 +39,7 @@
+ 
+ #include <algorithm>
+ #include <string>
++#include <limits>
+ 
+ using namespace std;
+ 
diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild b/dev-libs/xapian/xapian-1.2.25.ebuild
index 6fb5b4472847..c756a3c880b6 100644
--- a/dev-libs/xapian/xapian-1.2.25.ebuild
+++ b/dev-libs/xapian/xapian-1.2.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit multilib-minimal
+inherit flag-o-matic multilib-minimal
 
 MY_P="${PN}-core-${PV}"
 
@@ -24,6 +24,10 @@ S="${WORKDIR}/${MY_P}"
 multilib_src_configure() {
 	local myconf=""
 
+	# "brass_check.cc:40:48: error: reference to ‘byte’ is ambiguous"
+	# bug #789390
+	append-cxxflags -std=c++14
+
 	if use cpu_flags_x86_sse2; then
 		myconf="${myconf} --enable-sse=sse2"
 	else
diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild
index d78cc9126d08..28d37a143933 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17.ebuild
@@ -21,6 +21,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.17-gcc11-missing-include.patch
+)
+
 multilib_src_configure() {
 	local myconf=""
 
diff --git a/dev-libs/xapian/xapian-1.4.18.ebuild b/dev-libs/xapian/xapian-1.4.18.ebuild
index 6a4927607af9..e92a0c0daef0 100644
--- a/dev-libs/xapian/xapian-1.4.18.ebuild
+++ b/dev-libs/xapian/xapian-1.4.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"