gentoo resync : 11.05.2021

3 files changed, 88 insertions, 3 deletions

diff --git a/app-accessibility/epos/Manifest b/app-accessibility/epos/Manifest
index 442b04dcbc0f..1ed6c2bf2e80 100644
--- a/app-accessibility/epos/Manifest
+++ b/app-accessibility/epos/Manifest
@@ -1,10 +1,11 @@
 AUX README.gentoo 108 BLAKE2B 1cd107977e2ed79c26266edf888bb1e33945ac17170f8c7487dd9f2997c0cdbdcaba71f72b250b822aba5f5e152b5728570354be238cc5c68e82c33d38e56a23 SHA512 84afee5caf9c1703f10846e77c1bdc9e298a1d560ffe34b0d8f3b570001f45ca059b86860f62ebdf84ee811aaee7f2d2753db069bb7cb977abfb7ac2b3009829
 AUX epos-2.5.37-disable-tests.patch 401 BLAKE2B 1b5d6de2a7ac1f27910e58e311c550ea4101b4ac1e3756ce4950c66b07ee216a3e76afad903ea580b5bcdbebb2b2ee8a10214a22edf01eab5c51efff0144a7e9 SHA512 63e5026789e35b2dbf00479539ca2b7fd0567a9ff018337d14334f54f4840c0aa723e7fe44c29a6fa3709ba4130750da8fb886c65513d4d71cbf0bd026681e2e
+AUX epos-2.5.37-gcc-11.patch 3074 BLAKE2B 2eb81cdb8469daf87db136587b3fb22beee894e34293efaa4a8c4dbddc17c4614c939a4cfcc3f37435750de9b3804612c6f6cb2acfb6ba502f0e95fad25b46c8 SHA512 ab3dd7e339c220fada5c5a2ec8f62a2c97c858951af3fc9fb2f3f1beef25260b030ea26067664613ca5fbead92aedfbcbfe94c391310bf5730253bbe59cfd734
 AUX epos-2.5.37-gcc43.patch 454 BLAKE2B 6a3db8a49d3368c50bc78b2f3eadd83e46e3408b84b5a2784849f72d073db59b322356e39962fed9c822b8c3baf62f958e0943cd58dbb77b50316467f6b05794 SHA512 34c0b51a722c75e088315202c62dbf42086bd4fa4da19b1c788c759f4c21fee26a6d7c1a414af34c4ec10d30ac8bf7ea7b65c9f3b96779dce5b40201e3611e4d
 AUX epos-2.5.37-gcc45.patch 507 BLAKE2B 03760db124cfc94c69512f710b3e84704c2bf910e54b632a4cc5a3c563fa15fbd2fcb244cdd770b34873ec7d42bf77ac3784f22a561250926aa85da98aa4636c SHA512 7dfd25ebab3bbe2cd91ccb61945d444215b7ae0f087637d47b5ce422a9b8ab6bf392a614983a49037ac937fdfcb0e6c3091fa39e443e6084348baa0c4f1fb360
 AUX epos-2.5.37-gcc47.patch 333 BLAKE2B 0ad7975a408e97aab6761b362063b61b2d914e071b3ce9d2b188c05dda89845f07d545f4b22fab9c74900ccb1c79310bc34dbf6363f6654bf1e184cb786571c4 SHA512 84a5d979fa59eaeef6f560494d67918580eb4574dada052cbf926440a0a960027c50b36284e0870f746b2a5f13f909946661174ce8d6f155d1ea0f6d202c334f
 AUX epos-2.5.37-gcc7.patch 593 BLAKE2B 10d992f2f886318904dbbaab4707f453ee846e469415b9467ff0e05d586466b5bc176f41b5805f744dc7873fd7223372a59909fedc946cd9d950efd7b4bc7c8d SHA512 b19d218dc3387efb2e9ea8d444692821c53a9cc77ab8541ad7b95a280478983fd8644fbe8dca305539c487c06c60a2b67dae09bd1e3776e3f2a07cb26631b46c
 AUX eposd 442 BLAKE2B ac420143183e28654de3289fe0d27c9582a2b53024048c7beb4fce4287d38ef0f585cd9a449f92d999bfcf4c382ea8f86d25750655d222e87e2f28416fad076d SHA512 3a60ab455b7c00ece42a759fb98bc3e9948134839f709ed16123e39a323f24fa166907f981f65510d83f2fcc52697a2535cfafb4e7ccbb0f3d8c116123f662ed
 DIST epos-2.5.37.tar.gz 976240 BLAKE2B 9304ea32f9506f130d13f5c1d14ad2dcc448cf978d0f7cd26f6bc97397f4590bd5456c9a529dbb941eb53f19cd64b849a1cbf5aee402a8eb171dbacfc85ada03 SHA512 870718a5e7b5048eafd62c478963de92fe8a90b3e755f79ea665dc33ad762c0ec4ebaf7c99d5f2be8983a0deacba284ae07b24d9a31bdd1a1eff5924327255ef
