11 files changed, 292 insertions, 182 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a954e04e8db5..dc65a6fe2a5e 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 bbfdea548a6b..0a4cbe628dfa 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -7,8 +7,10 @@ AUX alsa-lib-1.2.13-update-symbol-name.patch 1574 BLAKE2B d685102ff60f4ed1bcdca4
 DIST alsa-lib-1.2.11.tar.bz2 1107150 BLAKE2B 7fb245ffbfb841bdd5cb9da08fb2ec0a4ce8d340d4d1461999aca558c67c16e7c596cd0bffab761b7b4549025b0fb25462fb352e6d3900fb42f00b47de58d34c SHA512 7bf2c541dff5262c0302a1c716ca10cdb5105f4e0ad48f3341c3c7e975b0c3ea835a298a05974c3e216a85912c368d8025ba3cdda3ff04a7683133ce5b2a286d
 DIST alsa-lib-1.2.12.tar.bz2 1108712 BLAKE2B bcb48ad2c8687454b312e789c650136fee0db8cccf58e997b9d619aac5c74288b69220589efdcd3917eb1d781ef71be5fcd16d997c59c069fe20788d1a479068 SHA512 053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d
 DIST alsa-lib-1.2.13.tar.bz2 1116739 BLAKE2B 1723ca5f191525e050f05423fb9ccf4501e4f20490d01b0c068493bbce279d3a067e8d0e5f52f9c76c2eaecb4c2b3fc42690193b88c313461fce2aec390175b3 SHA512 b0c0666e38e881dca985b61386523c045c71072a88be4952c986ffbe2107ec736da528858ebeffdf439de5c290914bf3facc654100a228c6d26fff9429142ef0
+DIST alsa-lib-1.2.14.tar.bz2 1115517 BLAKE2B 6fee05f859a19b8ef0d9896d37442c55f602e8b4aaa7698f30c01e03a339d7a74b3214493b095a64b59ee581fb7756d903d4965e080db552e062e2001e0662ff SHA512 2716cc3a2299da4a1a170d734af082d78dc452b253179d0f1a9ec190140734aecf002b6924eec4ff2699ce88ce1ae5c56821c267f36384910984db726d1f9626
 EBUILD alsa-lib-1.2.11.ebuild 2659 BLAKE2B 53310377ed59b845962bc6e77e69ef010a58c006f47692a755c44bf7fd3e539cef531fa692b43254a26a54071b77e55c7722b54dab9d73a71fff9ddd9bc39b55 SHA512 120e70af3e0cd5bdd66c40e18cc88caf9453cca6bdf9dabfc989dc1b9175ec6726983616548a87873a3bc2569e06592aba40810261195e4653fa7d9985a6ab5e
 EBUILD alsa-lib-1.2.12.ebuild 2588 BLAKE2B f63344a40d1d07be7c8ba1b57634d872aad48f5c334e8b3d95e55a512e91264ff1f197a38b54ec011ce096cf9219da1ea713362536f75d06a9e5ccd150246454 SHA512 67caebc57c286cdc5c13e7a77e5edd8fe5c56a8d56d126369fd21873a224df37a75e3b831a2316c1de3efd0d47e35fb76eedd0589c8b804f911084a8ce14c76e
 EBUILD alsa-lib-1.2.13-r2.ebuild 2822 BLAKE2B ae8ff340725d72fcd8bc528dc0bc4e4fba6b5993cbc360fd1f8752a412988505601885a3673264e8a50a0e1a5271f07a87aee9d6640c8d9d8a4df00afab7b68d SHA512 ec9765e322fed1fd321035e5f14c13ad287341a8ddbe3b94d34c38067ba2ffec02fa7920e43acfa77379b747b791ac9588e30469efdb1c25d14227dd3c309c4a
 EBUILD alsa-lib-1.2.13-r3.ebuild 2862 BLAKE2B 4f62f051192eaf6597027fdc8191b40abccb21d4a49cd82ee85da811401d405d79e29211e562155ab4e9bd85b7b73c8fba65de8f626157b02d4f000fdb46d116 SHA512 5a0cd599158d0e83d0e31b7c064119ed229286de6a44e0624bebe0009cfee7493d7bb2579a8d79033d037ec0325849f8cc3ba66f19256d313a85459d070aac7e
