gentoo auto-resync : 30:04:2023 - 23:18:21

3 files changed, 0 insertions, 227 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index aa936a61f1ec..807573203b92 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,10 +1,7 @@
-AUX harfbuzz-5.3.1-meson-freetype-icu.patch 5077 BLAKE2B e8eee50d555f7d12b374885e56d946b6283b2a041c4aa0d42bbb0463eca6a039aaef329ca9900f939dbc8a8797784d4e1719be3717e07c1d101827c11ce7f70d SHA512 5a6e3eb18153b87610c0cd14cefb4decf23183b4bebe439edacd3f61d3cfebb0863727dab395aef8bbd38264bf2e741181d0949c78b89cfdb353eb6fa08586cc
 AUX harfbuzz-6.0.0-gcc-13.patch 1065 BLAKE2B 4ecd58ed029c192035b35f9752b7795c77c0185b2189cd489ba1738a3e4a2b0a69e4f48a957d1d125ac42d6e5733d05b2bdb0cc32eba88166ab8270046650c38 SHA512 47c3033f902bc61edc3990dff0ad6e5c1272e300d93cb8d1724b2b891effed373f20c36b965ad35ed9d028e354a338bd6c8e4605eaffb952bf34522e99fa4fcf
-DIST harfbuzz-5.3.1.tar.xz 17874260 BLAKE2B e4d3926daca4f5c95441a9b99e10acd4b95bf365f56934a2bbb8b35955e8457a90a13b0ad3223d8350012373216083e910f517b34c0dffb09fb218a1f8e9ca48 SHA512 6b0aef2b7445f4a71c324b545414114507d8077dc186366f25140dcd3bedeee67868cfc65c0eef59ed950381a4c101a541900be4995f645377c11754b027b501
 DIST harfbuzz-6.0.0.tar.xz 18952524 BLAKE2B bb08f90cf9540a076ec2fe5498658a0e5f963537ebd98fce271af9070d0fc7178346bf56c600720d433c9e3a403f67ec3ac898abeb1da12697ad22980ecf5204 SHA512 66f8484586b1b334479d739df1d1107172715ce1d2a3c0105375174fa3e201fd69ceb1543c10d6db49b012912e823befc701f00621f7b5f68036eced80d36f65
 DIST harfbuzz-7.1.0.tar.xz 18655864 BLAKE2B e152ca15db53b6130cff039f039ee7f95134eac297c434941e7aa9b66e8925275de213680769cd8170ab28785985f3d288af23444087ca35f2861f17018a5943 SHA512 2f15bf14f927263c34201dba067ffac84133610121c58843c566d6f271f30f1dce44832a65bceb83828e25e9dd1a1d2a1610c5dbe2bef3ddbcecd7b5bcab8714
 DIST harfbuzz-7.2.0.tar.xz 18716956 BLAKE2B 247746d6a0f132a0d6b0c461d9e96a4fe76bc08bca4d05b28a034de60afee8e049d798fdf3962b892b33424245d8f00a63d6068b034e80ad9d7733180e8533c1 SHA512 c32ae887fa13da332a88885baa387fc472e501f5f682dcbdf5f038a25a18a75948a1313a94612ee44beae169fb1ddd66b883e7a2d236d0ad5b81476b5c4d3cb2
-EBUILD harfbuzz-5.3.1-r1.ebuild 2638 BLAKE2B 7eb5e51db916d3ba539e257722ebb9f43cf04b3d19c04d3d56284a34e435ac25c957048d23693afa61c2ba902151107ecd851d2c69b3d3faa497cdb20eeb7791 SHA512 1cd308511e362075ef7fc17a82831f41d2ab2bdf2d23911b7d9d5b634f309d3c921e0e6bb1025ed9f99cfe7d70b2e87bba72b7b26be6c06b9c542614d55ef960
 EBUILD harfbuzz-6.0.0.ebuild 2624 BLAKE2B e8509ea5a4c0b241d908165d6c23cf90d920fbbc1ba45f272607058bf30646feb385f313fe6e358983ac7a71c3f43ac774090ff86179d6c139a3d42f1c65a8cc SHA512 a5c3fdb502ec3b06f12a0e58ce060058f96665908fcfdb50bd268655fa16ee11ce9c6906e09105b628a4f97702cbd5fb5abd4e8a99b9b5a34802c71dd56f9375
 EBUILD harfbuzz-7.1.0.ebuild 2554 BLAKE2B f12f3781177ef9e3818a372b83ea4dfb07cc386d7d28d4c508b049c2ee4098b4d599da3c4875e296d789bc6af26480882fe2ff7ab9045bd072e12cb354083471 SHA512 ee9d6575e120f413392473528d9445fbf6116c93bb798f41b703db0ef93acb07ac77265e37814b0b22a084cbc4532427b6000a9b48f7f81619882e5548abb7a1
 EBUILD harfbuzz-7.2.0.ebuild 2623 BLAKE2B 0ef33c99c51199dd52e6c6b3e5e24490738809b7da6a6d48b3ee4ad6c6d8cadb3d1f135f7c3f947cbde082212fa6809cc2fb4cd4ecc3944684e4bfae3baff3a6 SHA512 cc64e6057697cc7ec827d1e0b0d77887434e7e5d3e9dd6ea0a787680dbb9b1a3d113046230436685b47972479eb62b5eccd74e04f3f206672b4676bfd7d94c16
