gentoo auto-resync : 14:03:2025 - 00:28:41

2 files changed, 242 insertions, 0 deletions

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index ea20a86871ba..4dff5fa18e34 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -11,8 +11,10 @@ AUX fontconfig-2.16.0-pthread.patch 1104 BLAKE2B 624b1eff01fff6b53263b1736582f2c
 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d SHA512 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
 DIST fontconfig-2.15.0.tar.xz 1447820 BLAKE2B 17c85fddc4ab84111c4f50afb89ecd8792c3aeaa2690b38fd39fca6f6cece69e9ce0cd3af8a2e54968c79ad1f9bee1e444699a13c068d9dfd3dfe1212ff37533 SHA512 754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417
 DIST fontconfig-2.16.0.tar.xz 1294156 BLAKE2B 48d6fcbfe83f0a4c026a4f90d864a4195805e04cc6dd486bd18d68caa8b55fd51fc37822781298152d363b70dc103c9f8b216f6dc0193b2b192eb35565482ec4 SHA512 90b5c39e5eadc56a9fbddd69b2a6eaa6bf9ee5cda003091b0896e66f87f3c1be8ab4442f54d20fca7232d72f60d9578f5e5ba3f376e39b64b8a2aa7b8f13b062
+DIST fontconfig-2.16.1.tar.xz 1296396 BLAKE2B 10835a6491060bf1ce62fa26c114f226e72081116fc9508df2963741dcd94c77476a7159a9dde065afc3dbeec8fed205c5c0a7040adaefdfd2c1cc5d2952da28 SHA512 50901593e7d3ae1727a9ae3861f2d4074e1f031f8a5ac0cb5ab8db90e35c2a12bd14e9f40185187035887a26c3aca054a751fcf97f5cff63484091aa386fec8b
 EBUILD fontconfig-2.14.2-r3.ebuild 7192 BLAKE2B ac09bacc348d9b612d5e77941c694cb4b3881463cd9e7f0cbebf34669affc3a217158abd672e1aeae5387db106dc7b6004194436f9786039ca8b72654234c1d2 SHA512 253f4a7030c9838e5c005c371d74e3df659ab7ece6a332f8e04d8d5ac9920f79d49fa4475d89e9323e834f37ae27781e2316d4ac33d4068659ecb29a42943d30
 EBUILD fontconfig-2.15.0-r1.ebuild 7218 BLAKE2B 587db6fb26a8a8fb7c97bc42ebea197f83d7f7add9be0ee3551a8d17786ce9414ca4888db29237a37801d4e0fcc10918312d6fca6111a13b98a61c0b2d9772b0 SHA512 a669483686a18534eaa1c219c819109cb47be30efb9a03a82eb0ebba8098e7437ff862c24be53deb873506f05754af0eeb95284df1b3d780b92e2b94fc43e7d5
 EBUILD fontconfig-2.15.0.ebuild 7145 BLAKE2B 16aba4bc2a195da5d43084008dff53d06626f07f0dd09c824124f59fef89693cb87ed13dbbd1e9271698c7956d9587a99d04488333545c389f2a5abf2a974614 SHA512 273d3c5350a13c0155eadb084c3830865417feb10fd272fa8738cdb65210054351026e848605ab818eaace7a88a08a571596ef57194363a8ea945880aa898a5e
 EBUILD fontconfig-2.16.0.ebuild 7424 BLAKE2B a41f0d418fd85a4a5270ba50ee608a8759f64fa47d7dc2e639d46bb4e024716f4f6f8db878ac7ccb33445df5130892afdc9973ea5e56d999f6c1f0f459d32a59 SHA512 31f66531a33e284ca994bda0615b50a091b29174ecdb4886ecbbafb6b2c5eb1316a11717beb73df6f35a0138c2399e58f76fe2736fa62622a6928a1f5b42cf51
+EBUILD fontconfig-2.16.1.ebuild 7420 BLAKE2B c9527d49f1de3aed858b158268a33d4d8b3886b59e24a41c0c1fa0f1566103cbf87391ff99dd120faaa3ec154541b7d88c1d15b22fbd2a567929bd7bf6438bd6 SHA512 02f47725327bb32a3f24fb660613b31748ffb990c0dd110745c3a766754f5664cd4c183a812c5d455a7579066d2cf31385c82256a251e667abf2758ad5bd7421
 MISC metadata.xml 672 BLAKE2B d23112b5d408aed97ad68bc9a141a570c22fd6bbf0022e979b7006817ae27bcba21be43558cb42df06f3c280cbed5570c62805bb69be8a64b1f41bd90b200bc0 SHA512 1ff9c1f22b9766127692eec4824ce966f7a7305ddfae0dd1d8b0e5b432926508dd7a898eada6c182e02c985e11c2f9a22f13eac195333ed32952af0e89015e9a
diff --git a/media-libs/fontconfig/fontconfig-2.16.1.ebuild b/media-libs/fontconfig/fontconfig-2.16.1.ebuild
new file mode 100644
index 000000000000..da1f8ee64b28
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.16.1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit eapi9-ver multilib meson-multilib python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="https://fontconfig.org/"
+SRC_URI="
+	https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PV}/${P}.tar.xz
+	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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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="
+	${PYTHON_DEPS}
+	>=dev-build/meson-1.6.0
+	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="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
+	# Avoid network access and unpackaged pytest-tap
+	"${FILESDIR}"/${PN}-2.16.0-network-test.patch
+
+	# Patches from upstream (can usually be removed with next version bump)
+	"${FILESDIR}"/${PN}-2.16.0-macro-preprocess.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
+		-Dcache-dir="${EPREFIX}"/var/cache/fontconfig
+		-Ddefault-fonts-dirs="${EPREFIX}"/usr/share/fonts
+		-Dadditional-fonts-dirs=$(IFS=, ; echo "${addfonts[*]}" )
+		-Dtemplate-dir="${EPREFIX}"/etc/fonts/conf.avail
+		# TODO: Rust
+		-Dfontations=disabled
+		-Dxml-backend=expat
+
+		# Let users choose via eselect-fontconfig. See bug #900681
+		# and https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/356.
+		-Ddefault-sub-pixel-rendering=none
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
+	meson_src_install
+
+	rm -rf "${ED}"/var/cache || die
+
+	# 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/${PF} || 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
+
+	# 2.14.2 and 2.14.2-r1 included the bad 10-sub-pixel-none.conf
+	if ver_replacing -eq 2.14.2 || ver_replacing -eq 2.14.2-r1; then
+		if [[ -e "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf ]] ; then
+			einfo "Deleting 10-sub-pixel-none.conf from bad fontconfig-2.14.2 (bug #900681)"
+			rm "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf || die
+		fi
+	fi
+
+	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
+}