gentoo resync : 31.05.2021

3 files changed, 33 insertions, 1 deletions

diff --git a/app-text/cuneiform/Manifest b/app-text/cuneiform/Manifest
index 3aa5bbeee7b4..dd25274f01ef 100644
--- a/app-text/cuneiform/Manifest
+++ b/app-text/cuneiform/Manifest
@@ -1,6 +1,7 @@
 AUX cuneiform-1.1.0-c-assert.patch 2012 BLAKE2B e1c71e4b1be912ce604b43b1b09f96b299d9cb7dd553ed818203a2c06f7227e2c140095064accab3f90a32b16948276abd05e3451aaef1e3f66d87e219828424 SHA512 8c05e27e425c5221e6bb47eb8655e21e9f4ecd311679cd1b80a04e255371ffc907a9bca3337e78af6c88f23a3c6cf474971e1e94b6c6f1d30f206d01fb9a3a95
 AUX cuneiform-1.1.0-fix_buffer_overflow.patch 1089 BLAKE2B df9be625fee6806634c56fabe2ea27d0e3457b5c5090a7ff20aad79827fa7e6c25382cc0a230c31c4da3987eaba88de3628adedf2286ca317820134b04980134 SHA512 b701573177788575c540bb2203dab4d3f7ccc150bb71a53a13ac61971b357a4bfa67764f9880fd042798a94d79b70bff85c13b8e6005be344eb51c1bcd9311ab
 AUX cuneiform-1.1.0-fix_buffer_overflow_2.patch 888 BLAKE2B 9185e7190120138cdc0fc943b41878b9036cfedcb71fe47910b6f2c41e2865915570501a20d512c7ca0cacc09ece9e9cf688dc0d57963e76f1e923545fabc9f6 SHA512 182e1756adcbb71bd052fef7caf9b638b448bf995e2a6d2d5646737d22cacedf90840fbabc84e580450e92cb08ae357ff862aab977b8e34459dcc479fb92a292
+AUX cuneiform-1.1.0-gcc11.patch 1214 BLAKE2B 9350442a9061fca2fe377e85e89fd44defde241c1b66f3edbf910f8542d855237ed6db769e09380fec28278ea1542a6134c79f7f3052c950f1fec669a8779c73 SHA512 35b813c3096a6f1277e860a6aaaeb14837b20618ac216dac73a8bc07cdd24f58058e2b58cbc1f4371352959cd5355be5359c47d8bf22f71da519dab96ea99226
 AUX cuneiform-1.1.0-gcc6.patch 6080 BLAKE2B c9cf22db876320005c78f5b96330a11782d2d521fd1dd3024345f61bebb7a7d357c280d30d71193a5f94fee7cdd934351ced1f2073bf69047e8a090bbce66818 SHA512 277cc973a1934d7f722e7a3e30c981cbe57cf268b1553f3f552e15eebcf4c191c7457a8f8c3562f7fb1629b3405c37b10298293c047b8d3b0e67bb0cf72462f4
 AUX cuneiform-1.1.0-gcc7.patch 2814 BLAKE2B fef51b014790b27acd042b5e46e1ff79111a983b869d9591ed16cdbaa36139748987d5b3c91e5dfcac77b1495edb6ccb93ce4e922b8eb1fb49da22d6ea789e9b SHA512 4b164868c4612c28f0f1460ec4fb417a015840705e5fe5aa44c6ee2e350506fe1f7a7cb8f24e29f54b449c2893ff83bbdafd7df8733154bf8759c89e67902088
 AUX cuneiform-1.1.0-graphicsmagick.patch 1500 BLAKE2B 36a9e1292bc889596468f96aa6e515fba1368d9f6f451e3b0f2d51e91032a3093d74fa6496f1360385d1f18a39159a3eaf055e4b748520ac7b7767bdee13b47a SHA512 c3cbd03fd93c172d0b02a49c7f470348f60a46e09413872aefd7e581ac4934e41a75210afefb93f83b28cf2733dd0d025b1198ce6e28a9b950e54097adf33af3
