gentoo auto-resync : 08:11:2023 - 10:24:46

7 files changed, 19 insertions, 288 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2f65906c1939..9ddffa2280b4 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index f82741758582..b1853ba5f6c8 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,15 +1,12 @@
 AUX gimp-2.10_fix_configure_GCC13_implicit_function_declarations.patch 583 BLAKE2B 5c7feb3e666b496ea718d63cd3e8d415604397d0e78c95e4449812b48d7548c3b81d194c955555d7ad516c46012826475191786486140e0516c91bac56df027c SHA512 d90e6bc41bc91114ee8068e2d2cdd8c83e707b30eba876aa7b369c44d0ee125953b387a8f041dd5cb521d0eb16824bb8496a9751595c75c5a76b4cc0b3251cc3
-AUX gimp-2.10_fix_file-dicom-return-value.patch 581 BLAKE2B 57acc6c2ade824a29a5ec5778958b9f29a524b0a4a366fc25bc5b2ea535694d15a9dca445543d0a59b2e827d9b9e4c7a3de734acb86fe6ed75235e6cc7760578 SHA512 a5f6c0a6b263a61c83c505182e9ceb0d1a26dfdff26175e349e212621f3b9e1d231d9d96843ab0484378f7162c20be27d519fdf814fa946b614224122ea06908
 AUX gimp-2.10_fix_musl_backtrace_backend_switch.patch 535 BLAKE2B 374433568330a4b5167e6f32bd9ecbe44e9ceb4004cce9504586b73dc31c7613d2766ae5615d74b2a51a05ff3592add2e7585b7d63eb43b219ebe6b37193edca SHA512 df0b9b357d085463ac3b791b6131dabfdd33d12e7b77f45f496379d08da1b0e8ae787b9b4b260ec221c22e3302d54b17493175db55514ec3e705782fdb80ec18
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
-DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
 DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc SHA512 4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a
-DIST gimp-2.99.14.tar.xz 24346236 BLAKE2B 087e28621c736a6ad8241c0f36334c6c5af53cb945711b089d15b54292ffcb7713be229591b8ccf79d06f7c7ede0919ceecad4deb511b20822a4f68ccfa1df49 SHA512 6ea3ca27cb0c830042ad42789d3017989dda195ebbdff38793afbee720f2986d489bec39c077b84889c847c0afc1bc7a2fec2e916574ae08aec42019715cb204
+DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B d033cd1407df3399b5968b7e3f7838d288143080b516476a5dd46599b6a84ac2efca591521368cef7a1c3d9935b45ed3262fb469e1ae36ccf60a1199f5cfa44d SHA512 dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66
 DIST gimp-2.99.16.tar.xz 24969172 BLAKE2B 45050c0e45e7c9e64ee92ac9b3985c05f528205f74f442979dee8b326f41b35de403a2de93edad090dd87987ef446531e01a67ca857ef03403414fc9ac1464dd SHA512 b0da0529b000a7309c9d601977518cd19a7bf50ab41952fa36b83c027042d6901c39d0a6870c16e8a8ad3318207c93d34ee3d50d0e5f35bcabeaa17d91e060ee
