gentoo resync : 29.12.2022

6 files changed, 88 insertions, 261 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index c9e7545ab6c2..c1f3bea8d324 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,14 +1,9 @@
 AUX 1.42.4-CVE-2019-1010238.patch 1088 BLAKE2B 7517b2b4c3502546a554d3b592c8c48af444bf2797fcffd18bd63fb97023f3fff666c70359d4935cf179d7e98be12b885e5a2937d882b27f213e17658002e0a9 SHA512 24f46b5d14dd589b0d5ca992169fb46a696d0251c63cf3c0210bfded534f4f35d20bcd158c4397d6ebe828ae995a5321daca4ecc634f0d5f38bc7f5ccf8f2fee
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
+AUX 1.50.7-harfbuzz-4.patch 2168 BLAKE2B 3aab03d810e6cb6b540c9381b310ef76cde1b4d3053db40fbf28f3bcb1a5de979927ff12d19639ad95af84dcf2b45eae5f2e148c00fb3d4243148ba928285176 SHA512 cdd895141817d4e0e363a3e9f2ae0df03c0cf379b6868689fa39fbd63b090864d59f74c1c432e55479e45ca0e14d4254cd2f4758b80f9f7cdb383285e953866c
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-DIST pango-1.50.4.tar.xz 4290504 BLAKE2B 310a7be79ebf693b3a7775fa86557539bf4ea682b0903266248ab2812504e805024b14a917531e71ad9b5637d4d3f3c1a06b84188eb01aeed37fdcc7d11679a9 SHA512 b44cf9bd7afd633fab326e70b69dcb9f00cc26dcc36361793d3654b5ae798a303d4e63e173370f396c4fa474a4118c53076927fe7cc944fc35a32adf3a656806
-DIST pango-1.50.5.tar.xz 4291708 BLAKE2B 90a1fc927ee1e06eb76ea6b82e9851e3381d5393a1992db0d3da4d3a934b5bf08f4485b40a9eef58aa906e3f0b74e71f491d947ae00310130ec5e23bde47d836 SHA512 6e898945ca9682ad113cea8a5702068d6141d39bc51a27093c6c1627c10825005155c73778cb5acab99551689dd1b47069f7d5ea102db11f00416ddcf747b8c6
-DIST pango-1.50.6.tar.xz 4293168 BLAKE2B 63cad33f5fe5361642edb0e26a11c45e28e23400f29c078079fa9ce4411eca90c67fdd789e8cf9caec0f1d4a6b5d619808d8dcf53447f961b66db17e1bbcdb97 SHA512 27fe5b2398995fc9103dbb957bb10e5f35284762260fe29366eafd2ba570d90bb0d2f865bd78ed6728417dfde54931f014aaa2155e3eae054e1a45a2a07bf90f
 DIST pango-1.50.7.tar.xz 4294752 BLAKE2B 049b7c09f2ec35ca229eadcd146513d2b292fac8c2296a1635f32c1e21a2ff14979c4ce4a88f966d2d85dad55e356f089c09e00062d06373f7d0760871333046 SHA512 4d754ed753fc34074c2a8751459406af7eb1eccb227c6158287f7e2921614d918cae47d078d4a2b4c098b641e40274e81bf1ec6b6a1b147efd550626665767d3
 EBUILD pango-1.42.4-r2.ebuild 2317 BLAKE2B 7bbc0227f8b846c1e51cc142e7a3088ec88c2fdc35fff8970daf3699e94e369de66380fc140aca039accd546270be27c809e13c0a71d42ae8df19f64198d22c8 SHA512 8c1c0f11ad9ecbe7f464e7b839de614e4f266d2674b843d133489b882270f02754c61b05f2624a2b4c9d571b7824d2a142ccc2105e2c7e968fc26e97e2936c1d
