gentoo resync : 31.05.2021

6 files changed, 6 insertions, 304 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 9a74121d989b..c1bf0bf4ed7e 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,15 +1,8 @@
 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 pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch 1148 BLAKE2B 3d11b4da8d8d518e295af03f1fee1339e493cb0e6a8f3db3778986b53deab5a2a6193d5c0aeb38461a9f2fa5d32324eb23fc3cd16ccd927602bf76a805036538 SHA512 8c70c0e42b25946f1e4bf907e353c78721389ac726ef4574f1d2e34e4d6f93fcdd7d4d095c5fa0d6f1e085b148d7ed653713dd1876a255dd7703bf190f2d159f
 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.44.7.tar.xz 521384 BLAKE2B 9917efc1bcc9115331149d77eb9b15373d4331ed6a8e5542a97fbbbb480eb0557736d4f1817c0fd56262f442e4b3c2c68607baacdd38b1684def1af58a583bfb SHA512 6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350
-DIST pango-1.48.3.tar.xz 565956 BLAKE2B 6860ae9df2b8629bdd1c5acf03453e1c6d62d8fd100752a6d5762ab1e0f2b3cbefb55e0f3476e53209d07541e7f8dffc680507378e94ab39b49601582a35e9a7 SHA512 769ceec71c5d64c08b91a0d78c5e39f6599fa199ae3f9d6dc4b94e5898a41e7f4b3d3f9c16a92f03d0e558778a4ef5bbe2967eefef17173211d53ffdb3d72041
-DIST pango-1.48.4.tar.xz 1791332 BLAKE2B 281e1ba5b52b99c61bcd90dcefb3de64e45a6de0eec5a375e209cb4316562a03e81dea73e6fb8921a631ef854dca8b035e06b3cec7ff73bf8f0033151d2cd20b SHA512 ce754c5e915ed18ba0f0ec89d74a1094e5b235821514b247d16afba7b74ecf1d850ad2b7b7d0a43da83da126c74be1b2e4c4400dbcd447e388e75e6b3c8b4dbe
 DIST pango-1.48.5.tar.xz 1819476 BLAKE2B 8529e8cbcf0f33be56cf09229abe45fb3525e12a9c2a6ad7cca416ff67a92eb010abc2ce814fa4d19a924186369eede4a576efdd2f4c64b39e31c9821c5e414a SHA512 2c758e649af5b9f9fa960c26a6f4dcf5abd8035101fdfe4a02fe02cb892250b615584b02d63aaa06f3da5cbe7bb848459ac969f43437c34cec084b51bcf48cab
 EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
-EBUILD pango-1.44.7.ebuild 2095 BLAKE2B 9a07720373325ae342c1a11216270f79783cec72cffc5198a38af6877019688466bd6505692dab3c2e509c6bbed815ce0b7897c94c7263dab692d070dfec7758 SHA512 6194aaebf76ef26476ba68bd0ee5fee76e08efd5104c4c67cd4d6b6f766bb97391ec10e14b90a9dc18d4051b87299c5514dfd3bad733aeb9061e72060942aeec
-EBUILD pango-1.48.3.ebuild 2203 BLAKE2B 283d1f214dbf1c94accbe73cb113978adc609d3451c6c68146a8c50d33e0bfab5a865fed6a4df577f41deb37e604605a1da0b3272b8cee95c969c789f443b225 SHA512 6cc8bcadc61b038f54e3c209bddd3d16b522c88aaa69cdc2fa826909c06e0a84f81c74001376b819de4d1d9a25b64c0d11c4cf522dd7291387b91cec9e0e685d
-EBUILD pango-1.48.4-r1.ebuild 2321 BLAKE2B a89427775ae3485bd75f27dccccaa9fb600f3b0e43aacc2016e221919532fa3c50614f71f2c78347422eedfcaa447abab1c6f2795a95167a6defb29fda6ac6f6 SHA512 6483bfe7515c8c70a30ca64e38e5413ff1423204662baf80a67c1d6005137c6bc739cb4fc89977b12e7835a350bab3414806ebbd2b80f2e1512d66dc102a6356
-EBUILD pango-1.48.5.ebuild 2321 BLAKE2B a89427775ae3485bd75f27dccccaa9fb600f3b0e43aacc2016e221919532fa3c50614f71f2c78347422eedfcaa447abab1c6f2795a95167a6defb29fda6ac6f6 SHA512 6483bfe7515c8c70a30ca64e38e5413ff1423204662baf80a67c1d6005137c6bc739cb4fc89977b12e7835a350bab3414806ebbd2b80f2e1512d66dc102a6356
+EBUILD pango-1.48.5.ebuild 2394 BLAKE2B 4b9fe6485727a78fabf1ac570c236181bbe99628775a32abb9d5ac8f2743aa4442f519254214f490a4b660b5dbfadb651b6abc6ec72fb44a240f8111e7121e65 SHA512 57d0164f17a6a131013f74b180b0099a34bf2e7537f082c121fb313dd0dc5ba9fd5f5ff2b7f75da6fee616b9e6804ad78d7dd4e7647371bcdc2f99b30078a2e8
 MISC metadata.xml 522 BLAKE2B 9e37b7287a6d6567d68daea4265ae5d13d3c336682408bdeb4f7ef92b9cd9907c4f69052fb52b59a8cd55eb40d04c660fedde562ac2a85e41844189810ed4fb8 SHA512 6af19288fc9a7e9f441f64df4e74f32ade7303df52e1c285275e41f34f0d7664b22167793c08e79e6667fe27f44afe5c1b8548d68f5878d63a432e293956fd82
