[gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/

["Sam James" <sam@gentoo.org>]

commit:     b0da9065adb31bcf1a9e2833208b6bded11f856e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  9 03:37:02 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep  9 03:38:54 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0da9065

media-libs/freetype: drop 2.13.0, 2.13.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/freetype/Manifest               |   6 -
 media-libs/freetype/freetype-2.13.0.ebuild | 259 -----------------------------
 media-libs/freetype/freetype-2.13.2.ebuild | 253 ----------------------------
 media-libs/freetype/metadata.xml           |   2 -
 4 files changed, 520 deletions(-)

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index b911d7f6ecd2..09e5860d6009 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,12 +1,6 @@
-DIST freetype-2.13.0.tar.xz 2492440 BLAKE2B 11aac3cddb3e71cc0e6a616ed609294d6641aa0011842aa8230eace826955883aca0063331660025be14582b44aa189718ce21e0e5193a66bb5d7cffa1d0fb7f SHA512 b93a69a92b99f54c4fc4a276066bc7a87597df132e42ef93f6d973f1425e64bebcc568defa511d39fb04ab4d3a2090a6db1e54cf992a80ff57d658fee28a9110
-DIST freetype-2.13.2.tar.xz 2501764 BLAKE2B cebc82180d9afaeb112a65ba78903d7bf7a9295a803166a033585ad2325add6023f05066852240c4665e56285345ba503b01ecd461d48f0478a8f3f56136988e SHA512 a5917edaa45cb9f75786f8a4f9d12fdf07529247e09dfdb6c0cf7feb08f7588bb24f7b5b11425fb47f8fd62fcb426e731c944658f6d5a59ce4458ad5b0a50194
 DIST freetype-2.13.3.tar.xz 2617564 BLAKE2B f9591c6998df02b072adaf38a968e91deae8ed4d53ea0cb74d08982c4f0e48b1a98c1378a698164e4f730f07a3b0bea308a94fcc2e2b8ce9967dbf9478b599bd SHA512 600828d7756c8cfa974448ef34ee0db573fb8cfdb2dc1e0358b63c44a03bfd7e3d4384424b9cc5e4749034f60231a550c4b7fcb46694fcacea218787ce305504
 DIST freetype-2.14.0.tar.xz 2665548 BLAKE2B 70b79290b16bc05e156032dc8a9136bddb21c1f9fc84692959c65f2bc3dc51df681587aee672de9eb393ec77edae05f8e4fdab642a9938dade9eb1186f6d010e SHA512 287661121fc52d609bb74a46c2ebba83af384f760ce737b2dc616326a36fa39ab651f279ca08b6ebb3b2d2c7d39e11438f8b1b676afe452acc9fe1499b8646bc
-DIST freetype-doc-2.13.0.tar.xz 2084016 BLAKE2B aa88eb5a30223a683348902624827bd7df218129fad0dcbb0f2453b9acf3930da634e9c67eda31191e868ca68db92059ed37cc0bd0287dc4458743538fdfe126 SHA512 d4367513e1ca48691aa6d64c36bf53603f67a67214378a2ae3810b2227084647743ee0d7137453f31c966ccb9ce19c2a72b3b5445d4accbce9a63d71f6b6800e
-DIST freetype-doc-2.13.2.tar.xz 2173920 BLAKE2B 273ab405b6c7097ace9c7882fddb22d2a0cf8cc1594e9d141ca18d13a3745ee2e481bd2ee214cba6d99224ef0d67fdcba1b08aa06e3556a80cda29f3b6026f97 SHA512 ca3438dcf6f995af556d8db3cb3cfdcabb81ab5a7dd88464ff757e3e418b3219b0011857cde8a338372e30d8375486ac8e50914da2ea948dc874f70010bce60c
 DIST freetype-doc-2.13.3.tar.xz 2173852 BLAKE2B 84244e28ace43929387052954b92089f570300dc8a9cb77e0ceb53001f081f6d6e5785ad081448ceb58254f8102e3ccf64d1fd323b02fb0a8232a0ba3eb9f3a8 SHA512 54ef9e3a4f0c298893268ed409f59aa1620a60c656ee3f8bdddbb91ffb2e70eea2f016a85c0a02eef699de362abee4aabae4482f0fa1cbf42967b5873fc84f2d
 DIST freetype-doc-2.14.0.tar.xz 2175416 BLAKE2B f8bdca0a1ef0c43e7b75f8ed0ee43cfca2a2d95427c585b8b849c42dfdf02af22348007d49b9a207b0f2cc8133227699a08dcdf552f2361755df62e57af256de SHA512 5f69e8a53b8fe20e968ffe60d911df89f116c55fee604971c2f552b32e4c25046777221d33145369c6bbcabff6efcd2ef9905d7f13386bcbf2cdeb88aec801c1
-DIST ft2demos-2.13.0.tar.xz 333952 BLAKE2B 34155615eb967dda2b62e47bb4095a6bf367dd79b7bd93dfc4dc172476b3bf704af4039623d55ee08d2d6a5365b4783e86a570e34b70af2e543bac64d40833b0 SHA512 7d686e9febdda587b74647cc38fa22f0722d0306ecb05430e319e05b6132c999d20728bcd7a6506b8d8ad45a6859443e2b69d766802497357a8f0ba3352404ba
-DIST ft2demos-2.13.2.tar.xz 341140 BLAKE2B 5e2c3eb2fccb359d03e154b94d349baab27aa465e40274ea99be1e19c8519ec9c434749c78a41743540bd38064a7c68e5389ff99443b8e320e617c4fe7f4558b SHA512 aa83ba4212ff7c4453b72f036136cb9b04cacf7d196388a3e4752613e000b3bb45a4dcf63d3d1d5b3d6ada10720304b532fb6e33ed6a5b399dcce45c27af9ade
 DIST ft2demos-2.13.3.tar.xz 342404 BLAKE2B 5f5a48e0ad839ece97ea2bd451bd819ccbf9347425dc323a368e5fed91cfddeffd61b1dfea2e7cc7d65e30e6ebb932dd142430998039eb4a8f91758a3690ddef SHA512 e662a20ad2ff80534e8ea0df2f299e8f61350f13d279f80f8257b18352e863dd2c266791b85d3410b0c83966cb12e3ff49cf398b83a651dc73772df9fcf5936c
 DIST ft2demos-2.14.0.tar.xz 344120 BLAKE2B ec4552644ea652f2d562126e24f45ff6d45dac9ae7b0c7dd232bf533059e6558e8654d207dc1c41a928fe351655d8c6abf691ba339f06d09f955796d95d037da SHA512 93d663c3eccd5313fa69cfa284d05e192ffed59cadfc0978f94ca7d720e5961ca707626d38e36dd5d4d7a1a08df7d503e12fb3423c8b4861a42ef8826b996dd1

diff --git a/media-libs/freetype/freetype-2.13.0.ebuild b/media-libs/freetype/freetype-2.13.0.ebuild
deleted file mode 100644
index 02a241130ece..000000000000
--- a/media-libs/freetype/freetype-2.13.0.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="High-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="https://downloads.sourceforge.net/freetype/${P/_/}.tar.xz
-		mirror://nongnu/freetype/${P/_/}.tar.xz
-		utils?	( https://downloads.sourceforge.net/freetype/ft2demos-${PV}.tar.xz
-			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
-		doc?	( https://downloads.sourceforge.net/freetype/${PN}-doc-${PV}.tar.xz
-			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	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"
-	IUSE+=" doc"
-else
-	inherit git-r3
-fi
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
-	utils? (
-		svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
-		X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-)
-
-_egit_repo_handler() {
-	if [[ "${PV}" == 9999 ]] ; then
-		local phase="${1}"
-		case ${phase} in
-			fetch|unpack)
-				:;
-			;;
-			*)
-				die "Please use this function with either \"fetch\" or \"unpack\""
-			;;
-		esac
-
-		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"
-		git-r3_src_${phase}
-		if use utils ; then
-			EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"
-			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
-			git-r3_src_${phase}
-		fi
-	else
-		default
-	fi
-}
-
-pkg_pretend() {
-	if use svg && ! use utils ; then
-		einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
-	fi
-}
-
-src_fetch() {
-	_egit_repo_handler ${EBUILD_PHASE}
-}
-
-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 -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};" \
-			< configure.raw > configure.ac || die
-		# eautoheader produces broken ftconfig.in
-		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
-		unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	pushd builds/unix &>/dev/null || die
-	# eautoheader produces broken ftconfig.in
-	AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
-	popd &>/dev/null || die
-
-	# This is the same as the 01 patch from infinality
-	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
-
-	enable_option() {
-		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to enable option $1"
-	}
-
-	disable_option() {
-		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to disable option $1"
-	}
-
-	# 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
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
-	elif use infinality ; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
-	elif use cleartype-hinting ; then
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
-	fi
-
-	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
-	# via environment (new since v2.8)
-	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
-	# See https://freetype.org/patents.html (expired!)
-	enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-	if ! use adobe-cff ; then
-		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
-	fi
-
-	if use debug ; then
-		enable_option FT_DEBUG_LEVEL_TRACE
-		enable_option FT_DEBUG_MEMORY
-	fi
-
-	if use utils ; then
-		cd "${WORKDIR}/ft2demos-${PV}" || die
-		# Disable tests needing X11 when USE="-X". (bug #177597)
-		if ! use X ; then
-			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
-		fi
-		cd "${S}" || die
-	fi
-
-	# bug #869803
-	rm docs/reference/sitemap.xml.gz || die
-
-	# we need non-/bin/sh to run configure
-	if [[ -n ${CONFIG_SHELL} ]] ; then
-		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
-			"${S}"/builds/unix/configure || die
-	fi
-
-	elibtoolize --patch-only
-}
-
-multilib_src_configure() {
-	type -P gmake &> /dev/null && export GNUMAKE=gmake
-
-	local myeconfargs=(
-		--disable-freetype-config
-		--enable-shared
-		--with-zlib
-		$(use_with brotli)
-		$(use_with bzip2)
-		$(use_with harfbuzz)
-		$(use_with png)
-		$(use_enable static-libs static)
-		$(usex utils $(use_with svg librsvg) --without-librsvg)
-
-		# avoid using libpng-config
-		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
-		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
-	)
-
-	case ${CHOST} in
-		mingw*|*-mingw*) ;;
-		# Workaround windows mis-detection: bug #654712
-		# Have to do it for both ${CHOST}-windres and windres
-		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
-	esac
-
-	export CC_BUILD="$(tc-getBUILD_CC)"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use utils ; then
-		einfo "Building utils"
-		# fix for Prefix, bug #339334
-		emake \
-			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
-			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use utils ; then
-		einfo "Installing utils"
-		emake DESTDIR="${D}" FT2DEMOS=1 \
-			TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
-	fi
-}
-
-multilib_src_install_all() {
-	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
-			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-		done
-	fi
-
-	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
-	if [[ "${PV}" != 9999 ]] && use doc ; then
-		docinto html
-		dodoc -r docs/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}

