[gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/

[Sam James]

commit:     1bcaafc79ff6b55d1b3c1e9f290cf6d309e91045
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Mon Aug 29 23:01:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 22:26:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bcaafc7

media-gfx/gimp: 2.99.12 version bump

In this release of Gimp dev-preview 2.99.12 the porting
from Autotools to Meson build system take place.

The Meson now is preferred by upstream.

Due to diferences of configuration options withon configure.ac
and meson_options.txt the some src_configuration options dropped

1. related to flags:
USE="aqua cpu_flags_ppc_altivec cpu_flags_ppc_mmx cpu_flags_ppc_sse"

2. autotools configure options:
GEGL="${EPREFIX}"/usr/bin/gegl-0.4
GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
--with-pdbgen

Also some patches are dropped in src_prepare() phase:

sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144

sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test

The USE="X" adds conditional support of x11-libs/libXcursor.

The FEATURES="test" now use x11-misc/xvfb-run instead virtualx.eclass to run tests.

In addition USE="doc" now build related to gobject-introspection (g-ir-doc)
plugin documentations. Early it's built was broken for autotools.

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gimp/Manifest                            |   1 +
 .../gimp/{gimp-9999.ebuild => gimp-2.99.12.ebuild} | 164 ++++++++++-----------
 media-gfx/gimp/gimp-9999.ebuild                    | 159 ++++++++++----------
 3 files changed, 159 insertions(+), 165 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 1e53ece76a38..5ff7fc538a25 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,2 +1,3 @@
 DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
 DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3
+DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-2.99.12.ebuild
similarity index 57%
copy from media-gfx/gimp/gimp-9999.ebuild
copy to media-gfx/gimp/gimp-2.99.12.ebuild
index 0f655ffb58a9..1ccb1b787b59 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-2.99.12.ebuild
@@ -5,20 +5,19 @@ EAPI=8
 
 LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{8..10} )
-GNOME2_EAUTORECONF=yes
 VALA_MIN_API_VERSION="0.50"
 VALA_USE_DEPEND=vapigen
 
-inherit git-r3 gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
+inherit lua-single meson python-single-r1 vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
-EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git"
-SRC_URI=""
+SRC_URI="mirror://gimp/v2.99/${P}.tar.xz"
+
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/3"
 
-IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k jpegxl 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"
+IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -39,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.92[introspection,lcms,vala?]
+	>=media-libs/babl-0.1.96[introspection,lcms,vala?]
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.14.0
 	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.9:2
@@ -55,11 +54,9 @@ COMMON_DEPEND="
 	>=x11-libs/cairo-1.16.0
 	>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
 	>=x11-libs/gtk+-3.24.16:3[introspection]
-	x11-libs/libXcursor
 	>=x11-libs/pango-1.44.7
 	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.9.1:= )
 	javascript? ( dev-libs/gjs )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
@@ -83,6 +80,7 @@ COMMON_DEPEND="
 	unwind? ( >=sys-libs/libunwind-1.1.0:= )
 	webp? ( >=media-libs/libwebp-0.6.0:= )
 	wmf? ( >=media-libs/libwmf-0.2.8 )
+	X? ( x11-libs/libXcursor )
 	xpm? ( x11-libs/libXpm )
 "
 
@@ -94,20 +92,22 @@ RDEPEND="
 
 DEPEND="
 	${COMMON_DEPEND}
-	>=dev-lang/perl-5.30.3
-	dev-util/gdbus-codegen
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.51.0
-	>=sys-devel/autoconf-2.54
-	>=sys-devel/automake-1.11
-	>=sys-devel/gettext-0.21
-	>=sys-devel/libtool-2.4.6
-	doc? ( dev-util/gi-docgen )
+	test? ( x11-misc/xvfb-run )
 	vala? ( $(vala_depend) )
 "
 
 # TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	>=dev-lang/perl-5.30.3
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.21
+	doc? (
+		app-text/yelp-tools
+		dev-libs/gobject-introspection[doctool]
+		dev-util/gi-docgen
+	)
+	virtual/pkgconfig
+"
 
 DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )
 
