3 files changed, 2 insertions, 108 deletions
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index f974e2705309..06846405a960 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,6 @@
-DIST harfbuzz-8.4.0.tar.xz 19241260 BLAKE2B 03d6bf0f70354d01ee85edb9fb80d48a91301f862f94f66fddc57ec808105dbeea013e595e2ee616d364773bb68bf5135d4cd44f31a5d3894952a1dced98855c SHA512 9d79ea86f7642f2f1a8726e12a48363eb395162c9b50524e7651b63ad3bb458a69fc82427dbcbfe2550231138f7e454b2c12097a51890f63c645fa3dc668f542
 DIST harfbuzz-8.5.0.tar.xz 19468172 BLAKE2B f598d7de953834499d1ab36c0fc9d95099fd7e99b87f630e1527aaa39deb2d339b9f3caaea3643238c6c1b321557f794f273929950b54fe9de2faa430d77855a SHA512 d5762f77b0913792d34596e6f3adb98ab693e2ef928396f997ca2e647ca7cad13fdd204fa15b49e2f7c33320ff210d7f078215d5765c9365571458b919a4f10c
 DIST harfbuzz-9.0.0.tar.xz 17895360 BLAKE2B fd35c41d25e77c96b1fc760b8ca0ffd1ac8f3382b51991bb28797d55c2171bf0700ac65266996bf5cab82b8e9c835c2fad9c8374d9c60d2a361c924d805afbf6 SHA512 2700b560727d9c4440ad9c74a170b857f20f9e553e5d98b0c4bcf086a25ba644149d7c89009a41d964af7a924efcc486da4dcbfa5cc4d47f9f10e9b6b8c689af
-EBUILD harfbuzz-8.4.0.ebuild 2714 BLAKE2B 9384baff4e8f17ea5eed5d98c06154f8b0b9c44d91a2c9711f9be092d10801de9a0125ab9f27b8450b18e86b69a5d6f8a5fd0f277670c84d5bfc8b5f71053129 SHA512 3eee664d83089939d5b4b085d971518958445e1594403fae2f1bc19c58e0a4bdea62dc23a931b823ac373dfe2adedc1a2aa2a2709e86f087095300bc9970f8c1
-EBUILD harfbuzz-8.5.0.ebuild 2715 BLAKE2B 0e9548235503242792d23fb8cfe4ce48aa6eb31605b7c7a090a92d9eddd6ffc89cbee42593d7eaecccabb79dba954da02877ea82f4c9a4a16e2e2c023540c013 SHA512 bb805c289c937b37be056bbecc9480481c15bfec379ad2034ab36243945dd43d1d19c22187fd08c91f636b672ccffd9770ae0bedd2167f76fe3da0517cb748e1
+EBUILD harfbuzz-8.5.0.ebuild 2714 BLAKE2B 9384baff4e8f17ea5eed5d98c06154f8b0b9c44d91a2c9711f9be092d10801de9a0125ab9f27b8450b18e86b69a5d6f8a5fd0f277670c84d5bfc8b5f71053129 SHA512 3eee664d83089939d5b4b085d971518958445e1594403fae2f1bc19c58e0a4bdea62dc23a931b823ac373dfe2adedc1a2aa2a2709e86f087095300bc9970f8c1
 EBUILD harfbuzz-9.0.0.ebuild 2426 BLAKE2B 173e25f2d675f85245d22639e6ea4600923b824edc3d611a9eb27809c11cb2f17cec4bce92f1ffcf8a8f43fa5f4ff2c0806dce233eb52642d2cceab167d43349 SHA512 fb86b70e62f260f49f0429d4d3202a26be2a806eff44190bd280c13e1f7c02ff4cbc576f22ccefa4a8448757bdb54c5bc1c2a130a1df00c3f4e7dc0b6d6a26cc
 EBUILD harfbuzz-9999.ebuild 2426 BLAKE2B 173e25f2d675f85245d22639e6ea4600923b824edc3d611a9eb27809c11cb2f17cec4bce92f1ffcf8a8f43fa5f4ff2c0806dce233eb52642d2cceab167d43349 SHA512 fb86b70e62f260f49f0429d4d3202a26be2a806eff44190bd280c13e1f7c02ff4cbc576f22ccefa4a8448757bdb54c5bc1c2a130a1df00c3f4e7dc0b6d6a26cc
 MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70
diff --git a/media-libs/harfbuzz/harfbuzz-8.4.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.4.0.ebuild
deleted file mode 100644
index 2035e9dc70fb..000000000000
--- a/media-libs/harfbuzz/harfbuzz-8.4.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-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 ~ia64 ~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 #726120
-	sed -i \
-		-e '/tests\/macos\.tests/d' \
-		test/shape/data/in-house/Makefile.sources \
-		|| die
-
-	# bug #790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-
-	# bug #762415
-	local pyscript
-	for pyscript in $(find -type f -name "*.py") ; do
-		python_fix_shebang -q "${pyscript}"
-	done
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for introspection, bug #535852
-	local emesonargs=(
-		# ICU 75 needs C++17 (bug #931090)
-		-Dcpp_std=c++17
-
-		-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-8.5.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild
index 1d243727ad03..2035e9dc70fb 100644
--- a/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-8.5.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"