gentoo auto-resync : 27:10:2022 - 09:57:18

11 files changed, 446 insertions, 2 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6e917aaac11d..d4bb8ec1d517 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 1f1e57ef9a7a..349f7d7c00ad 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,5 +1,7 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 DIST alsa-lib-1.2.7.2.tar.bz2 1085117 BLAKE2B 9ae3d4358d802970249e1b904faa7c4d646dec1d8c93e0de9c4b70065e912b910303d77e8f9f68c97b883ec270cf0dd8b97146b4a85f3aede4f290683c462fce SHA512 79e5920384e570a1acd8ecd1eb8812879333c3cedb1d15780080afc40125b97df893c33f4163d9dd863871b628bc6026265f8ace2c8634fc1af5b52b62ac9cfe
+DIST alsa-lib-1.2.8.tar.bz2 1091475 BLAKE2B e6171ac557db6265e3f02df7bd269eca62d09afaf2c04dc913d3bb217df23a8e66e808ad453fea5ed90d4d9226feb05065ad5d9b3575241b76675ccd27b9b4d4 SHA512 865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688
 EBUILD alsa-lib-1.2.7.2-r1.ebuild 2538 BLAKE2B 03e5450487342313b88d3fc092c10eaf3fc563deda3d0289f5978d8780669fe1c94f4f79fc2c25f6aef788f2feeb226b9e670d5eb88d904294aa1847d5e1cd99 SHA512 b60edde961118761c07f10088b72c3ec77884e02c14805fb6f0465b576a047598dd3551223ff449180f65fc07284c0d3234fe94c1760f72f6ed5a58bfa8693f3
 EBUILD alsa-lib-1.2.7.2.ebuild 2550 BLAKE2B 1c42ad20cb4b4044fba20a164a2c6e225872e840a2277a7cb4c7b18ebf6c1b455d24f2b5a0dd724a9c08bc594a98bb424cb60eed526afd6dfd8b7c15d26b3932 SHA512 4c064583506992e8400c254d6069a52ad732e1c84fd81ab94d4a31403a540f14e62b10b9f6e7c15d348f7bdfdfd10479fec4647f10881a0b9dc57d72e56064fb
-MISC metadata.xml 550 BLAKE2B 7cb512f3517d9506a371651e82feef9dd262fb1862547380ec6a2ac1885c2717ea07a974526324c460107041458fbeebdbd5a1930a483891f9bffc5e20ee6ca7 SHA512 a674617b6de08084580889b6629c52e3f6ed3d118da577cedd5ad3b94d1716762238a7c86440b9ddee4fd2e183ae9340639da7a7f5d298a1803aaf506229e886
+EBUILD alsa-lib-1.2.8.ebuild 2501 BLAKE2B 12944f160fc9bd3e3674609dac9b054a1179b0a4b155759e51c00f916c183d20bdb156eb1af72e6e60fe022591d938083030c687383c16a29197b68fff12da94 SHA512 faa04db0c873fba60256868bf2c69063ecd3f02f81d88a5c049ec20319f8c6566e6fb699b0aa4d54566e33b9fa1ab25e872eb90be976c6829a60e7884ec9ca71
+MISC metadata.xml 624 BLAKE2B b2f57320a348a39867c5ee362a9bea5df1518b4fa41cd99468fe87fea487da85e188889a7c77f0380b3beadd1807c86b444886d953263c218ca3746bc1aa2a5e SHA512 79f2bbc1d17edff04dc940355646e84583164407598c2a26d8decbfda3ad5de62e2926ec12c929c3b06a5fc7e9c1bce4a40e631d2bc4038979f9e240b7a33c09
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.8.ebuild
new file mode 100644
index 000000000000..ea97e535b5f7
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.8.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools multilib-minimal flag-o-matic python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+if [[ ${PV} == *_p* ]] ; then
+	# Please set correct commit ID for a snapshot release!
+	COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
+	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
+else
+	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
+	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	media-libs/alsa-topology-conf
+	media-libs/alsa-ucm-conf
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# bug #545950
+	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Broken upstream. Could in theory work with -flto-partitions=none
+	# but it's a hack to workaround the real problem and not strictly safe.
+	# bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
+	filter-lto
+
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+		--enable-thread-safety
+
+		$(multilib_native_use_enable python)
+		$(use_enable alisp)
+		$(use_with debug)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		emake doc
+		grep -FZrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::" || die
+	fi
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
+
+	default
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
+
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-lib/metadata.xml b/media-libs/alsa-lib/metadata.xml
index 296ff4616721..46d73ada1b5d 100644
--- a/media-libs/alsa-lib/metadata.xml
+++ b/media-libs/alsa-lib/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="thread-safety">thread-safe API functions</flag>
 	</use>
 	<upstream>
+		<changelog>https://www.alsa-project.org/wiki/Main_Page_News</changelog>
 		<remote-id type="cpe">cpe:/a:alsa-project:alsa-lib</remote-id>
 		<remote-id type="github">alsa-project/alsa-lib</remote-id>
 	</upstream>
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 198bdbf0e2f0..cb4cce8a971b 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,3 +1,5 @@
 DIST alsa-ucm-conf-1.2.7.2.tar.bz2 33011 BLAKE2B af8ce94b5eebb84e2420e96f9052e9ed1055f3c37aca088add6f98d562bba67b856ac5ec16adb3f1893fd612eeadd9d342b83ea615b213ce7d9ac010a0f5d4cb SHA512 b6866f1ca6a3f4d69d7923bc1107a64b49944a3a8756f129f39034e5390e08db1c295669e54dfe1437ca934cc11abf407f60fc8319f5cba3f021966e8654c2db
+DIST alsa-ucm-conf-1.2.8.tar.bz2 37843 BLAKE2B f2281a3a5d8b4fcbc4c75ce99a911a4ce3230abfa6f6d0aff8e175fe1b870750f43c087339490ed9f4d5ab314fda391e06e41cbed79239a16326a8f2d02ac262 SHA512 a15a9ca52c108ee95a421b91f3fad4329f1e9fb1c004a40d5ff1a57d6701bad19a31d5a296426d26439be9b87d2d543ce51588a98402d24c17f0f92aaf1096ca
 EBUILD alsa-ucm-conf-1.2.7.2.ebuild 517 BLAKE2B 41ab7ee7c44597bdc2ccf4d3d213deb759cc17d5d5fc0802c582dacd5c26a1ed44b3005e805b74fb5473144e82a28726e982d47268a159b42d07cdcd6ad55cd1 SHA512 82a04a52b13ded3d16f122a24c57526626139f40793704b7dadd6187029b3884f3b517e9d50c333752d18d25192a5a196d0013dad1b22aa426103c0a2671c0fe
-MISC metadata.xml 383 BLAKE2B e3e3cc51e4d63edae74abec36c58c3dfe469c536e2809f9e2c0084d05ce858febe96e3cfec9eaf08815a72c2f8eadf483e0a825688e7d94cb9204749b0e63288 SHA512 91874e9a6ca11962755f40b09f2fe1dd47bf3e98109cd99b816e860f6eba437ea3f1ea59c27f8bd1e85f6514feefacc3923e1549a0973699bbf8eefa7a6866d0
+EBUILD alsa-ucm-conf-1.2.8.ebuild 525 BLAKE2B b2e68ca5e1ddcdf6188d247e7ce6fe38421acb48815307b4c244baa6b744099ae90549e4f54a277abb1da052bf0b6511241427ce15c7ef63e876789e1bcec56b SHA512 57e6cde5a7c35091daa7246e3648e2bf0312a1c5f0fd3ca27592707c80428f451bad4441c60a858c77694614708bd6314c63ea9335605fc69950f3d7d29202ac
+MISC metadata.xml 457 BLAKE2B 68d8f949d705562928ce4f6a25faf692611f14d63e659723ca5095be6befb5c03bf7dca73a158973d58ac242626a8a4b6f7d8835377e21d5bc8d2307906fee7b SHA512 8b65e913e4d6fbdcd2c760c383d9d026cf053dd10a63689b782f19f88b199443542488bacb08fa02ffffff09165813323dcde06529c9ff744182b728aead0c6d
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.8.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.8.ebuild
new file mode 100644
index 000000000000..69d00e46df60
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ALSA ucm configuration files"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	insinto /usr/share/alsa
+	doins -r ucm{,2}
+}
diff --git a/media-libs/alsa-ucm-conf/metadata.xml b/media-libs/alsa-ucm-conf/metadata.xml
index ed795b5787e2..f89266cd5c30 100644
--- a/media-libs/alsa-ucm-conf/metadata.xml
+++ b/media-libs/alsa-ucm-conf/metadata.xml
@@ -5,6 +5,7 @@
 		<email>alsa-bugs@gentoo.org</email>
 	</maintainer>
 	<upstream>
+		<changelog>https://www.alsa-project.org/wiki/Main_Page_News</changelog>
 		<remote-id type="cpe">cpe:/a:alsa-project:alsa-ucm-conf</remote-id>
 		<remote-id type="github">alsa-project/alsa-ucm-conf</remote-id>
 	</upstream>
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index b9c9f64d9af5..e4c196391d2d 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -3,8 +3,12 @@ AUX fontconfig-2.13.93-latin-update.patch 1793 BLAKE2B 6d8bd13ee9eb4a5105fb6437e
 AUX fontconfig-2.14.0-docbook.patch 991 BLAKE2B 1c4b3336e88c6beb33d456adcee1e97b8d542d8c5799cba6b9710a162a4fa342836a5acde62d7723a110f8777232a5f7aa1e4e1bd73bbb20bb5005b96ae1ec24 SHA512 c140c94b1c03dc091ed005928d2957239bb1738cf70b36b2401d3fcf94e7eab05cee686ad27a60b1299cccfbc11f463425fd97419fd01786e27cb7840e5620cc
 AUX fontconfig-2.14.0-latin-update.patch 1889 BLAKE2B 42a5faab884bb47e645a8ee6f052577bfd8f9becb4b3d0e22e28ee4ba9a03458dd54a4becf9e0e3c728f18db68f3a115be619469fee7dfb2a20e508ef320b14b SHA512 c96c6ba0b2ebf24d0669bb982672ac03b45e1413f68f50f2ad6556ef87014d3c42875d6094426e1b89e108b5f165a0040a3740fc37d94902224549e56bb3642a
 AUX fontconfig-2.14.0-skip-bubblewrap-tests.patch 408 BLAKE2B 911a87e91dcdf49088e9a684a9af753464211f18fd471989410a57363dd71b7cc0940c9a8e61095d901b4d7ee804536262ebc6afb1af3f470d8cd164d2fd2113 SHA512 8302a3ccf5918c8a4c3af3ab3601752c005c0361003281996eba469195127fab0e99c8d225dcb674a1bc198f2c15b982cce49c6bb3234307cf58e47c9206ff5a
+AUX fontconfig-2.14.1-gperf-meson-debugging.patch 879 BLAKE2B a9697083b74ae9d7e48af9bd51fca347ef81d01e99731c31ec0535d7c9ff026f2ec41d9ad40454c72c88751b63fca6a24983b58aeae761a1a763f525136836dd SHA512 7f5d816b48ce558e87fe902ce70f6159281a6b34e7c3639997781930e9577dadad2c4d6dd929f243a5704d51db32134b5241060042f098d49dec8d83f816bb38
+AUX fontconfig-2.14.1-gperf-meson.patch 2559 BLAKE2B 203cdd0d208acaf417e81973810f2a1129f4e9ec75fb51addb36c29267943c4250d27926ab888cf339cf67e10c4ef7fd90d54990c819acfde796d4ec7dd8bd5a SHA512 b87e0506e374a04902a87bfa140fde9fcd4a1d769c249db8d218a32f0befcecca9ad7c7fe389806fc634b83d7a0100c568dba0e243f0a0c7f91e34ad6b5ac7d3
 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff SHA512 a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
+DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73 SHA512 ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db
 EBUILD fontconfig-2.13.93.ebuild 6082 BLAKE2B 23984420c87f6e64be7b3b511c37f2c992ac739835bac59b97a06aee76b248cf3f8517804cad6d3152151d2105c1554a82aeac98af2a44f3aaa575ea20ec267d SHA512 6584dbc2c6c6e045d6450f5eff45073c88a1e936a1ad1ce67d4551706950c1c4eb68a01208cecd5a185eb69a6fc5a9f4f131cba9788c4b16409065ef75d5212d
 EBUILD fontconfig-2.14.0-r1.ebuild 6742 BLAKE2B 27a4b527cadce296d9e221c395cacc4ab22ee3fa20edbe8a736d88971e655cdd1381dc02879bae0935d0c5d97d1128a89d969b9bd764d67475d1fb185934e0c7 SHA512 b0989ef1f9365d433422ba3c2cee6d817ae0654702d59aa5ffdd05bb16e61e063fdbab912d734a7e350da5559f9f35d33d86583a00ce2748a3dab550e28cb73f