-EBUILD pango-1.50.4.ebuild 2264 BLAKE2B d506d18f028db1a83bd38485a60706f7563f08f1b4bf5256a8e2d3a1be097030281d60a4946b8812b89c55d19c3d5a2dd4e3d11a7b24827a2fa0201c75c58d69 SHA512 769ba222582a9cd3c4b3bbacb2b27d5c5cc5cdb752a93ea8d94036ce35c9b31e0a1614c5b4384ca320edcfcc681204e2a4fff37b75adbdb56ed99ab2ab3073de
-EBUILD pango-1.50.5.ebuild 2272 BLAKE2B 5c1fa2368a5f1fe99f4e50cac03851c0cb28ec7fca9318d614257583df94182d07ef754990911466aafd75b0122c839106e51c90c5cc4a04bbdddf85bf8f9ce5 SHA512 f07c6b8ce20b9855790a3fcd075480294646be56ce1184b72125784f6c5717ac94f3fdd02f73e13137d6ad136c2780cd5d190ff9fffddbc426284bffc50031ea
-EBUILD pango-1.50.6.ebuild 2272 BLAKE2B 5c1fa2368a5f1fe99f4e50cac03851c0cb28ec7fca9318d614257583df94182d07ef754990911466aafd75b0122c839106e51c90c5cc4a04bbdddf85bf8f9ce5 SHA512 f07c6b8ce20b9855790a3fcd075480294646be56ce1184b72125784f6c5717ac94f3fdd02f73e13137d6ad136c2780cd5d190ff9fffddbc426284bffc50031ea
-EBUILD pango-1.50.7.ebuild 2278 BLAKE2B 813a7f842496d18f60c16cd00d25fd41a06a0d41ed9ba73034762338112ee7531a1efb2740758c91b5507e42261d6f528b59c1ce703957bf9c3bf3c80989ac3a SHA512 fda25bf8721f39e2d643bddda1f2977b935d649a5756bb9fdeee1969b35f65b17ccb8a368fdb450979e5690338cd7c99a89b8da9a5333d0b685882481aa11194
+EBUILD pango-1.50.7.ebuild 2393 BLAKE2B e71c83d31bb46754c830caf45f3c30ab369cb9225400b406fd0f75a4fe0cb854fdfe2338a9fc9431256415128846ddad0b81b9e4b0b6f87183752aaa1a3870c9 SHA512 d15bc369f30091885a59ec14c870210d0592eddb359ea1c00f2d03d3be793098bd6185475db358f48ebd8a770315b879b95ceaa7d6e60169f13037459344248d
 MISC metadata.xml 523 BLAKE2B 623788e7504fe89c7d8604eaa2a6b1ab5fb022965eaa3044dd2a94b6f68638453011257659c0f17b7ced9b6945acb3eb4767f9fd3ce9686b69b3b60b867dcdfb SHA512 a60feab6e4e50cb9b477f388d4534eed4616fac6aca4f6eae450fac42bfa9ca0d7382e36b98a159732f9c6926162cb2ea55d72a644bc77629ff09fd0097226eb
