gentoo resync : 14.05.2020

11 files changed, 370 insertions, 494 deletions

diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 24fd1ccae3c8..3b87787dc45e 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,14 +1,9 @@
-AUX 20170731-PyMem_Free.patch 5579 BLAKE2B ffb048f9790ea237f37bedf17ec50087002c621d9b47f087397d417d854f593576229fac3d0ec17c5ba95bd4d44b75b270ceb754d50bd5388c96f542af7d21fb SHA512 fff7b217002d4f270ba20bdce9dcec44b4d1a68f4ea5df45880f5766b897ae8dcf051612416aac28e80d6063c9a461acbac998bd51eef1878bf590a8d75d0963
-AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cfccf4c3990045a92af79b60c7e018a118996aa4f4b7146408b713b4eaf2b867110dc41d6c99ba302cdc522f62d035572a SHA512 ef4df9ac6589615f4ce619d073cb78dc9fcc281f24a01941567a09a9e536d105672856fa3fded436bddefac4de094d017ed51ace9d5bb0454f44dc373c95927b
-AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366
-AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341
+AUX 20200314-MacServiceReadFDs.patch 1053 BLAKE2B 733c1e217681b7f5f6cf776835f142d93224bc240928c2b37101f71a19f31f240ac6c1f28931e544b5e277b82e6f0baceb0634fb92a74009b0c3b93d49262824 SHA512 cd8bf4bdf1e792ec4a9c7177cfd2e0cae42d0fa4ad016bb5372826e776170c6d4c53cdd2013784410fac9e4fd674afe3030b64577b2ac9f4b019d84510425614
+AUX 20200314-big-endian.patch 11856 BLAKE2B ae107bec5156a60605d19588b61ce9b7869a41ce148f3da16b7f69a3c298667c224d0cd22796aa447ef71118ee0b6c0cb8682f71d483de4806cd4640cefcb86f SHA512 d15dd1dcc5d3ca6d798954b31ce2dbc943536bbbcd158eb3ac95c9643fa0dee4c0357aa954298ef8d270be13c0f012d424d9c5f34d865dd9dd33ff7f189d257f
 AUX 20200314-stylemap.patch 869 BLAKE2B a5907efaa1357f5b445eadfa951d9558de78eb1f8eb271cac15318a6d1e7d95c4d56918ca41307c9ff74ab05bf3cc373a5189ccaa5c76282b2c0c5d6834bfaba SHA512 1f0e363d42606fb506dd6f747ac250cce6ab4b5bf49400095cab9fd48b68232a8d58325147d2e1f7ca223093d36edf020f70f383bb0bf24f3a2f2fc3b35fb747
 AUX 20200314-tilepath.patch 1142 BLAKE2B 61aa804682a5e486c2f131fd9d81fc5d29ca946f18d9d11a323d4c49cfa8c9404b846e2afb6ac4dbf00af78133f27819f72f678298c3abfaeecd576877ac1ed4 SHA512 2cbd0ac47c211ceda2e2e4d6b62a69432e084ec664d58ff5e259f2d1eee9b70b64610d4a428d5f86305c8427c21dd6a00944a86a995c8cc5f9aed63df4aa5a31
 AUX CVE-2020-5395.patch 3073 BLAKE2B 15fa97a633e2c218f512a7d1202555e2465bad9adf0661bcc314a940d691520ba897ed6d76ff2b80111f3c016d71717ec4170196ce2177f3e6478b26f63e76ca SHA512 7dcdd6c4e8eb433de32fe76c2a1832ba9b318c5889ce03325516fa8d3ce63043a89e740758cf75b10626bac43352292e11ba0fdf31725ecff5b9d3065265ac3b
-DIST fontforge-20190801.tar.gz 20766334 BLAKE2B c3206e77da4a966b9e513c41c90e19522f3d1aad990cd3035d7c8a8cc009239811743c12c02df3b02fd91fa5a7738913dba43df14523a738a2232cd2d1a91700 SHA512 78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236
+AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
 DIST fontforge-20200314.tar.xz 13850076 BLAKE2B 5e6ae3b7940a5b3b08811abdfc9d151f231e6d457b219eb0c666e1b831db815b696f345eda0d4d423b7e340f56fca67205734ae19903b3815381080d34b5e95c SHA512 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975
-DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-EBUILD fontforge-20170731-r5.ebuild 2823 BLAKE2B 496e75f46e8ef562476c1d6a72d76e2068cd797a29f86dd32dabfd4338a594a04b3aa7e94c06b3c02402c21b61ca71a46a2c7f9d2bb803f63f5c35a6709889ee SHA512 6a05758d6d57e2c838a7aa520bb721c112dcdafd2305566e2dc7e8769ce91def379df759db8415c44387afce2ad7496b4e3a868c4b16786a311a2ded15b47234
-EBUILD fontforge-20190801.ebuild 2470 BLAKE2B 316185d2a92b3a9e508ffc5c4fb699d297c90940f1fd3d973fd88f47610e45547276c54abb89f105f1f2dd98c1f4854ae5137acce3871a315ca3f55b5e6efdc3 SHA512 3e98601babb0991fbab2c36292f8cef069b976cbcc82fccff1b01170b77fecb4ccfc09448409f071f7611222f3e2d65f7a60ee35f2cc1cd4be821d6c981a2e78
-EBUILD fontforge-20200314.ebuild 2889 BLAKE2B 571ba654bf7b988b986412a756a0f239575cefc28351dd98c52640cd9ea3c4bee2f508c1e83bef7d0b9117de2e679f530b86d1c003435cc7fba774c4ebe96b5b SHA512 f0d28db34a7392f318bdaf39dc83115ea113158ad0b544b9dd7cd0904777fb77c4585f627c43a19410474aab64c8d2e766254d66e0b46501f47a711fbb85e73c
+EBUILD fontforge-20200314.ebuild 3027 BLAKE2B 6279419e6cc43c67c7089acf6585563c3be3bbe67447129cc6e480d76ace2091f7430c6ae2353bc17df3e8ad70a6dfc0a26c2757fddbfa463c21e4eb2055852a SHA512 f86153004126af75d1c752139caa0cd0a9af482dcc032d28844cba7d038fced7e7cab7c3964a8583daa94ce5ccb2eca12444e9aa539563587caa4149b600d522
 MISC metadata.xml 968 BLAKE2B 25c959d8983e879ee629f097471240a284877f9b3881c1530b91ecfee2c1207c57811a9498f92701fabafee2d8756bf75885ffe55021ab8f6194d5ea2b4c52d2 SHA512 1fb9e55e26f8974a5cc3dd421fd644ec55761c2a6767c7c8d32f8f514720e4dfc3509645bce2acc082cfca6f4b4ed4fe633d1bc9d3074cfe8ba53ae5b1b16004