+EBUILD fontconfig-2.14.1.ebuild 6556 BLAKE2B e9808d495912d487ce2ebbfa0e6a180334e75c404d1bb415dc0617e2cadf636663c2e944b3906dbc76045b563724d37f997d00cd6f37df611e38e51f26b03ed6 SHA512 412b60c8afeb9c190a516c424d6ddc500eeecbb06102fe90b906eb559d36277de39760fb11ad1373b6f976ec476e6483cda3d787c0f27ec8753dd0c0c74d1006
 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66
diff --git a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch
new file mode 100644
index 000000000000..fb5e8a14f8b8
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson-debugging.patch
@@ -0,0 +1,23 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/240
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/335
+
+From c42eb5b503a44b0b062b041d2e8a0138ce21a0c7 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Thu, 27 Oct 2022 12:32:07 +0900
+Subject: [PATCH] Fix the build issue on meson when -g option is added to
+ c_args
+
+Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/335
+--- a/src/cutout.py
++++ b/src/cutout.py
+@@ -24,7 +24,8 @@ if __name__== '__main__':
+                 break
+ 
+     cpp = args[1]
+-    ret = subprocess.run(cpp + host_cargs + [args[0].input], stdout=subprocess.PIPE, check=True)
++    cpp_args = [i for i in host_cargs + [args[0].input] if not i.startswith('-g')]
++    ret = subprocess.run(cpp + cpp_args, stdout=subprocess.PIPE, check=True)
+ 
+     stdout = ret.stdout.decode('utf8')
+ 
+GitLab
diff --git a/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch
new file mode 100644
index 000000000000..5565012cad65
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.14.1-gperf-meson.patch
@@ -0,0 +1,79 @@
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/a07e2f1e8ad049772cd24b7daa0a4a168f33bfba.patch
+
+From a07e2f1e8ad049772cd24b7daa0a4a168f33bfba Mon Sep 17 00:00:00 2001
+From: Christopher Degawa <ccom@randomderp.com>
+Date: Tue, 25 Oct 2022 14:41:05 -0500
+Subject: [PATCH] meson: modify gperf test to remove sh dependency
+
+modifies the gperf test to instead rely on a file input
+rather than piping in using sh, as sh is often not reliable
+on Windows due to paths.
+
+Also changes the if else ladder into a foreach loop.
+
+Signed-off-by: Christopher Degawa <ccom@randomderp.com>
+--- /dev/null
++++ b/meson-cc-tests/gperf.txt
+@@ -0,0 +1 @@
++foo,bar
+--- a/meson.build
++++ b/meson.build
+@@ -315,39 +315,33 @@ if fc_configdir.startswith(fc_baseconfigdir + '/')
+   fonts_conf.set('CONFIGDIR', fc_configdir.split(fc_baseconfigdir + '/')[1])
+ endif
+ 
+-# It will automatically fallback to subproject if not found on system
+-gperf = find_program('gperf')
++gperf = find_program('gperf', required: false)
++gperf_len_type = ''
+ 
+-sh = find_program('sh', required : false)
+-
+-if not sh.found() # host_machine.system() == 'windows' or not sh.found()
+-  # TODO: This is not always correct
+-  if cc.get_id() == 'msvc'
+-    gperf_len_type = 'size_t'
+-  else
+-    gperf_len_type = 'unsigned'
+-  endif
+-else
++if gperf.found()
+   gperf_test_format = '''
+   #include <string.h>
+   const char * in_word_set(const char *, @0@);
+   @1@
+   '''
+-  gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C'
+-  gperf_snippet = run_command(sh, '-c', gperf_snippet_format.format(gperf.full_path()),
+-    check: true)
+-  gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout())
++  gperf_snippet = run_command(gperf, '-L', 'ANSI-C', files('meson-cc-tests/gperf.txt'),
++    check: true).stdout()
+ 
+-  if cc.compiles(gperf_test)
+-    gperf_len_type = 'size_t'
+-  else
+-    gperf_test = gperf_test_format.format('unsigned', gperf_snippet.stdout())
+-    if cc.compiles(gperf_test)
+-      gperf_len_type = 'unsigned'
+-    else
+-      error('unable to determine gperf len type')
++  foreach type : ['size_t', 'unsigned']
++    if cc.compiles(gperf_test_format.format(type, gperf_snippet))
++      gperf_len_type = type
++      break
+     endif
++  endforeach
++
++  if gperf_len_type == ''
++    error('unable to determine gperf len type')
+   endif
++else
++  # Fallback to subproject
++  gperf = find_program('gperf')
++  # assume if we are compiling from the wrap, the size is just size_t
++  gperf_len_type = 'size_t'
+ endif
+ 
+ message('gperf len type is @0@'.format(gperf_len_type))
+GitLab
diff --git a/media-libs/fontconfig/fontconfig-2.14.1.ebuild b/media-libs/fontconfig/fontconfig-2.14.1.ebuild
new file mode 100644
index 000000000000..0cc0f9683203
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.14.1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib meson-multilib readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="https://fontconfig.org/"
+SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="1.0"
+if ! [[ $(ver_cut 3) -ge 90 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
+fi
+IUSE="doc nls test"
+RESTRICT="!test? ( test )"
+
+# - Check minimum freetype & other deps on bumps. See
+#   https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/main/configure.ac#L314.
+#   Note that FT versioning is confusing, need to map it using
+#   https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
+#   But sometimes it's actually greater than that, e.g. see Fedora's spec file
+#   https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig.spec#_1
+#
+# - Purposefully dropped the xml USE flag and libxml2 support. Expat is the
+#   default and used by every distro. See bug #283191.
+#
+# - There's a test-only dep on json-c.
+#   It might become an optional(?) runtime dep in future though. Who knows.
+#   Keep an eye on it.
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.9.1[${MULTILIB_USEDEP}]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	!elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
+	elibc_Darwin? ( sys-libs/native-uuid )
+	elibc_SunOS? ( sys-libs/libuuid )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-libs/json-c )
+"
+BDEPEND="
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? (
+		=app-text/docbook-sgml-dtd-3.1*
+		app-text/docbook-sgml-utils[jadetex]
+	)
+	nls? ( >=sys-devel/gettext-0.19.8 )
+"
+PDEPEND="virtual/ttf-fonts"
+# We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT
+# when cross-compiling.
+IDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )"
+
+PATCHES=(
+	# bug #130466 + make liberation default
+	"${FILESDIR}"/${PN}-2.14.0-latin-update.patch
+	# Avoid test failure (bubblewrap doesn't work within sandbox)
+	"${FILESDIR}"/${PN}-2.14.0-skip-bubblewrap-tests.patch
+
+	# Patches from upstream (can usually be removed with next version bump)
+	"${FILESDIR}"/${P}-gperf-meson.patch
+	"${FILESDIR}"/${P}-gperf-meson-debugging.patch
+)
+
+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
+
+	# Test needs network access
+	# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/319
+	# On bumps, please check to see if this has been fixed
+	# to allow local access!
+	sed -i -e '/test-crbug1004254/d' test/meson.build || die
+}
+
+multilib_src_configure() {
+	local addfonts=(
+		"${EPREFIX}"/usr/local/share/fonts
+	)
+
+	# 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+=( /usr/X/lib/X11/fonts/Type1 )
+		;;
+
+		*-linux-gnu)
+			use prefix && [[ -d /usr/share/fonts ]] && \
+				addfonts+=( /usr/share/fonts )
+		;;
+	esac
+
+	local emesonargs=(
+		# USE=doc only controls the additional bits like html/pdf
+		# and regeneration of man pages from source. We always install
+		# the prebuilt man pages.
+		$(meson_native_use_feature doc)
+		$(meson_native_use_feature doc doc-txt)
+		$(meson_native_use_feature doc doc-html)
+		$(meson_native_use_feature doc doc-man)
+		$(meson_native_use_feature doc doc-pdf)
+
+		$(meson_native_use_feature nls)
+		$(meson_feature test tests)
+
+		-Dcache-build=disabled
+		-Ddefault-fonts-dirs="${EPREFIX}"/usr/share/fonts
+		-Dadditional-fonts-dirs=$(IFS=, ; echo "${addfonts[*]}" )
+		-Dtemplate-dir="${EPREFIX}"/etc/fonts/conf.avail
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
+	meson_src_install
+
+	# Avoid calling this multiple times, bug #459210
+	if multilib_is_native_abi; then
+		insinto /etc/fonts
+		doins fonts.conf
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# 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 ! use doc ; then
+		find "${S}" -name "*.[[:digit:]]" -type f -exec doman '{}' + || die
+	fi
+
+	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 || 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 || die
+
+	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
+		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
+			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 [[ -z ${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
+}