+EBUILD alsa-lib-1.2.14.ebuild 2639 BLAKE2B 371cdd6f8da1dd9100a6aaacaba985bdb235220e41095dcf1e79a9dddfca35c0a197529f595567d1a1e245bd79f0af6a1d71037cbc93982f3561884d5922e196 SHA512 3671bf98fd078181daba6a95a269ae7bd7909ea1ad2db876309ab54d267171c1c0d1b19c775484403462f2c165ccc03a33fbd7a87c0f73ddf89e4249deea2738
 MISC metadata.xml 508 BLAKE2B 5d7cb196ffea7d75c228f28cfbc88b7c3ca7e18b4f8f790dd51718bce508679fb61073f0df0a192028c57bf3c8f99e3838c7c061dc408ae915b84213fd14b383 SHA512 4b682f9fa77d3287e0e56e39c6aa97b06129f85cc1dd898efac0682dd33f6b22ca20e08dcb95423ac953eafde7d2850db9c5a363156eaefa2c1752dd72011a4c
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.14.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.14.ebuild
new file mode 100644
index 000000000000..ca0894aa4374
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.14.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+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="7e3a3c2b0a092d0f568ba3c98365030dd91cc877"
+	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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="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-text/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() {
+	# Tests fail to build w/ C23 (bug #944447)
+	append-cflags -std=gnu17
+
+	# 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.
+	# (This bug is closed as of 1.2.9 but there's been no clear actual fix to it.
+	# Let us know if you can identify one.)
+	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_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 '*.la' -delete || die
+
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index ca070990eede..92fce828b391 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,5 +1,7 @@
 AUX alsa-ucm-conf-1.2.13-ucm2-intel-product_name.patch 2064 BLAKE2B ae7b0b6306bb74ef2c3fa5950b5e472adb8a146567e73cdeca43fa8b11732f5def1b91cef2b098301e963f7fc4afcfb941cdf7e3022ad8d1d1c7e37364fb7a44 SHA512 28428300c1d93eac575747615780f4c874cc0c33e7bbfd6335fc3ae05e7d8bdcf6ffb8877969da055eebd0f0c2a1477600a2c62ed0aa0b97ed95259b3f7ee998
 AUX alsa-ucm-conf-1.2.13-ucm2-intel-sys_vendor.patch 1314 BLAKE2B e0c2454c372c11b81670c775fb92c310630d5a49d5441fcaaeefec94157b2c058a0d2bbde800d56fd0b22d498b596241e1c4ad1e4fbcde513759e205db102ee1 SHA512 e1211e5d3f498770e986cb061bb5de2ad85841e287bec0c18652a5c952502a513c451e3d05c77a7040dea43a64d70bf493fe2448be1f125aa72743b760e017c4
 DIST alsa-ucm-conf-1.2.13.tar.bz2 58408 BLAKE2B 87e4bf2285961e316ca853e9245e02447ea9e60fa506e124c072e2b6ed71345fc0c30b19bf8c849f8123a6b95a4facd22225eafccba8164266961110a60ef44c SHA512 cad867268851ac178f3a5378a00e292184b0e0ec7955f297ae7ed56073d3dddb06c08666b23b1bf6b0065068a9370ee34608bd687763658c79d34b64059b1c85