diff --git a/media-gfx/fontforge/files/20170731-PyMem_Free.patch b/media-gfx/fontforge/files/20170731-PyMem_Free.patch
deleted file mode 100644
index 48301dabb2f1..000000000000
--- a/media-gfx/fontforge/files/20170731-PyMem_Free.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From b6089f11bd7534c9aa38b875ef1e830fc3b898b4 Mon Sep 17 00:00:00 2001
-From: Jeremy Tan <jtanx@outlook.com>
-Date: Wed, 13 Sep 2017 17:22:18 +0800
-Subject: [PATCH] python: Use PyMem_Free wherever PyArg_ParseTuple+es is used
-
-https://docs.python.org/2.0/ext/parseTuple.html
-
-diff --git a/fontforge/python.c b/fontforge/python.c
-index 5d6820c40..c6d7aca2b 100644
---- a/fontforge/python.c
-+++ b/fontforge/python.c
-@@ -607,7 +607,13 @@ return( NULL );
- 	}
-     }
- 
--    if ( !SetPrefs((char *) prefname,&val,NULL)) {
-+    bool succeeded = SetPrefs((char *) prefname,&val,NULL);
-+    if (val.type == v_str && val.u.sval) {
-+        PyMem_Free(val.u.sval);
-+        val.u.sval = NULL;
-+    }
-+
-+    if (!succeeded) {
- 	PyErr_Format(PyExc_NameError, "Unknown preference item in SetPrefs: %s", prefname );
- return( NULL );
-     }
-@@ -728,7 +734,7 @@ static PyObject *PyFF_UnicodeFromName(PyObject *UNUSED(self), PyObject *args) {
- return( NULL );
- 
-     ret = Py_BuildValue("i", UniFromName((char *) name, ui_none,&custom));
--    free(name);
-+    PyMem_Free(name);
- return( ret );
- }
- 
-@@ -1361,12 +1367,14 @@ Py_RETURN_NONE;			/* Well, that was pointless */
-     if ( import==Py_None )
- 	import=NULL;
-     else if ( !PyCallable_Check(import) ) {
-+	PyMem_Free(name);
- 	PyErr_Format(PyExc_TypeError, "First argument is not callable" );
- return( NULL );
-     }
-     if ( export==Py_None )
- 	export=NULL;
-     else if ( !PyCallable_Check(export) ) {
-+	PyMem_Free(name);
- 	PyErr_Format(PyExc_TypeError, "Second argument is not callable" );
- return( NULL );
-     }
-@@ -1472,7 +1480,7 @@ static PyObject *PyFF_logError(PyObject *UNUSED(self), PyObject *args) {
-     if ( !PyArg_ParseTuple(args,"es","UTF-8", &msg) )
- return( NULL );
-     LogError(msg);
--    free(msg);
-+    PyMem_Free(msg);
- Py_RETURN_NONE;
- }
- 
-@@ -1486,6 +1494,8 @@ static PyObject *PyFF_postError(PyObject *UNUSED(self), PyObject *args) {
- return( NULL );
-     if( showPythonErrors )
-         ff_post_error(title,msg);		/* Prints to stderr if no ui */
-+    PyMem_Free(title);
-+    PyMem_Free(msg);
- Py_RETURN_NONE;
- }
- 
-@@ -1494,6 +1504,8 @@ static PyObject *PyFF_postNotice(PyObject *UNUSED(self), PyObject *args) {
-     if ( !PyArg_ParseTuple(args,"eses","UTF-8", &title, "UTF-8", &msg) )
- return( NULL );
-     ff_post_notice(title,msg);		/* Prints to stderr if no ui */
-+    PyMem_Free(title);
-+    PyMem_Free(msg);
- Py_RETURN_NONE;
- }
- 
-@@ -1511,8 +1523,8 @@ return( NULL );
- return( NULL );
- 
-     ret = ff_open_filename(title,def,filter);
--    free(title);
--    free(def);
-+    PyMem_Free(title);
-+    PyMem_Free(def);
-     if ( ret==NULL )
- Py_RETURN_NONE;
-     reto = DECODE_UTF8(ret,strlen(ret),NULL);
-@@ -1534,8 +1546,8 @@ return( NULL );
- return( NULL );
- 
-     ret = ff_save_filename(title,def,filter);
--    free(title);
--    free(def);
-+    PyMem_Free(title);
-+    PyMem_Free(def);
-     if ( ret==NULL )
- Py_RETURN_NONE;
-     reto = DECODE_UTF8(ret,strlen(ret),NULL);
-@@ -1558,8 +1570,8 @@ return( NULL );
- return( NULL );
-     if ( !PySequence_Check(answero) || STRING_CHECK(answero)) {
- 	PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument");
--	free(title);
--	free(quest);
-+	PyMem_Free(title);
-+	PyMem_Free(quest);
- return( NULL );
-     }
-     cnt = PySequence_Size(answero);
-@@ -1568,16 +1580,16 @@ return( NULL );
- 	cancel = cnt-1;
-     if ( cancel<0 || cancel>=cnt || def<0 || def>=cnt ) {
- 	PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th or 5th argument");
--	free(title);
--	free(quest);
-+	PyMem_Free(title);
-+	PyMem_Free(quest);
- 	free(answers);
- return( NULL );
-     }
-     for ( i=0; i<cnt; ++i ) {
-         PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i));
- 	if ( utf8_name==NULL ) {
--	    free(title);
--	    free(quest);
-+	    PyMem_Free(title);
-+	    PyMem_Free(quest);
- 	    FreeStringArray( i, answers );
- return( NULL );
- 	}
-@@ -1587,8 +1599,8 @@ return( NULL );
-     answers[cnt] = NULL;
- 
-     ret = ff_ask(title,(const char **) answers,def,cancel,quest);
--    free(title);
--    free(quest);
-+    PyMem_Free(title);
-+    PyMem_Free(quest);
-     FreeStringArray( cnt, answers );
- return( Py_BuildValue("i",ret));
- }
-@@ -1608,23 +1620,23 @@ return( NULL );
- return( NULL );
-     if ( !PySequence_Check(answero) || STRING_CHECK(answero)) {
- 	PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument");
--	free(title);
--	free(quest);
-+	PyMem_Free(title);
-+	PyMem_Free(quest);
- return( NULL );
-     }
-     cnt = PySequence_Size(answero);
-     answers = calloc(cnt+1, sizeof(char *));
-     if ( def<0 || def>=cnt ) {
- 	PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th argument");
--	free(title);
--	free(quest);
-+	PyMem_Free(title);
-+	PyMem_Free(quest);
- return( NULL );
-     }
-     for ( i=0; i<cnt; ++i ) {
-         PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i));
-         if ( utf8_name==NULL ) {
--	    free(title);
--	    free(quest);
-+	    PyMem_Free(title);
-+	    PyMem_Free(quest);
- 	    FreeStringArray( i, answers );
- return( NULL );
- 	}
-@@ -1634,8 +1646,8 @@ return( NULL );
-     answers[cnt] = NULL;
- 
-     ret = ff_choose(title,(const char **) answers,cnt,def,quest);
--    free(title);
--    free(quest);
-+    PyMem_Free(title);
-+    PyMem_Free(quest);
-     FreeStringArray( cnt, answers );
- return( Py_BuildValue("i",ret));
- }
-@@ -1654,8 +1666,8 @@ return( NULL );
- return( NULL );
- 
-     ret = ff_ask_string(title,def,quest);
--    free(title);
--    free(quest);
-+    PyMem_Free(title);
-+    PyMem_Free(quest);
-     free(def);
-     if ( ret==NULL )
- Py_RETURN_NONE;
--- 
-2.17.0
-
diff --git a/media-gfx/fontforge/files/20170731-gethex-unaligned.patch b/media-gfx/fontforge/files/20170731-gethex-unaligned.patch
deleted file mode 100644
index 812f7a444721..000000000000
--- a/media-gfx/fontforge/files/20170731-gethex-unaligned.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix unaligned access in gethex()
-
---- a/fontforge/sfd.c
-+++ b/fontforge/sfd.c
-@@ -3393,6 +3393,7 @@
- static int gethex(FILE *sfd, uint32 *val) {
-     char tokbuf[100]; int ch;
-     char *pt=tokbuf, *end = tokbuf+100-2;
-+    uint32 u;
- 
-     while ( isspace(ch = nlgetc(sfd)));
-     if ( ch=='#' )
-@@ -3416,7 +3417,8 @@
-     }
-     *pt='\0';
-     ungetc(ch,sfd);
--    *val = strtoul(tokbuf,NULL,16);
-+    u = strtoul(tokbuf,NULL,16);
-+    memcpy(val, &u, sizeof(u));
- return( pt!=tokbuf?1:ch==EOF?-1: 0 );
- }
- 
diff --git a/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch b/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch
deleted file mode 100644
index 30731b904f25..000000000000
--- a/media-gfx/fontforge/files/20170731-startnoui-FindOrMakeEncoding.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 72572a68d306712c040ca741f0655b190326a509 Mon Sep 17 00:00:00 2001
-From: Jeremy Tan <jtanx@outlook.com>
-Date: Sat, 9 Sep 2017 08:03:57 +0800
-Subject: [PATCH] startnoui.c: Include header that defines FindOrMakeEncoding
-
-Failure to include this was causing an implicit pointer to int conversion
-which results in an invalid pointer address on 64-bit builds.
-
-Fixes #3145.
-
-diff --git a/fontforgeexe/startnoui.c b/fontforgeexe/startnoui.c
-index ab8388539..7a188b7a2 100644
---- a/fontforgeexe/startnoui.c
-+++ b/fontforgeexe/startnoui.c
-@@ -27,6 +27,7 @@
- #include "fontforgevw.h"
- #include "scripting.h"
- #include "start.h"
-+#include "encoding.h"
- 
- #ifndef _NO_LIBUNICODENAMES
- #include <libunicodenames.h>	/* need to open a database when we start */
diff --git a/media-gfx/fontforge/files/20170731-tilepath.patch b/media-gfx/fontforge/files/20170731-tilepath.patch
deleted file mode 100644
index c14d81dc430c..000000000000
--- a/media-gfx/fontforge/files/20170731-tilepath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix implicit declarations
-
-Fixed upstream in a larger refactor.
-
---- a/fontforgeexe/tilepath.c
-+++ b/fontforgeexe/tilepath.c
-@@ -24,7 +24,9 @@
-  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
-+#include "cvundoes.h"
- #include "fontforgeui.h"
-+#include "fvfonts.h"
- #include "splineutil.h"
- #include "splineutil2.h"
- #include <math.h>
diff --git a/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch b/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch
new file mode 100644
index 000000000000..d6beff7984c9
--- /dev/null
+++ b/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch
@@ -0,0 +1,38 @@
+From 5a3d2ce60aeefd706c36a8325721b0c8c818c742 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 1 May 2020 05:06:07 -0400
+Subject: [PATCH] Stub-out MacServiceReadFDs() on non-Mac platforms (#4246)
+
+This should fix a build failure on Linux with musl libc due to the
+missing sys/select.h include.
+
+MacServiceReadFDs seems to only be called in startui.c, also behind the
+__Mac macro.
+
+Bug: https://bugs.gentoo.org/706792
+---
+ gdraw/gdraw.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdraw/gdraw.c b/gdraw/gdraw.c
+index 1fb3354b1d..6bac57b92a 100644
+--- a/gdraw/gdraw.c
++++ b/gdraw/gdraw.c
+@@ -32,7 +32,7 @@
+ #include "gkeysym.h"
+ #include "ustring.h"
+ 
+-#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__
++#if __Mac
+ #  include <sys/select.h>
+ #endif
+ 
+@@ -1076,7 +1076,7 @@ GDrawRemoveReadFD( GDisplay *gdisp,
+ 
+ void MacServiceReadFDs()
+ {
+-#if (!defined(__MINGW32__))&&(!defined(__CYGWIN__))
++#if __Mac
+     int ret = 0;
+     
+     GDisplay *gdisp = GDrawGetDisplayOfWindow(0);
diff --git a/media-gfx/fontforge/files/20200314-big-endian.patch b/media-gfx/fontforge/files/20200314-big-endian.patch
new file mode 100644
index 000000000000..f9581ad35f42
--- /dev/null
+++ b/media-gfx/fontforge/files/20200314-big-endian.patch
@@ -0,0 +1,298 @@
+From 65619185a42bd52bb4a4894c1714d78d96ed4175 Mon Sep 17 00:00:00 2001
+From: Jeremy Tan <jtanx@outlook.com>
+Date: Sun, 26 Apr 2020 18:57:58 +1000
+Subject: [PATCH 1/2] tottfgpos.c: fix incorrect sizing of the scripts array
+
+latn contains 58 entries (29 pairs), meaning the size was too small
+to fit the 0 marker at the end of the array
+---
+ fontforge/tottfgpos.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fontforge/tottfgpos.c b/fontforge/tottfgpos.c
+index 5de5164ed1..e12a0b8a79 100644
+--- a/fontforge/tottfgpos.c
++++ b/fontforge/tottfgpos.c
+@@ -60,7 +60,7 @@ int use_second_indic_scripts = false;
+ /* scripts (for opentype) that I understand */
+     /* see also list in lookups.c mapping script tags to friendly names */
+ 
+-static uint32 scripts[][59] = {
++static uint32 scripts[][61] = {
+ /* Adlam */	{ CHR('a','d','l','m'), 0x1e900, 0x1e95f },
+ /* Ahom */	{ CHR('a','h','o','m'), 0x11700, 0x1173f },
+ /* Anatolian */	{ CHR('h','l','u','w'), 0x14400, 0x1467f },
+
+From fde85b13382595cb3ab889e38570b4944edad808 Mon Sep 17 00:00:00 2001
+From: Jeremy Tan <jtanx@outlook.com>
+Date: Sun, 26 Apr 2020 19:00:04 +1000
+Subject: [PATCH 2/2] python.c: fix type specifier on long input/return values
+
+int is guaranteed to be at least 16 bits, while long is at least
+32 bits. So for uint32/int32 values, parse longs with the "l"/"k"
+specifier and cast return values to long.
+
+The cast is necessary as on amd64 a long is 64 bits
+---
+ fontforge/python.c | 68 +++++++++++++++++++++++-----------------------
+ 1 file changed, 34 insertions(+), 34 deletions(-)
+
+diff --git a/fontforge/python.c b/fontforge/python.c
+index 5344b0f60f..6c9675fa4e 100644
+--- a/fontforge/python.c
++++ b/fontforge/python.c
+@@ -760,7 +760,7 @@ static PyObject *PyFF_UnicodeAnnotationFromLib(PyObject *UNUSED(self), PyObject
+     char *temp;
+     long val;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+ 
+     if ( (temp=unicode_annot(val))==NULL ) {
+@@ -777,7 +777,7 @@ static PyObject *PyFF_UnicodeNameFromLib(PyObject *UNUSED(self), PyObject *args)
+     char *temp;
+     long val;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+ 
+     if ( (temp=unicode_name(val))==NULL ) {
+@@ -798,10 +798,10 @@ static PyObject *PyFF_UnicodeBlockStartFromLib(PyObject *UNUSED(self), PyObject
+ /* Use this function with UnicodeBlockNameFromLib(n) & UnicodeBlockEndFromLib(n). */
+     long val;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+ 
+-    return( Py_BuildValue("i", unicode_block_start(val)) );
++    return( Py_BuildValue("l", (long)unicode_block_start(val)) );
+ }
+ 
+ static PyObject *PyFF_UnicodeBlockEndFromLib(PyObject *UNUSED(self), PyObject *args) {
+@@ -809,10 +809,10 @@ static PyObject *PyFF_UnicodeBlockEndFromLib(PyObject *UNUSED(self), PyObject *a
+ /* Use this function with UnicodeBlockStartFromLib(n), UnicodeBlockNameFromLib(n) */
+     long val;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+ 
+-    return( Py_BuildValue("i", unicode_block_end(val)) );
++    return( Py_BuildValue("l", (long)unicode_block_end(val)) );
+ }
+ 
+ static PyObject *PyFF_UnicodeBlockNameFromLib(PyObject *UNUSED(self), PyObject *args) {
+@@ -822,7 +822,7 @@ static PyObject *PyFF_UnicodeBlockNameFromLib(PyObject *UNUSED(self), PyObject *
+     char *temp;
+     long val;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+ 
+     if ( (temp=unicode_block_name(val))==NULL ) {
+@@ -853,24 +853,24 @@ static PyObject *PyFF_UnicodeNames2GetCntFromLib(PyObject *UNUSED(self), PyObjec
+ static PyObject *PyFF_UnicodeNames2GetNxtFromLib(PyObject *UNUSED(self), PyObject *args) {
+     long val;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+-    return( Py_BuildValue("i", unicode_names2getUtabLoc(val)) );
++    return( Py_BuildValue("l", (long)unicode_names2getUtabLoc(val)) );
+ }
+ 
+ static PyObject *PyFF_UnicodeNames2NxtUniFromLib(PyObject *UNUSED(self), PyObject *args) {
+     long val;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+-    return( Py_BuildValue("i", unicode_names2valFrmTab(val)) );
++    return( Py_BuildValue("l", (long)unicode_names2valFrmTab(val)) );
+ }
+ 
+ static PyObject *PyFF_UnicodeNames2FrmTabFromLib(PyObject *UNUSED(self), PyObject *args) {
+     long val;
+     char *temp;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+     if ( (temp=unicode_name2FrmTab(val))==NULL ) {
+ 	return Py_BuildValue("s", "");
+@@ -883,7 +883,7 @@ static PyObject *PyFF_UnicodeNames2FromLib(PyObject *UNUSED(self), PyObject *arg
+     long val;
+     char *temp;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+     if ( (temp=unicode_name2(val))==NULL ) {
+ 	return Py_BuildValue("s", "");
+@@ -899,7 +899,7 @@ static PyObject *PyFF_UnicodeNames2FromLib(PyObject *UNUSED(self), PyObject *arg
+ static PyObject *PyFF_isligature(PyObject *UNUSED(self), PyObject *args) {
+     long codepoint;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
++    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
+ 	return( NULL );
+ 
+     return( Py_BuildValue("i", is_LIGATURE(codepoint)==0?1:0) );
+@@ -908,7 +908,7 @@ static PyObject *PyFF_isligature(PyObject *UNUSED(self), PyObject *args) {
+ static PyObject *PyFF_isvulgarfraction(PyObject *UNUSED(self), PyObject *args) {
+     long codepoint;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
++    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
+ 	return( NULL );
+ 
+     return( Py_BuildValue("i", is_VULGAR_FRACTION(codepoint)==0?1:0) );
+@@ -917,7 +917,7 @@ static PyObject *PyFF_isvulgarfraction(PyObject *UNUSED(self), PyObject *args) {
+ static PyObject *PyFF_isotherfraction(PyObject *UNUSED(self), PyObject *args) {
+     long codepoint;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
++    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
+ 	return( NULL );
+ 
+     return( Py_BuildValue("i", is_OTHER_FRACTION(codepoint)==0?1:0) );
+@@ -926,7 +926,7 @@ static PyObject *PyFF_isotherfraction(PyObject *UNUSED(self), PyObject *args) {
+ static PyObject *PyFF_isfraction(PyObject *UNUSED(self), PyObject *args) {
+     long codepoint;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
++    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
+ 	return( NULL );
+ 
+     return( Py_BuildValue("i", (is_VULGAR_FRACTION(codepoint)==0 || \
+@@ -957,28 +957,28 @@ static PyObject *PyFF_FracChartGetCnt(PyObject *UNUSED(self), PyObject *UNUSED(a
+ static PyObject *PyFF_LigChartGetNxt(PyObject *UNUSED(self), PyObject *args) {
+     long val;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+ 
+-    return( Py_BuildValue("i", Ligature_get_U(val)) );
++    return( Py_BuildValue("l", (long)Ligature_get_U(val)) );
+ }
+ 
+ static PyObject *PyFF_VulChartGetNxt(PyObject *UNUSED(self), PyObject *args) {
+     long val;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+ 
+-    return( Py_BuildValue("i", VulgFrac_get_U(val)) );
++    return( Py_BuildValue("l", (long)VulgFrac_get_U(val)) );
+ }
+ 
+ static PyObject *PyFF_OFracChartGetNxt(PyObject *UNUSED(self), PyObject *args) {
+     long val;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&val) )
++    if ( !PyArg_ParseTuple(args,"|l",&val) )
+ 	return( NULL );
+ 
+-    return( Py_BuildValue("i", Fraction_get_U(val)) );
++    return( Py_BuildValue("l", (long)Fraction_get_U(val)) );
+ }
+ 
+ /* If you have a unicode ligature, or fraction, these routines return loc n. */
+@@ -987,7 +987,7 @@ static PyObject *PyFF_OFracChartGetNxt(PyObject *UNUSED(self), PyObject *args) {
+ static PyObject *PyFF_LigChartGetLoc(PyObject *UNUSED(self), PyObject *args) {
+     long codepoint;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
++    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
+ 	return( NULL );
+ 
+     return( Py_BuildValue("i", Ligature_find_N(codepoint)) );
+@@ -996,7 +996,7 @@ static PyObject *PyFF_LigChartGetLoc(PyObject *UNUSED(self), PyObject *args) {
+ static PyObject *PyFF_VulChartGetLoc(PyObject *UNUSED(self), PyObject *args) {
+     long codepoint;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
++    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
+ 	return( NULL );
+ 
+     return( Py_BuildValue("i", VulgFrac_find_N(codepoint)) );
+@@ -1005,7 +1005,7 @@ static PyObject *PyFF_VulChartGetLoc(PyObject *UNUSED(self), PyObject *args) {
+ static PyObject *PyFF_OFracChartGetLoc(PyObject *UNUSED(self), PyObject *args) {
+     long codepoint;
+ 
+-    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
++    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
+ 	return( NULL );
+ 
+     return( Py_BuildValue("i", Fraction_find_N(codepoint)) );
+@@ -1066,7 +1066,7 @@ static PyObject *PyFF_LigChartGetAltVal(PyObject *UNUSED(self), PyObject *args)
+ 
+     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
+ 	return( NULL );
+-    return( Py_BuildValue("i", Ligature_alt_getV(nthCode,altN)) );
++    return( Py_BuildValue("l", (long)Ligature_alt_getV(nthCode,altN)) );
+ }
+ 
+ static PyObject *PyFF_LigChartUGetAltVal(PyObject *UNUSED(self), PyObject *args) {
+@@ -1074,7 +1074,7 @@ static PyObject *PyFF_LigChartUGetAltVal(PyObject *UNUSED(self), PyObject *args)
+ 
+     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
+ 	return( NULL );
+-    return( Py_BuildValue("i", LigatureU_alt_getV(nthCode,altN)) );
++    return( Py_BuildValue("l", (long)LigatureU_alt_getV(nthCode,altN)) );
+ }
+ 
+ static PyObject *PyFF_VulChartGetAltVal(PyObject *UNUSED(self), PyObject *args) {
+@@ -1082,7 +1082,7 @@ static PyObject *PyFF_VulChartGetAltVal(PyObject *UNUSED(self), PyObject *args)
+ 
+     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
+ 	return( NULL );
+-    return( Py_BuildValue("i", VulgFrac_alt_getV(nthCode,altN)) );
++    return( Py_BuildValue("l", (long)VulgFrac_alt_getV(nthCode,altN)) );
+ }
+ 
+ static PyObject *PyFF_VulChartUGetAltVal(PyObject *UNUSED(self), PyObject *args) {
+@@ -1090,7 +1090,7 @@ static PyObject *PyFF_VulChartUGetAltVal(PyObject *UNUSED(self), PyObject *args)
+ 
+     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
+ 	return( NULL );
+-    return( Py_BuildValue("i", VulgFracU_alt_getV(nthCode,altN)) );
++    return( Py_BuildValue("l", (long)VulgFracU_alt_getV(nthCode,altN)) );
+ }
+ 
+ static PyObject *PyFF_OFracChartGetAltVal(PyObject *UNUSED(self), PyObject *args) {
+@@ -1098,7 +1098,7 @@ static PyObject *PyFF_OFracChartGetAltVal(PyObject *UNUSED(self), PyObject *args
+ 
+     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
+ 	return( NULL );
+-    return( Py_BuildValue("i", Fraction_alt_getV(nthCode,altN)) );
++    return( Py_BuildValue("l", (long)Fraction_alt_getV(nthCode,altN)) );
+ }
+ 
+ static PyObject *PyFF_OFracChartUGetAltVal(PyObject *UNUSED(self), PyObject *args) {
+@@ -1106,7 +1106,7 @@ static PyObject *PyFF_OFracChartUGetAltVal(PyObject *UNUSED(self), PyObject *arg
+ 
+     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
+ 	return( NULL );
+-    return( Py_BuildValue("i", FractionU_alt_getV(nthCode,altN)) );
++    return( Py_BuildValue("l", (long)FractionU_alt_getV(nthCode,altN)) );
+ }
+ 
+ static PyObject *PyFF_Version(PyObject *UNUSED(self), PyObject *UNUSED(args)) {
+@@ -1542,8 +1542,8 @@ return( ret );
+ }
+ 
+ static PyObject *PyFF_scriptFromUnicode(PyObject *UNUSED(self), PyObject *args) {
+-    long u;
+-    if ( !PyArg_ParseTuple(args,"i",&u) )
++    unsigned long u;
++    if ( !PyArg_ParseTuple(args,"k",&u) )
+ 	return( NULL );
+ 
+     uint32 script = ScriptFromUnicode(u, NULL);
diff --git a/media-gfx/fontforge/files/fontforge-doc-no-warn-error.patch b/media-gfx/fontforge/files/fontforge-doc-no-warn-error.patch
new file mode 100644
index 000000000000..ed1526b62e25
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-doc-no-warn-error.patch
@@ -0,0 +1,25 @@
+From e8164ed0fa747bfc8e7e80e6ff6b9a34b7c1a33f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 27 Apr 2020 20:00:54 -0400
+Subject: [PATCH] doc: do not treat warnings as errors
+
+---
+ doc/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 6c4601a05..e5aeaed4f 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -21,7 +21,7 @@ file(STRINGS manifest.txt _manifest)
+ configure_file(manifest.txt manifest.txt COPYONLY)
+ 
+ add_custom_command(OUTPUT sphinx-docs
+-  COMMAND "${Sphinx_BUILD_BINARY}" -q -n -W -b html -d doctrees "${CMAKE_CURRENT_SOURCE_DIR}/sphinx" sphinx-docs
++  COMMAND "${Sphinx_BUILD_BINARY}" -q -n -b html -d doctrees "${CMAKE_CURRENT_SOURCE_DIR}/sphinx" sphinx-docs
+   DEPENDS ${_manifest}
+ )
+ 
+-- 
+2.26.2
+
diff --git a/media-gfx/fontforge/fontforge-20170731-r5.ebuild b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
deleted file mode 100644
index 3717888256a5..000000000000
--- a/media-gfx/fontforge/fontforge-20170731-r5.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.github.io/"
-SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-dist-${PV}.tar.xz"
-
-LICENSE="BSD GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	cairo? ( png )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( png python )
-"
-
-RDEPEND="
-	dev-libs/glib
-	dev-libs/libltdl:0
-	dev-libs/libxml2:2=
-	>=media-libs/freetype-2.3.7:2=
-	cairo? (
-		>=x11-libs/cairo-1.6:0=
-		x11-libs/pango:0=
-	)
-	gif? ( media-libs/giflib:0= )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )
-	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
-	gtk? ( x11-libs/gtk+:2= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	unicode? ( media-libs/libuninameslist:0= )
-	X? (
-		x11-libs/libX11:0=
-		x11-libs/libXi:0=
-		>=x11-libs/pango-1.10:0=[X]
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )
-"
-
-# Needs keywording on many arches.
-#	zeromq? (
-#		>=net-libs/czmq-2.2.0:0=
-#		>=net-libs/zeromq-4.0.4:0=
-#	)
-
-S="${WORKDIR}/fontforge-2.0.${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/20170731-startnoui-FindOrMakeEncoding.patch
-	"${FILESDIR}"/20170731-tilepath.patch
-	"${FILESDIR}"/20170731-gethex-unaligned.patch
-	"${FILESDIR}"/20170731-PyMem_Free.patch
-	"${FILESDIR}"/CVE-2020-5395.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
-		$(use_enable gtk gtk2-use)
-		$(use_enable python python-extension)
-		$(use_enable python python-scripting)
-		--enable-tile-path
-		--enable-gb12345
-		$(use_with cairo)
-		$(use_with gif giflib)
-		$(use_with jpeg libjpeg)
-		$(use_with png libpng)
-		$(use_with readline libreadline)
-		--without-libspiro
-		$(use_with tiff libtiff)
-		$(use_with unicode libuninameslist)
-		#$(use_with zeromq libzmq)
-		--without-libzmq
-		$(use_with X x)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Build system deps are broken
-	emake -C plugins
-	emake
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/fontforge/fontforge-20190801.ebuild b/media-gfx/fontforge/fontforge-20190801.ebuild
deleted file mode 100644
index 74590785e86e..000000000000
--- a/media-gfx/fontforge/fontforge-20190801.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.github.io/"
-SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.gz"
-
-LICENSE="BSD GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	cairo? ( png )
-	gtk? ( cairo )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/glib
-	dev-libs/libltdl:0
-	dev-libs/libxml2:2=
-	>=media-libs/freetype-2.3.7:2=
-	cairo? (
-		>=x11-libs/cairo-1.6:0=
-		x11-libs/pango:0=
-	)
-	gif? ( media-libs/giflib:0= )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )
-	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
-	gtk? ( >=x11-libs/gtk+-3.10:3 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	unicode? ( media-libs/libuninameslist:0= )
-	X? (
-		x11-libs/libX11:0=
-		x11-libs/libXi:0=
-		>=x11-libs/pango-1.10:0=[X]
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# Needs keywording on many arches.
-#	zeromq? (
-#		>=net-libs/czmq-2.2.0:0=
-#		>=net-libs/zeromq-4.0.4:0=
-#	)
-
-PATCHES=(
-	"${FILESDIR}"/20170731-gethex-unaligned.patch
-	"${FILESDIR}"/CVE-2020-5395.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
-		$(use_enable python python-extension)
-		$(use_enable python python-scripting)
-		--enable-tile-path
-		$(use_with cairo)
-		$(use_with gif giflib)
-		$(use_with jpeg libjpeg)
-		$(use_with png libpng)
-		$(use_with readline libreadline)
-		--without-libspiro
-		$(use_with tiff libtiff)
-		$(use_with unicode libuninameslist)
-		$(use_with X x)
-	)
-	if use gtk; then
-		# broken AC_ARG_ENABLE usage
-		# https://bugs.gentoo.org/681550
-		myeconfargs+=( --enable-gdk=gdk3 )
-	fi
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	docompress -x /usr/share/doc/${PF}/html
-	einstalldocs
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild
index 595c9336afa0..3379e2f1b634 100644
--- a/media-gfx/fontforge/fontforge-20200314.ebuild
+++ b/media-gfx/fontforge/fontforge-20200314.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
 RESTRICT="!test? ( test )"
 
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	sys-devel/gettext
-	doc? ( dev-python/sphinx )
+	doc? ( >=dev-python/sphinx-2 )
 	python? ( ${PYTHON_DEPS} )
 	test? ( ${RDEPEND} )
 "
@@ -55,6 +55,9 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/20200314-stylemap.patch
 	"${FILESDIR}"/20200314-tilepath.patch
+	"${FILESDIR}"/20200314-big-endian.patch
+	"${FILESDIR}"/fontforge-doc-no-warn-error.patch
+	"${FILESDIR}"/20200314-MacServiceReadFDs.patch
 )
 
 pkg_setup() {