@@ -8,5 +9,5 @@ AUX cuneiform-1.1.0-libm.patch 595 BLAKE2B 7c9bba013f4e3560149eb05504ebb9f600aba
 AUX cuneiform-1.1.0-typos.patch 1757 BLAKE2B b02ad10370a7bfed3201905c3282f5419e05845382084d70d4ce531722098bc1e225b3cb2bc6f6bd9978bea17903a9c2837e093b78935a5ddf1f05e29598b280 SHA512 5b8a1151b85cd2d5e0672b4ca125500047365051c9171bad49354d6e064d1fbe59631aa088183b9b0a3c9859b297cfc61055ab2f0fbfc3df669d3d6fa91ee4ce
 AUX cuneiform.1 2844 BLAKE2B ed7d68de70ebd50caf35bb22ebd23ef7ecf00633be22f237e19830456c1efe83a6c546dd27dcf776e91bdb9189236b48690cdf2b172602e2a0528c12de9b1532 SHA512 55dfaa6fd759a24c1a49ed1455a6f04e63c40f048872bc8309b770942747006bb5ed4704171a53490552c4170471934dcaeeb692921ebbc020f012f84afc6d77
 DIST cuneiform-linux-1.1.0.tar.bz2 26388511 BLAKE2B 9a9406d42b96d814b7342c48b384b7d46b529116e37f9946da6b1158bd223d2e4be0158bd0101f0b9821b7d63374758190e60232483779bdb6a4164d1b06034e SHA512 82395f43aae9f4b1301fb47b8d46613affb0ccb09c92d64ac3d77a593618cd56824225b0306176e4d8b90eb468abf6b9f534e97f28dabd4bba81cb7977b79b56
-EBUILD cuneiform-1.1.0-r3.ebuild 1497 BLAKE2B fecbe9b8d7be47d2cabdc42de3bd65d41525139054f7d018a7de23638514ee0ebce597958ec7b22761276bed2022179a4153670950126ec34800cdb2bb87a631 SHA512 41aedb8f002c8409be220667a1b737f65860bd324f387c963cc05698a80ffcf8022c0e129397448eab1a1ada1f2cc560075e22ea064224c3e9c8ee342b9ee949
+EBUILD cuneiform-1.1.0-r3.ebuild 1529 BLAKE2B 11e4cb0000af2c5691d314ab514f5d76ce77be16bf8790438ee266c1c915bd82e327385ca44c0cd483017f08ef318823d1ba8fb4adbbd8326af503b740e50362 SHA512 b649111f0703bd51f82e290ffc79360b3a5a41d0116085402d44f0f085281f6b19e10c2506beb6c69ab14c8816ae7110500b26dd12b171fa84da1918c6bcd95f
 MISC metadata.xml 250 BLAKE2B a79213869bd5899b9cfe177caee01e12a026f71485466cf3836d2809234fb64fe5c7ca8d945765fb2f40259fb0a9817e521d101d29ae87cd34098d5316f3dcba SHA512 b540aad05003ebec6a4f52250febbca55356d3d2d826d7b3f982d25ca543be928537194325600b5489970288e6500a671b0343735ed9ee052471efa26cd7cdab
diff --git a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
index 3874e69f95e6..16ad43b3ac40 100644
--- a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
+++ b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 	"${FILESDIR}"/${P}-gcc7.patch
 	"${FILESDIR}"/${P}-typos.patch
+	"${FILESDIR}"/${P}-gcc11.patch
 )
 
 src_prepare() {
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch b/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch
new file mode 100644
index 000000000000..47677507b261
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch
@@ -0,0 +1,30 @@
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h.orig	2021-05-23 10:45:12.714043888 +0300
++++ cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h	2021-05-23 10:45:47.233178549 +0300
+@@ -84,6 +84,7 @@
+    #endif
+ 
+    #if !defined(__MATH_H) && !defined(_INC_MATH)
++      #undef _GLIBCXX_USE_STD_SPEC_FUNCS
+       #include <math.h>
+    #endif
+ 
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp.orig	2021-05-23 10:51:00.757379453 +0300
++++ cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp	2021-05-23 10:51:22.445461911 +0300
+@@ -212,7 +212,7 @@
+     }
+ */
+     // write the text lines
+-	for (;sect>0;sect=sect->next)
++	for (;sect;sect=sect->next)
+ 	{
+ 		if (!WriteRtfSection(rtf,sect)) goto WRITE_END; //write section properties
+ 		//	int sectNum=0;
+@@ -897,7 +897,7 @@
+ //    if (curChar->fontNum>=rtf->page->fontsUsed || (prevChar&&prevChar->fontNum>=rtf->page->fontsUsed)) return TRUE;
+ 
+     // extract value for comparison
+-    if (prevChar>0) {
++    if (prevChar) {
+ //       lstrcpy(PrevTypeFace,TerFont[PrevFont].TypeFace);
+        PrevFamily=rtf->table[rtf->page->GetFontByNum(prevChar->fontNum)];
+        PrevStyle=prevChar->fontAttribs;