-EBUILD epos-2.5.37-r3.ebuild 901 BLAKE2B 35d71d3d267278b1f09495f8a7ead603520f2af87a284e7bfc8fccd977cdad87d341f156bee15d5a0c2470b9f4b63dd3a8eba3ce9851047b85ec56224cf6a91c SHA512 1dc80b3e08634c7686913e80c0a9cd55eb2234ace7ee4839510f0b3467b3d8732912aafd2ebde17ee67c02cb04600b2a7e8aa7579f0af7eba24619d150cf1818
+EBUILD epos-2.5.37-r3.ebuild 979 BLAKE2B 144c80b229e6ee6bb441b3faf00796d1f0fcfc18cf62e29a0861446bfdd2a56821426b0eec2d9b239f1656f3a53f648943b48674761ab9ac3c8992a230fc4d49 SHA512 e3ee63ec2456aed74dc922bb947a72fb987926a0fe81d8af3fde4fdd6ff5f420bf9718eabfb5cf13b5e7ddcb60365620cab34f6bfbd9d2daf6d59f555eb22780
 MISC metadata.xml 343 BLAKE2B 77d619d13082c8c8248f671c4e29031867028a05373e9ae48950a1d88540f3b1e5529739ef6e1a1479e04e3e6abd4556d1fd8cf39e5f10481d97110ecb0373d6 SHA512 0a3cbb37dfe8c2627ad7082f9f910c949d9f2477068ad7c68bb17658f0331bc7c736e84c452afa2204eb7fbd01c2edd68583800fcaec6962e456743999b0457d
diff --git a/app-accessibility/epos/epos-2.5.37-r3.ebuild b/app-accessibility/epos/epos-2.5.37-r3.ebuild
index f4146ed522d7..81187ea939bf 100644
--- a/app-accessibility/epos/epos-2.5.37-r3.ebuild
+++ b/app-accessibility/epos/epos-2.5.37-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 x86"
 IUSE=""
 
+RESTRICT=test # needs running eposd
+
 DEPEND="dev-util/byacc"
 RDEPEND=""
 
@@ -23,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.37-gcc47.patch
 	"${FILESDIR}"/${PN}-2.5.37-disable-tests.patch
 	"${FILESDIR}"/${PN}-2.5.37-gcc7.patch
