gentoo auto-resync : 20:05:2023 - 10:17:50

3 files changed, 15 insertions, 8 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 252996dbcb85..fe7f05becb01 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -8,6 +8,6 @@ DIST gimp-2.99.14.tar.xz 24346236 BLAKE2B 087e28621c736a6ad8241c0f36334c6c5af53c
 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 5860 BLAKE2B 3a4c858f8badd5eeb3e59695a886ceedc2fdba32303bdffbe4ebf0542497164c48512bb364cce99bdfb1c44241b4de8ecda709c561eb2ce0334ad871e3b39e4c SHA512 5e764b6314c395bc2b1b7f1fa8813a246a808775353627c3b7a2f43acb23155a5e7031291320ccc4752ed1fd183d53f7ba0e91ea89edda5a2fd7c3061b03e278
-EBUILD gimp-2.99.14-r2.ebuild 6890 BLAKE2B 5ec29388074da8724f31a5ec375451e90ab75dff100efdf1245bb336b68239231c0d1f6d24121ceb718a00053ea511a00daf5d30e313c94ca39e4625174316f7 SHA512 35d279deac4f5892fc2015e63022b1524fa663c317f0a69bf1bad8af7cfc6c740d75944bea1c52e676ac2958bef117535dc654eef45619cd1acfd1bed14b85ed
-EBUILD gimp-9999.ebuild 6709 BLAKE2B 1b420d17aef83cf1b58ef9b96da47dff88a484d1ed42704fa1a5bba44d503b89e795d729e4a556b4e514ad2da207e464bccf333ea09e5eae15af5fc585226b36 SHA512 4ca7db1be7112bfe7d273d94e6b0836626d157a9510abff71dbed3d30781e23188657189588856bd2d8ef68b46af4ee67a36cb0d8b43153e39df4c8a7e8f7b36
+EBUILD gimp-2.99.14-r3.ebuild 6903 BLAKE2B 65927150020c6e864f056dc840007672f0683966411aa2e339c1554b9800a823918d976f1fc0635cbfac2935fb18412721aa7c0e57922a6f72fbf503ebd01803 SHA512 f91bbdcf2b140651edfe7212a56bc6bd10ada839eb29d7261a22c1400cdeefc6413c48a4965b82624618d26ff9decccdcd871626ae4a3a3ae851b8421cf69165
+EBUILD gimp-9999.ebuild 6836 BLAKE2B bfd204c31255d9a6a385ac15286bcc3dd7be951d7a1806815073d971b968e9773f2c97e051f0dac9646b867c473350d3dc0a832f9a2f331a8344451889d3995a SHA512 9dbdb4da8efd64da96a6e91459e74dccb557a15ff8161252357d66e71eca47f8a1fb10e705b610f66c9ee7fc00bb1317d6eb0ec8582d5c625709b607a02518b7
 MISC metadata.xml 648 BLAKE2B 3454806e0bb680d45e98fd571cc5ad2e09d1083a84b44efb49ea527432be8a255ae02c1c53ff6bf47ce9e9e1a471d422212fd4c08d4983476c2585fa9b96e541 SHA512 dc39d7aa41dc6ae6ab850eec0ce9e10b0085aa8f4b4d762305f7ab70b7a1f7bbe454c21f3d87e796c29c41a4b99f7b3ca38a54261188e7b8acbf8bd3d79dfcd0
diff --git a/media-gfx/gimp/gimp-2.99.14-r2.ebuild b/media-gfx/gimp/gimp-2.99.14-r3.ebuild
index ef598098c880..3b7e1d2a2b7e 100644
--- a/media-gfx/gimp/gimp-2.99.14-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.99.14-r3.ebuild
@@ -111,6 +111,10 @@ BDEPEND="
 
 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
 
@@ -134,7 +138,7 @@ src_prepare() {
 	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-@0@.@1@'.format(gimp_app_version, gimp_app_version_micro)/" data/images/meson.build || die
+	sed -i -e "s/'gimp-@0@'.format(gimp_app_version)/'gimp-${PVR}'/" data/images/meson.build || die
 }
 
 _adjust_sandbox() {
@@ -242,9 +246,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 705248ae1799..6ebeb03acdcb 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -131,7 +131,10 @@ src_prepare() {
 	# 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
+	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() {
@@ -239,9 +242,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }