6 files changed, 263 insertions, 7 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 4e9e69e23058..c02d8e22b1be 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 8ebe0652b8ab..c7f5aa57a8bb 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -3,5 +3,5 @@ DIST exiv2-0.28.4.tar.gz 46932087 BLAKE2B 609925c8615ee787f16087065dae503311ce9c
 DIST exiv2-0.28.5.tar.gz 46932602 BLAKE2B 71975428aeb397233627cc49563d2bf8405bf4a2d46fff4e078a9bb0ce0d0b400590a673acd98c4390bf50d1acb8371029b5e872ddae6aa79022497161455eaa SHA512 43c1d68255ee8df124b3093e1f4101d2f55fd8d6105bb6f20b148fe7d59472b895f0cba914e59f6d1581e84eee9d7033572821b80c16507e92abcb9a738daadc
 EBUILD exiv2-0.28.3.ebuild 3261 BLAKE2B 6801c92f63122d21fc5c93e5a65f1c260ce458e12967e6362a51ddba454b757a7da1aeea0b229fe9ef3eca3b0a4906ca0be4bea16079e9c288ad21dbf53e12c0 SHA512 642977da6b3cb8963e350bcbb7a48be4e75042b72e333858b89ac932bf682ce0034384c5ec07977ebfc689a446f02717eb1ec5361067a94e773e082d1324ca9a
 EBUILD exiv2-0.28.4.ebuild 3268 BLAKE2B b52d4c24d99c1856997e5f5db50a067e3841ebe50e3e5cb1e61ccd8c9e15b7b98e1f80083c3cd90c370dfd7e9dc5ebbada492e5c19a32c18f3b960128ca10380 SHA512 7894d816e0883cf1147c447ed92fd78f87ca3b9323e0b9a6d132322e88701095abf3892e081e42e77f00126a00dcd36192e79386538f10f9262ba8ca33a85e7a
-EBUILD exiv2-0.28.5.ebuild 3268 BLAKE2B b52d4c24d99c1856997e5f5db50a067e3841ebe50e3e5cb1e61ccd8c9e15b7b98e1f80083c3cd90c370dfd7e9dc5ebbada492e5c19a32c18f3b960128ca10380 SHA512 7894d816e0883cf1147c447ed92fd78f87ca3b9323e0b9a6d132322e88701095abf3892e081e42e77f00126a00dcd36192e79386538f10f9262ba8ca33a85e7a
+EBUILD exiv2-0.28.5.ebuild 3262 BLAKE2B 37766a38caa6da91ccaa3c0250eac46568024d79995572eb275bcbf59b62ac118f6a4b53a37d7c54578d1693c1f143ed986d9ef5b21873eb34f73fc2be9dc3ec SHA512 d1f5ea0abb8517036bf9d52223d3ad1368bff9117579b11826f4b6343a9c942f8fab6ca2a03f1071e9ff30af216cebdb28ae165db6c16329482507f3a06ff438
 MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e
diff --git a/media-gfx/exiv2/exiv2-0.28.5.ebuild b/media-gfx/exiv2/exiv2-0.28.5.ebuild
index 42c69715bd8e..8e62e20a5237 100644
--- a/media-gfx/exiv2/exiv2-0.28.5.ebuild
+++ b/media-gfx/exiv2/exiv2-0.28.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index ef3ea42b4554..7f3bcab22d2d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -9,9 +9,11 @@ DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 58c29e3e00d873e69a5e5f4e9c3ff4d868ccf
 DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196 SHA512 844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985
 DIST gimp-3.0.0-RC2.tar.xz 26980968 BLAKE2B 56b98a7863df22cf81015a9da5d7535cfef5a154c47418b1b6c6212cc76423e0769a4aa8d76714d2eb22595b1f6e2c623e4444e35675db5fe7e40c8820fe71dd SHA512 c0a6e096d954f3048cb68fe4ff71dd2f49c802f800014ab8a3089a0e097e7d6f595e5716230c06e7edfddba948f0d01da14800935aa6ceb9dc2e12fb7f19d7e6
 DIST gimp-3.0.0-RC3.tar.xz 27043600 BLAKE2B 6dd3a64ab8a7ec3481fdc2c4d7aeeb34546fbd493f9f6663f154f8ff47616190df0fa3719ea17debde56ed9f32120b6d03d4acf45b9e98740fd2ebc11c429878 SHA512 f6da664aadc312cdfac248fb1d3d8eb681aff50b8b0dee6f5c23cfa768eb4899386f470d19e797d0b1ee24746c88c7c12b609c3dc091acd2a625baf0b028285f
+DIST gimp-3.0.0.tar.xz 27043544 BLAKE2B fe33a4f59850791867111d8c775ce74f083c75f789243ea8f622137ebae045f0c21b12d2b288e97ca611e68d4cb219d05825b082cf2594742ebbbd277ac9d2a8 SHA512 bb75b68054cda06a3fd6e9278fc535914cd1ea4af27d82c8f5e3480233ff4b8f6d6c479ffcd868c4fa3f1980aee741d7cf992273b09d1e862ae2b84164d038a3
 EBUILD gimp-2.10.38-r1.ebuild 6369 BLAKE2B e97ae7367bf369773f32fff168814b58bc3f6ffa1828d39f1b0d8a9a36b7a812a18be8db2716039e323054af9a0b853a586ef4ec4d37868615e57f72fbcf6eb9 SHA512 85bbbc80c6908e0618a7eebaeb028820fb14c0e2b41779043f6547ab9767b5af0b8019c895978a473e3ebda550126b257e96fd65494f3e5239d709b3497d1a59
+EBUILD gimp-3.0.0.ebuild 6930 BLAKE2B 673fc12f25c58589a8bc21d9c7d57ea1a720b5bc0170c9aa06e8b5842f4cf54a9336fcaa39b1cbf5c6bbbfb4cbd34861641c51df5c739985813951e8572c93b8 SHA512 49c2d14bfceca26bb41a4fa8033262564bf311c5f288467142aaa33760ab10e150e9a0be190d107682a12793062cb73cd265e12b3879386ceca5c2f90d101e8f
 EBUILD gimp-3.0.0_rc1.ebuild 7151 BLAKE2B 5cad985c4a3d8f1f968b1816617090ab1fe271971d2ccf1b877a748e65854e8e809d7e7d3aa542c98db8a00f77261df3cf2d1379f854bc52477c7ee4a8d8ecf3 SHA512 6f45446d8f4604f246c25c3542aa5c0a73f399ac7942dde94e066b264d18f1f3937a5cd66e52543cf1b82f818a58b5186a8791c554437907a38cbd162291f93f
 EBUILD gimp-3.0.0_rc2-r1.ebuild 7150 BLAKE2B 859807c458ab1ac0164452f5fae92e19541a339db710c2e0c7ad6e9d8a2a353743701473b9c0fd0fae36c05993f9846a45560f58b93b5203f0cb76200c1b9ec5 SHA512 a9400b5818f4de765559b5591d915e8f9eeb498e2b329b2d9e682d5e9b8042eed89709a65ec1edba1c7f8f17847836caa28817e72149fc0951455c4bb9a84ffa
 EBUILD gimp-3.0.0_rc3.ebuild 7206 BLAKE2B e9201499e9f59838a15d9012924a19920ba3aebace6fd6774d3c86328118f261c3fc0f2cff7413ba4514f2f71e7a06460b388f64813b36ca18865cdf00b7b6b0 SHA512 87e0d9ea381d091f8c5df3ed33b10357cfbdb310b0210f776af49d2b7ec119b99b60f295b75bb7faa73c085000ffd7d921be010889f3030b1c1cc5c3ec398b49
-EBUILD gimp-9999.ebuild 7346 BLAKE2B c499ce80bc51f5f6c9e72b7cb429a37538e8ec03be97a6bd21800206ee4cc45650bfb84e4913266fddbc379727e40088ebcdcb1159f4c873cc3985591e9e8e86 SHA512 577d85af4069a04f6e5b222b4b886d6e7db61510d1082049e3336de13d667c9998ac7ff39e43bb0eec84d3a22fdfdd69e332a994c39950231bc3c2533416debf
+EBUILD gimp-9999.ebuild 7188 BLAKE2B c6600f041c3d4f2fa8d6e211e47e8d944e6421d7c60a32fa8c1f9e3759886c855b7436ce53d7b465ef237672e3812688f258bdadff6aec65596809ef3436d6a4 SHA512 9abf036240802598eff84fb1549df72e96a4864aab67a1d21cf9cafb38ea3ee71e36cb917b5368088da7dd6446d570c8f3760775a21c6f509dafd945bc532038
 MISC metadata.xml 655 BLAKE2B f6628a2c5edb90b16db0f59af05446a3f31316f5558ece238d30c9350632713cf2db3d315c90b31229596659ec20859c17fde6b051f9ab8f8fe34d64902dad57 SHA512 712a259ae41d9052bde0761087928685b9b66a132db3f3b49121241d87728f51bf31a00541aa385bd03b57a2e2a03a0176356045dd4752485a8dca2bd61c5886
