gentoo resync : 05.12.2021

7 files changed, 48 insertions, 193 deletions

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index e0d36b8f3188..fd7c2cc97221 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,19 +1,16 @@
 AUX freetype-2.10.3-sizeof-types.patch 1038 BLAKE2B bb49e7d4195346b67f37c16f9f31e3d5b658398afa7209c5d7c89dbbf90c98385d0827960545b83573425c6be8e4615311f76d93e40ff6237977bfe160639587 SHA512 64e3cc7820bd0b8816ad34108fa174da90f2a0b8f96a3c94425900ba5f5eb8b01074fdfa3bee699815d7eb74ec44cf043239a932a228c2971557fad0caec912f
-AUX freetype-2.10.4-dont_hardcode_libtool.patch 1312 BLAKE2B 7cd7d9f5284a54a9667243ce1e2f16104f75b117b9b27367ccd2ceaf4c643829b3f1a031d51b6008d9300a31322634602cf281f09d56ecbfbf143b466894c4a4 SHA512 85f66eed284fe804857e1d651cbfc75cfcc4bad2126681dc36873cd9f9561c9d6c31fee39bc333e8ac936f491708e4b7b9d62de4b75015ac9a1f78b3c8647ec1
-AUX freetype-2.10.4-slibtool_build_fix.patch 1262 BLAKE2B b2e3fc0565f5b90c00628d44ec3d1633c3ccce0df3effabaf9e36636b78067d03c899c86a100e11df27ca299daf4afdc815924430b04a42bcabb4104d7f4a8b7 SHA512 5fd4fce61c4f1f78fc6e19477e89b8f989ad17a50ff48c49841f6a7499e0843525a489e622db8064799749b53e62f0177bbfde519fe03813eedd7ca6e752f238
 AUX freetype-2.11.0-COLR_missing_blend_mode.patch 2304 BLAKE2B 002fa132591422fc4ef9180dd2ee667d42d57cc5be08e253dec182a345280e42ec15f2dd8d30891e13d168bf0da77279216b4fdc8e56c4e59a11f3f3438525b9 SHA512 4e55f43b86f2d54867dd62558b7a02312e82581a9469395ef24f8b6f0ec2e9ec14776a828c2520970758d8d67cec0c659087e48b8ed3ae30c77a725a92a9ffc1
 AUX freetype-2.11.0-COLR_v1_clipbox_minor_fix.patch 681 BLAKE2B addd6b85be20b48b92af7f21dafab7014fae110163ed7d6a9341d958505d46a76dc131a54b1c954f3157737429b3b4a87ea0c7c621bfb3cb8f4f101ae2ce9398 SHA512 36060458da10c1afeaf3303010235e2b9adfd0273a7b8c0c0b5e4d4c30a3eac79485919613de892a1b0f2637d5f98fd5314477e833b78819421f134d6cdf40a3
 AUX freetype-2.11.0-quiet_noop.patch 1304 BLAKE2B 57276cf6480a4807e8e9704e5a9ea5d3a0d288e8af17f935e2911932fbe517d845b68abb503cfde697f6e6778a14c44334482d8917914817ec4c7f454dc005eb SHA512 f7261da6d457ce1c9ecd49d17a251f349f2786a3d12e42555a605a95b73573fdba90e70855b38e2c79ab6f4dabb8a8e6a3d1abc9fc8ca87d3ba29a04f9ee802f
-AUX ft2demos-2.10.4-install_target.patch 1647 BLAKE2B 4409123fbb089c1312ff90ebbb32c70f3a0025d96b705dd6be24bdf33fa0b1956e512549c39e5b378c2a6f4a4cb8e7708c096c786fbf0bcc3e037f691f9aad21 SHA512 5d77f5892f7ce4ab1bc3dcbfb04cd86f2fc54e347c2b3ce7e701995b0f75efc0164797b18454b645a0cc1cc8b0f41816b5bca19d786a66f3bc145fa0ca2cd8b1
-DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
 DIST freetype-2.11.0-COLR_v1_clipbox.patch.xz 3940 BLAKE2B 45b84b1070a9a9e1e13058ce7200555f4f9e26df4fe25eab4a644869df86f267cc91bfcf2ab10a9f0673be51504f05eec730300dee13ca34bb6f8afdc32ee354 SHA512 bf0cc00b3f27cb3408881cec46654be57b96b099cfd3df06e33b94aa47f35a7c9499a9935837be0f652d4f17ab2b6c78bc1fcef328754cde64f0b139d00ceb29
 DIST freetype-2.11.0.tar.xz 2256640 BLAKE2B ed14b566b8ac31a85dde4c8d26dd8b001f6a2cb506cfafd550b31bb90a3f592376d6f9f6bbe1b6c21e27e4ad23d0eafa7ea886211174b978e101fb6a77261324 SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d
-DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
+DIST freetype-2.11.1.tar.xz 2270728 BLAKE2B 15cc03e7b8ba93b2f240b0eee3f1cc07bca77d9ef67a1971d44d6c061a0dff2b13737fa417f7f2dc4e7e6df660223325931f69a107a6b2eaf14425fc71b7ca7b SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08
 DIST freetype-doc-2.11.0.tar.xz 2070604 BLAKE2B a45fa2e97574868fc4f08c646cb815152dde462538a32fddfc5ddccb32343286765f3952b9fc8b66204dfeb62470d4fada1a2338c377efa1c716ab9c5885fd60 SHA512 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301
-DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8
+DIST freetype-doc-2.11.1.tar.xz 2038348 BLAKE2B 2248d16bb12b29294226a67a10328c61b064c8e0ad7fb5f004c2e6da1237175f03d51a48d5df03a3de3bbe935307e573014c079c31468c9f59416bc4e9057a9c SHA512 c5e19d98425491682edc58230c48390925cc4b466169f655cf3b8575ba787a70feecdeb7a16224b132dcc32f17b041483d84056cda8e3132d98b531e46a26c36
 DIST ft2demos-2.11.0.tar.xz 257316 BLAKE2B fa59eeeba502733db940965a1affe8fc9ecefd68d3d31dd8c8a94b769310d53975403f7a7c4c6ca6f381b10f9b3057698bd09fff9adafa26981192478d3ca602 SHA512 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531
-EBUILD freetype-2.10.4.ebuild 6685 BLAKE2B ff901fcd11233f9c6a985704ff2296d86331618e02097274edc12fa792d9a11de530eb6f761514b4d03e11b00d42c993c73b3936a9b9bfa0cab15c9eea36f501 SHA512 e991118b3868791a4dd4cac750d4a31935766a97cc4998a0561f0a296f54e8bae7da7057226642e83cf61199dbaa463c17f97422edd73f30a65ad9dafd9ce750
+DIST ft2demos-2.11.1.tar.xz 257240 BLAKE2B 1d620af52e76d1152a0a6aeeb0036d2423e498e371b75c01c408cc0974845abfe2f3f562ad638ca5640ec1b24023d7a47e1688743ca738c2bb1ceea6ee05cfcf SHA512 93d68daefa8a49b4fc987a7356133299fe2a8e012415ea09ad7616ececcfd978fdf9fc7a2d855f7488f51a497d019acb89ef5774484babae66357b3083a883c5
 EBUILD freetype-2.11.0-r1.ebuild 7360 BLAKE2B e2237bf66903a9a48982762bd9db6496af2a902a2598103ae1dc6ff1c33178f1b3d8a4568622ef6d16d9e846a6cfec4f3f4e131e244bb689965541ed6b4210eb SHA512 6fa66ecb9285b1a49f058b4ec506cb60e2b616857c10c4336753cb8ca01a100164ed9f7f7ea8ed19cde69dbf1ddf1e72c80d8b9d95bf4473702de40688cfc707
 EBUILD freetype-2.11.0-r2.ebuild 7413 BLAKE2B 843335107d814566c2d4691b25112feb0764eeaee24aee7e3c057ae81c650546d1605fac8df4c221b60fe650741a53a98178c6b11bb34c929cb2980decd5fa91 SHA512 d660d1f931c66061676af5bc7303410ea6bddb8306e476b43720c855c80eb1183db183199d1ce0271844c0edceb4ed48635c2b97592c98b5189ee58ca58fcaaf
