gentoo resync : 22.01.2021

7 files changed, 127 insertions, 507 deletions

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index db2b9352651a..c5af9f57d07f 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,15 +1,11 @@
 AUX fontconfig-2.10.2-docbook.patch 648 BLAKE2B 70d66ae09a0729b667a4e5e57a7cf86926fb008285f89057bdf35f241bcd047dd8ad47d858d2fad26e67824c01e9f721877bb22afb2f8ffdd5538ed05694948c SHA512 b0adb7c406445c25c96c5dc37af9e6fcc8c75a0752af255465673812bdc332ce43439a100c056744ace0dd5b3350596eedd612489c33d19a6f6cd182c08e2961
 AUX fontconfig-2.12.3-latin-update.patch 2049 BLAKE2B 5fdf036d307a09eaa3b475fc9b87d3c927e60f49deced429d41c46c9c677b5f90de12d7f82d55feadc003a8b841456c372084afe1ead3320cdf78d3e7bc474b1 SHA512 24520d40e7049d0fa5c05054dbe6d82149688d3e327b1818c6816bd3315de56969b040c88f8db0cbbf4f377d5ebf77199dbd3af5bc7bcae8bcaea69820d68ce6
-AUX fontconfig-2.13.0-add-missing-lintl.patch 1119 BLAKE2B 7b6b8deeb5b06ed3016add4e9e04c65ec7d8ef43223783950ea911c3544ec084c8ae78739be5eb79f4bcd91b91bdc943726d2d3d6dab46cabec69e2ce2b8338f SHA512 439470687be12c6cf3f9da21a5b0d1fac6c685296f740247aaf6cf1c1e22bf567ab2348408ed9fabe0c6f7b738e54b9813e562e9d762c861b61f70ee569ad754
-AUX fontconfig-2.13.0-locale.patch 4096 BLAKE2B 8ebb0d8b72af07053a0fb7ee5550558d530b874051c7cfe8abde7f504c643a8b52bdaf265d39205d9c9fd5375f464ddaed858c9b599e633d04b92f94873bf65f SHA512 845b2db1783840070a27de2f28ce8f9cc6968b5e07c89c91110248261e9977bf15edc886b5ed9badb2fa14efc1868c82c4ab0ee45aec8a0cfbc74b5ae459c939
-AUX fontconfig-2.13.0-names.patch 2421 BLAKE2B e8e922a445dee1d7bc77b72384cf3ab58b6fc7e1e1bc7b341d59bd1dcdfd818cd15071278fac69229e3f6b8b09d19a351390d76b7112ebf8d9749d2e1de29b8d SHA512 7c9bebf3eb76de05cfd1481e679715bebc5c429ea6976e96866c0e80b0021d3f00adae888e348897574193d7029e48409a0b73698dc2c8963e485992400192ad
 AUX fontconfig-2.13.1-proper_homedir.patch 8048 BLAKE2B 8735be09139f13f41eeccd6ec9b34ad5086ec6716053570b1368a0c8068bff6431e15d5c3ca0a0341958aa8801ceba422ceec012adeca7f0fe71e4bd1f9a5970 SHA512 ecd77822f9ee6ff2529cb3401c5f4e8cf105583f51b040ab160b8ee99c62762a9eb04f836a15b1f6186423c8180238d0379d55442088d2bab03d8abe817e6e22
 AUX fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch 1005 BLAKE2B 48d1ad733b7543a17f4917c81a7ca2df402f6fbc851d97edbb0d6e58d28446b532a9804db0af45eaf3b294158ad5377ed2dee95b2f66fe63b44312c39def5262 SHA512 b583cd21d11add33bc94ff624ba96ab8fe585beac2fa285b7b207bfdf199debe2496d8cf12ec406d84fcb46eaba4c9c5afd768002e2b35e0d569fc82d894947b
 AUX fontconfig-2.13.1-static_build.patch 2274 BLAKE2B 41dcaf492c8096d9d5d964f98fe4fed432afecfa2ee97c2a53f297cd7f674ca162aa01dcdadcc648c9cfb4cb8bd3f91714f1808322dd65c70308550c3a8e1b6c SHA512 c5a1a80cc99850d1ab197079ec629032310913d7756d86defcae5c721f3a50078c4059347b21cdc409b0de0d45c1466f038a9b5280bd7f772a966b43cbb3fe6e
-DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
-DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
+AUX fontconfig-2.13.93-latin-update.patch 1793 BLAKE2B 6d8bd13ee9eb4a5105fb6437e41681daaeb2bf0739326646ae3c78d60c49a1137ce9d62087e3fcc042398840fd5957ca93b1da37886ad6e2f9829f9fa810dbdc SHA512 cee297048df1a116af0416dd81ccd221cf9e24be2b828b4ba9a92f96dd9951ff13d627166740a88b0d0d3f1fced1eece2b8495ed30d463702ce326e02a29851d
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
-EBUILD fontconfig-2.12.6.ebuild 4856 BLAKE2B 89422216e7ea3511433a9b804179139c1b32231ed78b73defb97e8d1a572a5076e78a8f59ceedd4698240172b4e95843d4a936a3ee52eb7b3a9c66b57a9f4dff SHA512 f743068c2b7d6e8582dc3f8005cf5dc7020e5e5da4e931ea6104f5bd3eec9f0adb99e802c95f390e40ea59adfa122aada183ae609d24d86ad5c121b8db5898a9
-EBUILD fontconfig-2.13.0-r4.ebuild 5155 BLAKE2B de35bc5b131b063d983eee820a87abcdc6d91b97e9ff09cd04aab5d856093df2a3bdd7f5f695eb1fa1368c1a1850539a1679ac3dad5ad1c76de5131273c465a4 SHA512 4757d8979ee3f2fb71510ec1168a1c31e11aa5bb8c2d70847e5e6190bcebcafde484e2d7dc0f3eb4621e25d042e83fa5a80a03aadd9a34b7b42a35102b9360e7
+DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
 EBUILD fontconfig-2.13.1-r2.ebuild 5606 BLAKE2B e56b1cff96e38c2495bbc041ba7f4a5debff6476ff2df3460ab19353876df21fa0be1af2b0dc4258e5b0c796c002ebb7b5be3dbee7b4047a062695872a39f5f3 SHA512 f45676cbe2ffb35839513cf85a76c5d9c7ead789fe4fa0be07ad1c1dc701f79caded154ce128a7da0a0a04e73e0ce8bd5665f305e935a6121d69bee1cff2247e