@@ -120,19 +120,21 @@ pkg_setup() {
 }
 
 src_prepare() {
-#	sed -i -e '/validate/s:${GIMP_TESTING:--no-net ${GIMP_TESTING:' desktop/test-appdata.sh.in || die # Bug 685210 (and duplicate 691070)
-
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+	default
 
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794
 
-	gnome2_src_prepare  # calls eautoreconf
+	# Fix (typo) MMX and SSE support detection
+	sed -i -e "s/'-mmx'/'-mmmx'/" -e "s/'-sse'/'-msse'/" meson.build || die
 
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+	# 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
 
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+	# 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_PATH@:'${EPYTHON}':' plug-ins/python/pygimp.interp.in || die
 }
 
 _adjust_sandbox() {
@@ -154,78 +156,67 @@ src_configure() {
 
 	use vala && vala_setup
 
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
-
-		--enable-default-binary
-
-		--disable-check-update
-		--enable-mp
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-pdbgen
-		--with-xmc
-		--without-appdata-test
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable doc gi-docgen)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with javascript)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with jpegxl)
-		$(use_with lua)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with python)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with vala)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
+	local emesonargs=(
+		-Denable-default-bin=true
+
+		-Dcheck-update=no
+		-Denable-multiproc=true
+		-Dappdata-test=disabled
+		-Dbug-report-url=https://bugs.gentoo.org/
+		-Dlibbacktrace=false
+		-Dwebkit-unmaintained=false
+		$(meson_feature aalib aa)
+		$(meson_feature alsa)
+		$(meson_feature doc gi-docgen)
+		$(meson_feature heif)
+		$(meson_feature jpeg2k jpeg2000)
+		$(meson_feature jpegxl jpeg-xl)
+		$(meson_feature mng)
+		$(meson_feature openexr)
+		$(meson_feature postscript ghostscript)
+		$(meson_feature test headless-tests)
+		$(meson_feature udev gudev)
+		$(meson_feature vala vala-plugins)
+		$(meson_feature webp)
+		$(meson_feature wmf)
+		$(meson_feature X xcursor)
+		$(meson_feature xpm)
+		$(meson_use doc g-ir-doc)
+		$(meson_use javascript)
+		$(meson_use lua)
+		$(meson_use python)
+		$(meson_use unwind libunwind)
+		$(meson_use vector-icons)
 	)
 
-	gnome2_src_configure "${myconf[@]}"
+	meson_src_configure
 }
 
 src_compile() {
 	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
+	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 prepend=gimp-org-
+	local prename=gimp-org-
 	(
 		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/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 "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
+			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() {
-	virtx emake check
-}
-
 src_install() {
-	gnome2_src_install
+	meson_src_install
 
 	if use python; then
 		python_optimize
@@ -240,13 +231,20 @@ src_install() {
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
 	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
 
+	# Create symlinks for Gimp exec in /usr/bin
+	dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp
+	dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /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-2.99 /usr/bin/gimp-test-clipboard
+	dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool
+
 	_rename_plugins || die
 }
 
 pkg_postinst() {
-	gnome2_pkg_postinst
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_pkg_postrm
+	xdg_desktop_database_update
 }

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 0f655ffb58a9..8b99104d33d7 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -5,11 +5,10 @@ EAPI=8
 
 LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{8..10} )
-GNOME2_EAUTORECONF=yes
 VALA_MIN_API_VERSION="0.50"
 VALA_USE_DEPEND=vapigen
 
-inherit git-r3 gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
+inherit git-r3 lua-single meson python-single-r1 vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
@@ -18,7 +17,7 @@ SRC_URI=""
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/3"
 
-IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k jpegxl 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"
+IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -39,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.92[introspection,lcms,vala?]
+	>=media-libs/babl-0.1.96[introspection,lcms,vala?]
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.14.0
 	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.9:2
@@ -55,11 +54,9 @@ COMMON_DEPEND="
 	>=x11-libs/cairo-1.16.0
 	>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
 	>=x11-libs/gtk+-3.24.16:3[introspection]
-	x11-libs/libXcursor
 	>=x11-libs/pango-1.44.7
 	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.9.1:= )
 	javascript? ( dev-libs/gjs )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
@@ -83,6 +80,7 @@ COMMON_DEPEND="
 	unwind? ( >=sys-libs/libunwind-1.1.0:= )
 	webp? ( >=media-libs/libwebp-0.6.0:= )
 	wmf? ( >=media-libs/libwmf-0.2.8 )
+	X? ( x11-libs/libXcursor )
 	xpm? ( x11-libs/libXpm )
 "
 
@@ -94,20 +92,22 @@ RDEPEND="
 
 DEPEND="
 	${COMMON_DEPEND}
-	>=dev-lang/perl-5.30.3
-	dev-util/gdbus-codegen
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.51.0
-	>=sys-devel/autoconf-2.54
-	>=sys-devel/automake-1.11
-	>=sys-devel/gettext-0.21
-	>=sys-devel/libtool-2.4.6
-	doc? ( dev-util/gi-docgen )
+	test? ( x11-misc/xvfb-run )
 	vala? ( $(vala_depend) )
 "
 
 # TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	>=dev-lang/perl-5.30.3
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.21
+	doc? (
+		app-text/yelp-tools
+		dev-libs/gobject-introspection[doctool]
+		dev-util/gi-docgen
+	)
+	virtual/pkgconfig
+"
 
 DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )
 