+DIST alsa-ucm-conf-1.2.14.tar.bz2 72126 BLAKE2B cbb4b81db7670207cac5b85ba9cd4d9df93e4aca573da4caffe0f1e0386a9685b837e58b7ed85ddcfecf3c0f2469e706833dad6f0ef020440c943aa41520f8f0 SHA512 a224e890919306bdcd606dfb873b089950c9fa89f24c02947692ee8ab1a05c419f2a8dc174440d17c8a9575cab293806630f2cb43d74677f7ef0d956b7883dc5
 EBUILD alsa-ucm-conf-1.2.13.ebuild 614 BLAKE2B 6d0c8a8f084fd697658ca5c5f2bdbfeadee299e76c076d669773739f4e5bc73d528c628a2c600d6be2c984a885c1422af510af7536449556348db275cd8f3512 SHA512 f3873a64ab37ed1678ef974bcbbf5b0dfdf0428983d43dee9dfb000258fc87ba2cdd5ed59a775618e33bec47c70751e7f04ae905eba9710b8ecae0139c97131a
+EBUILD alsa-ucm-conf-1.2.14.ebuild 511 BLAKE2B a03bd77b394b39488b0c23a8d3ba898a0e3a4cfc604a8affde4193c834e854ec26022347b532be1c6a89b0b5cd6c43294e265ad143378916a1a83bae41bec76f SHA512 67e286f8caaee131044bc4a6e9a64f73d6f625bf21be32d60017138393db44cbc2bf7d45737dd860c9ad2949cda6820cb39be9d22691095c3fd8fa8a3e90e218
 MISC metadata.xml 403 BLAKE2B c1555457584c9ccfc55d8cf423c2980863a68e45a2993133c56f124996c33a8ca402f7611fb22c4f6fd87cd5ea70e417f1424d4df5bc5aebca6ccbd2b5efb3e6 SHA512 23290395834ba3d4b58cc79ec5fca79b1b2710b69504a49057f3d26bb5f3ae3b1b7f2c4957d8b3d13168f81795c25df4cb5007ec3c60bbe61c7f588ae2445d43
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.14.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.14.ebuild
new file mode 100644
index 000000000000..fd2b51e1810c
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.14.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2025 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+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/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index d30d8d30ce07..dbb7f7a67763 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,10 +1,7 @@
 AUX harfbuzz-10.4.0-meson-freetype.patch 3656 BLAKE2B 47650ca4014737d2cfdfbb9b09b883780a5d1827f7eed7492d433b797c24f9bc03f41ea8502bfeb4d02384c93b10e8ceef30baf6dc441fff1328192a15ebf0cb SHA512 88c2f898a717b026a13cbbd46c9ff3fbdf295ee99fe45224c8916c20357a4fc5ffdd588d43fde3e6e2b1e78f1107284e05198049e9bf456965169c3b21bf9ba4
-DIST harfbuzz-10.1.0.tar.xz 17922136 BLAKE2B 7d78e31d045b984d8d1a8b1d1f8f282ff9b7dc748ffd65355266266e75064b14eb94ec6b1418e208ebb0fffb99ef174d1978ab14f0c318c1112c2d8005285979 SHA512 14b0e8fd417af9c78f36e532e3737c163902b85837be1028a8fd569508639b87afeb56f70a2313ba2f0f6d4b72bb6cee0bf50fb333dfc503c713e4d9cd86e9c3
 DIST harfbuzz-10.4.0.tar.xz 18120656 BLAKE2B 21a2ed81ead5f06658c6153ad756631aacf5522bf58cdc5a54585cc03b0562c634ecabcd686fa76d2dda3497eb1a7d9e10c771e29da62c5946438d9ed8c46075 SHA512 73e202225aeef6174ebd3b8b226ad9d5afb48c40ecdc1bc26d1bc5f0cf1d832a8ffc2fe5b7ae3b7c8f848552dd57116d407f44120c6813b59dbe9faed0c346dc
 DIST harfbuzz-11.0.1.tar.xz 18158636 BLAKE2B db36c39915a96e82ba1aefe48dd753e925ff32c05b5ac96a737da4c55e6416e18898c2cc9aa8aa8c24ea996a8fdf57838d4de274f0a583ad54c3a7ed04168cb6 SHA512 0eca477c9c2225fdfa2c571a302606aa5026ba809ca1b61b9edd7397b601c57fc1f7919068e9e193cc49b6ea643a8918934aa7cab1ac59947358e06fb1ad645d