+	"${FILESDIR}"/${PN}-2.5.37-gcc-11.patch
 )
 
 src_prepare() {
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch b/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch
new file mode 100644
index 000000000000..a14488b7d34a
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch
@@ -0,0 +1,81 @@
+Avoid `container` namespace clash with gcc-11's libstdc++ headers.
+
+https://bugs.gentoo.org/786264
+--- a/src/nnet/xmltempl.cc
++++ b/src/nnet/xmltempl.cc
+@@ -22,10 +22,10 @@ CXml * x ::print () const { \
+ #define RP(x) x
+ 
+ #define child(x,tag) retval->AddChild (*xml_print (x,tag));
+-#define container(x,tag) retval->AddChild (*xml_print_container (x,tag));
++#define epos_container(x,tag) retval->AddChild (*xml_print_container (x,tag));
+ #define child_opt(x,tag) if(x) child(x,tag)
+ #define child_enum(x,tag,enumS) retval->AddChild (*xml_print (enumS[x],tag));
+-#define container_opt(x,tag) if(x.size()) container(x,tag)
++#define container_opt(x,tag) if(x.size()) epos_container(x,tag)
+ #define structure(x,tag) retval->AddChild (*xml_print_str (x,tag));
+ #define structure_opt(x,tag,write_cond) if (write_cond) structure(x,tag)
+ 
+@@ -40,7 +40,7 @@ CXml * x ::print () const { \
+ #define CHILD(x)		child(x,#x)
+ #define CHILD_OPT(x)		child_opt(x,#x)
+ #define CHILD_ENUM(x,enumS)	child_enum(x,#x,enumS)
+-#define CONTAINER(x)		container(x,#x)
++#define CONTAINER(x)		epos_container(x,#x)
+ #define CONTAINER_OPT(x)	container_opt (x,#x)
+ #define STRUCTURE(x)		structure(x,#x)
+ #define STRUCTURE_OPT(x,cond)	structure_opt(x,#x,cond)
+@@ -60,7 +60,7 @@ return retval; }
+ #undef child
+ #undef child_opt
+ #undef child_enum
+-#undef container
++#undef epos_container
+ #undef container_opt
+ #undef structure
+ #undef structure_opt
+@@ -82,7 +82,7 @@ CString x ::read (CRox *xml) { \
+ #define child(x,tag) err += xml_read (xml,x,tag);
+ #define child_opt(x,tag) err += xml_read(xml,x,tag,false);
+ #define child_enum(x,tag,enumS) err += xml_read_enum(xml,x,enumS,tag);
+-#define container(x,tag) err += xml_read_container (xml,x,tag);
++#define epos_container(x,tag) err += xml_read_container (xml,x,tag);
+ #define container_opt(x,tag) err += xml_read_container (xml,x,tag,false);
+ #define structure(x,tag) err += xml_read_str (xml,x,tag);
+ #define structure_opt(x,tag,write_cond) err += xml_read_str (xml,x,tag,false);
+@@ -105,7 +105,7 @@ else return ""; }
+ #undef child
+ #undef child_opt
+ #undef child_enum
+-#undef container
++#undef epos_container
+ #undef container_opt
+ #undef structure
+ #undef structure_opt
+@@ -119,7 +119,7 @@ else return ""; }
+ 
+ #define XMLIZE(x,tag) x tmp##tag; retval->AddChild (*tmp##tag.printTemplate ());
+ #define child(x,tag) 
+-#define container(x,tag) 
++#define epos_container(x,tag) 
+ #define child_opt(x,tag) 
+ #define child_enum(x,tag,enumS) 
+ #define container_opt(x,tag) 
+@@ -145,7 +145,7 @@ CRox *xmltempl ()
+ #undef child
+ #undef child_opt
+ #undef child_enum
+-#undef container
++#undef epos_container
+ #undef container_opt
+ #undef structure
+ #undef structure_opt
+@@ -171,7 +171,7 @@ CXml * x ::printTemplate () const { \
+ 	CXml *retval = new CXml (#tag,1,0,"comment","structure " #x); \
+ 	retval->SetFF(DODELETE);
+ #define child(x,tag) retval->AddChild (*(new CXml(tag,1,0,"comment",#x))->SetFF(DODELETE));
+-#define container(x,tag) 
++#define epos_container(x,tag) 
+ #define child_opt(x,tag) 
+ #define child_enum(x,tag,enumS) 
+ #define container_opt(x,tag)