diff --git a/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch b/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
deleted file mode 100644
index 181d84587e13..000000000000
--- a/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://gitlab.gnome.org/GNOME/pango/merge_requests/161
-
-From b73284747ac937e31dc9191f84ed6e24284c88ee Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan <fanchunwei@src.gnome.org>
-Date: Mon, 25 Nov 2019 14:58:32 +0800
-Subject: [PATCH] tests/test-break.c: Only test Thai breaks with libthai
- available
-
-The four.break test data file involves the Thai language, meaning that
-this test will fail unless we have libthai.  Skip this test unless
-libthai is found.
----
- tests/test-break.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tests/test-break.c b/tests/test-break.c
-index 8549b678..47fa3009 100644
---- a/tests/test-break.c
-+++ b/tests/test-break.c
-@@ -305,6 +305,12 @@ main (int argc, char *argv[])
-       if (!strstr (name, "break"))
-         continue;
- 
-+#ifndef HAVE_LIBTHAI
-+      /* four.break involves Thai, so only test it when we have libthai */
-+      if (strstr (name, "four.break"))
-+        continue;
-+#endif
-+
-       path = g_strdup_printf ("/break/%s", name);
-       g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "breaks", name, NULL),
-                                  test_break, g_free);
--- 
-2.24.1
-
diff --git a/x11-libs/pango/pango-1.44.7.ebuild b/x11-libs/pango/pango-1.44.7.ebuild
deleted file mode 100644
index 98be14ec452a..000000000000
--- a/x11-libs/pango/pango-1.44.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
-IUSE="gtk-doc +introspection test +X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.59.2:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10:=[X,${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	tc-export CXX
-
-	local emesonargs=(
-		-Dgtk_doc="$(multilib_native_usex gtk-doc true false)"
-		-Dintrospection="$(multilib_native_usex introspection true false)"
-		-Dinstall-tests=false
-	)
-	meson_src_configure
-}
-
-muiltilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/x11-libs/pango/pango-1.48.3.ebuild b/x11-libs/pango/pango-1.48.3.ebuild
deleted file mode 100644
index 3928315b1d75..000000000000
--- a/x11-libs/pango/pango-1.48.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
-IUSE="gtk-doc +introspection sysprof test +X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/fribidi-0.19.7[${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=[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10:=[X,${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	sysprof? ( dev-util/sysprof-capture:4[${MULTILIB_USEDEP}] )
-"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-	)
-"
-
-src_prepare() {
-	xdg_src_prepare
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature sysprof)
-		-Dcairo=enabled
-		-Dfontconfig=enabled
-		-Dfreetype=enabled
-		-Dgtk_doc="$(multilib_native_usex gtk-doc true false)"
-		-Dintrospection="$(multilib_native_usex introspection enabled disabled)"
-		-Dinstall-tests=false
-		-Dlibthai=disabled
-		-Dxft=enabled
-	)
-	meson_src_configure
-}
-
-muiltilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/x11-libs/pango/pango-1.48.4-r1.ebuild b/x11-libs/pango/pango-1.48.4-r1.ebuild
deleted file mode 100644
index f647bd75feff..000000000000
--- a/x11-libs/pango/pango-1.48.4-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
-IUSE="gtk-doc +introspection sysprof test +X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk-doc? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/fribidi-0.19.7[${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=[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	sysprof? ( dev-util/sysprof-capture:4[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-	)
-"
-
-src_prepare() {
-	xdg_src_prepare
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		$(meson_feature sysprof)
-		$(meson_feature X xft)
-		-Dcairo=enabled
-		-Dfontconfig=enabled
-		-Dfreetype=enabled
-		-Dgtk_doc="$(multilib_native_usex gtk-doc true false)"
-		-Dintrospection="$(multilib_native_usex introspection enabled disabled)"
-		-Dinstall-tests=false
-		-Dlibthai=disabled
-	)
-	meson_src_configure
-}
-
-muiltilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	if use gtk-doc; then
-		mv "${ED}"/usr/share/doc/{${PN},${P}} || die
-	fi
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/x11-libs/pango/pango-1.48.5.ebuild b/x11-libs/pango/pango-1.48.5.ebuild
index f647bd75feff..02943d287652 100644
--- a/x11-libs/pango/pango-1.48.5.ebuild
+++ b/x11-libs/pango/pango-1.48.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 # X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
 IUSE="gtk-doc +introspection sysprof test +X"
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	dev-util/glib-utils
+	sys-apps/help2man
 	virtual/pkgconfig
 	gtk-doc? (
 		dev-util/gi-docgen
@@ -83,10 +84,11 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+	einstalldocs
 	if use gtk-doc; then
-		mv "${ED}"/usr/share/doc/{${PN},${P}} || die
+		mv "${ED}"/usr/share/doc/{${PN}/reference/,${PF}/html/} || die
+		rmdir "${ED}"/usr/share/doc/${PN} || die
 	fi
-	einstalldocs
 }
 
 pkg_postinst() {