-EBUILD harfbuzz-10.1.0.ebuild 2389 BLAKE2B 14dfefb842168446682edbd996827c0b32c163fd7997de89d7c43182bd90c0b80bf8ad799170ed0e948bea13ec301859d592712a66d8f97e1645b57507f782c0 SHA512 33ee38ac532f32abe13b45ce708137b09801fa16043e9e51ac64993df503de3e50a2e4f3f6e76295b09492a8f7ef41df3c9a8fec826bc9659d31a3a06fc8a9a0
 EBUILD harfbuzz-10.4.0-r1.ebuild 2453 BLAKE2B 3e75ac615fe1e071f859d2c72b62d4860ff7d3902285af780db677e7431960097928cd4aab0bb170f550678c703dcffd12bd55a1f4bdd3640e481db6923193ab SHA512 c1a120f5205309a7a75764831f02e7952e66518866312da50cfad1cde0fc5202ffb33a4d4638926bc5c4611f89b8e27d85ec1173733587fe7c6ba9d3bbb68431
-EBUILD harfbuzz-10.4.0.ebuild 2397 BLAKE2B 626bd3c11e350eb8fe8344dc1e940e9a67d02da902368e4b0ab97cf24c072391b06dd54d97ee8bfc4ba1a9f67a95cf5e37a3b48a694632dd9702215dec6f52d2 SHA512 95d951c443a4f323d27f8dcd210ab0afb4c9ec477ca0da39737429145f09c417722979c828c56d2f88da8ebf31f6df47bf009801effc615523f501f5025dcbe8
 EBUILD harfbuzz-11.0.1.ebuild 2440 BLAKE2B a2eea338047d73e4014e7e82b29505680ccd28823c76d1818858079514b95cdc90b8f66bd9b0435f35d0500566264ec84d0e21155f4952abe6af430a3973cd63 SHA512 a9f05daf401224ec7b6164f35693db2eb9e5dd8e9e327a8361ae756a69df934a73421e064ff1cf4b87262e6d96737936c662da825b8f0c0ed63c666e4cdbfd03
 EBUILD harfbuzz-9999.ebuild 2440 BLAKE2B a2eea338047d73e4014e7e82b29505680ccd28823c76d1818858079514b95cdc90b8f66bd9b0435f35d0500566264ec84d0e21155f4952abe6af430a3973cd63 SHA512 a9f05daf401224ec7b6164f35693db2eb9e5dd8e9e327a8361ae756a69df934a73421e064ff1cf4b87262e6d96737936c662da825b8f0c0ed63c666e4cdbfd03
 MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70