diff --git a/media-libs/freetype/freetype-2.13.2.ebuild b/media-libs/freetype/freetype-2.13.2.ebuild
deleted file mode 100644
index 5c479ecedb8c..000000000000
--- a/media-libs/freetype/freetype-2.13.2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="High-quality and portable font engine"
-HOMEPAGE="https://www.freetype.org/"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-else
-	SRC_URI="
-		https://downloads.sourceforge.net/freetype/${P/_/}.tar.xz
-		mirror://nongnu/freetype/${P/_/}.tar.xz
-		utils? (
-			https://downloads.sourceforge.net/freetype/ft2demos-${PV}.tar.xz
-			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz
-		)
-		doc? (
-			https://downloads.sourceforge.net/freetype/${PN}-doc-${PV}.tar.xz
-			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz
-		)
-	"
-	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
-
-LICENSE="|| ( FTL GPL-2+ )"
-SLOT="2"
-IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz +png static-libs svg utils"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
-	utils? (
-		svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
-		X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-)
-
-_egit_repo_handler() {
-	if [[ ${PV} == 9999 ]] ; then
-		local phase="${1}"
-		case ${phase} in
-			fetch|unpack)
-				:;
-			;;
-			*)
-				die "Please use this function with either \"fetch\" or \"unpack\""
-			;;
-		esac
-
-		local EGIT_REPO_URI
-		EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"
-		git-r3_src_${phase}
-		if use utils ; then
-			EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"
-			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
-			git-r3_src_${phase}
-		fi
-	else
-		default
-	fi
-}
-
-pkg_pretend() {
-	if use svg && ! use utils ; then
-		einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
-	fi
-}
-
-src_unpack() {
-	_egit_repo_handler ${EBUILD_PHASE}
-
-	if [[ ${PV} == 9999 ]] ; then
-		# Need to copy stuff from dlg subproject (bug #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 -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};" \
-			< configure.raw > configure.ac || die
-		unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	pushd builds/unix &>/dev/null || die
-	# eautoheader produces broken ftconfig.in
-	AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
-	popd &>/dev/null || die
-
-	# This is the same as the 01 patch from infinality
-	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
-
-	enable_option() {
-		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to enable option $1"
-	}
-
-	disable_option() {
-		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
-			include/${PN}/config/ftoption.h \
-			|| die "unable to disable option $1"
-	}
-
-	if ! use cleartype-hinting ; then
-		disable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
-	fi
-
-	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
-	# via environment (new since v2.8)
-	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
-	# See https://freetype.org/patents.html (expired!)
-	enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-	if ! use adobe-cff ; then
-		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
-	fi
-
-	if use debug ; then
-		enable_option FT_DEBUG_LEVEL_TRACE
-		enable_option FT_DEBUG_MEMORY
-	fi
-
-	if use utils ; then
-		cd "${WORKDIR}/ft2demos-${PV}" || die
-		# Disable tests needing X11 when USE="-X". (bug #177597)
-		if ! use X ; then
-			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
-		fi
-		cd "${S}" || die
-	fi
-
-	# bug #869803
-	rm docs/reference/sitemap.xml.gz || die
-
-	# We need non-/bin/sh to run configure
-	if [[ -n ${CONFIG_SHELL} ]] ; then
-		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
-			"${S}"/builds/unix/configure || die
-	fi
-
-	elibtoolize --patch-only
-}
-
-multilib_src_configure() {
-	export GNUMAKE=gmake
-
-	local myeconfargs=(
-		--disable-freetype-config
-		--enable-shared
-		--with-zlib
-		$(use_with brotli)
-		$(use_with bzip2)
-		$(use_with harfbuzz)
-		$(use_with png)
-		$(use_enable static-libs static)
-		$(usex utils $(use_with svg librsvg) --without-librsvg)
-
-		# Avoid using libpng-config
-		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
-		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
-	)
-
-	case ${CHOST} in
-		mingw*|*-mingw*) ;;
-		# Workaround windows mis-detection: bug #654712
-		# Have to do it for both ${CHOST}-windres and windres
-		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
-	esac
-
-	export CC_BUILD="$(tc-getBUILD_CC)"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use utils ; then
-		einfo "Building utils"
-		# Fix for Prefix, bug #339334
-		emake \
-			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
-			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use utils ; then
-		einfo "Installing utils"
-		emake DESTDIR="${D}" FT2DEMOS=1 \
-			TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
-	fi
-}
-
-multilib_src_install_all() {
-	if use fontforge ; then
-		# fontforge can probably cope with fewer of these, but this is simpler
-		einfo "Installing internal headers required for fontforge"
-		local header
-		find src/truetype include/freetype/internal -name '*.h' | \
-		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
-	fi
-
-	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
-	if [[ ${PV} != 9999 ]] && use doc ; then
-		docinto html
-		dodoc -r docs/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}

diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index 55ba112eb5e8..0a82ee911a3e 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -15,8 +15,6 @@
 			USE=truetype-debugger)</flag>
 		<flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for auto-hinting
 			OpenType fonts. WARNING: may trigger circular dependencies!</flag>
-		<flag name="infinality">Enable infinality options for improved LCD
-			filtering</flag>
 		<flag name="utils">Install utilities and examples from ft2demos</flag>
 	</use>
 	<upstream>