@@ -120,19 +120,18 @@ pkg_setup() {
 }
 
 src_prepare() {
-#	sed -i -e '/validate/s:${GIMP_TESTING:--no-net ${GIMP_TESTING:' desktop/test-appdata.sh.in || die # Bug 685210 (and duplicate 691070)
-
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+	default
 
-	gnome2_src_prepare  # calls eautoreconf
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794
 
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+	# 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
 
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+	# 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_PATH@:'${EPYTHON}':' plug-ins/python/pygimp.interp.in || die
 }
 
 _adjust_sandbox() {
@@ -154,78 +153,67 @@ src_configure() {
 
 	use vala && vala_setup
 
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
-
-		--enable-default-binary
-
-		--disable-check-update
-		--enable-mp
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-pdbgen
-		--with-xmc
-		--without-appdata-test
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable doc gi-docgen)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with javascript)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with jpegxl)
-		$(use_with lua)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with python)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with vala)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
+	local emesonargs=(
+		-Denable-default-bin=true
+
+		-Dcheck-update=no
+		-Denable-multiproc=true
+		-Dappdata-test=disabled
+		-Dbug-report-url=https://bugs.gentoo.org/
+		-Dlibbacktrace=false
+		-Dwebkit-unmaintained=false
+		$(meson_feature aalib aa)
+		$(meson_feature alsa)
+		$(meson_feature doc gi-docgen)
+		$(meson_feature heif)
+		$(meson_feature jpeg2k jpeg2000)
+		$(meson_feature jpegxl jpeg-xl)
+		$(meson_feature mng)
+		$(meson_feature openexr)
+		$(meson_feature postscript ghostscript)
+		$(meson_feature test headless-tests)
+		$(meson_feature udev gudev)
+		$(meson_feature vala vala-plugins)
+		$(meson_feature webp)
+		$(meson_feature wmf)
+		$(meson_feature X xcursor)
+		$(meson_feature xpm)
+		$(meson_use doc g-ir-doc)
+		$(meson_use javascript)
+		$(meson_use lua)
+		$(meson_use python)
+		$(meson_use unwind libunwind)
+		$(meson_use vector-icons)
 	)
 
-	gnome2_src_configure "${myconf[@]}"
+	meson_src_configure
 }
 
 src_compile() {
 	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
+	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 prepend=gimp-org-
+	local prename=gimp-org-
 	(
 		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/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 "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
+			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() {
-	virtx emake check
-}
-
 src_install() {
-	gnome2_src_install
+	meson_src_install
 
 	if use python; then
 		python_optimize
@@ -240,13 +228,20 @@ src_install() {
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
 	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
 
+	# Create symlinks for Gimp exec in /usr/bin
+	dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp
+	dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /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-2.99 /usr/bin/gimp-test-clipboard
+	dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool
+
 	_rename_plugins || die
 }
 
 pkg_postinst() {
-	gnome2_pkg_postinst
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_pkg_postrm
+	xdg_desktop_database_update
 }