diff --git a/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild
deleted file mode 100644
index 771a0996c06b..000000000000
--- a/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://harfbuzz.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-# 0.9.18 introduced the harfbuzz-icu split; bug #472416
-# 3.0.0 dropped some unstable APIs; bug #813705
-# 6.0.0 changed libharfbuzz-subset.so ABI
-SLOT="0/6.0.0"
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:=[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	# bug #790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for introspection, bug #535852
-	local emesonargs=(
-		-Dcoretext=disabled
-		-Dchafa=disabled
-		-Dwasm=disabled
-
-		$(meson_feature cairo)
-		$(meson_feature glib)
-		$(meson_feature graphite graphite2)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-		# Breaks building tests..
-		#$(meson_native_use_feature utilities)
-
-		$(meson_use experimental experimental_api)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	# harfbuzz:src / check-static-inits times out on hppa
-	meson_src_test --timeout-multiplier 5
-}
diff --git a/media-libs/harfbuzz/harfbuzz-10.4.0.ebuild b/media-libs/harfbuzz/harfbuzz-10.4.0.ebuild
deleted file mode 100644
index 05db84d3684c..000000000000
--- a/media-libs/harfbuzz/harfbuzz-10.4.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://harfbuzz.github.io/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-# 0.9.18 introduced the harfbuzz-icu split; bug #472416
-# 3.0.0 dropped some unstable APIs; bug #813705
-# 6.0.0 changed libharfbuzz-subset.so ABI
-SLOT="0/6.0.0"
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:=[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	# bug #790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for introspection, bug #535852
-	local emesonargs=(
-		-Dcoretext=disabled
-		-Dchafa=disabled
-		-Dwasm=disabled
-
-		$(meson_feature cairo)
-		$(meson_feature glib)
-		$(meson_feature graphite graphite2)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-		# Breaks building tests..
-		#$(meson_native_use_feature utilities)
-
-		$(meson_use experimental experimental_api)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	# harfbuzz:src / check-static-inits times out on hppa
-	meson_src_test --timeout-multiplier 5
-}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 5d48d7f14051..114ffb39a8f6 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,6 +1,7 @@
 AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e3017539faef0723e0a80fb9c4bbde94811f32b3e6ae271b3db39fd35487d75078cfbe9e596604c4e37fb5c6c18619ed524c52683219dd8af SHA512 b37ce78495a3bbc439f203d9db81d9bff3e7f980c01ef5187dee537dd9c1025c5163ec3760b48d91a099a2fafb60526c9fe83f7183fc605fb3cc0f5c7a65f6bf
 AUX opencv-4.1.2-opencl-license.patch 519 BLAKE2B 6dcdf809c3c75a39d0e44f02e157a0c0ee074fd15144565ed51ade7e7849cb313c084100f499cc1240424f4647a2ff73c8d5e61cbdf6d0499846db61b8a30729 SHA512 2874a5140ef5028eb6c64f36325904000edd722560cf876fc49d63b040633bcfea01cae27c156b18191564805cafd2986f26eea322b1376af4f2982d66ed7653
 AUX opencv-4.10.0-26234.patch 2791 BLAKE2B b55dd5fe4d554a0be48cabd7009d476fd47aa63bb4142ebb2f5681a2cdf17d530bffcec31e795a3ec7dc3524b3a9496562f83ea2fa9939d431d8d794458a2e9f SHA512 55f767366ab478cad5c2a1b89ccb38a0dbe66fc2c3e04d2cef767bb8dd2c672c6c523eba2b4fb67c73001f1a223c2c1b831f1b951c45b48fc5d649686c1a4cdf
+AUX opencv-4.10.0-cmake4.patch 6796 BLAKE2B 2e2e67a44a2b9fffe148f75c8343241090a969b854f15f45fc5fc78de102b6390a9fb830e7daa640fe4f6e8d5c4857245ae4c2fc40f93681ecd8f565ae768a45 SHA512 c9be74fef0ee8e5ff226fd1b59eb695ac3249e8e8093bce4080131481ec3fb98a0a092afdb82fb594e484502a69bcfa48d511694af91fd5a352bc87d00dd9692
 AUX opencv-4.10.0-cuda-fp16.patch 7482 BLAKE2B a38b32ccb262ba316e733f7464b279f006d44da7d3bac1f91ab10c844022979bff0aa509ec259d448bc2cc976a3a59ed03b18a163518e77ec72fe1010935a605 SHA512 57248a1296edb4b126fa5767c3c7251d4c11bceb8d73d7a8e3860d07679d782dceeca6277cbbf1573741ac948a0fba4eced94e978689cab1a145dff90e04932c
 AUX opencv-4.10.0-cudnn-9.patch 1890 BLAKE2B 08c9fd05bc3eb41e5ad2e74e17acb9d5d8fd8707106b2ceb581eef9b03d3e550acd91263807eaf1a730eb66a0246a7c4c02d84c56962fb8df1be82c9ed1c4e69 SHA512 79fa74ac37dfe6af3fb6a9417881cd42f5caeb31745e0144d0ea58b6da1250fd741f2e1b554e2bdd990cd25887601247eb537efdbab32a26930fe07bc1784c7d
 AUX opencv-4.10.0-dnn-explicitly-include-abseil-cpp.patch 1281 BLAKE2B e518599fd704c0551954af607ec76413fd599774994e347be3a723ca27f7c88ff669b3f61f841e9b614e22edb220ce844dc9b8d8c7484cd9c95ac4008ae07347 SHA512 9707e279358576270d24c0bc7e7e2d027c92a1897c9918a90b8b7641be2aaf8d4912dfd2bfa6c6c4fbf429dc3d6dde8b5cf1a6ed40d01154272d5f993e358463
@@ -27,5 +28,5 @@ DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLA
 DIST opencv_contrib-4.10.0-3607.patch 29870 BLAKE2B cf43afbd24d0b32817e908c55ac3bf0d5da8b82b2c459bc04ef31414e16285eefe334c46eeee730bd3cad2bbec062f5bc212a82bd7f2ac83baca231d711545d4 SHA512 3fdd08cee6d7da8edf36411f30c8d6230ebd86a1c896a08f1dc86d3a0982e1f1f99797066722bc51ce4b1a60a2db55853c348441b3e6edc0d318fcb7bd5cf944
 DIST opencv_contrib-4.10.0.tar.gz 55387316 BLAKE2B 5d6f884817b6d45b86833fcab1e31cd0fd7be19885698e0aefe300fa570f93c446d7f564567cc08099d559a98a65e9c3dd0fd35ceeca7e0e9a1e56edc74a0fe9 SHA512 480df862250692a97ce6431cba00dbecb70332307a19c1c04aa9d7444e6e74ab4f8c798548dce76d2319a9877624b82e361fb22a71df14b996087ade448be501
 DIST opencv_extra-4.10.0.tar.gz 504349887 BLAKE2B 6e76860beb95cf00698980a19cfd2894e5bfe0d477d94352cbb2ff98688acbc1c404953cbc3baa95453588e7b9063175a067f24006c5d2719a6c75d15f2ef891 SHA512 1a581dad61bc1e5075af5afed2dd3d67793232a9e1219408448d08c518ae714cf0c4d5fec2c25791351a49a0d265fe051ea142b2170f82843e19e82f65abc8c6
-EBUILD opencv-4.10.0.ebuild 43172 BLAKE2B 3967a8f5adb7c22d580a4bc695dfbd9da083a848b2d78e8b783f5ff850c9b13f2a9e3e647af5b76f09c535e410b6a1d8730f21f3d63c70386e082c36d4178a55 SHA512 3e44fb01a410d4d038f15669f4b9f05a36a3e47387fe4fdc7e773e00191a886da96de40c64eb3db2086150f54d0c36cb329a2c10bb735cf1c6ef147423ab3eea
+EBUILD opencv-4.10.0.ebuild 43218 BLAKE2B 206fc40b770ff0eadfb421fa78329980618fd6ed97cd88f813b4603689c40b794e187363f85b203448b3f26fc9d8f5e014bab23b2d22b71a9b48175569549d8a SHA512 56cee299ab2c9d9d8ce46b3126d4a566881bf281ca2d99e74dc42bf24d1cb2f347ea1718e61a4b2509d9f4649d52d0ef4522bbd0e2c8c2689025b0b425cf3175
 MISC metadata.xml 3937 BLAKE2B 5c56985141668333faa8e5f6f022207639cf1494bafba5ecfaf920b67a6b5de18d58c8535d2462ea6c973501400e927e5d15b220adc8b17dab78a184304849d3 SHA512 35cf8694e0a6e5a8017cff560238fc064493100da17bd35dc0ea926cd9a8e6de440cf1d860dc29df9b197c2b4f54a1e50152b495580f165ba44805443587672b
diff --git a/media-libs/opencv/files/opencv-4.10.0-cmake4.patch b/media-libs/opencv/files/opencv-4.10.0-cmake4.patch
new file mode 100644
index 000000000000..6078f1beba70
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.10.0-cmake4.patch
@@ -0,0 +1,165 @@
+https://github.com/opencv/opencv/pull/27192
+
+From cb8030809e0278d02fa335cc1f5ec7c3c17548e0 Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan@dennedy.org>
+Date: Wed, 2 Apr 2025 13:45:08 -0700
+Subject: [PATCH] Fix configuring with CMake version 4
+
+fixes #27122
+---
+ CMakeLists.txt                                                  | 2 +-
+ cmake/OpenCVGenPkgconfig.cmake                                  | 2 +-
+ .../introduction/linux_gcc_cmake/linux_gcc_cmake.markdown       | 2 +-
+ modules/python/CMakeLists.txt                                   | 2 +-
+ platforms/android/build-tests/test_cmake_build.py               | 2 +-
+ samples/CMakeLists.example.in                                   | 2 +-
+ samples/CMakeLists.txt                                          | 2 +-
+ samples/cpp/example_cmake/CMakeLists.txt                        | 2 +-
+ samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt | 2 +-
+ samples/hal/c_hal/CMakeLists.txt                                | 2 +-
+ samples/hal/slow_hal/CMakeLists.txt                             | 2 +-
+ samples/openvx/CMakeLists.txt                                   | 2 +-
+ 12 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7985623ffb53..ca402b65c9b1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,7 @@ endif()
+ include(cmake/OpenCVMinDepVersions.cmake)
+ 
+ if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
+-  cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
++  cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+   #Required to resolve linker error issues due to incompatibility with CMake v3.0+ policies.
+   #CMake fails to find _fseeko() which leads to subsequent linker error.
+   #See details here: http://www.cmake.org/Wiki/CMake/Policies
+diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
+index 4fc80f5e4b27..3532260efb53 100644
+--- a/cmake/OpenCVGenPkgconfig.cmake
++++ b/cmake/OpenCVGenPkgconfig.cmake
+@@ -110,7 +110,7 @@ endif()
+ # =============================================================================
+ else() # DEFINED CMAKE_HELPER_SCRIPT
+ 
+-cmake_minimum_required(VERSION 2.8.12.2)
++cmake_minimum_required(VERSION 3.5)
+ cmake_policy(SET CMP0012 NEW)
+ include("${CMAKE_HELPER_SCRIPT}")
+ include("${OpenCV_SOURCE_DIR}/cmake/OpenCVUtils.cmake")
+diff --git a/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.markdown b/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.markdown
+index 7cfbb31777d3..75bdc2ef42d0 100644
+--- a/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.markdown
++++ b/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.markdown
+@@ -63,7 +63,7 @@ int main(int argc, char** argv )
+ 
+ Now you have to create your CMakeLists.txt file. It should look like this:
+ @code{.cmake}
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project( DisplayImage )
+ find_package( OpenCV REQUIRED )
+ include_directories( ${OpenCV_INCLUDE_DIRS} )
+diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt
+index 93eab8c94d21..ec30f4215012 100644
+--- a/modules/python/CMakeLists.txt
++++ b/modules/python/CMakeLists.txt
+@@ -35,7 +35,7 @@ add_subdirectory(python3)
+ 
+ else()  # standalone build
+ 
+-cmake_minimum_required(VERSION 2.8.12.2)
++cmake_minimum_required(VERSION 3.5)
+ project(OpenCVPython CXX C)
+ include("./standalone.cmake")
+ 
+diff --git a/platforms/android/build-tests/test_cmake_build.py b/platforms/android/build-tests/test_cmake_build.py
+index 25d185b8e5c6..51affd1f3b4b 100644
+--- a/platforms/android/build-tests/test_cmake_build.py
++++ b/platforms/android/build-tests/test_cmake_build.py
+@@ -7,7 +7,7 @@
+ log.basicConfig(format='%(message)s', level=log.DEBUG)
+ 
+ CMAKE_TEMPLATE='''\
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
+ 
+ # Enable C++11
+ set(CMAKE_CXX_STANDARD 11)
+diff --git a/samples/CMakeLists.example.in b/samples/CMakeLists.example.in
+index 7cf20d5e44b3..59a133bc9d74 100644
+--- a/samples/CMakeLists.example.in
++++ b/samples/CMakeLists.example.in
+@@ -1,5 +1,5 @@
+ # cmake needs this line
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+ 
+ if(NOT DEFINED EXAMPLE_NAME)
+   message(FATAL_ERROR "Invalid build script: missing EXAMPLE_NAME")
+diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
+index 6a18b61afa33..dabe07747f81 100644
+--- a/samples/CMakeLists.txt
++++ b/samples/CMakeLists.txt
+@@ -62,7 +62,7 @@ else()
+ #  Standalone mode
+ #
+ #===================================================================================================
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+ 
+ project(samples C CXX)
+ option(BUILD_EXAMPLES "Build samples" ON)
+diff --git a/samples/cpp/example_cmake/CMakeLists.txt b/samples/cpp/example_cmake/CMakeLists.txt
+index 8d5cd98af291..f17aca4b5432 100644
+--- a/samples/cpp/example_cmake/CMakeLists.txt
++++ b/samples/cpp/example_cmake/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # cmake needs this line
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # Define project name
+ project(opencv_example_project)
+diff --git a/samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt b/samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt
+index 037d508569b3..1a35085aa2a6 100644
+--- a/samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt
++++ b/samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
+ 
+ FIND_PACKAGE(CUDA REQUIRED)
+ INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS})
+diff --git a/samples/hal/c_hal/CMakeLists.txt b/samples/hal/c_hal/CMakeLists.txt
+index 8cf78aa5ff63..72dfef01c3ad 100644
+--- a/samples/hal/c_hal/CMakeLists.txt
++++ b/samples/hal/c_hal/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+ 
+ set(PROJECT_NAME "c_hal")
+ set(HAL_LIB_NAME "c_hal")
+diff --git a/samples/hal/slow_hal/CMakeLists.txt b/samples/hal/slow_hal/CMakeLists.txt
+index 1ffa4670b6ab..a20596ea2a13 100644
+--- a/samples/hal/slow_hal/CMakeLists.txt
++++ b/samples/hal/slow_hal/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+ 
+ set(PROJECT_NAME "slow_hal")
+ set(HAL_LIB_NAME "slow_hal")
+diff --git a/samples/openvx/CMakeLists.txt b/samples/openvx/CMakeLists.txt
+index fd04e6b9e261..c5efdf9ad02a 100644
+--- a/samples/openvx/CMakeLists.txt
++++ b/samples/openvx/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ ocv_install_example_src(cpp *.cpp *.hpp CMakeLists.txt)
+ 
+-cmake_minimum_required(VERSION 2.8.12.2)
++cmake_minimum_required(VERSION 3.5)
+ 
+ set(OPENCV_OPENVX_SAMPLE_REQUIRED_DEPS
+   opencv_core
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index a1f434194b03..0209326a2531 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -338,6 +338,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.10.0-tbb-detection.patch"
 
 	"${DISTDIR}/${P}-protobuf-30.patch" # drop in 4.11
+	"${FILESDIR}/${P}-cmake4.patch" # PR pending
 
 	# TODO applied in src_prepare
 	# "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"