diff --git a/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch b/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
deleted file mode 100644
index 3e0a7beece9c..000000000000
--- a/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-https://bugs.gentoo.org/880479
-https://bugs.gentoo.org/880405
-https://github.com/harfbuzz/harfbuzz/pull/3870
-
-From 2c14943fb06ffd6de4e270454501ff5d305ede6e Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Tue, 8 Nov 2022 16:24:08 -0500
-Subject: [PATCH] meson: fix regression in detecting freetype2/icu-uc when
- explicitly disabled
-
-In #3811 / commit 53a194aa3f5f7de0b40e879e41fcbe0de6e9fefe a broken and
-half-implemented approach to kind of sort of handling the detection of
-both pkg-config and cmake names for dependencies, was implemented. It
-just checked for both versions with required: false, but when the build
-was configured with *disabled* options, it was still found because it
-was treated as auto.
-
-Really, the problem here is trying to outsmart Meson, which handles a
-lot of edge cases correctly. But it's possible, albeit very wordy, to
-manually implement Meson's internal logic via if/else fallbacks. Do so
-here.
---- a/meson.build
-+++ b/meson.build
-@@ -83,20 +83,35 @@ check_funcs = [
- 
- m_dep = cpp.find_library('m', required: false)
- 
--
--# Try pkgconfig name
--freetype_dep = dependency('freetype2', required: false)
--if not freetype_dep.found()
--  # Try cmake name
--  freetype_dep = dependency('freetype', required: false)
--endif
--if not freetype_dep.found()
--  # Subproject fallback, `allow_fallback: true` means the fallback will be
--  # tried even if the freetype option is set to `auto`.
--  freetype_dep = dependency('freetype2',
-+if meson.version().version_compare('>=0.60.0')
-+  # pkg-config: freetype2, cmake: Freetype
-+  freetype_dep = dependency('freetype2', 'Freetype',
-                             required: get_option('freetype'),
-                             default_options: ['harfbuzz=disabled'],
-                             allow_fallback: true)
-+else
-+  # painful hack to handle multiple dependencies but also respect options
-+  freetype_opt = get_option('freetype')
-+  # we want to handle enabled manually after fallbacks, but also handle disabled normally
-+  if freetype_opt.enabled()
-+    freetype_opt = false
-+  endif
-+  # try pkg-config name
-+  freetype_dep = dependency('freetype2', method: 'pkg-config', required: freetype_opt)
-+  # when disabled, leave it not-found
-+  if not freetype_dep.found() and not get_option('freetype').disabled()
-+    # Try cmake name
-+    freetype_dep = dependency('Freetype', method: 'cmake', required: false)
-+    # Subproject fallback, `allow_fallback: true` means the fallback will be
-+    # tried even if the freetype option is set to `auto`.
-+    if not freetype_dep.found()
-+      freetype_dep = dependency('freetype2',
-+                                method: 'pkg-config',
-+                                required: get_option('freetype'),
-+                                default_options: ['harfbuzz=disabled'],
-+                                allow_fallback: true)
-+    endif
-+  endif
- endif
- 
- glib_dep = dependency('glib-2.0', required: get_option('glib'))
-@@ -104,18 +119,36 @@ gobject_dep = dependency('gobject-2.0', required: get_option('gobject'))
- graphite2_dep = dependency('graphite2', required: get_option('graphite2'))
- graphite_dep = dependency('graphite2', required: get_option('graphite'))
- 
--# Try pkgconfig name
--icu_dep = dependency('icu-uc', required: false)
--if not icu_dep.found()
--  # Try cmake name
--  icu_dep = dependency('ICU',
--                       required: false,
--                       components: 'uc',
--                       method: 'cmake')
--endif
--if not icu_dep.found()
--  # Subproject fallback if icu option is enabled
--  icu_dep = dependency('icu-uc', required: get_option('icu'))
-+if meson.version().version_compare('>=0.60.0')
-+  # pkg-config: icu-uc, cmake: ICU but with components
-+  icu_dep = dependency('icu-uc', 'ICU',
-+                            components: 'uc',
-+                            required: get_option('icu'),
-+                            default_options: ['harfbuzz=disabled'],
-+                            allow_fallback: true)
-+else
-+  # painful hack to handle multiple dependencies but also respect options
-+  icu_opt = get_option('icu')
-+  # we want to handle enabled manually after fallbacks, but also handle disabled normally
-+  if icu_opt.enabled()
-+    icu_opt = false
-+  endif
-+  # try pkg-config name
-+  icu_dep = dependency('icu-uc', method: 'pkg-config', required: icu_opt)
-+  # when disabled, leave it not-found
-+  if not icu_dep.found() and not get_option('icu').disabled()
-+    # Try cmake name
-+    icu_dep = dependency('ICU', method: 'cmake', components: 'uc', required: false)
-+    # Try again with subproject fallback. `allow_fallback: true` means the
-+    # fallback will be tried even if the icu option is set to `auto`, but
-+    # we cannot pass this option until Meson 0.59.0, because no wrap file
-+    # is checked into git.
-+    if not icu_dep.found()
-+      icu_dep = dependency('icu-uc',
-+                           method: 'pkg-config',
-+                           required: get_option('icu'))
-+    endif
-+  endif
- endif
- 
- if icu_dep.found() and icu_dep.type_name() == 'pkgconfig'
-
diff --git a/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild b/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild
deleted file mode 100644
index 63ea38ab164d..000000000000
--- a/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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
-SLOT="0/4.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:= )
-	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}
-	>=dev-libs/gobject-introspection-common-1.34
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-freetype-icu.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	# bug #726120
-	sed -i \
-		-e '/tests\/macos\.tests/d' \
-		test/shape/data/in-house/Makefile.sources \
-		|| die
-
-	# bug #618772
-	append-cxxflags -std=c++14
-
-	# bug #790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	# 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=(
-		-Dcoretext="disabled"
-		-Dchafa="disabled"
-
-		$(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 cairo)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-
-		$(meson_use experimental experimental_api)
-	)
-
-	meson_src_configure
-}