-EBUILD gimp-2.10.32-r4.ebuild 5792 BLAKE2B d540c13b099e3d07089ae3ec68dba083bdcf5d27f860eba9ab5117dfb72b3a0715d1530eab54e06a2a4a93af78ae1b878ea37c3d187ee090bc208b88160e44d4 SHA512 7cbc3ae79e6add3294644c71b94528f1865bc22d951463f70fe05fae3ab7273891f3c1e82fe803c05e382dd7ce56c59f503df45cffdc5a9b151820a35d8fd818
-EBUILD gimp-2.10.34-r1.ebuild 5691 BLAKE2B b5f65b44c7b62c855685c89b877633b779895ca84a916297fc5c973f70b2780b12fb09e6803065ba99133e2e2847232d38242dd64aa7b17330d646fd27e4767b SHA512 f82900051f8f8b172ec2b158c4f2e651a860ca98584f799479e82d219121db4a6d3527f0f25179734694052bea0fc5b5035e5a75780924d46fa86a2d4f2104a8
-EBUILD gimp-2.10.34-r2.ebuild 5858 BLAKE2B b86049719eb4833287f5a9829fc8b1c7c46135e454dd6380ba8f84786f2f5cc447e25d15754dcc72799378367d0a0370bba056c0aaa11705086aaf11061cbd8b SHA512 4547c253b7a841207190dd0bfb452cc5dd6bb8a00958dfeaa0dc05f0a7d8f5922eb442e398961c35aa2a838b5001955c044fd7429e50cc304ce36f71f85637cf
-EBUILD gimp-2.99.14-r3.ebuild 6903 BLAKE2B 65927150020c6e864f056dc840007672f0683966411aa2e339c1554b9800a823918d976f1fc0635cbfac2935fb18412721aa7c0e57922a6f72fbf503ebd01803 SHA512 f91bbdcf2b140651edfe7212a56bc6bd10ada839eb29d7261a22c1400cdeefc6413c48a4965b82624618d26ff9decccdcd871626ae4a3a3ae851b8421cf69165
+EBUILD gimp-2.10.34-r1.ebuild 5716 BLAKE2B eb80d635f67bb515af112cf5d4b8c9f826480d61490d6d1292d6413bdc64ddf030f09abd6a0e16f6e72c296eac27637579e370594e9e3d24f1b9eb21584bc8f8 SHA512 f0d7e9b2000934ce7ab3e3783fe4095c48a58d5a30a7284b7586bac09481ec69ae7237a00e1c5031d62e3093f4744c200ea9be39186a8debcf0eb2f94567f9b6
+EBUILD gimp-2.10.34-r2.ebuild 5883 BLAKE2B 0703733007c411edbbeaa2b0babbe800196ca0640f854a6880ecb347becc80ed15b39a7ca988439db42ffa939881cd5a2f2c29b0e2bb018841ea09a0d37533af SHA512 bee716dad1765e798dbd3225cd0f59ec0e4885261e17d97e57ad061563165261076e9ad876819344e128fe85d536ba0466260b9fdb190092066b719f5b680ccc
+EBUILD gimp-2.10.36.ebuild 5856 BLAKE2B 9d05f9938ec4c112e6f1c213bf9d385e7736af92e82141eb2b82650bc046b96b47cd4db3e7f28618a3b1b592c29d85aa17a1fc01e473a5b7b0575bdbcdefb980 SHA512 130086dacb969972b237f763f4ce47e5df3edcdfe78600ffebaaf64f2c2107bec5339bb4f87640ff900cb7446a1f75580743ad18662e47aba786fb43687f6d0b
 EBUILD gimp-2.99.16.ebuild 7006 BLAKE2B af6434ed590cfe951ee993507a1f06c906d1ac6c43ada9bbc6bbc0feb61af79fbadeb061c403935979ea198fc5d872b20084f0216bb5ed1eeb035baec4bf9e11 SHA512 bf5f13e1dde99226e4bd84142498781c4410ae994487290acbbe0e2fdbfc88bbe97993044604664078f46df5342625e85d19a132851196bd6100ee6ed88795a8
 EBUILD gimp-9999.ebuild 6940 BLAKE2B a9891b9dbb087e8a46742a8970d81c6420fc0f8ec93f96617f9a4612e2ebdc3e8eff058e4966bafe200938f926695c6e1bd08687a22248680ac66402c0dc871f SHA512 5b9256b0b172aea629d7eedca4831b5d47c9bf07cd83ae9068e8449de416d8ffee8db283dd86b02d805e9d756faebdba4b9618405a3428b45a4b369293e7b469
 MISC metadata.xml 579 BLAKE2B 7766f3da8488794ee014731965efd289e9e95d07631cd7f08ce9469fb33ed1ada31b646f337afcbb3a540d4de83fa5764fc2aa18c4b132341520d4717c7b251d SHA512 9bf1c5c4442af756e6ce40a7399f096ed1732c095eafdb4ff580e4122154e2549d9e8c36a7cc0391f0bd49c07422c5c59123278d62645330aeefdc9130aef182
