gentoo resync : 14.08.2021

4 files changed, 81 insertions, 4 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 2be8ff33ce99..bb338e9b60d4 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -4,8 +4,10 @@ DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 DIST pango-1.48.5.tar.xz 1819476 BLAKE2B 8529e8cbcf0f33be56cf09229abe45fb3525e12a9c2a6ad7cca416ff67a92eb010abc2ce814fa4d19a924186369eede4a576efdd2f4c64b39e31c9821c5e414a SHA512 2c758e649af5b9f9fa960c26a6f4dcf5abd8035101fdfe4a02fe02cb892250b615584b02d63aaa06f3da5cbe7bb848459ac969f43437c34cec084b51bcf48cab
 DIST pango-1.48.7.tar.xz 2050880 BLAKE2B 2ee048d9713aed0972ffdf3feb96c7c0683ffa1494ac2b798a4f6b1f5797d689b0e0c06bcc3f4a10130d23279ed295a3a59141c75bd3a0f2da7facf62d6c3baa SHA512 e5680d628f531bea7633945bd74dc51a93c4c881dec58fcf9f6271043e77b82a4805e311355cb4d9f8cdfcdf52785a5a6391517a264b62416c26e82dff4aca39
+DIST pango-1.48.8.tar.xz 2061300 BLAKE2B 0a7fc00e15ce5c0362c6d6e115c46037e8f92c181db35bdc048fbd4ebf0c8983be81b5d9f751afe00436e8ab50013153be7851854fdb81954352099e229633d0 SHA512 172beb06b0bba2c06449c3117e69ae58c17ea2e501ab2ee33258129c04ff045d2e71b80ff2c1dbd405b758085d657c201d19a845dddefc0a61261037e861cd36
 EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
 EBUILD pango-1.48.5-r1.ebuild 2140 BLAKE2B e53a8cab9f9de8c8e5828fbfe3784877ef4c416ee39a1780a49b0978c5f4a85ff21e2a53a3204c65a51458d25b143ce8361dc8323fa34167981066040cb982ab SHA512 ebadd72e5bfb7ed5fccc1da685d6b973c7931fcc076c6a466e49e8c41980e0a781f3ff42272b83b0b9db02224b9a30881fd2f0c484c9f0f163101f17e1b5b3c9
-EBUILD pango-1.48.7-r1.ebuild 2053 BLAKE2B 1b729b32692a2324bffc00de5e03d800fc6db3810385b8110b7664e3c6349cc4fbd7e2888f765166d5505b8ec0edb1464106ff35a8c75ca0ae6ce824777f3537 SHA512 81e4946d186614e2028d6ed714e3798590b7fde1ba45f943e10f7a9e1796270ef656f80c8a8455dc49fc6409a77eb39d6585e580bef5363032c4379a08d9816e
-EBUILD pango-1.48.7.ebuild 2190 BLAKE2B 748b0b14323d74607ca92991bb6a58440869fc3fc9996c858c1bb9f7b91d7c9911d358d8e1de7f53cb3bceab6aa09fe38491680851ab4883526bb4a59b33186b SHA512 d789063995b19a11a48c54899fbbfcdeb56b06bbb5f8ddc54b5ab919f05fbe5d420b2b462c1abf2ca37648e9ef20983b6decb21f60e083e0ccd291161723db89
+EBUILD pango-1.48.7-r1.ebuild 2052 BLAKE2B 1de2a75042e1f1132e945d832716011425003d7077b8ba8ece55dadb7390cdc9e355e8a423a7eebb6d0102025d524a1fa2bc0541be1f86f2c601fc1cda77cf34 SHA512 bbfd4adfb62ad0d827553053f310b7c237f07f6597537b7702183baa0cb3cfc039ebf43996934ad745c1ddab52349eb43bb702daf46fc2fc664606ad231b045d
+EBUILD pango-1.48.7.ebuild 2189 BLAKE2B 5039ee583f4d18dc93fe51f398e47ebf55acf617e320042cf8ed4ae431fd2b9829513a86e54125db65c3e6a384dabebe04e1c1a82ceb12cf0e3d372204f16573 SHA512 58bfe2f21bfb7a161a5cc3e0140313c0656f076f46aa5668b06b9537d754894abcd7a96438d2335ec070814853193b3e3e4b97e86a1a5f0628e097e16c29c4b4
+EBUILD pango-1.48.8.ebuild 2054 BLAKE2B 487470875c5a78508292841229e1600208c73dcf4bf10accbffeff3f7ff04e85c2cf3623d085af116e753efc172951b3b9c168996859c6253430a9ca1ab4c369 SHA512 1c87f5774542d295a7f5ef2d8fe3445654493ce426af739d0f823c03732021df5667195462f498daf670f908e23558f43cb7e81802fbaa7faf98a44dcdc290c9
 MISC metadata.xml 522 BLAKE2B 9e37b7287a6d6567d68daea4265ae5d13d3c336682408bdeb4f7ef92b9cd9907c4f69052fb52b59a8cd55eb40d04c660fedde562ac2a85e41844189810ed4fb8 SHA512 6af19288fc9a7e9f441f64df4e74f32ade7303df52e1c285275e41f34f0d7664b22167793c08e79e6667fe27f44afe5c1b8548d68f5878d63a432e293956fd82
diff --git a/x11-libs/pango/pango-1.48.7-r1.ebuild b/x11-libs/pango/pango-1.48.7-r1.ebuild
index 306afbbf4a59..f343da45e60c 100644
--- a/x11-libs/pango/pango-1.48.7-r1.ebuild
+++ b/x11-libs/pango/pango-1.48.7-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="debug +introspection sysprof X"
 
 RDEPEND="
 	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
 	>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
 	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
 	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
diff --git a/x11-libs/pango/pango-1.48.7.ebuild b/x11-libs/pango/pango-1.48.7.ebuild
index b225dec34899..c07ba38597fd 100644
--- a/x11-libs/pango/pango-1.48.7.ebuild
+++ b/x11-libs/pango/pango-1.48.7.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( introspection )"
 
 RDEPEND="
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
 	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}]
diff --git a/x11-libs/pango/pango-1.48.8.ebuild b/x11-libs/pango/pango-1.48.8.ebuild
new file mode 100644
index 000000000000..31ec4a4021ca
--- /dev/null
+++ b/x11-libs/pango/pango-1.48.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic gnome2-utils meson-multilib toolchain-funcs 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 ~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.2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${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*
+}