gentoo auto-resync : 31:08:2024 - 12:01:05

2 files changed, 14 insertions, 18 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 9744fa9ba357..f5aa9dc2871f 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -13,5 +13,5 @@ EBUILD gimp-2.10.36-r2.ebuild 6001 BLAKE2B e2b78361ae0d4703479e8b9c1a62e99f7099b
 EBUILD gimp-2.10.36.ebuild 5854 BLAKE2B 811d0ea7218ec368006864732bf94c6f07c7cdb2eeffc1df5deda811bc8cecd76ffa4f17230dd91313fe59ae803a35dc20c6be7e53e2b2143db24ba7dbf57dc8 SHA512 8ad6430138b98b4d384f3657f45733a5e1bd59db25b9619a4593d51af35bcd7b5cfbbe54587cb4f72b54fa1dfeac32a31d4727d0ddb666154810261806188040
 EBUILD gimp-2.10.38.ebuild 6115 BLAKE2B 27cfe3d0f6dd2e208680d1a723741e16ee5abc863141b81f3b343769f7aac837c474af6603f58ffc7e92b1528da674694076b7b61dde0f6d06d7b5b0259eecb4 SHA512 0990d4f80238b84873f131a8a0eca76ae6fa958af5f4f7c2a5e03ed14ce8adac0698480d1836287fda73902e548a4f723f992db6dfd317c0ef9c6b7a45044a0e
 EBUILD gimp-2.99.18-r1.ebuild 7253 BLAKE2B 0c95a252589be3d821a73b7651e866207928cee724d16e934f585bd9080869620d1b20546672ddf229ef59bd21f54d5906da19bf2bafab76d479b05b3adfc403 SHA512 042f9a4d904d2be0bedbb6dde123a7d12f8c43b7502990e2a0c6884c287522db8e0bfeebc0fa621a54992739482db4a8b8f3675ba7f5af33999ea4c390f6bf37
-EBUILD gimp-9999.ebuild 7111 BLAKE2B 726d3e15b968938fa2fcbc66775d58c46329cf679b08b36e507c3c26524aba189c8719c78f085b4ff8d574258579ae3e9bd537296f93e7cf0724cadd378230b9 SHA512 170c006ef43c1093f705cf530a21441e8afdbeb7d454c3e9ab0eddd504e2dccdcca24707829b523f0e2eb4025f808cd00d848738b2c26d51f6205ea82f76da6c
+EBUILD gimp-9999.ebuild 7261 BLAKE2B bc600ce49c014d66c1b0101df3256a75eb223654c5fd912e43d8c4560288d6b2baddf7b8595e60306621c71a3a87813a52b391364274fb9d7b13817ec642cbb7 SHA512 adfea86c9eb9b3bb82ff319289b241a20912a24b7b9e09296d27ac2a71ae78d8ea20a68e28a6e7275551a035d009bf0673c428308465f9b989f5aca7808fe626
 MISC metadata.xml 655 BLAKE2B f6628a2c5edb90b16db0f59af05446a3f31316f5558ece238d30c9350632713cf2db3d315c90b31229596659ec20859c17fde6b051f9ab8f8fe34d64902dad57 SHA512 712a259ae41d9052bde0761087928685b9b66a132db3f3b49121241d87728f51bf31a00541aa385bd03b57a2e2a03a0176356045dd4752485a8dca2bd61c5886
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 122443176973..477c892d26a4 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -15,10 +15,10 @@ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git"
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 
-IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript python test udev unwind vala vector-icons webp wmf xpm"
+IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons webp wmf xpm"
 REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
 RESTRICT="!test? ( test )"
@@ -26,6 +26,10 @@ RESTRICT="!test? ( test )"
 # media-libs/{babl,gegl} are required to be built with USE="introspection"
 # to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
 COMMON_DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+	')
 	>=app-accessibility/at-spi2-core-2.46.0
 	>=app-text/poppler-0.90.1[cairo]
 	>=app-text/poppler-data-0.4.9
@@ -36,10 +40,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.98[introspection,lcms,vala?]
+	>=media-libs/babl-9999[introspection,lcms,vala?]
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.48:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gegl-9999[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.14.0
 	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.13.1:2
@@ -69,12 +73,6 @@ COMMON_DEPEND="
 	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-2.3.0:= )
 	postscript? ( app-text/ghostscript-gpl:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
-		')
-	)
 	udev? ( >=dev-libs/libgudev-167:= )
 	unwind? ( >=sys-libs/libunwind-1.1.0:= )
 	webp? ( >=media-libs/libwebp-0.6.0:= )
@@ -116,11 +114,12 @@ pkg_pretend() {
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
+	python-single-r1_pkg_setup
 	use lua && lua-single_pkg_setup
 
-	if use python; then
-		python-single-r1_pkg_setup
+	if has_version ">=media-libs/babl-9999" || has_version ">=media-libs/gegl-9999"; then
+		ewarn "Please make sure to rebuid media-libs/babl-9999 and media-libs/gegl-9999 packages"
+		ewarn "before building media-gfx/gimp-9999 to have their latest master branch versions."
 	fi
 }
 
@@ -182,7 +181,6 @@ src_configure() {
 		$(meson_feature openexr)
 		$(meson_feature openmp)
 		$(meson_feature postscript ghostscript)
-		$(meson_feature python)
 		$(meson_feature test headless-tests)
 		$(meson_feature udev gudev)
 		$(meson_feature vala)
@@ -229,9 +227,7 @@ src_test() {
 src_install() {
 	meson_src_install
 
-	if use python; then
-		python_optimize
-	fi
+	python_optimize
 
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default