-EBUILD freetype-9999.ebuild 7149 BLAKE2B d9698283807a6799874f8a091e1defce0493d4595b59fe4b9eae558523bcdea09576342dbb5ea4c8c67982a74391e9ac2aa6c6d39f3ae29db752cbf12e5214d5 SHA512 faf5616c0a855be291e1613cc0c2082bda0092e106c053989a333c4b7d3ed2ef7d41094e7e174f516aed831e0701e378ba3bacebbd0a95022bed000b0b1fdc30
-MISC metadata.xml 1614 BLAKE2B 1f7da38175a6bb383328518d7a69a2378a3127fce884c35163b6144afdf21149acd857c6c26d65c1a1962afd370f025f6a3f496581ca28b767ae5960392a9c6c SHA512 ea0ec7da4ea7f2f71c06aea15694e6654808a780fd5a248088cb44af23dcb4c0961d7034d2e09b674d89098c152fd84c7f4c90831c0e275f6ebcd4a15659baa7
+EBUILD freetype-2.11.1.ebuild 7069 BLAKE2B 66b804a6d452535962c0e8f3a3bb8f98aebe66a5890940be32201dc06c54a2ea7468da0efb66a84495f19e62b3a456f35f9fa52361f40f765b6dc372a3e94b43 SHA512 da68528c0e9f21c2482e4fa30bfb663ef8f527c38c5179e11b6b15af3cbb184996a97afafe47d4f0719c46d3da187a67bac82c54f167f3834bdce8aa0c10e0b8
+EBUILD freetype-9999.ebuild 7069 BLAKE2B 66b804a6d452535962c0e8f3a3bb8f98aebe66a5890940be32201dc06c54a2ea7468da0efb66a84495f19e62b3a456f35f9fa52361f40f765b6dc372a3e94b43 SHA512 da68528c0e9f21c2482e4fa30bfb663ef8f527c38c5179e11b6b15af3cbb184996a97afafe47d4f0719c46d3da187a67bac82c54f167f3834bdce8aa0c10e0b8
+MISC metadata.xml 1361 BLAKE2B ec4f7fc1bd3a16f507b0ff18a637849744a5e470a26037a2ef7e0e9a6537408184ca722a003340128f962bcda1cedc044e411c58e5d315602095e1997dccc920 SHA512 16112a7dbc2231ebe0b9cecfd3b91bd966d49de1e04eb72694ef0a22c9495e6a91ac31da7bd027ce90fcda08ca10144d24c4e28b798a1074af147ab0f8b007c7
diff --git a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch b/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
deleted file mode 100644
index 310b5aaca935..000000000000
--- a/media-libs/freetype/files/freetype-2.10.4-dont_hardcode_libtool.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 597566b2301deeff4e9832aebdab1bf659a2accf Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 22 Mar 2021 16:15:37 -0700
-Subject: [PATCH] * Makefile, mac/Makefile (LINK_CMD): Don't hard-code
- `libtool`.
-
----
- Makefile     |    3 +--
- mac/Makefile |    3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 810142f..949402f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -165,8 +165,7 @@ else
- 
-   ifeq ($(PLATFORM),unix)
-     override CC = $(CCraw)
--    LINK_CMD    = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
--                  --mode=link $(CC) \
-+    LINK_CMD    = $(LIBTOOL) --mode=link $(CC) \
-                   $(subst /,$(COMPILER_SEP),$(LDFLAGS))
-     LINK_LIBS   = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME)
-   else
-diff --git a/mac/Makefile b/mac/Makefile
-index 73ae99c..52038a4 100644
---- a/mac/Makefile
-+++ b/mac/Makefile
-@@ -68,8 +68,7 @@ else
-   LINK_ITEMS = $T$(subst /,$(COMPILER_SEP),$@ $<)
- 
-   CC        = $(CCraw)
--  LINK_CMD  = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
--		--mode=link $(CC) \
-+  LINK_CMD  = $(LIBTOOL) --mode=link $(CC) \
- 		$(subst /,$(COMPILER_SEP),$(LDFLAGS))
-   ifeq ($(findstring CoreServices,$(LDFLAGS)),)
-     LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(MATH) \
--- 
-GitLab
-
diff --git a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch b/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
deleted file mode 100644
index 895a86c444d6..000000000000
--- a/media-libs/freetype/files/freetype-2.10.4-slibtool_build_fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8e9447b32dae7e6c95bee3f878ee1877f9b628a4 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 22 Mar 2021 16:15:09 -0700
-Subject: [PATCH] [graph] Fix build with `slibtool`.
-
-* graph/rules.mk (GRAPH_LIB): Handle the case specially where
-`LIBTOOL` is defined.
-(COMPILE_GRAPH_LIB) <LIBTOOL>: Enable use of `dlopen`.
----
- rules.mk |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/graph/rules.mk b/graph/rules.mk
-index 4903a38..a3f0de1 100644
---- a/graph/rules.mk
-+++ b/graph/rules.mk
-@@ -12,7 +12,6 @@
- 
- 
- GRAPH_INCLUDES := $(subst /,$(COMPILER_SEP),$(TOP_DIR_2)/graph)
--GRAPH_LIB      := $(OBJ_DIR_2)/graph.$(SA)
- 
- GRAPH := $(TOP_DIR_2)/graph
- 
-@@ -46,9 +45,11 @@ GRAPH_OBJS := $(OBJ_DIR_2)/gblblit.$(O)   \
- # this value can be modified by the system-specific graphics drivers.
- #
- ifneq ($(LIBTOOL),)
--  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -static \
-+  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(A)
-+  COMPILE_GRAPH_LIB = $(LIBTOOL) --mode=link $(CCraw) -module -static \
-                                  -o $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
- else
-+  GRAPH_LIB        := $(OBJ_DIR_2)/graph.$(SA)
-   COMPILE_GRAPH_LIB = ar -r $(subst /,$(COMPILER_SEP),$@ $(GRAPH_OBJS))
- endif
- 
--- 
-GitLab
-
diff --git a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch b/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
deleted file mode 100644
index f3d7f8de43e4..000000000000
--- a/media-libs/freetype/files/ft2demos-2.10.4-install_target.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b88cd2f027e77bd26d1334fc13c4eda796423d19 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 24 Mar 2021 09:04:41 -0700
-Subject: [PATCH] [build] Add an `install` target for binaries and man pages.
-
-* Makefile (MANPAGES): New variable.
-(install) <unix>: New target.
----
- Makefile |   19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 949402f..8352f61 100644
---- a/Makefile
-+++ b/Makefile
-@@ -194,7 +194,7 @@ else
-                 $(LINK_LIBS) $(subst /,$(COMPILER_SEP),$(GRAPH_LIB)) \
-                 $(GRAPH_LINK) $(MATH)
- 
--  .PHONY: exes clean distclean
-+  .PHONY: exes clean distclean install
- 
- 
-   ###################################################################
-@@ -317,6 +317,11 @@ else
-   # EXES += fttimer
-   # EXES += testname
- 
-+  # Not all demo programs have a man page; we thus check for existence in a
-+  # loop.
-+  #
-+  MANPAGES := $(foreach man,$(EXES),$(wildcard $(TOP_DIR_2)/man/$(man).1))
-+
-   exes: $(EXES:%=$(BIN_DIR_2)/%$E)
- 
- 
-@@ -567,6 +572,18 @@ else
-                         $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ)
- 	  $(LINK_NEW)
- 
-+  ifeq ($(PLATFORM),unix)
-+    install: exes
-+	    $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \
-+                             $(DESTDIR)$(mandir)/man1
-+	    $(foreach bin,$(EXES), \
-+              $(LIBTOOL) --mode=install \
-+                $(INSTALL) $(BIN_DIR_2)/$(bin) \
-+                           $(DESTDIR)$(bindir)/$(bin);)
-+	    $(foreach man,$(MANPAGES), \
-+              $(INSTALL) $(man) \
-+                         $(DESTDIR)$(mandir)/man1/$(notdir $(man));)
-+  endif
- endif
- 
- 
--- 
-GitLab
-
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.11.1.ebuild
index 4bec88e1dd43..d0c71e729b9c 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.11.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
-DESCRIPTION="A high-quality and portable font engine"
+DESCRIPTION="High-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist brotli bzip2 +cleartype_hinting debug fontforge harfbuzz infinality +png static-libs utils"
+IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
@@ -24,7 +24,6 @@ fi
 
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
-RESTRICT="!bindist? ( bindist )" # bug 541408
 
 RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