+EBUILD fontconfig-2.13.93.ebuild 5832 BLAKE2B 277d6ebe2e2481cacf7e3b4a513899b4bdd65aec0f2db1353c169eb3e46060fc4d6f3493ca36c642b68693ade6aac0d107e15b4f044e72941ae957a78e00bc51 SHA512 4d09dc19f73128bfdd66bf14ff643f78c4c2d777cc526c2817dbc1905cea66194ad5465603794061e1a0c11f98933b14da0274b1c78d0c12523753f096280344
 MISC metadata.xml 598 BLAKE2B 9dde998386dce5ea1c1a087103d18c0e0654bc2e8a59e1bd99ef92eab86584b52d0b1a00da4bd1921bf322f00752c9a1954aec1e5daff6c68497eb8cc8e82bf2 SHA512 fa7c42680f0108f22187ff0daac898161bbe7a74265c7370e1fcf1c3cc6f78987e88722b5159ee524b4245daa528474986e0ed69036f3d4b7a95948012acf324
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch b/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch
deleted file mode 100644
index 6bea02b1fca8..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 07bd14c5c7fed103020dc9b630d6a254861ada07 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Fri, 9 Mar 2018 11:55:43 +0900
-Subject: Fix the build issue again on MinGW with enabling nls
-
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1ff065b..2111ce0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -82,7 +82,7 @@ AM_CPPFLAGS = 						\
- 	-DFC_CACHEDIR='"$(FC_CACHEDIR)"'                \
- 	-DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'		\
- 	-DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"'
--LDADD  = $(INTLLIBS)
-+LDADD  = $(LIBINTL)
- 
- EXTRA_DIST += makealias
- 
-@@ -168,7 +168,7 @@ lib_LTLIBRARIES = libfontconfig.la
- libfontconfig_la_LDFLAGS =			\
- 	-version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
- 
--libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS)
-+libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL)
- 
- libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
- 
--- 
-cgit v1.1
-
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch b/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch
deleted file mode 100644
index 002e493a409e..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-https://bugs.gentoo.org/650332
-Do not set locale in the library.
-Patch from upstream.
-
---- a/fc-cache/fc-cache.c
-+++ b/fc-cache/fc-cache.c
-@@ -41,6 +41,7 @@
- #include <fcntl.h>
- #include <dirent.h>
- #include <string.h>
-+#include <locale.h>
- 
- #if defined (_WIN32)
- #define STRICT
-@@ -302,6 +303,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "Efrsy:Vvh", longopts, NULL)) != -1)
- #else
---- a/fc-cat/fc-cat.c
-+++ b/fc-cat/fc-cat.c
-@@ -40,6 +40,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <errno.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -271,6 +272,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "Vvrh", longopts, NULL)) != -1)
- #else
---- a/fc-conflist/fc-conflist.c
-+++ b/fc-conflist/fc-conflist.c
-@@ -38,6 +38,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -102,6 +103,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "Vh", longopts, NULL)) != -1)
- #else
---- a/fc-list/fc-list.c
-+++ b/fc-list/fc-list.c
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #else
-@@ -117,6 +118,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int			c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "vbf:qVh", longopts, NULL)) != -1)
- #else
---- a/fc-match/fc-match.c
-+++ b/fc-match/fc-match.c
-@@ -36,6 +36,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -121,6 +122,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int			c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "asvbf:Vh", longopts, NULL)) != -1)
- #else
---- a/fc-pattern/fc-pattern.c
-+++ b/fc-pattern/fc-pattern.c
-@@ -36,6 +36,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -111,6 +112,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "cdf:Vh", longopts, NULL)) != -1)
- #else
---- a/fc-query/fc-query.c
-+++ b/fc-query/fc-query.c
-@@ -39,6 +39,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -115,6 +116,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "i:bf:Vh", longopts, NULL)) != -1)
- #else
---- a/fc-scan/fc-scan.c
-+++ b/fc-scan/fc-scan.c
-@@ -39,6 +39,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #ifdef ENABLE_NLS
- #include <libintl.h>
-@@ -110,6 +111,7 @@
- #if HAVE_GETOPT_LONG || HAVE_GETOPT
-     int		c;
- 
-+    setlocale (LC_ALL, "");
- #if HAVE_GETOPT_LONG
-     while ((c = getopt_long (argc, argv, "bf:Vh", longopts, NULL)) != -1)
- #else
---- a/src/fccfg.c
-+++ b/src/fccfg.c
-@@ -26,7 +26,6 @@
- 
- #include "fcint.h"
- #include <dirent.h>
--#include <locale.h>
- #include <sys/types.h>
- 
- #if defined (_WIN32) && !defined (R_OK)
-@@ -39,18 +38,6 @@
- FcConfigEnsure (void)
- {
-     FcConfig	*config;
--    FcBool	is_locale_initialized;
--    static void *static_is_locale_initialized;
--retry_locale:
--    is_locale_initialized = (intptr_t) fc_atomic_ptr_get (&static_is_locale_initialized);
--    if (!is_locale_initialized)
--    {
--	is_locale_initialized = FcTrue;
--	if (!fc_atomic_ptr_cmpexch (&static_is_locale_initialized, NULL,
--				    (void *)(intptr_t) is_locale_initialized))
--	    goto retry_locale;
--	setlocale (LC_ALL, "");
--    }
- retry_config:
-     config = fc_atomic_ptr_get (&_fcConfig);
-     if (!config)
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch b/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch
deleted file mode 100644
index dddc8bb95726..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://bugs.gentoo.org/650370
-
-From 198358dd8ff858c9e36531a7406ccb2246ae77b7 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Mon, 12 Mar 2018 11:49:58 +0900
-Subject: [PATCH 1/2] Allow the constant names in the range
-
-https://bugs.freedesktop.org/show_bug.cgi?id=105415
----
- src/fcname.c | 34 +++++++++++++++++++++++++++++-----
- 1 file changed, 29 insertions(+), 5 deletions(-)
-
-diff --git a/src/fcname.c b/src/fcname.c
-index 79e413e..15fb659 100644
---- a/src/fcname.c
-+++ b/src/fcname.c
-@@ -330,13 +330,37 @@ FcNameConvert (FcType type, FcChar8 *string)
-     case FcTypeRange:
- 	if (sscanf ((char *) string, "[%lg %lg]", &b, &e) != 2)
- 	{
--	    v.u.d = strtod ((char *) string, &p);
--	    if (p != NULL && p[0] != 0)
-+	    char *sc, *ec;
-+	    size_t len = strlen ((const char *) string);
-+	    int si, ei;
-+
-+	    sc = malloc (len);
-+	    ec = malloc (len);
-+	    if (sc && ec && sscanf ((char *) string, "[%s %[^]]]", sc, ec) == 2)
- 	    {
--		v.type = FcTypeVoid;
--		break;
-+		if (FcNameConstant ((const FcChar8 *) sc, &si) &&
-+		    FcNameConstant ((const FcChar8 *) ec, &ei))
-+		    v.u.r =  FcRangeCreateDouble (si, ei);
-+		else
-+		    goto bail1;
-+	    }
-+	    else
-+	    {
-+	    bail1:
-+		v.type = FcTypeDouble;
-+		if (FcNameConstant (string, &si))
-+		{
-+		    v.u.d = (double) si;
-+		} else {
-+		    v.u.d = strtod ((char *) string, &p);
-+		    if (p != NULL && p[0] != 0)
-+			v.type = FcTypeVoid;
-+		}
- 	    }
--	    v.type = FcTypeDouble;
-+	    if (sc)
-+		free (sc);
-+	    if (ec)
-+		free (ec);
- 	}
- 	else
- 	    v.u.r = FcRangeCreateDouble (b, e);
--- 
-2.16.2
-
-From 4699406a68321179b14fae7412f828e2f37a7033 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Wed, 14 Mar 2018 18:31:30 +0900
-Subject: [PATCH 2/2] Add the value of the constant name to the implicit object
- in the pattern
-
-For objects which has been changed the object type to FcTypeRange.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=105415
----
- src/fcname.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/fcname.c b/src/fcname.c
-index 15fb659..c9320ae 100644
---- a/src/fcname.c
-+++ b/src/fcname.c
-@@ -490,6 +490,10 @@ FcNameParse (const FcChar8 *name)
- 			if (!FcPatternAddBool (pat, c->object, c->value))
- 			    goto bail2;
- 			break;
-+		    case FcTypeRange:
-+			if (!FcPatternAddInteger (pat, c->object, c->value))
-+			    goto bail2;
-+			break;
- 		    default:
- 			break;
- 		    }
--- 
-2.16.2
-
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch
new file mode 100644
index 000000000000..910f0c7ef565
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.13.93-latin-update.patch
@@ -0,0 +1,62 @@
+--- fontconfig-2.13.93/conf.d/60-latin.conf
++++ fontconfig-2.13.93/conf.d/60-latin.conf
+@@ -5,44 +5,47 @@
+ 	<alias>
+ 		<family>serif</family>
+ 		<prefer>
++			<family>Liberation Serif</family>
+ 			<family>DejaVu Serif</family>
+ 			<family>Times New Roman</family>
+-			<family>Thorndale AMT</family>
+ 			<family>Luxi Serif</family>
+ 			<family>Nimbus Roman No9 L</family>
+ 			<family>Nimbus Roman</family>
+ 			<family>Times</family>
++			<family>Thorndale AMT</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>sans-serif</family>
+ 		<prefer>
++			<family>Liberation Sans</family>
+ 			<family>DejaVu Sans</family>
+-			<family>Verdana</family>
+ 			<family>Arial</family>
+-			<family>Albany AMT</family>
+ 			<family>Luxi Sans</family>
+ 			<family>Nimbus Sans L</family>
+ 			<family>Nimbus Sans</family>
+ 			<family>Helvetica</family>
+ 			<family>Lucida Sans Unicode</family>
+ 			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
++			<family>Verdana</family>
+ 			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
++			<family>Albany AMT</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>monospace</family>
+ 		<prefer>
++			<family>Liberation Mono</family>
+ 			<family>DejaVu Sans Mono</family>
+ 			<family>Inconsolata</family>
+ 			<family>Andale Mono</family>
+ 			<family>Courier New</family>
+-			<family>Cumberland AMT</family>
+ 			<family>Luxi Mono</family>
+ 			<family>Nimbus Mono L</family>
+ 			<family>Nimbus Mono</family>
+ 			<family>Nimbus Mono PS</family>
+ 			<family>Courier</family>
++			<family>Cumberland AMT</family>
+ 		</prefer>
+ 	</alias>
+ <!--
+@@ -63,6 +66,7 @@
+ 	<alias>
+ 		<family>cursive</family>
+ 		<prefer>
++			<family>Comic Neue</family>
+ 			<family>ITC Zapf Chancery Std</family>
+ 			<family>Zapfino</family>
+ 			<family>Comic Sans MS</family>
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
deleted file mode 100644
index afb9dc10bb9a..000000000000
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal readme.gentoo-r1
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/"
-SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc static-libs"
-
-# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
-# default and used by every distro.  See bug #283191.
-RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.7.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( =app-text/docbook-sgml-dtd-3.1*
-		app-text/docbook-sgml-utils[jadetex] )"
-PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
-	virtual/ttf-fonts"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
-	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
-)
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
-pkg_setup() {
-	DOC_CONTENTS="Please make fontconfig configuration changes using
-	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
-	overwritten. If you need to reset your configuration to upstream defaults,
-	delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
-}
-
-src_prepare() {
-	default
-	export GPERF=$(type -P true)  # avoid dependency on gperf, #631980
-	sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \
-		configure.ac || die # rest of gperf dependency fix, #631920
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local addfonts
-	# harvest some font locations, such that users can benefit from the
-	# host OS's installed fonts
-	case ${CHOST} in
-		*-darwin*)
-			addfonts=",/Library/Fonts,/System/Library/Fonts"
-		;;
-		*-solaris*)
-			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
-				addfonts=",/usr/X/lib/X11/fonts/TrueType"
-			[[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
-				addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
-		;;
-		*-linux-gnu)
-			use prefix && [[ -d /usr/share/fonts ]] && \
-				addfonts=",/usr/share/fonts"
-		;;
-	esac
-
-	local myeconfargs=(
-		$(use_enable doc docbook)
-		$(use_enable static-libs static)
-		--enable-docs
-		--localstatedir="${EPREFIX}"/var
-		--with-default-fonts="${EPREFIX}"/usr/share/fonts
-		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"
-		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	# avoid calling this multiple times, bug #459210
-	if multilib_is_native_abi; then
-		# stuff installed from build-dir
-		emake -C doc DESTDIR="${D}" install-man
-
-		insinto /etc/fonts
-		doins fonts.conf
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-
-	# fc-lang directory contains language coverage datafiles
-	# which are needed to test the coverage of fonts.
-	insinto /usr/share/fc-lang
-	doins fc-lang/*.orth
-
-	dodoc doc/fontconfig-user.{txt,pdf}
-
-	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
-		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
-		rm -rf "${ED}"usr/share/doc/fontconfig
-	fi
-
-	# Changes should be made to /etc/fonts/local.conf, and as we had
-	# too much problems with broken fonts.conf we force update it ...
-	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
-	doenvd "${T}"/37fontconfig
-
-	# As of fontconfig 2.7, everything sticks their noses in here.
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# Bug #193476
-	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
-	# config files.  If we install as-is, we'll blow away user settings.
-	ebegin "Syncing fontconfig configuration to system"
-	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
-		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
-			f=${file##*/}
-			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
-			else
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
-			fi
-		done
-	fi
-	eend $?
-}
-
-pkg_postinst() {
-	einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
-	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
-
-	readme.gentoo_print_elog
-
-	if [[ ${ROOT} = / ]]; then
-		multilib_pkg_postinst() {
-			ebegin "Creating global font cache for ${ABI}"
-			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
-			eend $?
-		}
-
-		multilib_parallel_foreach_abi multilib_pkg_postinst
-	fi
-}
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
index 338f391d2aed..329ec7d1678e 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
@@ -1,41 +1,54 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools multilib-minimal readme.gentoo-r1 eapi7-ver
+inherit autotools multilib-minimal readme.gentoo-r1
 
 DESCRIPTION="A library for configuring and customizing font access"
 HOMEPAGE="https://fontconfig.org/"
-SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
+SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
+# Test test-bz106632 is known to be broken, see bug #751232
+# and would require several backports. It will be fixed in
+# next version.
+# check-missing-doc is known to be broken, see bug #733608
+# because fontconfig-2.13.1-static_build.patch introduces a
+# function FcStrBuildFilename which is lacking documentation.
+# However, backporting isn't worth it. Will be fixed in
+# next version.
+RESTRICT="test"
+
+BDEPEND="dev-util/gperf
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? (
+		=app-text/docbook-sgml-dtd-3.1*
+		app-text/docbook-sgml-utils[jadetex]
+	)"
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
 # default and used by every distro.  See bug #283191.
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
-	!elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+	!elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
 	elibc_Darwin? ( sys-libs/native-uuid )
+	elibc_SunOS? ( sys-libs/libuuid )
 	virtual/libintl[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.19.8
-	doc? ( =app-text/docbook-sgml-dtd-3.1*
-		app-text/docbook-sgml-utils[jadetex] )"
+DEPEND="${RDEPEND}"
 PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
 	virtual/ttf-fonts"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
-	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
-	"${FILESDIR}"/${P}-locale.patch #650332
-	"${FILESDIR}"/${P}-names.patch #650370
-	"${FILESDIR}"/${P}-add-missing-lintl.patch #652674
+	"${FILESDIR}"/${PN}-2.13.93-latin-update.patch # 130466 + make liberation default
+
+	# Patches from upstream (can usually be removed with next version bump)
 )
 
 MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