diff --git a/media-gfx/gimp/gimp-3.0.0.ebuild b/media-gfx/gimp/gimp-3.0.0.ebuild
new file mode 100644
index 000000000000..93de4f4da202
--- /dev/null
+++ b/media-gfx/gimp/gimp-3.0.0.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{10..13} )
+VALA_USE_DEPEND=vapigen
+
+inherit flag-o-matic lua-single meson python-single-r1 toolchain-funcs vala xdg
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/3"
+KEYWORDS="~amd64"
+
+IUSE="X aalib alsa doc fits 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} )
+	test? ( X )
+	xpm? ( X )
+"
+
+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
+	>=dev-libs/appstream-glib-0.7.16
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/json-glib-1.4.4
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.57.3:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.112[introspection,lcms,vala?]
+	>=media-libs/fontconfig-2.12.6
+	>=media-libs/freetype-2.10.2
+	>=media-libs/gegl-0.4.56:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gexiv2-0.14.0
+	>=media-libs/harfbuzz-2.6.5:=
+	>=media-libs/lcms-2.13.1:2
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.37:0=
+	>=media-libs/tiff-4.1.0:=
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	>=x11-libs/cairo-1.16.0[X=]
+	>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
+	>=x11-libs/gtk+-3.24.48:3[introspection,X=]
+	>=x11-libs/pango-1.50.0[X=]
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	fits? ( sci-libs/cfitsio )
+	heif? ( >=media-libs/libheif-1.13.0:= )
+	javascript? ( dev-libs/gjs )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
+	jpegxl? ( >=media-libs/libjxl-0.6.1:= )
+	lua? (
+		${LUA_DEPS}
+		$(lua_gen_cond_dep '
+			dev-lua/lgi[${LUA_USEDEP}]
+		')
+	)
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-2.3.0:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	udev? ( >=dev-libs/libgudev-167:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8[X=] )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		>=x11-libs/libXmu-1.1.4
+	)
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( x11-misc/xvfb-run )
+	vala? ( $(vala_depend) )
+"
+
+# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
+BDEPEND="
+	>=dev-lang/perl-5.30.3
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.21
+	doc? (
+		dev-libs/gobject-introspection[doctool]
+		dev-util/gi-docgen
+	)
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794
+
+	# Fix Gimp  and GimpUI devel doc installation paths
+	sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp/meson.build || die
+	sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp-ui/meson.build || die
+
+	# Fix pygimp.interp python implementation path.
+	# Meson @PYTHON_PATH@ use sandbox path e.g.:
+	# '/var/tmp/portage/media-gfx/gimp-2.99.12/temp/python3.10/bin/python3'
+	sed -i -e 's/@PYTHON_EXE@/'${EPYTHON}'/' plug-ins/python/pygimp.interp.in || die
+
+	# Set proper intallation path of documentation logo
+	sed -i -e "s/'gimp-@0@'.format(gimp_app_version)/'gimp-${PVR}'/" gimp-data/images/logo/meson.build || die
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	# bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
+	append-cflags -std=gnu17
+
+	use vala && vala_setup
+
+	local emesonargs=(
+		-Denable-default-bin=enabled
+
+		-Dcheck-update=no
+		-Ddebug-self-in-build=false
+		-Denable-multiproc=true
+		-Dappdata-test=disabled
+		-Dbug-report-url=https://bugs.gentoo.org/
+		-Dilbm=disabled
+		-Dlibbacktrace=false
+		-Dwebkit-unmaintained=false
+		$(meson_feature aalib aa)
+		$(meson_feature alsa)
+		$(meson_feature doc gi-docgen)
+		$(meson_feature fits)
+		$(meson_feature heif)
+		$(meson_feature javascript)
+		$(meson_feature jpeg2k jpeg2000)
+		$(meson_feature jpegxl jpeg-xl)
+		$(meson_feature mng)
+		$(meson_feature openexr)
+		$(meson_feature openmp)
+		$(meson_feature postscript ghostscript)
+		$(meson_feature test headless-tests)
+		$(meson_feature udev gudev)
+		$(meson_feature vala)
+		$(meson_feature webp)
+		$(meson_feature wmf)
+		$(meson_feature X xcursor)
+		$(meson_feature xpm)
+		$(meson_use lua)
+		$(meson_use unwind libunwind)
+		$(meson_use vector-icons)
+	)
+
+	meson_src_configure
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	meson_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prename=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/3.0/plug-ins || exit 1
+		for plugin_slash in $(ls -d1 */); do
+			plugin=${plugin_slash%/}
+			if [[ -f ${plugin}/${plugin} ]]; then
+				# NOTE: Folder and file name need to match for Gimp to load that plug-in
+				#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
+				mv ${plugin}/{,${prename}}${plugin} || exit 1
+				mv {,${prename}}${plugin} || exit 1
+			fi
+		done
+	)
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${BUILD_DIR}/libgimp:${LD_LIBRARY_PATH}"
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Create symlinks for Gimp exec in /usr/bin
+	dosym "${ESYSROOT}"/usr/bin/gimp-3.0 /usr/bin/gimp
+	dosym "${ESYSROOT}"/usr/bin/gimp-console-3.0 /usr/bin/gimp-console
+	dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter
+	dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-3.0 /usr/bin/gimp-test-clipboard
+	dosym "${ESYSROOT}"/usr/bin/gimptool-3.0 /usr/bin/gimptool
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index d3f55c7cdc88..0f04ed813692 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -240,10 +240,6 @@ src_install() {
 
 	python_optimize
 
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
 	find "${D}" -name '*.la' -type f -delete || die
 
 	# Create symlinks for Gimp exec in /usr/bin