diff --git a/x11-libs/pango/files/1.50.7-harfbuzz-4.patch b/x11-libs/pango/files/1.50.7-harfbuzz-4.patch
new file mode 100644
index 000000000000..91598f9969e5
--- /dev/null
+++ b/x11-libs/pango/files/1.50.7-harfbuzz-4.patch
@@ -0,0 +1,78 @@
+https://gitlab.gnome.org/GNOME/pango/-/commit/0226bdd9c223f5651b6657a14cebc900bbac4b19
+https://bugs.gentoo.org/836317
+
+Fixes tests with Harfbuzz 4.0.0 ish.
+
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Fri, 10 Jun 2022 08:00:22 -0400
+Subject: [PATCH] Update tests to pass on F36
+
+Rounding differences are our downfall :(
+--- a/tests/layouts/valid-14.layout
++++ b/tests/layouts/valid-14.layout
+@@ -25,7 +25,7 @@
+     "is-ellipsized" : true,
+     "unknown-glyphs" : 1,
+     "width" : 161792,
+-    "height" : 20480,
++    "height" : 21047,
+     "log-attrs" : [
+       {
+         "char-break" : true,
+@@ -261,7 +261,7 @@
+               ]
+             },
+             "flags" : 0,
+-            "y-offset" : 0,
++            "y-offset" : 567,
+             "start-x-offset" : 0,
+             "end-x-offset" : 0,
+             "glyphs" : [
+@@ -360,7 +360,7 @@
+               ]
+             },
+             "flags" : 0,
+-            "y-offset" : 0,
++            "y-offset" : 337,
+             "start-x-offset" : 0,
+             "end-x-offset" : 0,
+             "glyphs" : [
+--- a/tests/layouts/valid-20.layout
++++ b/tests/layouts/valid-20.layout
+@@ -40,7 +40,7 @@
+     "is-wrapped" : false,
+     "is-ellipsized" : false,
+     "unknown-glyphs" : 0,
+-    "width" : 67584,
++    "width" : 76800,
+     "height" : 25600,
+     "log-attrs" : [
+       {
+@@ -138,7 +138,7 @@
+             "glyphs" : [
+               {
+                 "glyph" : 244,
+-                "width" : 15360,
++                "width" : 18432,
+                 "x-offset" : 14764,
+                 "y-offset" : 3845,
+                 "is-cluster-start" : true,
+@@ -146,7 +146,7 @@
+               },
+               {
+                 "glyph" : 272,
+-                "width" : 15360,
++                "width" : 18432,
+                 "x-offset" : 14764,
+                 "y-offset" : 4280,
+                 "is-cluster-start" : true,
+@@ -154,7 +154,7 @@
+               },
+               {
+                 "glyph" : 273,
+-                "width" : 15360,
++                "width" : 18432,
+                 "x-offset" : 14764,
+                 "y-offset" : 3507,
+                 "is-cluster-start" : true,
+GitLab
diff --git a/x11-libs/pango/pango-1.50.4.ebuild b/x11-libs/pango/pango-1.50.4.ebuild
deleted file mode 100644
index 92c1485a0b64..000000000000
--- a/x11-libs/pango/pango-1.50.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic gnome2-utils meson-multilib xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
-
-IUSE="debug +introspection sysprof X"
-
-RDEPEND="
-	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	dev-util/glib-utils
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DPANGO_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS
-	fi
-
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		-Dgtk_doc=false # we ship pregenerated docs
-		$(meson_native_use_feature introspection)
-		-Dinstall-tests=false
-		-Dfontconfig=enabled
-		$(meson_feature sysprof)
-		-Dlibthai=disabled
-		-Dcairo=enabled
-		$(meson_feature X xft)
-		-Dfreetype=enabled
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/gtk-doc/html
-	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
-	doins -r "${S}"/docs/Pango*
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if has_version 'media-libs/freetype[-harfbuzz]' ; then
-		ewarn "media-libs/freetype is installed without harfbuzz support. This may"
-		ewarn "lead to minor font rendering problems, see bug 712374."
-	fi
-}
diff --git a/x11-libs/pango/pango-1.50.5.ebuild b/x11-libs/pango/pango-1.50.5.ebuild
deleted file mode 100644
index 13c9fd367584..000000000000
--- a/x11-libs/pango/pango-1.50.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic gnome2-utils meson-multilib xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="debug +introspection sysprof X"
-
-RDEPEND="
-	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	dev-util/glib-utils
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DPANGO_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS
-	fi
-
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		-Dgtk_doc=false # we ship pregenerated docs
-		$(meson_native_use_feature introspection)
-		-Dinstall-tests=false
-		-Dfontconfig=enabled
-		$(meson_feature sysprof)
-		-Dlibthai=disabled
-		-Dcairo=enabled
-		$(meson_feature X xft)
-		-Dfreetype=enabled
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/gtk-doc/html
-	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
-	doins -r "${S}"/docs/Pango*
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if has_version 'media-libs/freetype[-harfbuzz]' ; then
-		ewarn "media-libs/freetype is installed without harfbuzz support. This may"
-		ewarn "lead to minor font rendering problems, see bug 712374."
-	fi
-}
diff --git a/x11-libs/pango/pango-1.50.6.ebuild b/x11-libs/pango/pango-1.50.6.ebuild
deleted file mode 100644
index 13c9fd367584..000000000000
--- a/x11-libs/pango/pango-1.50.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic gnome2-utils meson-multilib xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="debug +introspection sysprof X"
-
-RDEPEND="
-	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	dev-util/glib-utils
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DPANGO_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS
-	fi
-
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		-Dgtk_doc=false # we ship pregenerated docs
-		$(meson_native_use_feature introspection)
-		-Dinstall-tests=false
-		-Dfontconfig=enabled
-		$(meson_feature sysprof)
-		-Dlibthai=disabled
-		-Dcairo=enabled
-		$(meson_feature X xft)
-		-Dfreetype=enabled
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/gtk-doc/html
-	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
-	doins -r "${S}"/docs/Pango*
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if has_version 'media-libs/freetype[-harfbuzz]' ; then
-		ewarn "media-libs/freetype is installed without harfbuzz support. This may"
-		ewarn "lead to minor font rendering problems, see bug 712374."
-	fi
-}
diff --git a/x11-libs/pango/pango-1.50.7.ebuild b/x11-libs/pango/pango-1.50.7.ebuild
index f3c9e0dbfdde..366b60090874 100644
--- a/x11-libs/pango/pango-1.50.7.ebuild
+++ b/x11-libs/pango/pango-1.50.7.ebuild
@@ -11,9 +11,10 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
-IUSE="debug +introspection sysprof X"
+IUSE="debug +introspection sysprof test X"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
@@ -37,8 +38,13 @@ BDEPEND="
 	dev-util/glib-utils
 	sys-apps/help2man
 	virtual/pkgconfig
+	test? ( media-fonts/cantarell )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-harfbuzz-4.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	gnome2_environment_reset