@@ -44,16 +57,23 @@ pkg_setup() {
 	DOC_CONTENTS="Please make fontconfig configuration changes using
 	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
 	overwritten. If you need to reset your configuration to upstream defaults,
-	delete the directory ${EROOT%/}/etc/fonts/conf.d/ and re-emerge fontconfig."
+	delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
 }
 
 src_prepare() {
 	default
-	export GPERF=$(type -P true)  # avoid dependency on gperf, #631980
-	sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \
-		configure.ac || die # rest of gperf dependency fix, #631920
 	eautoreconf
-	rm test/out.expected || die #662048
+
+	# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/272
+	# Please remove on next version bump!
+	if [[ "${PV}" == 2.13.93 ]] ; then
+		local sgmlfile
+		for sgmlfile in doc/*.fncs ; do
+			touch -r ${sgmlfile} ${sgmlfile//.fncs/.sgml} || die
+		done
+	else
+		die "Forgot to clean up src_prepare()"
+	fi
 }
 
 multilib_src_configure() {
@@ -86,8 +106,7 @@ multilib_src_configure() {
 		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
 	)
 
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install() {
@@ -114,21 +133,26 @@ multilib_src_install_all() {
 
 	dodoc doc/fontconfig-user.{txt,pdf}
 
-	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
-		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
-		rm -rf "${ED}"usr/share/doc/fontconfig
+	if [[ -e ${ED}/usr/share/doc/fontconfig/ ]] ;  then
+		mv "${ED}"/usr/share/doc/fontconfig/* \
+			"${ED}"/usr/share/doc/${P} || die
+		rm -rf "${ED}"/usr/share/doc/fontconfig || die
 	fi
 
 	# Changes should be made to /etc/fonts/local.conf, and as we had
 	# too much problems with broken fonts.conf we force update it ...
-	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
+	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' \
+		> "${T}"/37fontconfig || die
 	doenvd "${T}"/37fontconfig
 
 	# As of fontconfig 2.7, everything sticks their noses in here.
 	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
+	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' \
+		> "${ED}"/etc/sandbox.d/37fontconfig || die
 
 	readme.gentoo_create_doc
+
+	keepdir /var/cache/${PN}
 }
 
 pkg_preinst() {
@@ -136,15 +160,17 @@ pkg_preinst() {
 	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
 	# config files.  If we install as-is, we'll blow away user settings.
 	ebegin "Syncing fontconfig configuration to system"
-	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
-		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
+	if [[ -e ${EROOT}/etc/fonts/conf.d ]] ; then
+		local file f
+		for file in "${EROOT}"/etc/fonts/conf.avail/* ; do
 			f=${file##*/}
-			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
+			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]] ; then
+				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+					&& ln -sf ../conf.avail/"${f}" \
+						"${ED}"/etc/fonts/conf.d/ &>/dev/null
 			else
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
+				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+					&& rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null
 			fi
 		done
 	fi
@@ -152,12 +178,12 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	einfo "Cleaning broken symlinks in ${EROOT%/}/etc/fonts/conf.d/"
-	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
+	einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
+	find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
 
 	readme.gentoo_print_elog
 
-	if [[ ${ROOT} = / ]]; then
+	if [[ ${ROOT} == "" ]] ; then
 		multilib_pkg_postinst() {
 			ebegin "Creating global font cache for ${ABI}"
 			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf