commit:     602a4d4aa8ef15e1acd58f19a1ad2b8d8b431282
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Thu Nov 24 23:05:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 07:52:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=602a4d4a

media-gfx/gimp: 2.99.14 version bump

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.14.ebuild}  | 21 ++++++++++++---------
 media-gfx/gimp/gimp-9999.ebuild                     | 10 +++++-----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 5ff7fc538a25..a5b8d49da69a 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,4 @@
 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
+DIST gimp-2.99.14.tar.xz 24346236 BLAKE2B 
087e28621c736a6ad8241c0f36334c6c5af53cb945711b089d15b54292ffcb7713be229591b8ccf79d06f7c7ede0919ceecad4deb511b20822a4f68ccfa1df49
 SHA512 
6ea3ca27cb0c830042ad42789d3017989dda195ebbdff38793afbee720f2986d489bec39c077b84889c847c0afc1bc7a2fec2e916574ae08aec42019715cb204

diff --git a/media-gfx/gimp/gimp-9999.ebuild 
b/media-gfx/gimp/gimp-2.99.14.ebuild
similarity index 91%
copy from media-gfx/gimp/gimp-9999.ebuild
copy to media-gfx/gimp/gimp-2.99.14.ebuild
index ab1bc5eb943f..3b46b2c60b3c 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-2.99.14.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{8..11} )
 VALA_MIN_API_VERSION="0.50"
 VALA_USE_DEPEND=vapigen
 
-inherit git-r3 lua-single meson python-single-r1 vala xdg
+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/v$(ver_cut 1-2)/${P}.tar.xz"
+
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 
@@ -28,23 +28,23 @@ 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/atk-2.34.1
        >=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.96[introspection,lcms,vala?]
+       >=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.38:0.4[cairo,introspection,lcms,vala?]
+       >=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.9:2
+       >=media-libs/lcms-2.13.1:2
        media-libs/libjpeg-turbo
        >=media-libs/libmypaint-1.6.1:=
        >=media-libs/libpng-1.6.37:0=
@@ -57,7 +57,7 @@ COMMON_DEPEND="
        >=x11-libs/pango-1.44.7
        aalib? ( media-libs/aalib )
        alsa? ( >=media-libs/alsa-lib-1.0.0 )
-       heif? ( >=media-libs/libheif-1.9.1:= )
+       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:= )
@@ -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-@0@.@1@'.format(gimp_app_version, 
gimp_app_version_micro)/" data/images/meson.build || die
 }
 
 _adjust_sandbox() {

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index ab1bc5eb943f..20c37382e07c 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -28,23 +28,23 @@ 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/atk-2.34.1
        >=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.96[introspection,lcms,vala?]
+       >=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.38:0.4[cairo,introspection,lcms,vala?]
+       >=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.9:2
+       >=media-libs/lcms-2.13.1:2
        media-libs/libjpeg-turbo
        >=media-libs/libmypaint-1.6.1:=
        >=media-libs/libpng-1.6.37:0=
@@ -57,7 +57,7 @@ COMMON_DEPEND="
        >=x11-libs/pango-1.44.7
        aalib? ( media-libs/aalib )
        alsa? ( >=media-libs/alsa-lib-1.0.0 )
-       heif? ( >=media-libs/libheif-1.9.1:= )
+       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:= )

Reply via email to