diff --git a/media-gfx/gimp/files/gimp-2.10_fix_file-dicom-return-value.patch b/media-gfx/gimp/files/gimp-2.10_fix_file-dicom-return-value.patch
deleted file mode 100644
index 8bc50cbcf18e..000000000000
--- a/media-gfx/gimp/files/gimp-2.10_fix_file-dicom-return-value.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Issue: https://bugs.gentoo.org/875413
-Upstream issue: https://gitlab.gnome.org/GNOME/gimp/-/issues/8807
-Upstream patch: https://gitlab.gnome.org/GNOME/gimp/-/commit/543f9e37e69b4e57b5e44092542c95bb2052f047
-
---- a/plug-ins/common/file-dicom.c
-+++ b/plug-ins/common/file-dicom.c
-@@ -602,7 +602,7 @@ load_image (const gchar  *filename,
-                                (gchar *) value, samples_per_pixel);
-                   g_free (dicominfo);
-                   fclose (DICOM);
--                  return NULL;
-+                  return -1;
-                 }
- 
-               break;
diff --git a/media-gfx/gimp/gimp-2.10.34-r1.ebuild b/media-gfx/gimp/gimp-2.10.34-r1.ebuild
index f92c7fc8c74c..c8bea7670e07 100644
--- a/media-gfx/gimp/gimp-2.10.34-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.34-r1.ebuild
@@ -72,6 +72,7 @@ DEPEND="
 	${COMMON_DEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1
 	dev-util/gtk-update-icon-cache
 	>=dev-util/intltool-0.40.1
 	>=sys-devel/gettext-0.19
diff --git a/media-gfx/gimp/gimp-2.10.34-r2.ebuild b/media-gfx/gimp/gimp-2.10.34-r2.ebuild
index 8d820542e76e..e1ab77f0834f 100644
--- a/media-gfx/gimp/gimp-2.10.34-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.34-r2.ebuild
@@ -72,6 +72,7 @@ DEPEND="
 	${COMMON_DEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1
 	dev-util/gtk-update-icon-cache
 	>=dev-util/intltool-0.40.1
 	>=sys-devel/gettext-0.19
diff --git a/media-gfx/gimp/gimp-2.10.32-r4.ebuild b/media-gfx/gimp/gimp-2.10.36.ebuild
index b1a59ff2e607..5bb123cf8fc5 100644
--- a/media-gfx/gimp/gimp-2.10.32-r4.ebuild
+++ b/media-gfx/gimp/gimp-2.10.36.ebuild
@@ -12,13 +12,13 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
+DEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0
 	>=app-text/poppler-0.50[cairo]
 	>=app-text/poppler-data-0.4.7
@@ -28,10 +28,10 @@ COMMON_DEPEND="
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.6:2
 	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.90
+	>=media-libs/babl-0.1.98
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.36:0.4[cairo]
+	>=media-libs/gegl-0.4.40:0.4[cairo]
 	>=media-libs/gexiv2-0.10.6
 	>=media-libs/harfbuzz-0.9.19:=
 	>=media-libs/lcms-2.8:2
@@ -51,7 +51,7 @@ COMMON_DEPEND="
 	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
 	heif? ( >=media-libs/libheif-1.9.1:= )
 	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.6.1:= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
 	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-1.6.1:= )
 	postscript? ( app-text/ghostscript-gpl:= )
@@ -63,18 +63,18 @@ COMMON_DEPEND="
 "
 
 RDEPEND="
-	${COMMON_DEPEND}
+	${DEPEND}
 	x11-themes/hicolor-icon-theme
 	gnome? ( gnome-base/gvfs )
 "
 
-DEPEND="
-	${COMMON_DEPEND}
+BDEPEND="
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1
 	dev-util/gtk-update-icon-cache
 	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
+	>=sys-devel/gettext-0.19.8
 	>=sys-devel/libtool-2.2
 	virtual/pkgconfig
 "
@@ -83,18 +83,19 @@ DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
-	"${FILESDIR}/${PN}-2.10_fix_file-dicom-return-value.patch" # Bug 875413 (duplicates 886481, 887587)
+	"${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
+	"${FILESDIR}/${PN}-2.10_fix_configure_GCC13_implicit_function_declarations.patch" #899796
 )
 
 src_prepare() {
 	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
+	sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
 
 	gnome2_src_prepare  # calls eautoreconf
 
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || 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
 
 	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
diff --git a/media-gfx/gimp/gimp-2.99.14-r3.ebuild b/media-gfx/gimp/gimp-2.99.14-r3.ebuild
deleted file mode 100644
index 3b7e1d2a2b7e..000000000000
--- a/media-gfx/gimp/gimp-2.99.14-r3.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-VALA_USE_DEPEND=vapigen
-
-inherit lua-single meson python-single-r1 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"
-
-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} )
-"
-
-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="
-	>=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.68.0:2
-	>=dev-libs/json-glib-1.4.4
-	dev-libs/libxml2:2
-	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/fontconfig-2.12.6
-	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.40: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
-	>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
-	>=x11-libs/gtk+-3.24.16:3[introspection]
-	>=x11-libs/pango-1.44.7
-	>=x11-libs/libXmu-1.1.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	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:= )
-	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:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	X? ( x11-libs/libXcursor )
-	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? (
-		app-text/yelp-tools
-		dev-libs/gobject-introspection[doctool]
-		dev-util/gi-docgen
-	)
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-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_PATH@/'${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}'/" data/images/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
-
-	use vala && vala_setup
-
-	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)
-	)
-
-	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/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 "${prename}file-svg/${prename}file-svg"
-				mv ${plugin}/{,${prename}}${plugin} || exit 1
-				mv {,${prename}}${plugin} || exit 1
-			fi
-		done
-	)
-}
-
-src_install() {
-	meson_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# 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
-
-	# 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() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}