gentoo resync : 22.05.2021

2 files changed, 21 insertions, 11 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 81cce9710ac6..3f2dfc379e2d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,9 +2,9 @@ AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b984
 AUX gimp-2.99.2_fix_autoconf-2.70.patch 1913 BLAKE2B 779ce5a54150ee2a89507420931f255c09602af36ab8176f7ae9f18a7c1feb12451e817d2a89251d0366af6db90f602a107108227c98ac99b73e16ddb7b1fd05 SHA512 efa8882896335d3ac4ae7fb8874b5bd568472ccdcaeaf1d771f6c6b815b138186016f39f5f2f30fa01c1018ad583649fcf564cc5a8bcece741092f7dbc22f5fa
 DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
 DIST gimp-2.10.24.tar.bz2 31546295 BLAKE2B e2b873313b41799cb9461f6cd2ec45dcb0d3f51fe3e2710e47be99be868fba962cb75afb47bc2f12e2d6090993d70f560f4d58d2614939a0d36cadc9191fa2a7 SHA512 828350ad5c53b8409463c24693821d78a1940f18c221249ae7b864ad9db5cf01ab41d6ec5bbefd96115f0e91809ecdc61451d71881b56b07920c442f4a514936
-DIST gimp-2.99.4.tar.bz2 30355676 BLAKE2B b982139e36809b7e149c1c055d7cf0506c0c00beda2745904c62f4b56f1f1605378358f29ab427f7df6c68251ce367e00d79a1b9b7b3d0fde22526895eb5ce27 SHA512 1abb6851f4c6af440d75d09c55dcb6bf6485739de1960fb536035935729331221265beef589386da685ad8ffbe83e0f0699cf2db55589953deae4d82aa99154b
+DIST gimp-2.99.6.tar.bz2 30663040 BLAKE2B ccbdc2baa9e99a94e85345ce90bcba6ca56c0f264d3248d198009b730a5c810997b76c7d7a3cf131374316298d719a3e70c81ee7bc0a5e34beda1b112921807a SHA512 51ada696693ac51624ba222d1fff54d39bdc72a06de54f7c244b89740b77f7205aab44f1cec90785ca4196cab32f817e7390b4287a30f5024606163f24222961
 EBUILD gimp-2.10.22-r2.ebuild 5636 BLAKE2B ab208d7b8c28b52eee77ed8ba150264e7939308474a6adffa7372589f5b4d1347b1d25145d1f91aae4a05731d1a050e99cfe7700ae2ff455a67eca1cb61dfe8d SHA512 d9646bd07e014e6efa79782665b0d095b95476ede9ce15222428c53c91609b5837d925923aae8f3cad92b20043f0db98993a4b037e6bd866cd467753c49f20be
 EBUILD gimp-2.10.24.ebuild 5581 BLAKE2B 7639817275bc53b7e08b8f190aa11b2be6d62f2c12f46474fe67c74409fdbb0a4cc2bcaa8c7bdd04721f111ea52d3c8a950efb9d85ee1d22cbaab687207fcbe7 SHA512 c22ff9efa6044e6f0fba4094b0bd9debfb9752464357dbbe7c760ba9901ad36d479c1bbecfcae8c7c6b0bfecb8084cab970d8ee1d458122b2eb9f0b40a0b8054
-EBUILD gimp-2.99.4.ebuild 6553 BLAKE2B d57881c19a9f742024773bf6ce2ace5612fada66e047abb4f121cd14326af8314fb3d9ca19ef47317e6908bb567a8207aabb6916208621a1e13870e2e4b2136e SHA512 f4f03298670b734e1ff69d6ee2c57e9f01f79a57236fd6b9518b67cc7f4672c0486b3e63182913826f08fc0c5e0e5d86ee844e435f5c598c86d24e0af6c15aa6
+EBUILD gimp-2.99.6.ebuild 6837 BLAKE2B 451ec9116fdbfb48ff788495e50827ce4a353c1bbed8d4c70b5fab6dfa91cb2689d127492ac4f65a49b1cadff0c95d4d513fe9932ad9b9b81d01ef89291987c0 SHA512 56bbda601c4e6763605db989de30842f6af3f1fe166f09afe2b2d93a638a7f75c0e7f5744e05c18d1f8771bd4400283c5579ec6faa6260dd0f281825b06578fb
 EBUILD gimp-9999.ebuild 7011 BLAKE2B 5c9703b19e17a0e95e88d27c8a37cd316decf0d721c55243bc456b0a6467c6d952bbefaf79938358c03b2bb17b2c984375c837f992670640e180fe9e33e232f9 SHA512 c4c6e9ad7f32b76db12469398d7a49001de4e6043c536b09803fcfced310d1166b6877a72ed67e628ccfa8e06effd723bbeb3c4ba68e30de9815c98df206405f
 MISC metadata.xml 576 BLAKE2B cf4bbbe0b8610a1e1b0190c58bb578cb5c0d2bc7b1350ce98b1ce091af2e6052554bad53a96e729f4de30acb231cebc5ba3bc10b92302405bb2a791bbe897024 SHA512 82fcdb57a699ab887f9b0d0a9edb33d7e7d26e3aaa88727986820cf6053a9f9d275e1227ce82bd5e0291fc9c0d9362e014c08ca0822229d717ee851970dc6c8a
diff --git a/media-gfx/gimp/gimp-2.99.4.ebuild b/media-gfx/gimp/gimp-2.99.6.ebuild
index 9d731708d3a4..d2c37000187a 100644
--- a/media-gfx/gimp/gimp-2.99.4.ebuild
+++ b/media-gfx/gimp/gimp-2.99.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 GNOME2_EAUTORECONF=yes
-VALA_MIN_API_VERSION="0.40"
+VALA_MIN_API_VERSION="0.44"
 VALA_USE_DEPEND=vapigen
 
 inherit autotools gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
@@ -18,9 +18,11 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="0/3"
 KEYWORDS=""
 
-IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -36,10 +38,10 @@ COMMON_DEPEND="
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.21:2
 	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.84[introspection,lcms,vala?]
+	>=media-libs/babl-0.1.86[introspection,lcms,vala?]
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.28:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.10.10
 	>=media-libs/harfbuzz-2.6.5
 	>=media-libs/lcms-2.9:2
@@ -57,7 +59,7 @@ COMMON_DEPEND="
 	aalib? ( media-libs/aalib )
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.7.0:= )
+	heif? ( >=media-libs/libheif-1.9.1:= )
 	javascript? ( dev-libs/gjs )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
 	lua? (
@@ -101,6 +103,8 @@ DEPEND="
 	>=sys-devel/gettext-0.21
 	>=sys-devel/libtool-2.4.6
 	doc? (
+		app-text/yelp-tools
+		dev-libs/gobject-introspection[doctool]
 		>=dev-util/gtk-doc-1.32
 		dev-util/gtk-doc-am
 	)
@@ -176,6 +180,7 @@ src_configure() {
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable doc gtk_doc)
+		$(use_enable doc g-ir-doc)
 		$(use_enable vector-icons)
 		$(use_with aalib aa)
 		$(use_with alsa)
@@ -243,6 +248,11 @@ src_install() {
 	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
 
 	_rename_plugins || die
+
+	if use doc; then
+		mkdir "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs" || die
+		cp -r "${S}/devel-docs/g-ir-docs/html/"{gjs,python} "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs/" || die
+	fi
 }
 
 pkg_postinst() {