@@ -44,10 +43,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
-)
-
 _egit_repo_handler() {
 	if [[ "${PV}" == 9999 ]] ; then
 		local phase="${1}"
@@ -61,10 +56,10 @@ _egit_repo_handler() {
 		esac
 
 		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
+		EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"
 		git-r3_src_${phase}
 		if use utils ; then
-			EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
+			EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"
 			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
 			git-r3_src_${phase}
 		fi
@@ -79,18 +74,36 @@ src_fetch() {
 
 src_unpack() {
 	_egit_repo_handler ${EBUILD_PHASE}
+
+	if [[ "${PV}" == 9999 ]] ; then
+		# Need to copy stuff from dlg subproject (#758902)
+		local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
+		local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
+		local dlg_dest_dir="${S}/include"
+		mkdir -p "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
+	fi
 }
 
 src_prepare() {
 	if [[ "${PV}" == 9999 ]] ; then
+		# Do NOT automagically mess with submodules!!!
+		sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
 		# inspired by shipped autogen.sh script
-		eval $(sed -nf version.sed include/freetype/freetype.h)
+		eval $(sed -n \
+			-e 's/^#define  *\(FREETYPE_MAJOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_MINOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_PATCH\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			include/freetype/freetype.h || die)
+		FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
+		[[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
 		pushd builds/unix &>/dev/null || die
-		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
+		sed -e "s;@VERSION@;${FREETYPE};" \
 			< configure.raw > configure.ac || die
 		# eautoheader produces broken ftconfig.in
 		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
-		unset freetype_major freetype_minor freetype_patch
+		unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
 		popd &>/dev/null || die
 	fi
 
@@ -114,11 +127,11 @@ src_prepare() {
 	# Will be the new default for >=freetype-2.7.0
 	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
 
-	if use infinality && use cleartype_hinting; then
+	if use infinality && use cleartype-hinting ; then
 		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
-	elif use infinality; then
+	elif use infinality ; then
 		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
-	elif use cleartype_hinting; then
+	elif use cleartype-hinting ; then
 		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
 	fi
 
@@ -126,32 +139,24 @@ src_prepare() {
 	# via environment (new since v2.8)
 	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
 
-	if ! use bindist; then
-		# See http://freetype.org/patents.html
-		# ClearType is covered by several Microsoft patents in the US
-		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-	fi
+	# See https://freetype.org/patents.html (expired!)
+	enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
 
-	if ! use adobe-cff; then
+	if ! use adobe-cff ; then
 		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
 	fi
 
-	if use debug; then
+	if use debug ; then
 		enable_option FT_DEBUG_LEVEL_TRACE
 		enable_option FT_DEBUG_MEMORY
 	fi
 
-	if use utils; then
+	if use utils ; then
 		cd "${WORKDIR}/ft2demos-${PV}" || die
 		# Disable tests needing X11 when USE="-X". (bug #177597)
-		if ! use X; then
+		if ! use X ; then
 			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
 		fi
-
-		# Taken from upstream (https://bugs.gentoo.org/775881)
-		eapply "${FILESDIR}/${P}-slibtool_build_fix.patch"
-		eapply "${FILESDIR}/${P}-dont_hardcode_libtool.patch"
-		eapply "${FILESDIR}/ft2demos-2.10.4-install_target.patch"
 		cd "${S}" || die
 	fi
 
@@ -170,8 +175,8 @@ multilib_src_configure() {
 
 	local myeconfargs=(
 		--disable-freetype-config
-		--enable-biarch-config
 		--enable-shared
+		--with-zlib
 		$(use_with brotli)
 		$(use_with bzip2)
 		$(use_with harfbuzz)
@@ -196,7 +201,7 @@ multilib_src_configure() {
 multilib_src_compile() {
 	default
 
-	if multilib_is_native_abi && use utils; then
+	if multilib_is_native_abi && use utils ; then
 		einfo "Building utils"
 		# fix for Prefix, bug #339334
 		emake \
@@ -216,12 +221,12 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	if use fontforge; then
+	if use fontforge ; then
 		# Probably fontforge needs less but this way makes things simplier...
 		einfo "Installing internal headers required for fontforge"
 		local header
 		find src/truetype include/freetype/internal -name '*.h' | \
-		while read header; do
+		while read header ; do
 			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
 			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
 		done
@@ -233,5 +238,5 @@ multilib_src_install_all() {
 		dodoc -r docs/*
 	fi
 
-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 85c3544019b3..d0c71e729b9c 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -43,10 +43,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
-)
-
 _egit_repo_handler() {
 	if [[ "${PV}" == 9999 ]] ; then
 		local phase="${1}"
@@ -179,8 +175,8 @@ multilib_src_configure() {
 
 	local myeconfargs=(
 		--disable-freetype-config
-		--enable-biarch-config
 		--enable-shared
+		--with-zlib
 		$(use_with brotli)
 		$(use_with bzip2)
 		$(use_with harfbuzz)
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index a1abb71c48e7..f57f580a8c2b 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -14,9 +14,6 @@
 		<flag name="brotli">Enable brotli decompression support via <pkg>app-arch/brotli</pkg></flag>
 		<flag name="cleartype-hinting">Bytecode hinting mode for TrueType fonts that
 			activates subpixel hinting (a.k.a. ClearType hinting) by default</flag>
-		<flag name="cleartype_hinting">New bytecode hinting mode for TrueType fonts that
-			activates subpixel hinting (a.k.a. ClearType hinting) by default</flag>
-		<flag name="bindist">Disable ClearType support (see http://freetype.org/patents.html)</flag>
 		<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
 		<flag name="fontforge">Install internal headers required for TrueType
 			debugger in <pkg>media-gfx/fontforge</pkg> (built with