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

2026-03-16 Thread Sam James
commit: ffce6633d7bebe558a9e24874a722b0f5cfee65e
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sun Mar 15 00:24:55 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 16 13:51:52 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffce6633

media-gfx/gimp: add 3.2.0

Bug: https://bugs.gentoo.org/947607
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/330
Merges: https://codeberg.org/gentoo/gentoo/pulls/330
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest|  1 +
 media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch   | 59 --
 .../gimp/{gimp-.ebuild => gimp-3.2.0.ebuild}   |  8 ++-
 media-gfx/gimp/gimp-.ebuild|  4 +-
 4 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index f2d0b765eefa..f6db3ccc46b7 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,2 +1,3 @@
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-3.0.8.tar.xz 27277560 BLAKE2B 
327aa7833406bd09d7b36ef5ee59a1c65766ab3faa5085507af4b215688cba659be135a95a4980ee44b95fdfad47bf15fb5ec61e62156761302ba996cc4cd233
 SHA512 
0d4f05bd155249982e190768b29393f50d51015bc1c20c0bf9959d42907dc7d2076479aff0d8892038c54b4eb7036d07323d5f5ab64cdc4bf092215a0e9e4be5
+DIST gimp-3.2.0.tar.xz 34899036 BLAKE2B 
67335b5c148b023fe2d36d510885ee91e0ffc2df6786296b2ac8287974925656792cd5f25327839059c898f7a40b281b5a96ab53fc800e42303ded1278ad3c8f
 SHA512 
fee7042464dbe6f5562df4337ca8b9a8958f904e4a0d2c2ec8770fb1e4c24787a53fdb98d749688f8708111b3fc35243fa669111dd251eb519c3e48bc94a366f

diff --git a/media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch 
b/media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch
index 08f308a236c3..72bb733e17fb 100644
--- a/media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch
+++ b/media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch
@@ -1,22 +1,73 @@
 https://bugs.gentoo.org/968162
+https://gitlab.gnome.org/GNOME/gimp/-/commit/4828b2d3f7950efe1d3b72be60ad33dd896f433d
+https://gitlab.gnome.org/GNOME/gimp/-/commit/21851685364e0dde80df1d42d3c97495ef8ee1d8
 
+From 4828b2d3f7950efe1d3b72be60ad33dd896f433d Mon Sep 17 00:00:00 2001
+From: Alfred Wingate 
+Date: Sun, 15 Mar 2026 20:13:06 +0200
+Subject: [PATCH 1/2] tools: allow use of NM env variable
+
+Bug: https://bugs.gentoo.org/968162
+Signed-off-by: Alfred Wingate 
+--- a/libgimp/meson.build
 b/libgimp/meson.build
+@@ -628,6 +628,8 @@ else
+ endif
+ 
+ if not platform_osx and host_cpu_family != 'x86'
++  nm = find_program('nm', required: false)
++
+   # Verify .def files for Windows linking.
+   # We check this on non-Windows platform (Debian) on CI, and on Windows 
itself.
+   custom_target('check-def-files',
+@@ -653,6 +655,7 @@ if not platform_osx and host_cpu_family != 'x86'
+   libgimpthumb,
+   libgimpwidgets
+ ],
++env: nm.found() ? { 'NM': nm.full_path() } : {},
+ output: [ 'check-def-files', ],
+ command: [
+   python, meson.project_source_root() / 'tools' / 'defcheck.py', 
meson.project_source_root(),
 --- a/tools/defcheck.py
 +++ b/tools/defcheck.py
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ Needs the tool "nm", "objdump" or "dumpbin" to work
  
- import os, sys, subprocess
+ import os, sys, subprocess, shutil
  
 -from os import path
 +from os import getenv, path
  
  def_files = (
 "libgimpbase/gimpbase.def",
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ if len(sys.argv) > 1:
sys.exit (-1)
  
  libextension   = ".so"
 -command= "nm --defined-only --extern-only "
 +command= getenv("NM", default="nm") + " --defined-only --extern-only "
+ libprefix  = "lib"
  platform_linux = True
  
- if sys.platform in ['win32', 'cygwin']:
+-- 
+GitLab
+
+
+From 21851685364e0dde80df1d42d3c97495ef8ee1d8 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate 
+Date: Sun, 15 Mar 2026 20:13:49 +0200
+Subject: [PATCH 2/2] tools: include error message to ease debugging
+
+Signed-off-by: Alfred Wingate 
+--- a/tools/defcheck.py
 b/tools/defcheck.py
+@@ -102,6 +102,7 @@ for df in def_files:
+status, nm = subprocess.getstatusoutput (command + libname)
+if status != 0:
+   print("trouble reading {} - has it been compiled?".format(libname))
++  print(nm)
+   have_errors = -1
+   continue
+ 
+-- 
+GitLab
+

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-3.2.0.ebuild
similarity index 98%
copy from media-gfx/gimp/gimp-.ebuild
copy to media-gfx/gimp/gimp-3.2.0.ebuild
index 23fcbb037ed0..fca51e5aa9d5 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-3.2.0.ebuild
@@ -31,7 +31,7 @@ else

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

2026-03-16 Thread Sam James
commit: 03096531c7ccab0e841192afa6e7e07c3ac05342
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sun Mar 15 00:30:18 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 16 13:51:51 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03096531

media-gfx/gimp: drop 3.2.0_rc2, 3.2.0_rc3

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/330
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest |   2 -
 media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch |  28 ---
 media-gfx/gimp/gimp-3.2.0_rc2.ebuild| 294 --
 media-gfx/gimp/gimp-3.2.0_rc3.ebuild| 320 
 4 files changed, 644 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 2031a58430fd..f2d0b765eefa 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,4 +1,2 @@
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-3.0.8.tar.xz 27277560 BLAKE2B 
327aa7833406bd09d7b36ef5ee59a1c65766ab3faa5085507af4b215688cba659be135a95a4980ee44b95fdfad47bf15fb5ec61e62156761302ba996cc4cd233
 SHA512 
0d4f05bd155249982e190768b29393f50d51015bc1c20c0bf9959d42907dc7d2076479aff0d8892038c54b4eb7036d07323d5f5ab64cdc4bf092215a0e9e4be5
-DIST gimp-3.2.0-RC2.tar.xz 34615136 BLAKE2B 
91c1567efcadbf1db0ea9c54e99354c65e723526ca417250d17cdba7b9ffa82d81964309fa955d074ddc47f8a7c4f61a1bd9535f1b6edbb3c886d37ceb9379a5
 SHA512 
b6b201b4f76966f96ab201761a61b4040907d31850c8786d3824d9aac14f04ae53697b74e5c9fee69640c4843fc1b7810a8990b19ba3d7a8131d8783aa5b6d0b
-DIST gimp-3.2.0-RC3.tar.xz 39997044 BLAKE2B 
8c8981654cfe90723f636f4e0f124f4d43a9b5a14f8df08655aa7d2e9b74899a833dd53a92bcb45f41e4d5176dd455d03a3f9042aa36d2ff210f5b1a9a60a15d
 SHA512 
a42c4f38e138cf6849e2d2aa509de1800d637bcdb0d4e51eb946740c3156f8661b304799ec9b4345330c91a742498e7a0e26950baeef73e12e15f81224da8068

diff --git a/media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch 
b/media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch
deleted file mode 100644
index ca92daeee38f..
--- a/media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.gnome.org/GNOME/gimp/-/issues/14822
-https://gitlab.gnome.org/GNOME/gimp/-/issues/15257
-https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2566
-https://gitlab.gnome.org/GNOME/gimp/-/commit/2fd12847496a9a242ca8edc448d400d3660b8009
-https://gitlab.gnome.org/GNOME/gimp/-/commit/93869f43cf3f489ed5aa35ce018f6f4edbbdcb67
-
-From 2fd12847496a9a242ca8edc448d400d3660b8009 Mon Sep 17 00:00:00 2001
-From: Jehan 
-Date: Thu, 4 Dec 2025 23:47:00 +0100
-Subject: [PATCH] Issue #15257: test failing because gegl:bevel doesn't see GPL
- ops.
-
 a/app/tests/tests.c
-+++ b/app/tests/tests.c
-@@ -162,6 +162,10 @@ gimp_init_for_gui_testing_internal (gboolean  show_gui,
- 
-   /* from main() */
-   gimp_log_init ();
-+  g_object_set (gegl_config (),
-+"use-opencl",  FALSE,
-+"application-license", "GPL3",
-+NULL);
-   gegl_init (NULL, NULL);
- 
-   /* Introduce an error margin for positions written to sessionrc */
--- 
-GitLab
-

diff --git a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild 
b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
deleted file mode 100644
index 8c72c9a3ccde..
--- a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{11..14} )
-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/";
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git";
-
-   MAJOR_VERSION="3"
-else
-   MY_PV="${PV/_rc/-RC}"
-   MY_P="${PN}-${MY_PV}"
-   SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${MY_P}.tar.xz"
-   S="${WORKDIR}/${MY_P}"
-
-   MAJOR_VERSION="$(ver_cut 1)"
-
-   # Dont keyword prereleases or unstable releases
-   # 
https://gitlab.gnome.org/Infrastructure/gimp-web-devel/-/blob/testing/content/core/maintainer/versioning.md#software-version
-   if ! [[ ${PV} =~ _rc ]] &&
-   [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] &&
-   [[ $(( $(ver_cut 3) % 2 )) -eq 0 ]]
-   then
-   KEYWORDS="~amd64 ~arm ~x86"
-   fi
-fi
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/${MAJOR_VERSION}"
-
-IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vec

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

2026-03-10 Thread Sam James
commit: b20e4256ca04968bc0a8708797e49459bf950ac6
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Sat Mar  7 04:16:15 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 11 05:16:05 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20e4256

media-gfx/gimp: -native-symlinks fix without NM/READLINK in make.conf

Tested in an environment without the ~workaround of CC/CXX/NM/READLINK/…
set in make.conf

Bug: https://bugs.gentoo.org/968162
Fixes: ca7b3a0b88dadc613d6c1547aeb2b6a79d9a515c
Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/236
Merges: https://codeberg.org/gentoo/gentoo/pulls/236
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch | 22 ++
 media-gfx/gimp/gimp-3.2.0_rc2.ebuild |  2 ++
 media-gfx/gimp/gimp-3.2.0_rc3.ebuild |  6 ++
 3 files changed, 30 insertions(+)

diff --git a/media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch 
b/media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch
new file mode 100644
index ..08f308a236c3
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/968162
+
+--- a/tools/defcheck.py
 b/tools/defcheck.py
+@@ -31,7 +31,7 @@
+ 
+ import os, sys, subprocess
+ 
+-from os import path
++from os import getenv, path
+ 
+ def_files = (
+"libgimpbase/gimpbase.def",
+@@ -55,7 +55,7 @@
+   sys.exit (-1)
+ 
+ libextension   = ".so"
+-command= "nm --defined-only --extern-only "
++command= getenv("NM", default="nm") + " --defined-only --extern-only "
+ platform_linux = True
+ 
+ if sys.platform in ['win32', 'cygwin']:

diff --git a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild 
b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
index 75f6e244bfe2..8c72c9a3ccde 100644
--- a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
+++ b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
@@ -202,6 +202,8 @@ src_configure() {
use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
use X || append-cppflags -DGENTOO_GTK_HIDE_X11
 
+   tc-export NM READELF
+
use vala && vala_setup
 
local emesonargs=(

diff --git a/media-gfx/gimp/gimp-3.2.0_rc3.ebuild 
b/media-gfx/gimp/gimp-3.2.0_rc3.ebuild
index 23fcbb037ed0..204fac3fc411 100644
--- a/media-gfx/gimp/gimp-3.2.0_rc3.ebuild
+++ b/media-gfx/gimp/gimp-3.2.0_rc3.ebuild
@@ -156,6 +156,10 @@ BDEPEND="
 
 DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 
+PATCHES=(
+   "${FILESDIR}"/gimp-3.2.0-respect-NM.patch
+)
+
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -215,6 +219,8 @@ src_configure() {
use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
use X || append-cppflags -DGENTOO_GTK_HIDE_X11
 
+   tc-export NM READELF
+
use vala && vala_setup
 
local emesonargs=(



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

2026-03-03 Thread Sam James
commit: a69c91963a8f026a84c8434d878390c8c300aebb
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Mar  3 12:50:47 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  3 21:54:55 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69c9196

media-gfx/gimp: drop 2.10.38-r3, 3.0.6

Closes: https://bugs.gentoo.org/969449
Bug: https://bugs.gentoo.org/969286
Bug: https://bugs.gentoo.org/969287
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/205
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest   |   1 -
 media-gfx/gimp/gimp-2.10.38-r3.ebuild | 236 --
 media-gfx/gimp/gimp-3.0.6.ebuild  | 260 --
 3 files changed, 497 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 71f2ab6e8164..2031a58430fd 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,5 +1,4 @@
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
-DIST gimp-3.0.6.tar.xz 27197880 BLAKE2B 
ef5220a36ca4666db5c8c20628458e5b621b3bfb594be8eda974f3be18429d946e35456428c8a28a957911c6302ab69d2eb35bb7249f332f5ac4d6146c28c9d1
 SHA512 
513fe11083b6560ce7bbe1b56ccbc0d83a4edb33e110508543fc8c8fdf6c60d91f9af60cb4d83926eec490baceb6c9cc5aae43a4d0ae7a04099f4036e50d179c
 DIST gimp-3.0.8.tar.xz 27277560 BLAKE2B 
327aa7833406bd09d7b36ef5ee59a1c65766ab3faa5085507af4b215688cba659be135a95a4980ee44b95fdfad47bf15fb5ec61e62156761302ba996cc4cd233
 SHA512 
0d4f05bd155249982e190768b29393f50d51015bc1c20c0bf9959d42907dc7d2076479aff0d8892038c54b4eb7036d07323d5f5ab64cdc4bf092215a0e9e4be5
 DIST gimp-3.2.0-RC2.tar.xz 34615136 BLAKE2B 
91c1567efcadbf1db0ea9c54e99354c65e723526ca417250d17cdba7b9ffa82d81964309fa955d074ddc47f8a7c4f61a1bd9535f1b6edbb3c886d37ceb9379a5
 SHA512 
b6b201b4f76966f96ab201761a61b4040907d31850c8786d3824d9aac14f04ae53697b74e5c9fee69640c4843fc1b7810a8990b19ba3d7a8131d8783aa5b6d0b
 DIST gimp-3.2.0-RC3.tar.xz 39997044 BLAKE2B 
8c8981654cfe90723f636f4e0f124f4d43a9b5a14f8df08655aa7d2e9b74899a833dd53a92bcb45f41e4d5176dd455d03a3f9042aa36d2ff210f5b1a9a60a15d
 SHA512 
a42c4f38e138cf6849e2d2aa509de1800d637bcdb0d4e51eb946740c3156f8661b304799ec9b4345330c91a742498e7a0e26950baeef73e12e15f81224da8068

diff --git a/media-gfx/gimp/gimp-2.10.38-r3.ebuild 
b/media-gfx/gimp/gimp-2.10.38-r3.ebuild
deleted file mode 100644
index 72a042642e6d..
--- a/media-gfx/gimp/gimp-2.10.38-r3.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools flag-o-matic gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-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 ~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="
-   >=app-accessibility/at-spi2-core-2.50.1
-   app-arch/bzip2
-   app-arch/xz-utils
-   >=app-text/poppler-0.50[cairo]
-   >=app-text/poppler-data-0.4.7
-   >=dev-libs/glib-2.56.2:2
-   >=dev-libs/json-glib-1.2.6
-   >=gnome-base/librsvg-2.40.6:2
-   >=media-gfx/mypaint-brushes-1.3.1:1.0=
-   >=media-libs/babl-0.1.98
-   >=media-libs/fontconfig-2.12.4
-   >=media-libs/freetype-2.1.7
-   >=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
-   media-libs/libjpeg-turbo:=
-   >=media-libs/libmypaint-1.6.1:=
-   >=media-libs/libpng-1.6.25:0=
-   >=media-libs/tiff-3.5.7:=
-   net-libs/glib-networking[ssl]
-   virtual/zlib:=
-   >=x11-libs/cairo-1.12.2
-   >=x11-libs/gdk-pixbuf-2.31:2
-   >=x11-libs/gtk+-2.24.32:2
-   x11-libs/libX11
-   x11-libs/libXcursor
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXmu
-   >=x11-libs/pango-1.29.4
-   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:= )
-   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-   jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-   mng? ( media-libs/libmng:= )
-   openexr? ( >=media-libs/openexr-1.6.1:= )
-   postscript? ( app-text/ghostscript-gpl:= )
-   udev? ( dev-libs/libgudev )
-

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

2026-03-03 Thread Sam James
commit: 955cee246ae639f28fc1de49dc902ba082fa03b4
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Mar  3 12:10:50 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  3 21:54:55 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=955cee24

media-gfx/gimp: add 3.2.0_rc3

Bug: https://bugs.gentoo.org/970096
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/205
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest| 1 +
 media-gfx/gimp/{gimp-.ebuild => gimp-3.2.0_rc3.ebuild} | 8 
 media-gfx/gimp/gimp-.ebuild| 8 
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 8b30d5263ce1..71f2ab6e8164 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,3 +2,4 @@ DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccf
 DIST gimp-3.0.6.tar.xz 27197880 BLAKE2B 
ef5220a36ca4666db5c8c20628458e5b621b3bfb594be8eda974f3be18429d946e35456428c8a28a957911c6302ab69d2eb35bb7249f332f5ac4d6146c28c9d1
 SHA512 
513fe11083b6560ce7bbe1b56ccbc0d83a4edb33e110508543fc8c8fdf6c60d91f9af60cb4d83926eec490baceb6c9cc5aae43a4d0ae7a04099f4036e50d179c
 DIST gimp-3.0.8.tar.xz 27277560 BLAKE2B 
327aa7833406bd09d7b36ef5ee59a1c65766ab3faa5085507af4b215688cba659be135a95a4980ee44b95fdfad47bf15fb5ec61e62156761302ba996cc4cd233
 SHA512 
0d4f05bd155249982e190768b29393f50d51015bc1c20c0bf9959d42907dc7d2076479aff0d8892038c54b4eb7036d07323d5f5ab64cdc4bf092215a0e9e4be5
 DIST gimp-3.2.0-RC2.tar.xz 34615136 BLAKE2B 
91c1567efcadbf1db0ea9c54e99354c65e723526ca417250d17cdba7b9ffa82d81964309fa955d074ddc47f8a7c4f61a1bd9535f1b6edbb3c886d37ceb9379a5
 SHA512 
b6b201b4f76966f96ab201761a61b4040907d31850c8786d3824d9aac14f04ae53697b74e5c9fee69640c4843fc1b7810a8990b19ba3d7a8131d8783aa5b6d0b
+DIST gimp-3.2.0-RC3.tar.xz 39997044 BLAKE2B 
8c8981654cfe90723f636f4e0f124f4d43a9b5a14f8df08655aa7d2e9b74899a833dd53a92bcb45f41e4d5176dd455d03a3f9042aa36d2ff210f5b1a9a60a15d
 SHA512 
a42c4f38e138cf6849e2d2aa509de1800d637bcdb0d4e51eb946740c3156f8661b304799ec9b4345330c91a742498e7a0e26950baeef73e12e15f81224da8068

diff --git a/media-gfx/gimp/gimp-.ebuild 
b/media-gfx/gimp/gimp-3.2.0_rc3.ebuild
similarity index 97%
copy from media-gfx/gimp/gimp-.ebuild
copy to media-gfx/gimp/gimp-3.2.0_rc3.ebuild
index 4dbb5d495823..23fcbb037ed0 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-3.2.0_rc3.ebuild
@@ -70,7 +70,7 @@ COMMON_DEPEND="
>=media-libs/fontconfig-2.12.4
>=media-libs/freetype-2.1.7
=media-libs/gexiv2-0.14.0[introspection]
+   >=media-libs/gexiv2-0.14.0:=[introspection]
>=media-libs/harfbuzz-2.8.2:=
>=media-libs/lcms-2.8:2
media-libs/libjpeg-turbo:=
@@ -169,7 +169,8 @@ pkg_setup() {
if ! has "en_US.utf8" ${locales} && ! has "en_US.UTF-8" 
${locales}; then
# portage splits and unset LC_ALL. Cannot rely on that
if [[ "${LANG}" != "C" ]] && [[ "${LANG}" != "POSIX" ]] 
&& [[ "${LANG}" == "${LANG#C\.}" ]]; then
-   # Set LC_ALL to avoid locales breaking due to 
the profile setting LC_MESSAGES=C and portage itself setting LC_COLLATE=C
+   # Set LC_ALL to avoid locales breaking due to 
the profile setting LC_MESSAGES=C
+   # and portage itself setting LC_COLLATE=C
einfo "Setting LC_ALL=${LANG} based on LANG 
because en_US.UTF-8 isn't available, bug #968468"
export LC_ALL="${LANG}"
else
@@ -302,12 +303,11 @@ src_install() {
# gimp-$(ver_cut 1-2) -> gimp-$(ver_cut 1) -> gimp
dosym "${ESYSROOT}"/usr/bin/gimp-${MAJOR_VERSION} /usr/bin/gimp
dosym "${ESYSROOT}"/usr/bin/gimp-console-${MAJOR_VERSION} 
/usr/bin/gimp-console
-   dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-${MAJOR_VERSION} 
/usr/bin/gimp-script-fu-interpreter
dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-${MAJOR_VERSION} 
/usr/bin/gimp-test-clipboard
dosym "${ESYSROOT}"/usr/bin/gimptool-${MAJOR_VERSION} /usr/bin/gimptool
 
if use bash-completion; then
-   bashcomp_alias gimp-3.0 gimp{,-3} gimp-console{,-3,-3.0}
+   bashcomp_alias gimp-3.2 gimp{,-3} gimp-console{,-3,-3.2}
fi
 
_rename_plugins || die

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 4dbb5d495823..23fcbb037ed0 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -70,7 +70,7 @@ COMMON_DEPEND="
>=media-libs/fontconfig-2.12.4
>=media-libs/freetype-2.1.7
=media-libs/gexiv2-0.14.0[introspection]
+   >=media-libs/gexiv2-0.14.0:=[introspection]
>=media-libs/harfbuz

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

2026-02-12 Thread Eli Schwartz
commit: 4baa976ad265fef920d3298836aca9c43f9b3c84
Author: Eli Schwartz  gentoo  org>
AuthorDate: Fri Feb 13 03:53:50 2026 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Fri Feb 13 03:54:28 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4baa976a

media-gfx/gimp: Stabilize 3.0.8-r1 ppc64, #969420

Signed-off-by: Eli Schwartz  gentoo.org>

 media-gfx/gimp/gimp-3.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.8-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
index e40edde6a75c..21ddebbb50f2 100644
--- a/media-gfx/gimp/gimp-3.0.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 x86"
 
 IUSE="X aalib alsa bash-completion doc fits gnome heif javascript jpeg2k 
jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons 
wayland webp wmf xpm"
 REQUIRED_USE="



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

2026-02-12 Thread Eli Schwartz
commit: 287781ee04b4a58d0347c50a0ae47dcbc9cc1dc6
Author: Eli Schwartz  gentoo  org>
AuthorDate: Fri Feb 13 02:27:52 2026 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Fri Feb 13 03:54:24 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=287781ee

media-gfx/gimp: Stabilize 3.0.8-r1 x86, #969420

Signed-off-by: Eli Schwartz  gentoo.org>

 media-gfx/gimp/gimp-3.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.8-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
index a947d26969a7..e40edde6a75c 100644
--- a/media-gfx/gimp/gimp-3.0.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 x86"
 
 IUSE="X aalib alsa bash-completion doc fits gnome heif javascript jpeg2k 
jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons 
wayland webp wmf xpm"
 REQUIRED_USE="



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

2026-02-12 Thread Sam James
commit: ba04541635fa4a59d35f46da2e343c9bf2bc76c4
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 13 00:37:23 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 13 00:37:23 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba045416

media-gfx/gimp: Stabilize 3.0.8-r1 amd64, #969420

Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.8-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
index f39456381e66..a947d26969a7 100644
--- a/media-gfx/gimp/gimp-3.0.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~x86"
 
 IUSE="X aalib alsa bash-completion doc fits gnome heif javascript jpeg2k 
jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons 
wayland webp wmf xpm"
 REQUIRED_USE="



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

2026-02-12 Thread Sam James
commit: 021061e8679bb36294edb90f44a7d48e7f5d9bfc
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 13 00:28:08 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 13 00:28:08 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=021061e8

media-gfx/gimp: Stabilize 3.0.8-r1 arm64, #969420

Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.8-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
index 70b8b4411170..f39456381e66 100644
--- a/media-gfx/gimp/gimp-3.0.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~x86"
 
 IUSE="X aalib alsa bash-completion doc fits gnome heif javascript jpeg2k 
jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons 
wayland webp wmf xpm"
 REQUIRED_USE="



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

2026-02-08 Thread Sam James
commit: ba1147ed43b2ef34965963f0fb3dc9fac99798cf
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sun Feb  8 20:34:51 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb  8 20:41:39 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba1147ed

media-gfx/gimp: tighten C.UTF-8/C.utf-8 check

Bug: https://bugs.gentoo.org/969468
Fixes: 73412ee2b83589fc6bccf63c320cbbe4cd20e50e
Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.8-r1.ebuild | 2 +-
 media-gfx/gimp/gimp-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.8-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
index 0795b4c13e07..70b8b4411170 100644
--- a/media-gfx/gimp/gimp-3.0.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
@@ -143,7 +143,7 @@ pkg_setup() {
local locales="$(locale -a)"
if ! has "en_US.utf8" ${locales} && ! has "en_US.UTF-8" 
${locales}; then
# portage splits and unset LC_ALL. Cannot rely on that
-   if [[ ${LANG} != C ]] && [[ ${LANG} != POSIX ]] && ! [[ 
${LANG} =~ C. ]]; then
+   if [[ "${LANG}" != "C" ]] && [[ "${LANG}" != "POSIX" ]] 
&& [[ "${LANG}" == "${LANG#C\.}" ]]; then
# Set LC_ALL to avoid locales breaking due to 
the profile setting LC_MESSAGES=C and portage itself setting LC_COLLATE=C
einfo "Setting LC_ALL=${LANG} based on LANG 
because en_US.UTF-8 isn't available, bug #968468"
export LC_ALL="${LANG}"

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index afb84ea38cfb..4dbb5d495823 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -168,7 +168,7 @@ pkg_setup() {
local locales="$(locale -a)"
if ! has "en_US.utf8" ${locales} && ! has "en_US.UTF-8" 
${locales}; then
# portage splits and unset LC_ALL. Cannot rely on that
-   if [[ ${LANG} != C ]] && [[ ${LANG} != POSIX ]] && ! [[ 
${LANG} =~ C. ]]; then
+   if [[ "${LANG}" != "C" ]] && [[ "${LANG}" != "POSIX" ]] 
&& [[ "${LANG}" == "${LANG#C\.}" ]]; then
# Set LC_ALL to avoid locales breaking due to 
the profile setting LC_MESSAGES=C and portage itself setting LC_COLLATE=C
einfo "Setting LC_ALL=${LANG} based on LANG 
because en_US.UTF-8 isn't available, bug #968468"
export LC_ALL="${LANG}"



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

2026-02-07 Thread Sam James
commit: ca5dbe6a2a1aad09b79632acbedf453bfae3f1f8
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Feb  2 17:55:49 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb  7 17:44:37 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5dbe6a

media-gfx/gimp: only warn about missing babl/gegl  in the live package

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45601
Closes: https://github.com/gentoo/gentoo/pull/45601
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.2.0_rc2.ebuild | 8 +---
 media-gfx/gimp/gimp-.ebuild  | 8 +---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild 
b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
index 0b42b7f8476a..75f6e244bfe2 100644
--- a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
+++ b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
@@ -170,9 +170,11 @@ pkg_setup() {
python-single-r1_pkg_setup
use lua && lua-single_pkg_setup
 
-   if has_version ">=media-libs/babl-" || has_version 
">=media-libs/gegl-"; then
-   ewarn "Please make sure to rebuild media-libs/babl- and 
media-libs/gegl- packages"
-   ewarn "before building media-gfx/gimp- to have their latest 
master branch versions."
+   if [[ ${PV} ==  ]]; then
+   if has_version ">=media-libs/babl-" || has_version 
">=media-libs/gegl-"; then
+   ewarn "Please make sure to rebuild media-libs/babl- 
and media-libs/gegl- packages"
+   ewarn "before building media-gfx/gimp- to have 
their latest master branch versions."
+   fi
fi
 }
 

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 39e63c1f05a2..afb84ea38cfb 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -182,9 +182,11 @@ pkg_setup() {
python-single-r1_pkg_setup
use lua && lua-single_pkg_setup
 
-   if has_version ">=media-libs/babl-" || has_version 
">=media-libs/gegl-"; then
-   ewarn "Please make sure to rebuild media-libs/babl- and 
media-libs/gegl- packages"
-   ewarn "before building media-gfx/gimp- to have their latest 
master branch versions."
+   if [[ ${PV} ==  ]]; then
+   if has_version ">=media-libs/babl-" || has_version 
">=media-libs/gegl-"; then
+   ewarn "Please make sure to rebuild media-libs/babl- 
and media-libs/gegl- packages"
+   ewarn "before building media-gfx/gimp- to have 
their latest master branch versions."
+   fi
fi
 }
 



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

2026-02-07 Thread Sam James
commit: 73412ee2b83589fc6bccf63c320cbbe4cd20e50e
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Feb  2 17:45:08 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb  7 17:44:37 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73412ee2

media-gfx/gimp: allow build without en_US.UTF-8

Closes: https://bugs.gentoo.org/969468
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45601
Signed-off-by: Sam James  gentoo.org>

 .../gimp/files/gimp-3.0.8-allow-user-locale.patch  | 39 ++
 media-gfx/gimp/gimp-3.0.8-r1.ebuild| 22 +++-
 media-gfx/gimp/gimp-.ebuild| 19 ++-
 3 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gimp/files/gimp-3.0.8-allow-user-locale.patch 
b/media-gfx/gimp/files/gimp-3.0.8-allow-user-locale.patch
new file mode 100644
index ..734b49d3996c
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-3.0.8-allow-user-locale.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/969468
+https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2610
+https://gitlab.gnome.org/GNOME/gimp/-/commit/cae3be98df77b27ebaa6b9a07a5d64f375f18e28
+
+From cae3be98df77b27ebaa6b9a07a5d64f375f18e28 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate 
+Date: Sat, 31 Jan 2026 20:21:27 +0200
+Subject: [PATCH] tools/gen-languages: query user locale before falling back to
+ en_US
+
+setlocale(LC_ALL, "") queries the user locale.
+
+setlocale(LC_ALL, NULL) also queries the locale, but not the user
+locale. It actually queries the programs locale, which by default is C.
+
+Otherwise the user would need to have en_US.UTF-8 available no matter
+what.
+
+Check that derivates UTF8 of C locale aren't used as well.
+
+Bug: https://bugs.gentoo.org/969468
+Fixes: 88261f8b4cab65350cd858e9221a91da4c7f86db
+Signed-off-by: Alfred Wingate 
+--- a/tools/gen-languages.c
 b/tools/gen-languages.c
+@@ -280,8 +280,8 @@ gimp_language_store_parser_init (GError **error)
+   goto cleanup;
+ }
+ 
+-  locale = setlocale (LC_ALL, NULL);
+-  if (g_strcmp0 (locale, "C") == 0 || g_strcmp0 (locale, "POSIX") == 0)
++  locale = setlocale (LC_ALL, "");
++  if (g_strcmp0 (locale, "C") == 0 || g_strcmp0 (locale, "POSIX") == 0 || 
g_str_has_prefix (locale, "C."))
+ {
+   /* Note: we do not care about what we set, except not C or POSIX.
+* It may be any valid locale. This needs to be set so that this
+-- 
+GitLab
+

diff --git a/media-gfx/gimp/gimp-3.0.8-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
index 8d51913e2c9e..0795b4c13e07 100644
--- a/media-gfx/gimp/gimp-3.0.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
@@ -26,6 +26,8 @@ REQUIRED_USE="
 
 RESTRICT="!test? ( test )"
 
+# TODO: next revbump add iso-codes as a build time dependency. It affects the 
end result whether its available
+
 # See libgimp_deps_table in libgimp/meson.build for introspection 
dependencies, bug #969449
 COMMON_DEPEND="
${PYTHON_DEPS}
@@ -126,6 +128,7 @@ DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 PATCHES=(
"${FILESDIR}"/gimp-3.0.6-respect-NM.patch
"${FILESDIR}"/gimp-3.0.8-no-libunwind.patch
+   "${FILESDIR}"/gimp-3.0.8-allow-user-locale.patch
 )
 
 pkg_pretend() {
@@ -133,7 +136,24 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   use openmp && tc-check-openmp
+
+   # bug #969468
+   local locales="$(locale -a)"
+   if ! has "en_US.utf8" ${locales} && ! has "en_US.UTF-8" 
${locales}; then
+   # portage splits and unset LC_ALL. Cannot rely on that
+   if [[ ${LANG} != C ]] && [[ ${LANG} != POSIX ]] && ! [[ 
${LANG} =~ C. ]]; then
+   # Set LC_ALL to avoid locales breaking due to 
the profile setting LC_MESSAGES=C and portage itself setting LC_COLLATE=C
+   einfo "Setting LC_ALL=${LANG} based on LANG 
because en_US.UTF-8 isn't available, bug #968468"
+   export LC_ALL="${LANG}"
+   else
+   eerror "Cannot use LANG=${LANG} as it cannot be 
C or POSIX"
+   die "en_US.UTF-8 isn't available and cannot 
fallback to user locale, bug #969468"
+   fi
+   fi
+   fi
+
python-single-r1_pkg_setup
use lua && lua-single_pkg_setup
 }

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 0447c217ca37..39e63c1f05a2 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -161,7 +161,24 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   use openmp && tc-check-openm

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

2026-02-04 Thread Eli Schwartz
commit: 02bc99eb57d33601cb981d44c10b292526f3c561
Author: Eli Schwartz  gentoo  org>
AuthorDate: Thu Feb  5 01:10:45 2026 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Thu Feb  5 01:10:45 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02bc99eb

media-gfx/gimp: Stabilize 2.10.38-r4 ppc64, #969421

Signed-off-by: Eli Schwartz  gentoo.org>

 media-gfx/gimp/gimp-2.10.38-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-2.10.38-r4.ebuild 
b/media-gfx/gimp/gimp-2.10.38-r4.ebuild
index be8271a1028c..35468ec850dc 100644
--- a/media-gfx/gimp/gimp-2.10.38-r4.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38-r4.ebuild
@@ -12,7 +12,7 @@ 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 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~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"
 



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

2026-02-04 Thread Sam James
commit: 6530b67ba1885fbeb1226004b68cadc18717f361
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb  4 23:28:13 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  4 23:28:13 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6530b67b

media-gfx/gimp: Stabilize 2.10.38-r4 arm64, #969421

Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-2.10.38-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-2.10.38-r4.ebuild 
b/media-gfx/gimp/gimp-2.10.38-r4.ebuild
index bf0465e9f635..e69c9d666b1d 100644
--- a/media-gfx/gimp/gimp-2.10.38-r4.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38-r4.ebuild
@@ -12,7 +12,7 @@ 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 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~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"
 



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

2026-01-30 Thread Joonas Niilola
commit: c166f9154a1cdf7b16fec6c90d07d67478f78557
Author: Alfred Wingate  protonmail  com>
AuthorDate: Fri Jan 30 08:45:45 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jan 30 09:35:07 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c166f915

media-gfx/gimp: add all the introspection dependencies

Skip 3.0.6 as there gexiv2 missing wont cause issues for USE="-vala"
and because 3.0.8 would be stabilized sooner anyway.

Bug: https://bugs.gentoo.org/969449
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45578
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/{gimp-3.0.8.ebuild => gimp-3.0.8-r1.ebuild} | 13 ++---
 media-gfx/gimp/gimp-.ebuild| 13 ++---
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.8.ebuild 
b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
similarity index 95%
rename from media-gfx/gimp/gimp-3.0.8.ebuild
rename to media-gfx/gimp/gimp-3.0.8-r1.ebuild
index 832722c9a955..8d51913e2c9e 100644
--- a/media-gfx/gimp/gimp-3.0.8.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8-r1.ebuild
@@ -26,8 +26,7 @@ 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}
+# See libgimp_deps_table in libgimp/meson.build for introspection 
dependencies, bug #969449
 COMMON_DEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
@@ -40,7 +39,7 @@ COMMON_DEPEND="
>=app-text/poppler-0.90.1[cairo]
>=app-text/poppler-data-0.4.9
>=dev-libs/appstream-0.16.1:=
-   >=dev-libs/glib-2.70.0:2
+   >=dev-libs/glib-2.70.0:2[introspection]
>=dev-libs/gobject-introspection-1.82.0-r2
>=dev-libs/json-glib-1.4.4
>=gnome-base/librsvg-2.40.6:2
@@ -49,8 +48,8 @@ COMMON_DEPEND="
>=media-libs/fontconfig-2.12.6
>=media-libs/freetype-2.10.2
>=media-libs/gegl-0.4.62:0.4[cairo,introspection,lcms,vala?]
-   =media-libs/gexiv2-0.14.0
+   =media-libs/gexiv2-0.14.0[introspection]
>=media-libs/harfbuzz-2.6.5:=
>=media-libs/lcms-2.13.1:2
media-libs/libjpeg-turbo:=
@@ -59,10 +58,10 @@ COMMON_DEPEND="
>=media-libs/tiff-4.1.0:=
net-libs/glib-networking[ssl]
virtual/zlib:=
-   >=x11-libs/cairo-1.16.0[X?]
+   >=x11-libs/cairo-1.16.0[introspection(+),X?]
>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
>=x11-libs/gtk+-3.24.48:3[introspection,wayland?,X?]
-   >=x11-libs/pango-1.50.0[X?]
+   >=x11-libs/pango-1.50.0[introspection,X?]
aalib? ( media-libs/aalib )
alsa? ( >=media-libs/alsa-lib-1.0.0 )
fits? ( sci-libs/cfitsio:= )

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 41363995a23d..8b5244cdccbc 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -49,8 +49,7 @@ RESTRICT="!test? ( test )"
 
 # automagic dependency on bash to create bash-completions
 
-# 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}
+# See libgimp_deps_table in libgimp/meson.build for introspection 
dependencies, bug #969449
 COMMON_DEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
@@ -64,7 +63,7 @@ COMMON_DEPEND="
>=app-text/poppler-0.69.0[cairo]
>=app-text/poppler-data-0.4.9
>=dev-libs/appstream-0.16.1:=
-   >=dev-libs/glib-2.70.0:2
+   >=dev-libs/glib-2.70.0:2[introspection]
>=dev-libs/gobject-introspection-1.82.0-r2
>=dev-libs/json-glib-1.2.6
>=gnome-base/librsvg-2.40.6:2
@@ -72,8 +71,8 @@ COMMON_DEPEND="
media-gfx/mypaint-brushes:2.0=
>=media-libs/fontconfig-2.12.4
>=media-libs/freetype-2.1.7
-   =media-libs/gexiv2-0.14.0
+   =media-libs/gexiv2-0.14.0[introspection]
>=media-libs/harfbuzz-2.8.2:=
>=media-libs/lcms-2.8:2
media-libs/libjpeg-turbo:=
@@ -82,10 +81,10 @@ COMMON_DEPEND="
>=media-libs/tiff-4.0.0:=
net-libs/glib-networking[ssl]
virtual/zlib:=
-   >=x11-libs/cairo-1.14.0[X?]
+   >=x11-libs/cairo-1.14.0[introspection(+),X?]
>=x11-libs/gdk-pixbuf-2.30.8:2[introspection]
>=x11-libs/gtk+-3.24.0:3[introspection,wayland?,X?]
-   >=x11-libs/pango-1.50.0[X?]
+   >=x11-libs/pango-1.50.0[introspection,X?]
aalib? ( media-libs/aalib )
alsa? ( >=media-libs/alsa-lib-1.0.0 )
fits? ( sci-libs/cfitsio:= )



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

2026-01-30 Thread Joonas Niilola
commit: f3ece9dd15bb000f4a11b4bbba0f0cc885580ce6
Author: Alfred Wingate  protonmail  com>
AuthorDate: Fri Jan 30 08:48:15 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jan 30 09:35:07 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ece9dd

media-gfx/gimp: drop redundant comment

Fixes: 6661c8a943c1424b9b8e2447e9f02aff5a009eb8
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45578
Closes: https://github.com/gentoo/gentoo/pull/45578
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 8b5244cdccbc..0447c217ca37 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -47,8 +47,6 @@ REQUIRED_USE="
 
 RESTRICT="!test? ( test )"
 
-# automagic dependency on bash to create bash-completions
-
 # See libgimp_deps_table in libgimp/meson.build for introspection 
dependencies, bug #969449
 COMMON_DEPEND="
${PYTHON_DEPS}



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

2026-01-29 Thread Sam James
commit: 5314f54c7c5d9752ad750bd99573c5432871c17b
Author: Alfred Wingate  protonmail  com>
AuthorDate: Wed Jan 28 18:20:29 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 29 17:12:59 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5314f54c

media-gfx/gimp: skip long time failing test

Bug: https://bugs.gentoo.org/910444
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45563
Closes: https://github.com/gentoo/gentoo/pull/45563
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-2.10.38-r4.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-gfx/gimp/gimp-2.10.38-r4.ebuild 
b/media-gfx/gimp/gimp-2.10.38-r4.ebuild
index c3d87cbe5017..bf0465e9f635 100644
--- a/media-gfx/gimp/gimp-2.10.38-r4.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38-r4.ebuild
@@ -118,6 +118,9 @@ src_prepare() {
has_version -d ">=media-libs/libheif-1.18.0" && eapply 
"${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
fi
 
+   # bug #910444
+   sed -e '/test-tools/d' -i app/tests/Makefile.am || die
+
gnome2_src_prepare  # calls eautoreconf
 
sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' 
-i configure || die #615144



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

2026-01-29 Thread Sam James
commit: 0a30d862acf29fc8e87d90e1af5be280920405fc
Author: Alfred Wingate  protonmail  com>
AuthorDate: Wed Jan 28 17:47:12 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 29 17:12:58 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a30d862

media-gfx/gimp: backport vulnerability fixes

Keep the old revision around just in case due to how many patches got
backported.

Bug: https://bugs.gentoo.org/969287
Bug: https://bugs.gentoo.org/969286
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45563
Signed-off-by: Sam James  gentoo.org>

 .../gimp/files/gimp-2.10.38-ZDI-CAN-27863.patch| 149 +
 .../gimp/files/gimp-2.10.38-ZDI-CAN-28158.patch|  28 +++
 .../gimp/files/gimp-2.10.38-ZDI-CAN-28232.patch|  34 +++
 .../gimp/files/gimp-2.10.38-ZDI-CAN-28248.patch|  82 +++
 .../gimp/files/gimp-2.10.38-ZDI-CAN-28265.patch|  40 
 .../gimp/files/gimp-2.10.38-ZDI-CAN-28273.patch|  64 ++
 .../gimp/files/gimp-2.10.38-ZDI-CAN-28591.patch|  88 
 .../gimp/files/gimp-2.10.38-ZDI-CAN-28599.patch|  89 
 .../gimp/files/gimp-2.10.38-fix-psp-overflow.patch |  46 
 media-gfx/gimp/gimp-2.10.38-r4.ebuild  | 245 +
 10 files changed, 865 insertions(+)

diff --git a/media-gfx/gimp/files/gimp-2.10.38-ZDI-CAN-27863.patch 
b/media-gfx/gimp/files/gimp-2.10.38-ZDI-CAN-27863.patch
new file mode 100644
index ..47d24434779c
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.10.38-ZDI-CAN-27863.patch
@@ -0,0 +1,149 @@
+https://bugs.gentoo.org/969286
+https://www.zerodayinitiative.com/advisories/ZDI-25-911/
+https://gitlab.gnome.org/GNOME/gimp/-/issues/14811
+https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2444
+https://gitlab.gnome.org/GNOME/gimp/-/commit/0f309f9a8d82f43fa01383bc5a5c41d28727d9e3
+
+From ea423250c1f3dca4a1cea15e2644c5b04fda478b Mon Sep 17 00:00:00 2001
+From: Jacob Boerema 
+Date: Wed, 3 Sep 2025 13:31:45 -0400
+Subject: [PATCH] plug-ins: fix dicom plug-in ZDI-CAN-27863
+
+GIMP DCM File Parsing Heap-based Buffer Overflow Remote Code Execution
+Vulnerability
+
+This adds more safety checks and sets actual GError's instead of just
+calling gimp_quit.
+
+Cherry-picked from 3d909166463731e94dfe62042d76225ecfc4c1e4
+
+Cherry-picked to 2.10 and modified to work correctly with this context:
+6bca8c4f8970d976c731463f938ae39df3c3fd4c
+72df7883ef503bc81a2e1498bfcb842dd97da221
+--- a/plug-ins/common/file-dicom.c
 b/plug-ins/common/file-dicom.c
+@@ -330,6 +330,7 @@ load_image (const gchar  *filename,
+   gintbits_stored   = 0;
+   ginthigh_bit  = 0;
+   guint8 *pix_buf   = NULL;
++  guint64 pixbuf_size   = 0;
+   gbooleanis_signed = FALSE;
+   guint8  in_sequence   = 0;
+   gbooleanimplicit_encoding = FALSE;
+@@ -385,6 +386,7 @@ load_image (const gchar  *filename,
+   guint16  ctx_us;
+   guint8  *value;
+   guint32  tag;
++  size_t   actual_read;
+ 
+   if (fread (&group_word, 1, 2, DICOM) == 0)
+ break;
+@@ -489,15 +491,24 @@ load_image (const gchar  *filename,
+ 
+   if (element_length >= (G_MAXUINT - 6))
+ {
+-  g_message ("'%s' seems to have an incorrect value field length.",
+- gimp_filename_to_utf8 (filename));
+-  gimp_quit ();
++  g_set_error (error, GIMP_PLUG_IN_ERROR, 0,
++   _("'%s' has an an incorrect value for field size. 
Possibly corrupt image."),
++   gimp_filename_to_utf8 (filename));
++  g_free (dicominfo);
++  fclose (DICOM);
++  return -1;
+ }
+ 
+   /* Read contents. Allocate a bit more to make room for casts to int
+below. */
+   value = g_new0 (guint8, element_length + 4);
+-  fread (value, 1, element_length, DICOM);
++  actual_read = fread (value, 1, element_length, DICOM);
++  if (actual_read < element_length)
++{
++  g_warning ("Missing data: needed %u bytes, got %u. Possibly corrupt 
image.",
++ element_length, (guint32) actual_read);
++  element_length = actual_read;
++}
+ 
+   /* ignore everything inside of a sequence */
+   if (in_sequence)
+@@ -510,7 +521,7 @@ load_image (const gchar  *filename,
+   if (big_endian && group_word != 0x0002)
+ ctx_us = GUINT16_SWAP_LE_BE (ctx_us);
+ 
+-  g_debug ("group: %04x, element: %04x, length: %d",
++  g_debug ("group: %04x, element: %04x, length: %u",
+group_word, element_word, element_length);
+   g_debug ("Value: %s", (char*)value);
+   /* Recognize some critical tags */
+@@ -644,6 +655,7 @@ load_image (const gchar  *filename,
+   if (group_word == 0x7fe0 && element_word == 0x0010)
+ {
+   pix_buf = value;
++  pixbuf_size = element_length;
+ 

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

2026-01-29 Thread Joonas Niilola
commit: 2d204720cdcfc923170c2cdc54232c30c8adf7b6
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Jan 27 13:11:01 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 29 16:32:09 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d204720

media-gfx/gimp: disable headless tests again

Additionally add -j1 to tests as I saw one instance of flakyness. The
tests dont take long enough for this to be a big deal.

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45541
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-3.0.8.ebuild | 9 +++--
 media-gfx/gimp/gimp-.ebuild  | 9 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.8.ebuild b/media-gfx/gimp/gimp-3.0.8.ebuild
index d698920b4486..cd3452ac7ca3 100644
--- a/media-gfx/gimp/gimp-3.0.8.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8.ebuild
@@ -185,7 +185,9 @@ src_configure() {
$(meson_feature openexr)
$(meson_feature openmp)
$(meson_feature postscript ghostscript)
-   $(meson_feature test headless-tests)
+   # https://gitlab.gnome.org/GNOME/gimp/-/issues/15763
+   -Dheadless-tests=disabled
+   #$(meson_feature test headless-tests)
$(meson_feature udev gudev)
$(meson_feature vala)
$(meson_feature webp)
@@ -225,11 +227,14 @@ _rename_plugins() {
 
 src_test() {
local -x LD_LIBRARY_PATH="${BUILD_DIR}/libgimp:${LD_LIBRARY_PATH}"
+
# Try hard to avoid system installed gimp causing issues
local -x GIMP3_DIRECTORY="${BUILD_DIR}/"
local -x GIMP3_PLUGINDIR="${BUILD_DIR}/plug-ins/"
local -x GIMP3_SYSCONFDIR="${BUILD_DIR}/etc/"
-   meson_src_test
+
+   # Flakyness is possible
+   meson_src_test -j1
 }
 
 src_install() {

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 4321edd5e61a..55ffbcbf665f 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -217,7 +217,9 @@ src_configure() {
$(meson_feature openexr)
$(meson_feature openmp)
$(meson_feature postscript ghostscript)
-   $(meson_feature test headless-tests)
+   # https://gitlab.gnome.org/GNOME/gimp/-/issues/15763
+   -Dheadless-tests=disabled
+   #$(meson_feature test headless-tests)
$(meson_feature udev gudev)
$(meson_feature vala)
$(meson_feature webp)
@@ -257,11 +259,14 @@ _rename_plugins() {
 
 src_test() {
local -x LD_LIBRARY_PATH="${BUILD_DIR}/libgimp:${LD_LIBRARY_PATH}"
+
# Try hard to avoid system installed gimp causing issues
local -x GIMP3_DIRECTORY="${BUILD_DIR}/"
local -x GIMP3_PLUGINDIR="${BUILD_DIR}/plug-ins/"
local -x GIMP3_SYSCONFDIR="${BUILD_DIR}/etc/"
-   meson_src_test
+
+   # Flakyness is possible
+   meson_src_test -j1
 }
 
 src_install() {



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

2026-01-29 Thread Joonas Niilola
commit: 170538afc2ca9bf925ba88841598e3967a6b9d4d
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Jan 27 10:26:06 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 29 16:32:09 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=170538af

media-gfx/gimp: backport libunwind=false fix

Reported-by: Chris Mayo  gmail.com>
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45541
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/files/gimp-3.0.8-no-libunwind.patch | 49 ++
 media-gfx/gimp/gimp-3.0.8.ebuild   |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/media-gfx/gimp/files/gimp-3.0.8-no-libunwind.patch 
b/media-gfx/gimp/files/gimp-3.0.8-no-libunwind.patch
new file mode 100644
index ..634240df50cf
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-3.0.8-no-libunwind.patch
@@ -0,0 +1,49 @@
+https://gitlab.gnome.org/GNOME/gimp/-/issues/15750
+https://gitlab.gnome.org/GNOME/gimp/-/commit/a22b7c895cba10ffcf00ce66f656d1473de62685
+
+From a22b7c895cba10ffcf00ce66f656d1473de62685 Mon Sep 17 00:00:00 2001
+From: Bruno Lopes 
+Date: Sun, 25 Jan 2026 11:11:48 -0300
+Subject: [PATCH] meson: Fix libunwind header detection on non-macOS platforms
+
+Closes: #15750
+(cherry picked from commit 1aa51ca0637db88a4ea958d03fa6692e6ac0289b)
+--- a/meson.build
 b/meson.build
+@@ -731,11 +731,14 @@ conf.set('HAVE_LIBBACKTRACE', libbacktrace.found())
+ ## Check for libunwind
+ # In most platforms, unw_*() functions are in the libunwind library.
+ # In macOS, it is on libSystem (there we only need the SDK header).
+-libunwind = ( get_option('libunwind')
+-  ? dependency('libunwind', version: '>=1.1.0', required: false)
+-  : no_dep
+-)
+-have_unwind = libunwind.found() or cc.has_header('libunwind.h', required: 
false)
++libunwind = no_dep
++if get_option('libunwind')
++  libunwind = dependency('libunwind', version: '>=1.1.0', required: false)
++  libunwind_h = platform_osx ? cc.has_header('libunwind.h', required: false) 
: false
++  have_unwind = libunwind.found() or libunwind_h
++else
++  have_unwind = false
++endif
+ conf.set('HAVE_LIBUNWIND', have_unwind ? 1 : false)
+ 
+ ## Check for backtrace() API
+@@ -758,11 +761,11 @@ if platform_windows
+ elif platform_linux
+   if not have_execinfo_h
+ dashboard_backtrace='no (missing: execinfo.h)'
+-  elif not libbacktrace.found() and not libunwind.found()
++  elif not libbacktrace.found() and not have_unwind
+ dashboard_backtrace='rough (missing: libbacktrace and libunwind)'
+   elif not libbacktrace.found()
+ dashboard_backtrace='partially detailed (missing: libbacktrace)'
+-  elif not libunwind.found()
++  elif not have_unwind
+ dashboard_backtrace='partially detailed (missing: libunwind)'
+   else
+ dashboard_backtrace='detailed'
+-- 
+GitLab
+

diff --git a/media-gfx/gimp/gimp-3.0.8.ebuild b/media-gfx/gimp/gimp-3.0.8.ebuild
index bb352b93ed81..d698920b4486 100644
--- a/media-gfx/gimp/gimp-3.0.8.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8.ebuild
@@ -122,8 +122,8 @@ BDEPEND="
 DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 
 PATCHES=(
-   "${FILESDIR}"/gimp-3.0.6-fix-tests.patch
"${FILESDIR}"/gimp-3.0.6-respect-NM.patch
+   "${FILESDIR}"/gimp-3.0.8-no-libunwind.patch
 )
 
 pkg_pretend() {



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

2026-01-29 Thread Joonas Niilola
commit: f56532c073315b848a497cd0cbec3376e259b43d
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Jan 27 14:08:16 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 29 16:32:09 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56532c0

media-gfx/gimp: update sed

See-Also: 
https://gitlab.gnome.org/GNOME/gimp-data/-/commit/9ff721b6ff7cf5768f934e9077291025a6fa3715
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45541
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-3.0.8.ebuild | 2 +-
 media-gfx/gimp/gimp-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.8.ebuild b/media-gfx/gimp/gimp-3.0.8.ebuild
index e8920563c974..82fc900c03c0 100644
--- a/media-gfx/gimp/gimp-3.0.8.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8.ebuild
@@ -149,7 +149,7 @@ src_prepare() {
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
+   sed -i -e "s/'gimp-' + gimp_api_version/'gimp-${PVR}'/" 
gimp-data/images/logo/meson.build || die
 
# Force disable x11_target if USE="-X" is setup. See bug 943164 for 
additional info
use !X && { sed -i -e 's/x11_target = /x11_target = false #/' 
meson.build || die; }

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 87d44397300a..6ed7eecd2e43 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -185,7 +185,7 @@ src_prepare() {
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
+   sed -i -e "s/'gimp-' + gimp_api_version/'gimp-${PVR}'/" 
gimp-data/images/logo/meson.build || die
 
# Force disable x11_target if USE="-X" is setup. See bug 943164 for 
additional info
use !X && { sed -i -e 's/x11_target = /x11_target = false #/' 
meson.build || die; }



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

2026-01-29 Thread Joonas Niilola
commit: cdcb3711ec1ab5d1e617e1c5806c9ecc8b04a521
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sun Jan 25 01:26:24 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 29 16:32:09 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdcb3711

media-gfx/gimp: add 3.0.8

Bug: https://bugs.gentoo.org/969287
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45541
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/Manifest  |   1 +
 media-gfx/gimp/gimp-3.0.8.ebuild | 257 +++
 2 files changed, 258 insertions(+)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index d0755bea31db..8b30d5263ce1 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,4 @@
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-3.0.6.tar.xz 27197880 BLAKE2B 
ef5220a36ca4666db5c8c20628458e5b621b3bfb594be8eda974f3be18429d946e35456428c8a28a957911c6302ab69d2eb35bb7249f332f5ac4d6146c28c9d1
 SHA512 
513fe11083b6560ce7bbe1b56ccbc0d83a4edb33e110508543fc8c8fdf6c60d91f9af60cb4d83926eec490baceb6c9cc5aae43a4d0ae7a04099f4036e50d179c
+DIST gimp-3.0.8.tar.xz 27277560 BLAKE2B 
327aa7833406bd09d7b36ef5ee59a1c65766ab3faa5085507af4b215688cba659be135a95a4980ee44b95fdfad47bf15fb5ec61e62156761302ba996cc4cd233
 SHA512 
0d4f05bd155249982e190768b29393f50d51015bc1c20c0bf9959d42907dc7d2076479aff0d8892038c54b4eb7036d07323d5f5ab64cdc4bf092215a0e9e4be5
 DIST gimp-3.2.0-RC2.tar.xz 34615136 BLAKE2B 
91c1567efcadbf1db0ea9c54e99354c65e723526ca417250d17cdba7b9ffa82d81964309fa955d074ddc47f8a7c4f61a1bd9535f1b6edbb3c886d37ceb9379a5
 SHA512 
b6b201b4f76966f96ab201761a61b4040907d31850c8786d3824d9aac14f04ae53697b74e5c9fee69640c4843fc1b7810a8990b19ba3d7a8131d8783aa5b6d0b

diff --git a/media-gfx/gimp/gimp-3.0.8.ebuild b/media-gfx/gimp/gimp-3.0.8.ebuild
new file mode 100644
index ..e8920563c974
--- /dev/null
+++ b/media-gfx/gimp/gimp-3.0.8.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{11..14} )
+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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
+
+IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland 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-arch/bzip2
+   app-arch/libarchive:=
+   >=app-arch/xz-utils-5.0.0
+   >=app-text/poppler-0.90.1[cairo]
+   >=app-text/poppler-data-0.4.9
+   >=dev-libs/appstream-0.16.1:=
+   >=dev-libs/glib-2.70.0:2
+   >=dev-libs/gobject-introspection-1.82.0-r2
+   >=dev-libs/json-glib-1.4.4
+   >=gnome-base/librsvg-2.40.6:2
+   >=media-gfx/mypaint-brushes-1.3.1:1.0=
+   >=media-libs/babl-0.1.114[introspection,lcms,vala?]
+   >=media-libs/fontconfig-2.12.6
+   >=media-libs/freetype-2.10.2
+   >=media-libs/gegl-0.4.62: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]
+   virtual/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,wayland?,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 '
+

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

2026-01-29 Thread Joonas Niilola
commit: 3ad50fa21ec0d138d9b874df669f753919db4bc3
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Jan 27 17:17:32 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 29 16:32:10 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad50fa2

media-gfx/gimp: missing headless-tests dependency

Upstream commit: 0352559efafa881cea92a5b8cf4c6f01b6a457f2

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45541
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild | 5 -
 media-gfx/gimp/gimp-3.0.8.ebuild | 5 -
 media-gfx/gimp/gimp-3.2.0_rc2.ebuild | 5 -
 media-gfx/gimp/gimp-.ebuild  | 5 -
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index d2df83136526..001f09924467 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -102,7 +102,10 @@ RDEPEND="
 
 DEPEND="
${COMMON_DEPEND}
-   test? ( x11-misc/xvfb-run )
+   test? (
+   sys-apps/dbus
+   x11-misc/xvfb-run
+   )
vala? ( $(vala_depend) )
 "
 

diff --git a/media-gfx/gimp/gimp-3.0.8.ebuild b/media-gfx/gimp/gimp-3.0.8.ebuild
index f5fb87b527dc..832722c9a955 100644
--- a/media-gfx/gimp/gimp-3.0.8.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8.ebuild
@@ -117,7 +117,10 @@ BDEPEND="
vala? ( $(vala_depend) )
virtual/pkgconfig
 "
-#  X? ( test? ( x11-misc/xvfb-run ) )
+#  X? ( test? (
+#  sys-apps/dbus
+#  x11-misc/xvfb-run
+#  ) )
 
 DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 

diff --git a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild 
b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
index 2ff7a5c51c64..0b42b7f8476a 100644
--- a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
+++ b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
@@ -146,7 +146,10 @@ BDEPEND="
>=dev-libs/gobject-introspection-1.82.0-r2[doctool]
dev-util/gi-docgen
)
-   test? ( x11-misc/xvfb-run )
+   test? (
+   sys-apps/dbus
+   x11-misc/xvfb-run
+   )
vala? ( $(vala_depend) )
vector-icons? ( x11-misc/shared-mime-info )
 "

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 6cc0647f81e8..41363995a23d 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -152,7 +152,10 @@ BDEPEND="
vala? ( $(vala_depend) )
vector-icons? ( x11-misc/shared-mime-info )
 "
-#  X? ( test? ( x11-misc/xvfb-run ) )
+#  X? ( test? (
+#  sys-apps/dbus
+#  x11-misc/xvfb-run
+#  ) )
 
 DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 



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

2026-01-29 Thread Joonas Niilola
commit: 6661c8a943c1424b9b8e2447e9f02aff5a009eb8
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Jan 27 14:03:11 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 29 16:32:09 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6661c8a9

media-gfx/gimp: conditional bash-completions support

Upstream commit: 88b4f29ce7f6a47f269bafb86b39bc8f6324fcc8

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45541
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-3.0.8.ebuild | 22 ++
 media-gfx/gimp/gimp-.ebuild  | 13 +++--
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.8.ebuild b/media-gfx/gimp/gimp-3.0.8.ebuild
index cd3452ac7ca3..4de98258733e 100644
--- a/media-gfx/gimp/gimp-3.0.8.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{11..14} )
 VALA_USE_DEPEND=vapigen
 
-inherit flag-o-matic lua-single meson python-single-r1 toolchain-funcs vala xdg
+inherit bash-completion-r1 flag-o-matic lua-single meson python-single-r1 
toolchain-funcs vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -17,7 +17,7 @@ LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
 
-IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
+IUSE="X aalib alsa bash-completion doc fits gnome heif javascript jpeg2k 
jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons 
wayland webp wmf xpm"
 REQUIRED_USE="
${PYTHON_REQUIRED_USE}
lua? ( ${LUA_REQUIRED_USE} )
@@ -100,22 +100,23 @@ RDEPEND="
gnome? ( gnome-base/gvfs )
 "
 
-DEPEND="
-   ${COMMON_DEPEND}
-   test? ( x11-misc/xvfb-run )
-   vala? ( $(vala_depend) )
-"
+DEPEND="${COMMON_DEPEND}"
 
-# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
 BDEPEND="
>=dev-lang/perl-5.30.3
dev-libs/libxslt
>=dev-util/gdbus-codegen-2.80.5-r1
>=sys-devel/gettext-0.21
+   bash-completion? (
+   app-shells/bash-completion
+   app-shells/bash
+   )
doc? (
>=dev-libs/gobject-introspection-1.82.0-r2[doctool]
dev-util/gi-docgen
)
+   test? ( x11-misc/xvfb-run )
+   vala? ( $(vala_depend) )
virtual/pkgconfig
 "
 
@@ -175,6 +176,7 @@ src_configure() {
-Dwebkit-unmaintained=false
$(meson_feature aalib aa)
$(meson_feature alsa)
+   $(meson_feature bash-completion)
$(meson_feature doc gi-docgen)
$(meson_feature fits)
$(meson_feature heif)
@@ -250,6 +252,10 @@ src_install() {
dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-3.0 
/usr/bin/gimp-test-clipboard
dosym "${ESYSROOT}"/usr/bin/gimptool-3.0 /usr/bin/gimptool
 
+   if use bash-completion; then
+   bashcomp_alias gimp-3.0 gimp{,-3} gimp-console{,-3,-3.0}
+   fi
+
_rename_plugins || die
 }
 

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 55ffbcbf665f..919940b0cb24 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{11..14} )
 VALA_USE_DEPEND=vapigen
 
-inherit flag-o-matic lua-single meson python-single-r1 toolchain-funcs vala xdg
+inherit bash-completion-r1 flag-o-matic lua-single meson python-single-r1 
toolchain-funcs vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -38,7 +38,7 @@ fi
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/${MAJOR_VERSION}"
 
-IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
+IUSE="X aalib alsa bash-completion doc fits gnome heif javascript jpeg2k 
jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons 
wayland webp wmf xpm"
 REQUIRED_USE="
${PYTHON_REQUIRED_USE}
lua? ( ${LUA_REQUIRED_USE} )
@@ -142,6 +142,10 @@ BDEPEND="
>=dev-util/gdbus-codegen-2.80.5-r1
>=sys-devel/gettext-0.21
virtual/pkgconfig
+   bash-completion? (
+   app-shells/bash-completion
+   app-shells/bash
+   )
doc? (
>=dev-libs/gobject-introspection-1.82.0-r2[doctool]
dev-util/gi-docgen
@@ -207,6 +211,7 @@ src_configure() {
-Dwebkit-unmaintained=false
$(meson_feature aalib aa)
$(meson_feature alsa)
+   $(meson_feature bash-completion)
$(meson_feature doc gi-docgen)
$(meson_feature fits)

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

2026-01-29 Thread Joonas Niilola
commit: d076f53d01f541e30814b73b0de4c225c93c9aa8
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Jan 27 14:05:23 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 29 16:32:09 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d076f53d

media-gfx/gimp: use the branding eclass

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45541
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-3.0.8.ebuild | 4 ++--
 media-gfx/gimp/gimp-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.8.ebuild b/media-gfx/gimp/gimp-3.0.8.ebuild
index 4de98258733e..a531936f86f4 100644
--- a/media-gfx/gimp/gimp-3.0.8.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{11..14} )
 VALA_USE_DEPEND=vapigen
 
-inherit bash-completion-r1 flag-o-matic lua-single meson python-single-r1 
toolchain-funcs vala xdg
+inherit bash-completion-r1 branding flag-o-matic lua-single meson 
python-single-r1 toolchain-funcs vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -170,7 +170,7 @@ src_configure() {
-Ddebug-self-in-build=false
-Denable-multiproc=true
-Dappdata-test=disabled
-   -Dbug-report-url=https://bugs.gentoo.org/
+   -Dbug-report-url="${BRANDING_OS_BUG_REPORT_URL}"
-Dilbm=disabled
-Dlibbacktrace=false
-Dwebkit-unmaintained=false

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 919940b0cb24..61a750b4b52c 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{11..14} )
 VALA_USE_DEPEND=vapigen
 
-inherit bash-completion-r1 flag-o-matic lua-single meson python-single-r1 
toolchain-funcs vala xdg
+inherit bash-completion-r1 branding flag-o-matic lua-single meson 
python-single-r1 toolchain-funcs vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -205,7 +205,7 @@ src_configure() {
-Ddebug-self-in-build=false
-Denable-multiproc=true
-Dappdata-test=disabled
-   -Dbug-report-url=https://bugs.gentoo.org/
+   -Dbug-report-url="${BRANDING_OS_BUG_REPORT_URL}"
-Dilbm=disabled
-Dlibbacktrace=false
-Dwebkit-unmaintained=false



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

2026-01-29 Thread Joonas Niilola
commit: 4e252b9f06a6508d61ac4ab8bf418aa93d8bd79f
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Jan 27 12:05:05 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 29 16:32:09 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e252b9f

media-gfx/gimp: drop applied patch from live

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45541
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index b0f19e6d5714..4321edd5e61a 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -153,10 +153,6 @@ BDEPEND="
 
 DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 
-PATCHES=(
-   "${FILESDIR}"/gimp-3.0.6-fix-tests.patch
-)
-
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }



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

2026-01-29 Thread Joonas Niilola
commit: da5ed85833532ffe972f944218f5f0f640314bc3
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Jan 27 16:42:25 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 29 16:32:10 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5ed858

media-gfx/gimp: drop X requirement from tests

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45541
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-3.0.8.ebuild | 5 ++---
 media-gfx/gimp/gimp-.ebuild  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.8.ebuild b/media-gfx/gimp/gimp-3.0.8.ebuild
index a531936f86f4..f5fb87b527dc 100644
--- a/media-gfx/gimp/gimp-3.0.8.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8.ebuild
@@ -21,7 +21,6 @@ IUSE="X aalib alsa bash-completion doc fits gnome heif 
javascript jpeg2k jpegxl
 REQUIRED_USE="
${PYTHON_REQUIRED_USE}
lua? ( ${LUA_REQUIRED_USE} )
-   test? ( X )
xpm? ( X )
 "
 
@@ -115,10 +114,10 @@ BDEPEND="
>=dev-libs/gobject-introspection-1.82.0-r2[doctool]
dev-util/gi-docgen
)
-   test? ( x11-misc/xvfb-run )
vala? ( $(vala_depend) )
virtual/pkgconfig
 "
+#  X? ( test? ( x11-misc/xvfb-run ) )
 
 DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 
@@ -189,7 +188,7 @@ src_configure() {
$(meson_feature postscript ghostscript)
# https://gitlab.gnome.org/GNOME/gimp/-/issues/15763
-Dheadless-tests=disabled
-   #$(meson_feature test headless-tests)
+   #$(usex X $(meson_feature test headless-tests) 
-Dheadless-tests=disabled )
$(meson_feature udev gudev)
$(meson_feature vala)
$(meson_feature webp)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 61a750b4b52c..6cc0647f81e8 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -42,7 +42,6 @@ IUSE="X aalib alsa bash-completion doc fits gnome heif 
javascript jpeg2k jpegxl
 REQUIRED_USE="
${PYTHON_REQUIRED_USE}
lua? ( ${LUA_REQUIRED_USE} )
-   test? ( X )
xpm? ( X )
 "
 
@@ -150,10 +149,10 @@ BDEPEND="
>=dev-libs/gobject-introspection-1.82.0-r2[doctool]
dev-util/gi-docgen
)
-   test? ( x11-misc/xvfb-run )
vala? ( $(vala_depend) )
vector-icons? ( x11-misc/shared-mime-info )
 "
+#  X? ( test? ( x11-misc/xvfb-run ) )
 
 DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 
@@ -224,7 +223,7 @@ src_configure() {
$(meson_feature postscript ghostscript)
# https://gitlab.gnome.org/GNOME/gimp/-/issues/15763
-Dheadless-tests=disabled
-   #$(meson_feature test headless-tests)
+   #$(usex X $(meson_feature test headless-tests) 
-Dheadless-tests=disabled )
$(meson_feature udev gudev)
$(meson_feature vala)
$(meson_feature webp)



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

2026-01-29 Thread Joonas Niilola
commit: 8769a10aed4854f3acfc16a8dbd200a475eac765
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Jan 26 14:08:04 2026 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 29 16:32:09 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8769a10a

media-gfx/gimp: append properly to the preprocessor

Whilst here it wouldn't make much of a difference due to the codebase being
mostly C, its still better to do it properly.

Suggested-by: Chris Mayo  gmail.com>
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45541
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild | 4 ++--
 media-gfx/gimp/gimp-3.0.8.ebuild | 4 ++--
 media-gfx/gimp/gimp-3.2.0_rc2.ebuild | 4 ++--
 media-gfx/gimp/gimp-.ebuild  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index 5a17b34afbc6..d2df83136526 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -157,8 +157,8 @@ src_prepare() {
 
 src_configure() {
# defang automagic dependencies. Bug 943164
-   use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
-   use X || append-cflags -DGENTOO_GTK_HIDE_X11
+   use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+   use X || append-cppflags -DGENTOO_GTK_HIDE_X11
 
use vala && vala_setup
 

diff --git a/media-gfx/gimp/gimp-3.0.8.ebuild b/media-gfx/gimp/gimp-3.0.8.ebuild
index 82fc900c03c0..bb352b93ed81 100644
--- a/media-gfx/gimp/gimp-3.0.8.ebuild
+++ b/media-gfx/gimp/gimp-3.0.8.ebuild
@@ -157,8 +157,8 @@ src_prepare() {
 
 src_configure() {
# defang automagic dependencies. Bug 943164
-   use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
-   use X || append-cflags -DGENTOO_GTK_HIDE_X11
+   use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+   use X || append-cppflags -DGENTOO_GTK_HIDE_X11
 
use vala && vala_setup
 

diff --git a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild 
b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
index 4101e80e9010..2ff7a5c51c64 100644
--- a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
+++ b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
@@ -194,8 +194,8 @@ src_prepare() {
 
 src_configure() {
# defang automagic dependencies. Bug 943164
-   use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
-   use X || append-cflags -DGENTOO_GTK_HIDE_X11
+   use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+   use X || append-cppflags -DGENTOO_GTK_HIDE_X11
 
use vala && vala_setup
 

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 6ed7eecd2e43..b0f19e6d5714 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -193,8 +193,8 @@ src_prepare() {
 
 src_configure() {
# defang automagic dependencies. Bug 943164
-   use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
-   use X || append-cflags -DGENTOO_GTK_HIDE_X11
+   use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+   use X || append-cppflags -DGENTOO_GTK_HIDE_X11
 
use vala && vala_setup
 



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

2026-01-15 Thread Sam James
commit: ca7b3a0b88dadc613d6c1547aeb2b6a79d9a515c
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Jan 15 16:17:37 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 15 19:28:48 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7b3a0b

media-gfx/gimp: respect NM

Closes: https://bugs.gentoo.org/968162
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45388
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/files/gimp-3.0.6-respect-NM.patch | 25 
 media-gfx/gimp/gimp-3.0.6.ebuild |  1 +
 media-gfx/gimp/gimp-3.2.0_rc2.ebuild |  1 +
 3 files changed, 27 insertions(+)

diff --git a/media-gfx/gimp/files/gimp-3.0.6-respect-NM.patch 
b/media-gfx/gimp/files/gimp-3.0.6-respect-NM.patch
new file mode 100644
index ..1baf9d3be257
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-3.0.6-respect-NM.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/968162
+
+diff --git a/tools/defcheck.py b/tools/defcheck.py
+index 3103481..30d875f 100644
+--- a/tools/defcheck.py
 b/tools/defcheck.py
+@@ -31,7 +31,7 @@ Needs the tool "nm" to work
+ 
+ import sys, subprocess
+ 
+-from os import path
++from os import getenv, path
+ 
+ def_files = sys.argv[1:]
+ 
+@@ -65,7 +65,7 @@ for df in def_files:
+#  unsortindex = i+1
+#  break;
+ 
+-   status, nm = subprocess.getstatusoutput ("nm --defined-only --extern-only 
" +
++   status, nm = subprocess.getstatusoutput (getenv("NM", default="nm") + " 
--defined-only --extern-only " +
+ libname)
+if status != 0:
+   print("trouble reading {} - has it been compiled?".format(libname))
+

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index 9d9b93ff7a33..5a17b34afbc6 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -123,6 +123,7 @@ DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 
 PATCHES=(
"${FILESDIR}"/gimp-3.0.6-fix-tests.patch
+   "${FILESDIR}"/gimp-3.0.6-respect-NM.patch
 )
 
 pkg_pretend() {

diff --git a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild 
b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
index 87d44397300a..4101e80e9010 100644
--- a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
+++ b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild
@@ -155,6 +155,7 @@ DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 
 PATCHES=(
"${FILESDIR}"/gimp-3.0.6-fix-tests.patch
+   "${FILESDIR}"/gimp-3.0.6-respect-NM.patch
 )
 
 pkg_pretend() {



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

2026-01-15 Thread Sam James
commit: 586433b736d0c0e49611043d885344c5999183f0
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Jan 15 16:16:25 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 15 19:28:48 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=586433b7

media-gfx/gimp: drop 3.2.0_rc1

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45388
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest  |   1 -
 media-gfx/gimp/gimp-3.2.0_rc1.ebuild | 284 ---
 2 files changed, 285 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index ddd8eb0b460a..d0755bea31db 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,4 +1,3 @@
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-3.0.6.tar.xz 27197880 BLAKE2B 
ef5220a36ca4666db5c8c20628458e5b621b3bfb594be8eda974f3be18429d946e35456428c8a28a957911c6302ab69d2eb35bb7249f332f5ac4d6146c28c9d1
 SHA512 
513fe11083b6560ce7bbe1b56ccbc0d83a4edb33e110508543fc8c8fdf6c60d91f9af60cb4d83926eec490baceb6c9cc5aae43a4d0ae7a04099f4036e50d179c
-DIST gimp-3.2.0-RC1.tar.xz 33798224 BLAKE2B 
f3f149f9c6b7c60788693f9aa9482122f74942dc64e39ca4434a742619079057c4de0bfabab5090760f880a878b920afa80a51adf1159459bfcae32f329cf53b
 SHA512 
4184896aa808b1348dfc61eb9d03f4f90ac4febb3d4369e7966b893984079a0f6dd16f8ffc2b6dc362c2b72983aba657206c69dd584bf93bfb0aae4d2aa9cfc7
 DIST gimp-3.2.0-RC2.tar.xz 34615136 BLAKE2B 
91c1567efcadbf1db0ea9c54e99354c65e723526ca417250d17cdba7b9ffa82d81964309fa955d074ddc47f8a7c4f61a1bd9535f1b6edbb3c886d37ceb9379a5
 SHA512 
b6b201b4f76966f96ab201761a61b4040907d31850c8786d3824d9aac14f04ae53697b74e5c9fee69640c4843fc1b7810a8990b19ba3d7a8131d8783aa5b6d0b

diff --git a/media-gfx/gimp/gimp-3.2.0_rc1.ebuild 
b/media-gfx/gimp/gimp-3.2.0_rc1.ebuild
deleted file mode 100644
index 69d39fba7fb9..
--- a/media-gfx/gimp/gimp-3.2.0_rc1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{11..14} )
-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/";
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git";
-
-   MAJOR_VERSION="3"
-else
-   MY_PV="${PV/_rc/-RC}"
-   MY_P="${PN}-${MY_PV}"
-   SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${MY_P}.tar.xz"
-   S="${WORKDIR}/${MY_P}"
-
-   MAJOR_VERSION="$(ver_cut 1)"
-
-   # Dont keyword prereleases or unstable releases
-   # 
https://gitlab.gnome.org/Infrastructure/gimp-web-devel/-/blob/testing/content/core/maintainer/versioning.md#software-version
-   if ! [[ ${PV} =~ _rc ]] &&
-   [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] &&
-   [[ $(( $(ver_cut 3) % 2 )) -eq 0 ]]
-   then
-   KEYWORDS="~amd64 ~arm ~x86"
-   fi
-fi
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/${MAJOR_VERSION}"
-
-IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland 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.4.0
-   app-arch/bzip2
-   app-arch/libarchive:=
-   >=app-arch/xz-utils-5.0.0
-   app-text/iso-codes
-   >=app-text/poppler-0.69.0[cairo]
-   >=app-text/poppler-data-0.4.9
-   >=dev-libs/appstream-0.16.1:=
-   >=dev-libs/glib-2.70.0:2
-   >=dev-libs/gobject-introspection-1.82.0-r2
-   >=dev-libs/json-glib-1.2.6
-   >=gnome-base/librsvg-2.40.6:2
-   >=media-gfx/exiv2-0.27.4
-   media-gfx/mypaint-brushes:2.0=
-   >=media-libs/fontconfig-2.12.4
-   >=media-libs/freetype-2.1.7
-   =media-libs/gexiv2-0.14.0
-   >=media-libs/harfbuzz-2.8.2:=
-   >=media-libs/lcms-2.8:2
-   media-libs/libjpeg-turbo:=
-   >=media-libs/libmypaint-1.5.0:=
-   >=media-libs/libpng-1.6.25:0=
-   >=media-libs/tiff-4.0.0:=
-   net-libs/glib-networking[ssl]
-   virtual/zlib:=
-   >=x11-libs/cairo

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

2025-12-26 Thread Sam James
commit: 48bf6018d98809f9e6f11f917495e7a9d48d7273
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 26 11:19:05 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 26 11:19:05 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48bf6018

media-gfx/gimp: Stabilize 3.0.6 amd64, #967968

Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index 424765652d74..3fe2b7f1207d 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 x86"
 
 IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
 REQUIRED_USE="



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

2025-12-25 Thread Eli Schwartz
commit: db140e7d85fb4dd61af72f9ad8793e9c6c53c8b9
Author: Eli Schwartz  gentoo  org>
AuthorDate: Thu Dec 25 13:36:11 2025 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Thu Dec 25 16:34:42 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db140e7d

media-gfx/gimp: Stabilize 3.0.6 ppc64, #967968

Signed-off-by: Eli Schwartz  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index 25b538be7bef..c359c06ebf13 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~x86"
 
 IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
 REQUIRED_USE="



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

2025-12-25 Thread Eli Schwartz
commit: b188b490e04c7a3822d2bf2db6ad42f67d93869f
Author: Eli Schwartz  gentoo  org>
AuthorDate: Thu Dec 25 14:19:46 2025 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Thu Dec 25 16:34:42 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b188b490

media-gfx/gimp: Stabilize 3.0.6 x86, #967968

Signed-off-by: Eli Schwartz  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index c359c06ebf13..424765652d74 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 x86"
 
 IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
 REQUIRED_USE="



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

2025-12-11 Thread WANG Xuerui
commit: fa6a94d337716310f7b093aa700ed6becb1912b2
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu Dec 11 12:26:38 2025 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu Dec 11 12:37:31 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa6a94d3

media-gfx/gimp: keyword 3.0.6 for ~loong, #951566

Signed-off-by: WANG Xuerui  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index c519da494c9b..cf654c4a3238 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
 
 IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
 REQUIRED_USE="



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

2025-12-09 Thread Sam James
commit: c92f7ee3de4eff486a7e617389b45425bc8519f4
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec  9 22:54:34 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  9 22:54:56 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c92f7ee3

media-gfx/gimp: Keyword 3.0.6 ppc64, #951566

Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index daca39278eaf..c519da494c9b 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
 REQUIRED_USE="



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

2025-12-09 Thread Sam James
commit: eac20005d690a0b04617279886c8865b87a04c9e
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec  9 22:54:31 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  9 22:54:55 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac20005

media-gfx/gimp: Keyword 3.0.6 ppc, #951566

Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index 3ed6d230eb0f..daca39278eaf 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 
 IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
 REQUIRED_USE="



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

2025-12-09 Thread Sam James
commit: fcacd6789fda7fde1be95668d1c9b6f43475cefe
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec  9 22:54:27 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  9 22:54:54 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcacd678

media-gfx/gimp: Keyword 3.0.6 arm64, #951566

Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index adad573e62ba..3ed6d230eb0f 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
 REQUIRED_USE="



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

2025-12-09 Thread Sam James
commit: e24bdedcf8e47c6dfd1841182637d478799a052f
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Dec  9 00:37:47 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  9 09:49:23 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24bdedc

media-gfx/gimp: backport test fixes

See-Also: 5b0516cdc2380be42fa17f251aeb9f7ac89bf691
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44899
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index 2b83bb9c5d75..c04178752dde 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -221,6 +221,10 @@ _rename_plugins() {
 
 src_test() {
local -x LD_LIBRARY_PATH="${BUILD_DIR}/libgimp:${LD_LIBRARY_PATH}"
+   # Try hard to avoid system installed gimp causing issues
+   local -x GIMP3_DIRECTORY="${BUILD_DIR}/"
+   local -x GIMP3_PLUGINDIR="${BUILD_DIR}/plug-ins/"
+   local -x GIMP3_SYSCONFDIR="${BUILD_DIR}/etc/"
meson_src_test
 }
 



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

2025-12-09 Thread Sam James
commit: 0eb771864139886b2a39fcd5be598d97714ff9fd
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Dec  9 00:40:01 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  9 09:49:23 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb77186

media-gfx/gimp: re-enable and fix headless tests

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44899
Closes: https://github.com/gentoo/gentoo/pull/44899
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch | 28 +
 media-gfx/gimp/gimp-3.0.6.ebuild|  8 ---
 media-gfx/gimp/gimp-3.2.0_rc1.ebuild|  8 ---
 media-gfx/gimp/gimp-.ebuild |  4 +---
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch 
b/media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch
new file mode 100644
index ..ca92daeee38f
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch
@@ -0,0 +1,28 @@
+https://gitlab.gnome.org/GNOME/gimp/-/issues/14822
+https://gitlab.gnome.org/GNOME/gimp/-/issues/15257
+https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2566
+https://gitlab.gnome.org/GNOME/gimp/-/commit/2fd12847496a9a242ca8edc448d400d3660b8009
+https://gitlab.gnome.org/GNOME/gimp/-/commit/93869f43cf3f489ed5aa35ce018f6f4edbbdcb67
+
+From 2fd12847496a9a242ca8edc448d400d3660b8009 Mon Sep 17 00:00:00 2001
+From: Jehan 
+Date: Thu, 4 Dec 2025 23:47:00 +0100
+Subject: [PATCH] Issue #15257: test failing because gegl:bevel doesn't see GPL
+ ops.
+
+--- a/app/tests/tests.c
 b/app/tests/tests.c
+@@ -162,6 +162,10 @@ gimp_init_for_gui_testing_internal (gboolean  show_gui,
+ 
+   /* from main() */
+   gimp_log_init ();
++  g_object_set (gegl_config (),
++"use-opencl",  FALSE,
++"application-license", "GPL3",
++NULL);
+   gegl_init (NULL, NULL);
+ 
+   /* Introduce an error margin for positions written to sessionrc */
+-- 
+GitLab
+

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index c04178752dde..adad573e62ba 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -120,6 +120,10 @@ BDEPEND="
 
 DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 
+PATCHES=(
+   "${FILESDIR}"/gimp-3.0.6-fix-tests.patch
+)
+
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -179,9 +183,7 @@ src_configure() {
$(meson_feature openexr)
$(meson_feature openmp)
$(meson_feature postscript ghostscript)
-   # https://gitlab.gnome.org/GNOME/gimp/-/issues/14822
-   -Dheadless-tests=disabled
-   #$(meson_feature test headless-tests)
+   $(meson_feature test headless-tests)
$(meson_feature udev gudev)
$(meson_feature vala)
$(meson_feature webp)

diff --git a/media-gfx/gimp/gimp-3.2.0_rc1.ebuild 
b/media-gfx/gimp/gimp-3.2.0_rc1.ebuild
index a2bc9ecc9f56..e773a981cbba 100644
--- a/media-gfx/gimp/gimp-3.2.0_rc1.ebuild
+++ b/media-gfx/gimp/gimp-3.2.0_rc1.ebuild
@@ -150,6 +150,10 @@ BDEPEND="
 
 DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 
+PATCHES=(
+   "${FILESDIR}"/gimp-3.0.6-fix-tests.patch
+)
+
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -214,9 +218,7 @@ src_configure() {
$(meson_feature openexr)
$(meson_feature openmp)
$(meson_feature postscript ghostscript)
-   # https://gitlab.gnome.org/GNOME/gimp/-/issues/14822
-   -Dheadless-tests=disabled
-   #$(meson_feature test headless-tests)
+   $(meson_feature test headless-tests)
$(meson_feature udev gudev)
$(meson_feature vala)
$(meson_feature webp)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index a2bc9ecc9f56..3f1a46690c32 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -214,9 +214,7 @@ src_configure() {
$(meson_feature openexr)
$(meson_feature openmp)
$(meson_feature postscript ghostscript)
-   # https://gitlab.gnome.org/GNOME/gimp/-/issues/14822
-   -Dheadless-tests=disabled
-   #$(meson_feature test headless-tests)
+   $(meson_feature test headless-tests)
$(meson_feature udev gudev)
$(meson_feature vala)
$(meson_feature webp)



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

2025-12-09 Thread Sam James
commit: ba62c2ec8df4d3b3c691af43d926307323da3807
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Dec  4 20:45:00 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  9 09:49:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba62c2ec

media-gfx/gimp: drop 3.0.4-r1, 3.1.4

Bug: https://bugs.gentoo.org/965334
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44899
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest|   2 -
 ...gimp-3.0.4_fix_gir_and_plugins_build_deps.patch |  52 -
 media-gfx/gimp/gimp-3.0.4-r1.ebuild| 251 -
 media-gfx/gimp/gimp-3.1.4.ebuild   | 248 
 4 files changed, 553 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index a72e6199d981..f938a5067564 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,5 +1,3 @@
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
-DIST gimp-3.0.4.tar.xz 27060240 BLAKE2B 
eecca35ed8a97bc7bdbe8ad9dcbdd293b12acb125b795ceb99e2182cc61777175a7204b7a8b7b4ad265f079570cd450b7c465f8ec0ca975339d05835867ef77c
 SHA512 
7a83768caae458b75883522c87d5297e9642b64b0516c482804034b8b9acc6af6afc89d1b4a549fd26de3e33816136c31d440f554f9c8ccd43536260916a
 DIST gimp-3.0.6.tar.xz 27197880 BLAKE2B 
ef5220a36ca4666db5c8c20628458e5b621b3bfb594be8eda974f3be18429d946e35456428c8a28a957911c6302ab69d2eb35bb7249f332f5ac4d6146c28c9d1
 SHA512 
513fe11083b6560ce7bbe1b56ccbc0d83a4edb33e110508543fc8c8fdf6c60d91f9af60cb4d83926eec490baceb6c9cc5aae43a4d0ae7a04099f4036e50d179c
-DIST gimp-3.1.4.tar.xz 30525080 BLAKE2B 
8ac0ebc4282295cd3afa3a1c46e3f0b9f32834d969034df9a9389a0d7423ac517479822bee8c63f74545edfc256171489a7254ffd1e31ac4d7eca7a036239bba
 SHA512 
cfd9c80f2ccd6e3980b98cd764f15c4c84c10d341dcad0153df0f8559606f5eea5b931faf914f7ea9a4544095e123a8a8f986231362f11a50b5ec5f9752cadf7
 DIST gimp-3.2.0-RC1.tar.xz 33798224 BLAKE2B 
f3f149f9c6b7c60788693f9aa9482122f74942dc64e39ca4434a742619079057c4de0bfabab5090760f880a878b920afa80a51adf1159459bfcae32f329cf53b
 SHA512 
4184896aa808b1348dfc61eb9d03f4f90ac4febb3d4369e7966b893984079a0f6dd16f8ffc2b6dc362c2b72983aba657206c69dd584bf93bfb0aae4d2aa9cfc7

diff --git 
a/media-gfx/gimp/files/gimp-3.0.4_fix_gir_and_plugins_build_deps.patch 
b/media-gfx/gimp/files/gimp-3.0.4_fix_gir_and_plugins_build_deps.patch
deleted file mode 100644
index 7ebe330ffe71..
--- a/media-gfx/gimp/files/gimp-3.0.4_fix_gir_and_plugins_build_deps.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 452622cc1a96032ff22ac41d362e4ff7fdce Mon Sep 17 00:00:00 2001
-From: Natanael Copa 
-Date: Wed, 21 May 2025 15:12:20 +0200
-Subject: [PATCH] Issue #13657: fix build dependencies
-
-We need the gir and plugins to be able to generate the splash image(s).
-Add those as dependencies to gimp executable to ensure they are there
-when needed.
-
-Fixes: https://gitlab.gnome.org/GNOME/gimp/-/issues/13657

- meson.build | 2 +-
- plug-ins/common/meson.build | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index d408232e9e..7780a5869f 100644
 a/meson.build
-+++ b/meson.build
-@@ -1980,7 +1980,7 @@ if meson.can_run_host_binaries() and 
have_gobject_introspection
-   else
- gimp_real_exe = gimpmain_exe
-   endif
--  gimp_exe_depends = [gimp_real_exe]
-+  gimp_exe_depends = [gimp_real_exe, libgimp_gir, libgimpui_gir] + 
plugin_custom_targets
-   gimp_run_env.set('GIMP_SELF_IN_BUILD', gimp_real_exe.full_path())
- 
-   menu_paths=meson.global_build_root() / 'menus:' + 
meson.global_source_root() / 'menus'
-diff --git a/plug-ins/common/meson.build b/plug-ins/common/meson.build
-index b6aa62d895..e172603779 100644
 a/plug-ins/common/meson.build
-+++ b/plug-ins/common/meson.build
-@@ -186,6 +186,7 @@ if get_option('webkit-unmaintained')
-   }
- endif
- 
-+plugin_custom_targets = []
- foreach plugin : common_plugins_list
-   plugin_name = plugin.get('name')
-   plugin_sources = [ plugin.get('sources', plugin_name + '.c') ]
-@@ -243,7 +244,7 @@ foreach plugin : common_plugins_list
- 
-   # Ugly trick to copy executables into subfolders so that we can run GIMP 
from
-   # the build directory without installing it.
--  custom_target('test-' + plugin_name,
-+  plugin_custom_targets += custom_target('test-' + plugin_name,
- input: [ plugin_exe ],
- output: [ plugin_name + '.dummy' ],
- command: [ python, meson.project_source_root() / 
'build/meson/cp-plug-in-subfolder.py',
--- 
-GitLab
-

diff --git a/media-gfx/gimp/gimp-3.0.4-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.4-r1.e

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

2025-12-03 Thread Sam James
commit: 5b0516cdc2380be42fa17f251aeb9f7ac89bf691
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Nov 18 03:39:43 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  4 01:21:33 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0516cd

media-gfx/gimp: add 3.2.0_rc1

* Match upstream dependency requirements to the best of our abilities.
* Use the same ebuild for the live version
* Try hard to avoid test failures stemming from already installed
  configuration and plugins.
* Update symlinks creation to use the Gimp major version.

Closes: https://bugs.gentoo.org/965456
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44691
Closes: https://github.com/gentoo/gentoo/pull/44691
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest|   1 +
 .../{gimp-.ebuild => gimp-3.2.0_rc1.ebuild}| 117 +
 media-gfx/gimp/gimp-.ebuild| 117 +
 3 files changed, 147 insertions(+), 88 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 1b34e8b19381..a72e6199d981 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,3 +2,4 @@ DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccf
 DIST gimp-3.0.4.tar.xz 27060240 BLAKE2B 
eecca35ed8a97bc7bdbe8ad9dcbdd293b12acb125b795ceb99e2182cc61777175a7204b7a8b7b4ad265f079570cd450b7c465f8ec0ca975339d05835867ef77c
 SHA512 
7a83768caae458b75883522c87d5297e9642b64b0516c482804034b8b9acc6af6afc89d1b4a549fd26de3e33816136c31d440f554f9c8ccd43536260916a
 DIST gimp-3.0.6.tar.xz 27197880 BLAKE2B 
ef5220a36ca4666db5c8c20628458e5b621b3bfb594be8eda974f3be18429d946e35456428c8a28a957911c6302ab69d2eb35bb7249f332f5ac4d6146c28c9d1
 SHA512 
513fe11083b6560ce7bbe1b56ccbc0d83a4edb33e110508543fc8c8fdf6c60d91f9af60cb4d83926eec490baceb6c9cc5aae43a4d0ae7a04099f4036e50d179c
 DIST gimp-3.1.4.tar.xz 30525080 BLAKE2B 
8ac0ebc4282295cd3afa3a1c46e3f0b9f32834d969034df9a9389a0d7423ac517479822bee8c63f74545edfc256171489a7254ffd1e31ac4d7eca7a036239bba
 SHA512 
cfd9c80f2ccd6e3980b98cd764f15c4c84c10d341dcad0153df0f8559606f5eea5b931faf914f7ea9a4544095e123a8a8f986231362f11a50b5ec5f9752cadf7
+DIST gimp-3.2.0-RC1.tar.xz 33798224 BLAKE2B 
f3f149f9c6b7c60788693f9aa9482122f74942dc64e39ca4434a742619079057c4de0bfabab5090760f880a878b920afa80a51adf1159459bfcae32f329cf53b
 SHA512 
4184896aa808b1348dfc61eb9d03f4f90ac4febb3d4369e7966b893984079a0f6dd16f8ffc2b6dc362c2b72983aba657206c69dd584bf93bfb0aae4d2aa9cfc7

diff --git a/media-gfx/gimp/gimp-.ebuild 
b/media-gfx/gimp/gimp-3.2.0_rc1.ebuild
similarity index 68%
copy from media-gfx/gimp/gimp-.ebuild
copy to media-gfx/gimp/gimp-3.2.0_rc1.ebuild
index d1e1cc793fb5..a2bc9ecc9f56 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-3.2.0_rc1.ebuild
@@ -7,13 +7,36 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{11..14} )
 VALA_USE_DEPEND=vapigen
 
-inherit flag-o-matic git-r3 lua-single meson python-single-r1 toolchain-funcs 
vala xdg
+inherit flag-o-matic lua-single meson python-single-r1 toolchain-funcs vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
-EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git";
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git";
+
+   MAJOR_VERSION="3"
+else
+   MY_PV="${PV/_rc/-RC}"
+   MY_P="${PN}-${MY_PV}"
+   SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${MY_P}.tar.xz"
+   S="${WORKDIR}/${MY_P}"
+
+   MAJOR_VERSION="$(ver_cut 1)"
+
+   # Dont keyword prereleases or unstable releases
+   # 
https://gitlab.gnome.org/Infrastructure/gimp-web-devel/-/blob/testing/content/core/maintainer/versioning.md#software-version
+   if ! [[ ${PV} =~ _rc ]] &&
+   [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] &&
+   [[ $(( $(ver_cut 3) % 2 )) -eq 0 ]]
+   then
+   KEYWORDS="~amd64 ~arm ~x86"
+   fi
+fi
+
 LICENSE="GPL-3+ LGPL-3+"
-SLOT="0/3"
+SLOT="0/${MAJOR_VERSION}"
 
 IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
 REQUIRED_USE="
@@ -32,42 +55,42 @@ COMMON_DEPEND="
$(python_gen_cond_dep '
>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
')
-   >=app-accessibility/at-spi2-core-2.46.0
+   >=app-accessibility/at-spi2-core-2.4.0
app-arch/bzip2
app-arch/libarchive:=
>=app-arch/xz-utils-5.0.0
-   >=app-text/poppler-0.90.1[cairo]
+   app-text/iso-codes
+   >=app-text/poppler-0.69.0[cairo]
>=app-text/poppler-data-0.4.9
>=dev-libs/appstream-0.16.1:=
>=dev-libs/glib-2.70.0:2
>=dev-libs/gobject-introspection-1.82.0-r2
-   >=dev-libs/json-glib-1.4.4
+   >=dev-libs/json-glib-1.2.6
>=

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

2025-12-03 Thread Sam James
commit: 5f76ede58f8a9e9b6c30b6d5f2527bd094f74107
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Nov 18 03:43:44 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  4 01:21:33 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f76ede5

media-gfx/gimp: add myself as a maintainer

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44691
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 1d4884378e1c..b7ad9e3f5bdc 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -1,7 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   [email protected]
+   Alfred Wingate
+   
+   
+   [email protected]
+   Proxy Maintainers
+   

Enable ALSA support in midi input 
controller
Enable support for loading/exporting FITS 
images



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

2025-11-04 Thread Sam James
commit: a5702b2f885831044d97ceaa69f43f31b9a695e4
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Nov  3 17:20:24 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  4 11:43:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5702b2f

media-gfx/gimp: filter lto in gimp-2

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44451
Closes: https://github.com/gentoo/gentoo/pull/44451
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-2.10.38-r3.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-gfx/gimp/gimp-2.10.38-r3.ebuild 
b/media-gfx/gimp/gimp-2.10.38-r3.ebuild
index 7cefe19fa9e8..177531773ce0 100644
--- a/media-gfx/gimp/gimp-2.10.38-r3.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38-r3.ebuild
@@ -136,6 +136,9 @@ src_configure() {
# bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
append-cflags -std=gnu17
 
+   # segfault in tests with gcc-15
+   filter-lto
+
local myconf=(
GEGL="${EPREFIX}"/usr/bin/gegl-0.4
GDBUS_CODEGEN="${EPREFIX}"/bin/false



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

2025-11-04 Thread Sam James
commit: fcc303d606c16b7f621341894d4220feefe3bc11
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Nov  3 17:08:02 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  4 11:43:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcc303d6

media-gfx/gimp: backport ZDI-CAN-27823 fix

Bug: https://bugs.gentoo.org/965334
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44451
Signed-off-by: Sam James  gentoo.org>

 .../gimp/files/gimp-2.10.38-ZDI-CAN-27823.patch| 76 ++
 ...mp-2.10.38-r2.ebuild => gimp-2.10.38-r3.ebuild} |  1 +
 2 files changed, 77 insertions(+)

diff --git a/media-gfx/gimp/files/gimp-2.10.38-ZDI-CAN-27823.patch 
b/media-gfx/gimp/files/gimp-2.10.38-ZDI-CAN-27823.patch
new file mode 100644
index ..95023eae1da5
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.10.38-ZDI-CAN-27823.patch
@@ -0,0 +1,76 @@
+https://bugs.gentoo.org/965334
+https://www.zerodayinitiative.com/advisories/ZDI-25-978/
+https://gitlab.gnome.org/GNOME/gimp/-/issues/14814
+https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2449
+https://gitlab.gnome.org/GNOME/gimp/-/commit/4eb106f2bff2d9b8e518aa455a884c6f38d70c6a
+
+From 345c79b73b1a6d0fbdc11ff86899a3d0a9c8c003 Mon Sep 17 00:00:00 2001
+From: Jacob Boerema 
+Date: Wed, 3 Sep 2025 18:37:26 -0400
+Subject: [PATCH] plug-ins: fix ZDI-CAN-27823
+
+GIMP XWD File Parsing Heap-based Buffer Overflow Remote Code Execution
+Vulnerability.
+
+Check offset in colormap is valid before writing to it.
+
+Cherry-picked to 2.10 and modified to work correctly with this context:
+ea68d87b66ec53e3cc5073993bd84ed96ce59590
+44ebcee901f25180b8b9b04f6d26474919557f0d
+--- a/plug-ins/common/file-xwd.c
 b/plug-ins/common/file-xwd.c
+@@ -183,7 +183,8 @@ static gint32 load_xwd_f2_d8_b8   (const gchar   
*filename,
+ static gint32 load_xwd_f2_d16_b16 (const gchar   *filename,
+FILE  *ifp,
+L_XWDFILEHEADER   *xwdhdr,
+-   L_XWDCOLOR*xwdcolmap);
++   L_XWDCOLOR*xwdcolmap,
++   GError   **error);
+ static gint32 load_xwd_f2_d24_b32 (const gchar   *filename,
+FILE  *ifp,
+L_XWDFILEHEADER   *xwdhdr,
+@@ -581,7 +582,7 @@ load_image (const gchar  *filename,
+ }
+   else if ((depth <= 16) && (bpp == 16))
+ {
+-  image_ID = load_xwd_f2_d16_b16 (filename, ifp, &xwdhdr, xwdcolmap);
++  image_ID = load_xwd_f2_d16_b16 (filename, ifp, &xwdhdr, xwdcolmap, 
error);
+ }
+   else if ((depth <= 24) && ((bpp == 24) || (bpp == 32)))
+ {
+@@ -1543,7 +1544,8 @@ static gint32
+ load_xwd_f2_d16_b16 (const gchar *filename,
+  FILE*ifp,
+  L_XWDFILEHEADER *xwdhdr,
+- L_XWDCOLOR  *xwdcolmap)
++ L_XWDCOLOR  *xwdcolmap,
++ GError **error)
+ {
+   register guchar *dest, lsbyte_first;
+   gint width, height, linepad, i, j, c0, c1, ncols;
+@@ -1606,9 +1608,20 @@ load_xwd_f2_d16_b16 (const gchar *filename,
+   greenval = (green * 255) / maxgreen;
+   for (blue = 0; blue <= maxblue; blue++)
+ {
++  guint32 offset = ((red << redshift) + (green << greenshift) +
++(blue << blueshift)) * 3;
++
++  if (offset+2 >= maxval)
++{
++  g_set_error (error, GIMP_PLUG_IN_ERROR, 0,
++   _("Invalid colormap offset. Possibly corrupt 
image."));
++  g_free (data);
++  g_free (ColorMap);
++  g_object_unref (buffer);
++  return -1;
++}
+   blueval = (blue * 255) / maxblue;
+-  cm = ColorMap + ((red << redshift) + (green << greenshift)
+-   + (blue << blueshift)) * 3;
++  cm = ColorMap + offset;
+   *(cm++) = redval;
+   *(cm++) = greenval;
+   *cm = blueval;
+-- 
+2.51.2
+

diff --git a/media-gfx/gimp/gimp-2.10.38-r2.ebuild 
b/media-gfx/gimp/gimp-2.10.38-r3.ebuild
similarity index 99%
rename from media-gfx/gimp/gimp-2.10.38-r2.ebuild
rename to media-gfx/gimp/gimp-2.10.38-r3.ebuild
index 56e34cc0e333..7cefe19fa9e8 100644
--- a/media-gfx/gimp/gimp-2.10.38-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38-r3.ebuild
@@ -97,6 +97,7 @@ PATCHES=(

"${FILESDIR}/${PN}-2.10_fix_configure_GCC13_implicit_function_declarations.patch"
 #899796
"${FILESDIR}/${PN}-2.10.36_c99_tiff.patch" #919282
"${FILESDIR}/${PN}-2.10.36_c99_metadata.patch" #919282
+   "${FILESDIR}/

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

2025-10-17 Thread Sam James
commit: 0b6ce3ab617851ea670914018132a1e6c1be4c2e
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Oct  6 21:38:46 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  9 05:45:09 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6ce3ab

media-gfx/gimp: add subslot operator for cfitsio

gimp-org-file-fits links against libcfitsio.so.10

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44074
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild | 2 +-
 media-gfx/gimp/gimp-3.1.4.ebuild | 2 +-
 media-gfx/gimp/gimp-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index d4771641bf43..24dbde73b49d 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -65,7 +65,7 @@ COMMON_DEPEND="
>=x11-libs/pango-1.50.0[X?]
aalib? ( media-libs/aalib )
alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   fits? ( sci-libs/cfitsio )
+   fits? ( sci-libs/cfitsio:= )
heif? ( >=media-libs/libheif-1.13.0:= )
javascript? ( dev-libs/gjs )
jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )

diff --git a/media-gfx/gimp/gimp-3.1.4.ebuild b/media-gfx/gimp/gimp-3.1.4.ebuild
index cd46ebad71ad..2f431b46cdf6 100644
--- a/media-gfx/gimp/gimp-3.1.4.ebuild
+++ b/media-gfx/gimp/gimp-3.1.4.ebuild
@@ -64,7 +64,7 @@ COMMON_DEPEND="
>=x11-libs/pango-1.50.0[X?]
aalib? ( media-libs/aalib )
alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   fits? ( sci-libs/cfitsio )
+   fits? ( sci-libs/cfitsio:= )
heif? ( >=media-libs/libheif-1.13.0:= )
javascript? ( dev-libs/gjs )
jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index ff7f454ee21b..140c16b30e69 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -63,7 +63,7 @@ COMMON_DEPEND="
>=x11-libs/pango-1.50.0[X?]
aalib? ( media-libs/aalib )
alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   fits? ( sci-libs/cfitsio )
+   fits? ( sci-libs/cfitsio:= )
heif? ( >=media-libs/libheif-1.13.0:= )
javascript? ( dev-libs/gjs )
jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )



[gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/, profiles/features/wd40/

2025-10-17 Thread Sam James
commit: ba0bb32854304a31120be59e49a7e35c19be9967
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Oct  6 19:45:56 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  9 05:45:01 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0bb328

media-gfx/gimp: allow for older librsvg

This matches upstream requirements in meson.build and it apparently
should work.

Bug: https://bugs.gentoo.org/920531
See-Also: https://gitlab.gnome.org/GNOME/gimp/-/issues/14544
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44074
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.6.ebuild| 2 +-
 media-gfx/gimp/gimp-3.1.4.ebuild| 2 +-
 media-gfx/gimp/gimp-.ebuild | 2 +-
 profiles/features/wd40/package.mask | 2 +-
 profiles/features/wd40/package.use.mask | 4 
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
index 443d240a9456..d4771641bf43 100644
--- a/media-gfx/gimp/gimp-3.0.6.ebuild
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
>=dev-libs/glib-2.70.0:2
dev-libs/gobject-introspection
>=dev-libs/json-glib-1.4.4
-   >=gnome-base/librsvg-2.57.3:2
+   >=gnome-base/librsvg-2.40.6:2
>=media-gfx/mypaint-brushes-1.3.1:1.0=
>=media-libs/babl-0.1.114[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6

diff --git a/media-gfx/gimp/gimp-3.1.4.ebuild b/media-gfx/gimp/gimp-3.1.4.ebuild
index f939dc8bfa81..cd46ebad71ad 100644
--- a/media-gfx/gimp/gimp-3.1.4.ebuild
+++ b/media-gfx/gimp/gimp-3.1.4.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
>=dev-libs/glib-2.70.0:2
dev-libs/gobject-introspection
>=dev-libs/json-glib-1.4.4
-   >=gnome-base/librsvg-2.57.3:2
+   >=gnome-base/librsvg-2.40.6:2
>=media-gfx/mypaint-brushes-1.5.1:2.0=
>=media-libs/babl-0.1.114[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index c774e8a233cc..ff7f454ee21b 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
>=dev-libs/glib-2.70.0:2
dev-libs/gobject-introspection
>=dev-libs/json-glib-1.4.4
-   >=gnome-base/librsvg-2.57.3:2
+   >=gnome-base/librsvg-2.40.6:2
>=media-gfx/mypaint-brushes-1.3.0:2.0=
>=media-libs/babl-[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6

diff --git a/profiles/features/wd40/package.mask 
b/profiles/features/wd40/package.mask
index 521c7f7e500f..20f697a2c019 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -400,7 +400,7 @@ gnome-extra/gnome-browser-connector
 gnome-extra/gnome-tweaks
 gnome-extra/sushi
 >=media-gfx/libimagequant-4
-media-gfx/gimp
+=media-libs/libopenraw-0.3.2
 media-plugins/gimp-lqr
 media-video/rav1e

diff --git a/profiles/features/wd40/package.use.mask 
b/profiles/features/wd40/package.use.mask
index 75ab1bc8e5fa..34f7d1593aaf 100644
--- a/profiles/features/wd40/package.use.mask
+++ b/profiles/features/wd40/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Alfred Wingate  (2025-09-15)
 # Tests require dev-python/paramiko.
 dev-python/dulwich test



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

2025-10-17 Thread Sam James
commit: 0a54c4b196bef3a8bfad10a2df4c824cc4a3d6b2
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Oct  6 19:36:23 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct  9 05:44:59 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a54c4b1

media-gfx/gimp: add 3.0.6

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44074
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest  |   1 +
 media-gfx/gimp/gimp-3.0.6.ebuild | 249 +++
 2 files changed, 250 insertions(+)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index f2c301d2ff23..fa8140ee54c4 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,5 +2,6 @@ DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccf
 DIST gimp-3.0.0.tar.xz 27043544 BLAKE2B 
fe33a4f59850791867111d8c775ce74f083c75f789243ea8f622137ebae045f0c21b12d2b288e97ca611e68d4cb219d05825b082cf2594742ebbbd277ac9d2a8
 SHA512 
bb75b68054cda06a3fd6e9278fc535914cd1ea4af27d82c8f5e3480233ff4b8f6d6c479ffcd868c4fa3f1980aee741d7cf992273b09d1e862ae2b84164d038a3
 DIST gimp-3.0.2.tar.xz 27019468 BLAKE2B 
dd853b67c47d93882ff9393b808f085eab24eff337e61ed317372f186d2d94994778763e06523131bc8e1d43d077607d8c88c6a8ccb4d23115e28eb37cf473d8
 SHA512 
e5f72f9f1447ff3ec5ab78bc589831767c00be91a0f337b1ab2d5beee3f79b01464c3de0dc1a518fd72180b4232be5b8d7121d186425a766090842b550f534df
 DIST gimp-3.0.4.tar.xz 27060240 BLAKE2B 
eecca35ed8a97bc7bdbe8ad9dcbdd293b12acb125b795ceb99e2182cc61777175a7204b7a8b7b4ad265f079570cd450b7c465f8ec0ca975339d05835867ef77c
 SHA512 
7a83768caae458b75883522c87d5297e9642b64b0516c482804034b8b9acc6af6afc89d1b4a549fd26de3e33816136c31d440f554f9c8ccd43536260916a
+DIST gimp-3.0.6.tar.xz 27197880 BLAKE2B 
ef5220a36ca4666db5c8c20628458e5b621b3bfb594be8eda974f3be18429d946e35456428c8a28a957911c6302ab69d2eb35bb7249f332f5ac4d6146c28c9d1
 SHA512 
513fe11083b6560ce7bbe1b56ccbc0d83a4edb33e110508543fc8c8fdf6c60d91f9af60cb4d83926eec490baceb6c9cc5aae43a4d0ae7a04099f4036e50d179c
 DIST gimp-3.1.2.tar.xz 49360004 BLAKE2B 
3d728a82081c3f386e996de22b60db12653dd499d5891bdf6bdc26fd04e6e7691fe2868b9404f3c0c0da0f3ee8982eaaa459637e55aed0e342077ed0fdcbfe6b
 SHA512 
1e0ccd7a5726fec78297e9e1d7c9e6d95838e078228e93cad55590badbafead1f63829f9ba9cfdba4885d6afe54e1626a488d0ad2feae19a72950d2c352fef3b
 DIST gimp-3.1.4.tar.xz 30525080 BLAKE2B 
8ac0ebc4282295cd3afa3a1c46e3f0b9f32834d969034df9a9389a0d7423ac517479822bee8c63f74545edfc256171489a7254ffd1e31ac4d7eca7a036239bba
 SHA512 
cfd9c80f2ccd6e3980b98cd764f15c4c84c10d341dcad0153df0f8559606f5eea5b931faf914f7ea9a4544095e123a8a8f986231362f11a50b5ec5f9752cadf7

diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild
new file mode 100644
index ..443d240a9456
--- /dev/null
+++ b/media-gfx/gimp/gimp-3.0.6.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{11..14} )
+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 ~arm ~x86"
+
+IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland 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-arch/bzip2
+   app-arch/libarchive:=
+   >=app-arch/xz-utils-5.0.0
+   >=app-text/poppler-0.90.1[cairo]
+   >=app-text/poppler-data-0.4.9
+   >=dev-libs/appstream-0.16.1:=
+   >=dev-libs/glib-2.70.0:2
+   dev-libs/gobject-introspection
+   >=dev-libs/json-glib-1.4.4
+   >=gnome-base/librsvg-2.57.3:2
+   >=media-gfx/mypaint-brushes-1.3.1:1.0=
+   >=media-libs/babl-0.1.114[introspection,lcms,vala?]
+   >=media-libs/fontconfig-2.12.6
+   >=media-libs/freetype-2.10.2
+   >=media-libs/gegl-0.4.62: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]

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

2025-10-02 Thread Sam James
commit: e784be4722bfa259ac2414167b5ec8acea0843a3
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Oct  2 12:34:22 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  3 00:06:26 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e784be47

media-gfx/gimp: temporarily disable headless tests

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44005
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 73f45e245e15..c774e8a233cc 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -182,7 +182,9 @@ src_configure() {
$(meson_feature openexr)
$(meson_feature openmp)
$(meson_feature postscript ghostscript)
-   $(meson_feature test headless-tests)
+   # https://gitlab.gnome.org/GNOME/gimp/-/issues/14822
+   -Dheadless-tests=disabled
+   #$(meson_feature test headless-tests)
$(meson_feature udev gudev)
$(meson_feature vala)
$(meson_feature webp)



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

2025-10-02 Thread Sam James
commit: cdc3db5df6b4b25ee732dc55b45d2bcccfb5aa85
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Sep  1 07:04:29 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  3 00:06:26 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc3db5d

media-gfx/gimp: add 3.1.4

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44005
Closes: https://github.com/gentoo/gentoo/pull/44005
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest  |   1 +
 media-gfx/gimp/gimp-3.1.4.ebuild | 248 +++
 2 files changed, 249 insertions(+)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index bd3e46ea3ab1..f2c301d2ff23 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -3,3 +3,4 @@ DIST gimp-3.0.0.tar.xz 27043544 BLAKE2B 
fe33a4f59850791867111d8c775ce74f083c75f7
 DIST gimp-3.0.2.tar.xz 27019468 BLAKE2B 
dd853b67c47d93882ff9393b808f085eab24eff337e61ed317372f186d2d94994778763e06523131bc8e1d43d077607d8c88c6a8ccb4d23115e28eb37cf473d8
 SHA512 
e5f72f9f1447ff3ec5ab78bc589831767c00be91a0f337b1ab2d5beee3f79b01464c3de0dc1a518fd72180b4232be5b8d7121d186425a766090842b550f534df
 DIST gimp-3.0.4.tar.xz 27060240 BLAKE2B 
eecca35ed8a97bc7bdbe8ad9dcbdd293b12acb125b795ceb99e2182cc61777175a7204b7a8b7b4ad265f079570cd450b7c465f8ec0ca975339d05835867ef77c
 SHA512 
7a83768caae458b75883522c87d5297e9642b64b0516c482804034b8b9acc6af6afc89d1b4a549fd26de3e33816136c31d440f554f9c8ccd43536260916a
 DIST gimp-3.1.2.tar.xz 49360004 BLAKE2B 
3d728a82081c3f386e996de22b60db12653dd499d5891bdf6bdc26fd04e6e7691fe2868b9404f3c0c0da0f3ee8982eaaa459637e55aed0e342077ed0fdcbfe6b
 SHA512 
1e0ccd7a5726fec78297e9e1d7c9e6d95838e078228e93cad55590badbafead1f63829f9ba9cfdba4885d6afe54e1626a488d0ad2feae19a72950d2c352fef3b
+DIST gimp-3.1.4.tar.xz 30525080 BLAKE2B 
8ac0ebc4282295cd3afa3a1c46e3f0b9f32834d969034df9a9389a0d7423ac517479822bee8c63f74545edfc256171489a7254ffd1e31ac4d7eca7a036239bba
 SHA512 
cfd9c80f2ccd6e3980b98cd764f15c4c84c10d341dcad0153df0f8559606f5eea5b931faf914f7ea9a4544095e123a8a8f986231362f11a50b5ec5f9752cadf7

diff --git a/media-gfx/gimp/gimp-3.1.4.ebuild b/media-gfx/gimp/gimp-3.1.4.ebuild
new file mode 100644
index ..f939dc8bfa81
--- /dev/null
+++ b/media-gfx/gimp/gimp-3.1.4.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{11..14} )
+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"
+
+IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland 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-arch/bzip2
+   app-arch/libarchive:=
+   >=app-arch/xz-utils-5.0.0
+   >=app-text/poppler-0.90.1[cairo]
+   >=app-text/poppler-data-0.4.9
+   >=dev-libs/appstream-0.16.1:=
+   >=dev-libs/glib-2.70.0:2
+   dev-libs/gobject-introspection
+   >=dev-libs/json-glib-1.4.4
+   >=gnome-base/librsvg-2.57.3:2
+   >=media-gfx/mypaint-brushes-1.5.1:2.0=
+   >=media-libs/babl-0.1.114[introspection,lcms,vala?]
+   >=media-libs/fontconfig-2.12.6
+   >=media-libs/freetype-2.10.2
+   >=media-libs/gegl-0.4.62: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,wayland?,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 '
+

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

2025-10-02 Thread Sam James
commit: a8ca3efac53a8dc1391bc3aa0907b7e2c355619d
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Sep  1 07:09:11 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  3 00:06:25 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ca3efa

media-gfx/gimp: port to appstream

Upstream commit: 8277817b6250632a5b2499f5fb650f393821b780
Upstream commit (minimum lowered): 40adbff456619d2fb71a5e1f57434fbf8c45c64f

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44005
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 9835fe301346..73f45e245e15 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -38,7 +38,7 @@ COMMON_DEPEND="
>=app-arch/xz-utils-5.0.0
>=app-text/poppler-0.90.1[cairo]
>=app-text/poppler-data-0.4.9
-   >=dev-libs/appstream-glib-0.7.16:=
+   >=dev-libs/appstream-0.16.1:=
>=dev-libs/glib-2.70.0:2
dev-libs/gobject-introspection
>=dev-libs/json-glib-1.4.4



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

2025-07-30 Thread Joonas Niilola
commit: 307d7e2d4cb8508be84a3e81044a05c0f1ae2e29
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Jul 30 14:00:58 2025 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jul 30 14:00:58 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=307d7e2d

media-gfx/gimp: Keyword 3.0.4-r1 x86, #951566

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-3.0.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.4-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
index df92016947ee..6f8af1ad09d5 100644
--- a/media-gfx/gimp/gimp-3.0.4-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
 REQUIRED_USE="



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

2025-07-13 Thread Sam James
commit: b2537d3f2d10e18ae3566ca1f18d3b2a62dc84dd
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 13 08:15:15 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 13 08:15:15 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2537d3f

media-gfx/gimp: switch to mypaint-brushes-2 for live

See upstream commit ea8b9dc13c28ab1bcd11dae64732ae925ffc85fe.

Bug: https://bugs.gentoo.org/955838
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index c0ca84ec12f0..9835fe301346 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
dev-libs/gobject-introspection
>=dev-libs/json-glib-1.4.4
>=gnome-base/librsvg-2.57.3:2
-   >=media-gfx/mypaint-brushes-1.3.1:1.0=
+   >=media-gfx/mypaint-brushes-1.3.0:2.0=
>=media-libs/babl-[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6
>=media-libs/freetype-2.10.2



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

2025-07-04 Thread Sam James
commit: a3e0ebaa1656b88f3890d505801933c5184816d7
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Fri Jul  4 19:19:18 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  5 05:35:24 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e0ebaa

media-gfx/gimp: drop to maintainer-needed

Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42870
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/metadata.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 2b1fa7ac6a48..1d4884378e1c 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -1,14 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   [email protected]
-   Sergey Torokhov
-   
-   
-   [email protected]
-   Proxy Maintainers
-   
+   

Enable ALSA support in midi input 
controller
Enable support for loading/exporting FITS 
images



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

2025-07-04 Thread Sam James
commit: 3030fbee384d3e29de42ff58b749cf30e7d4ea49
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Fri Jul  4 16:52:02 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  4 18:33:08 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3030fbee

media-gfx/gimp: update .ebuild, rm adjust_sandbox, add USE=wayland

Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42597
Closes: https://github.com/gentoo/gentoo/pull/42597
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 31 +++
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index f6caf9083d07..c0ca84ec12f0 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{11..14} )
 VALA_USE_DEPEND=vapigen
 
-inherit git-r3 lua-single meson python-single-r1 toolchain-funcs vala xdg
+inherit flag-o-matic git-r3 lua-single meson python-single-r1 toolchain-funcs 
vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git";
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 
-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"
+IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
 REQUIRED_USE="
${PYTHON_REQUIRED_USE}
lua? ( ${LUA_REQUIRED_USE} )
@@ -57,10 +57,10 @@ COMMON_DEPEND="
>=media-libs/tiff-4.1.0:=
net-libs/glib-networking[ssl]
sys-libs/zlib
-   >=x11-libs/cairo-1.16.0[X=]
+   >=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=]
+   >=x11-libs/gtk+-3.24.48:3[introspection,wayland?,X?]
+   >=x11-libs/pango-1.50.0[X?]
aalib? ( media-libs/aalib )
alsa? ( >=media-libs/alsa-lib-1.0.0 )
fits? ( sci-libs/cfitsio )
@@ -80,7 +80,7 @@ COMMON_DEPEND="
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=] )
+   wmf? ( >=media-libs/libwmf-0.2.8[X?] )
X? (
x11-libs/libX11
x11-libs/libXcursor
@@ -147,24 +147,15 @@ src_prepare() {
 
# 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
+   # Force disable x11_target if USE="-X" is setup. See bug 943164 for 
additional info
+   use !X && { sed -i -e 's/x11_target = /x11_target = false #/' 
meson.build || die; }
 }
 
 src_configure() {
-   _adjust_sandbox
+   # defang automagic dependencies. Bug 943164
+   use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+   use X || append-cflags -DGENTOO_GTK_HIDE_X11
 
use vala && vala_setup
 



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

2025-07-04 Thread Sam James
commit: 18ab05eeab8995dffa3560b5e2ff8d910b286bd0
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Fri Jul  4 16:44:15 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  4 18:33:07 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ab05ee

media-gfx/gimp: enable py3.14

Co-authored-by: Ian Jordan  gmail.com>
Suggested-by: Ian Jordan  gmail.com>
Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42597
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.4-r1.ebuild | 2 +-
 media-gfx/gimp/gimp-3.1.2.ebuild| 2 +-
 media-gfx/gimp/gimp-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.4-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
index 57eb9ce0b2fe..333545a849c1 100644
--- a/media-gfx/gimp/gimp-3.0.4-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 VALA_USE_DEPEND=vapigen
 
 inherit flag-o-matic lua-single meson python-single-r1 toolchain-funcs vala xdg

diff --git a/media-gfx/gimp/gimp-3.1.2.ebuild b/media-gfx/gimp/gimp-3.1.2.ebuild
index 00d65b746c24..e596e0a88818 100644
--- a/media-gfx/gimp/gimp-3.1.2.ebuild
+++ b/media-gfx/gimp/gimp-3.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 VALA_USE_DEPEND=vapigen
 
 inherit flag-o-matic lua-single meson python-single-r1 toolchain-funcs vala xdg

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 5ef72e1abd96..f6caf9083d07 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 VALA_USE_DEPEND=vapigen
 
 inherit git-r3 lua-single meson python-single-r1 toolchain-funcs vala xdg



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

2025-07-04 Thread Sam James
commit: fab20dd84b18a8ce6c0580ae84e179b9aee75995
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Fri Jul  4 16:47:13 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  4 18:33:08 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab20dd8

media-gfx/gimp: Revert c17 in 3.0.4

Gimp have merged c23 enforcing compiler support into master
which means we can revert forcing -std=gnu17

Bug: https://bugs.gentoo.org/944284
Co-authored-by: Ian Jordan  gmail.com>
Suggested-by: Ian Jordan  gmail.com>
Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42597
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.4-r1.ebuild | 3 ---
 media-gfx/gimp/gimp-3.1.2.ebuild| 3 ---
 2 files changed, 6 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.4-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
index 333545a849c1..df92016947ee 100644
--- a/media-gfx/gimp/gimp-3.0.4-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
@@ -154,9 +154,6 @@ src_prepare() {
 }
 
 src_configure() {
-   # bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
-   append-cflags -std=gnu17
-
# defang automagic dependencies. Bug 943164
use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
use X || append-cflags -DGENTOO_GTK_HIDE_X11

diff --git a/media-gfx/gimp/gimp-3.1.2.ebuild b/media-gfx/gimp/gimp-3.1.2.ebuild
index e596e0a88818..7e5bcfd2f1d7 100644
--- a/media-gfx/gimp/gimp-3.1.2.ebuild
+++ b/media-gfx/gimp/gimp-3.1.2.ebuild
@@ -149,9 +149,6 @@ src_prepare() {
 }
 
 src_configure() {
-   # bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
-   append-cflags -std=gnu17
-
# defang automagic dependencies. Bug 943164
use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
use X || append-cflags -DGENTOO_GTK_HIDE_X11



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

2025-07-04 Thread Sam James
commit: 32358ffc72c0b44e0a1509e36228591b2e72b867
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Fri Jul  4 16:38:33 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  4 18:33:06 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32358ffc

media-gfx/gimp: fix dependencies

* bzip2, libarchive and xz-utils are automagic. Make them unconditional
to avoid issues in binpkgs and confusion in users, unless proper options
are added into the build system.
* Missing dependencies gobject-introspection and libXfixes.
* libxslt was only used for xsltproc at build time. libxml2 doesn't
appear to have been used ever.
* Missing subslot operator for appstream-glib.

Co-authored-by: Alfred Wingate  protonmail.com>
Suggested-by: Alfred Wingate  protonmail.com>
Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42597
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.4-r1.ebuild | 10 +++---
 media-gfx/gimp/gimp-3.1.2.ebuild| 10 +++---
 media-gfx/gimp/gimp-.ebuild | 10 +++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.4-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
index 443301242d01..57eb9ce0b2fe 100644
--- a/media-gfx/gimp/gimp-3.0.4-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
@@ -35,13 +35,15 @@ COMMON_DEPEND="
>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
')
>=app-accessibility/at-spi2-core-2.46.0
+   app-arch/bzip2
+   app-arch/libarchive:=
+   >=app-arch/xz-utils-5.0.0
>=app-text/poppler-0.90.1[cairo]
>=app-text/poppler-data-0.4.9
-   >=dev-libs/appstream-glib-0.7.16
+   >=dev-libs/appstream-glib-0.7.16:=
>=dev-libs/glib-2.70.0:2
+   dev-libs/gobject-introspection
>=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-1.3.1:1.0=
>=media-libs/babl-0.1.114[introspection,lcms,vala?]
@@ -85,6 +87,7 @@ COMMON_DEPEND="
x11-libs/libX11
x11-libs/libXcursor
x11-libs/libXext
+   x11-libs/libXfixes
>=x11-libs/libXmu-1.1.4
)
xpm? ( x11-libs/libXpm )
@@ -105,6 +108,7 @@ DEPEND="
 # TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
 BDEPEND="
>=dev-lang/perl-5.30.3
+   dev-libs/libxslt
dev-util/gdbus-codegen
>=sys-devel/gettext-0.21
doc? (

diff --git a/media-gfx/gimp/gimp-3.1.2.ebuild b/media-gfx/gimp/gimp-3.1.2.ebuild
index d6b305bddf65..00d65b746c24 100644
--- a/media-gfx/gimp/gimp-3.1.2.ebuild
+++ b/media-gfx/gimp/gimp-3.1.2.ebuild
@@ -34,13 +34,15 @@ COMMON_DEPEND="
>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
')
>=app-accessibility/at-spi2-core-2.46.0
+   app-arch/bzip2
+   app-arch/libarchive:=
+   >=app-arch/xz-utils-5.0.0
>=app-text/poppler-0.90.1[cairo]
>=app-text/poppler-data-0.4.9
-   >=dev-libs/appstream-glib-0.7.16
+   >=dev-libs/appstream-glib-0.7.16:=
>=dev-libs/glib-2.70.0:2
+   dev-libs/gobject-introspection
>=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-1.3.1:1.0=
>=media-libs/babl-0.1.114[introspection,lcms,vala?]
@@ -84,6 +86,7 @@ COMMON_DEPEND="
x11-libs/libX11
x11-libs/libXcursor
x11-libs/libXext
+   x11-libs/libXfixes
>=x11-libs/libXmu-1.1.4
)
xpm? ( x11-libs/libXpm )
@@ -104,6 +107,7 @@ DEPEND="
 # TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
 BDEPEND="
>=dev-lang/perl-5.30.3
+   dev-libs/libxslt
dev-util/gdbus-codegen
>=sys-devel/gettext-0.21
doc? (

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 418c7c263509..5ef72e1abd96 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -33,13 +33,15 @@ COMMON_DEPEND="
>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
')
>=app-accessibility/at-spi2-core-2.46.0
+   app-arch/bzip2
+   app-arch/libarchive:=
+   >=app-arch/xz-utils-5.0.0
>=app-text/poppler-0.90.1[cairo]
>=app-text/poppler-data-0.4.9
-   >=dev-libs/appstream-glib-0.7.16
+   >=dev-libs/appstream-glib-0.7.16:=
>=dev-libs/glib-2.70.0:2
+   dev-libs/gobject-introspection
>=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-1.3.1:1.0=
>=media-libs/babl-[introspection,lcms,vala?]
@@ -83,6 +85,7 @@ COMMON_DEPEND="
x11-libs/libX11
x11-lib

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

2025-07-04 Thread Sam James
commit: f993cd5dcda0c77c5c42460c99a9fc8f50e3a909
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Fri Jul  4 16:34:17 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  4 18:33:06 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f993cd5d

media-gfx/gimp: drop autotools leftover

Co-authored-by: Alfred Wingate  protonmail.com>
Suggested-by: Alfred Wingate  protonmail.com>
Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42597
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.4-r1.ebuild | 2 --
 media-gfx/gimp/gimp-3.1.2.ebuild| 2 --
 media-gfx/gimp/gimp-.ebuild | 2 --
 3 files changed, 6 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.4-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
index a1d930a04c41..443301242d01 100644
--- a/media-gfx/gimp/gimp-3.0.4-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
@@ -231,8 +231,6 @@ src_install() {
python_optimize "${ED}/usr/$(get_libdir)/gimp"
python_fix_shebang "${ED}/usr/$(get_libdir)/gimp"
 
-   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

diff --git a/media-gfx/gimp/gimp-3.1.2.ebuild b/media-gfx/gimp/gimp-3.1.2.ebuild
index 583e25039623..d6b305bddf65 100644
--- a/media-gfx/gimp/gimp-3.1.2.ebuild
+++ b/media-gfx/gimp/gimp-3.1.2.ebuild
@@ -226,8 +226,6 @@ src_install() {
python_optimize "${ED}/usr/$(get_libdir)/gimp"
python_fix_shebang "${ED}/usr/$(get_libdir)/gimp"
 
-   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

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 40a8705c5be1..418c7c263509 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -236,8 +236,6 @@ src_install() {
python_optimize "${ED}/usr/$(get_libdir)/gimp"
python_fix_shebang "${ED}/usr/$(get_libdir)/gimp"
 
-   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



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

2025-07-04 Thread Sam James
commit: 125db2b97db030a068a4b582f0b83f7a5810dde3
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Fri Jul  4 16:21:24 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  4 18:33:05 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=125db2b9

media-gfx/gimp: fix python plugins

PYTHON_SINGLE_TARGET won't do anything if the shebangs don't reflect it.
Also fix use of python_optimize.

Co-authored-by: Alfred Wingate  protonmail.com>
Suggested-by: Alfred Wingate  protonmail.com>
Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42597
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.4-r1.ebuild | 3 ++-
 media-gfx/gimp/gimp-3.1.2.ebuild| 3 ++-
 media-gfx/gimp/gimp-.ebuild | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.4-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
index 3bf6d6d7461a..a1d930a04c41 100644
--- a/media-gfx/gimp/gimp-3.0.4-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
@@ -228,7 +228,8 @@ src_test() {
 src_install() {
meson_src_install
 
-   python_optimize
+   python_optimize "${ED}/usr/$(get_libdir)/gimp"
+   python_fix_shebang "${ED}/usr/$(get_libdir)/gimp"
 
find "${D}" -name '*.la' -type f -delete || die
 

diff --git a/media-gfx/gimp/gimp-3.1.2.ebuild b/media-gfx/gimp/gimp-3.1.2.ebuild
index 0ff36aabca60..583e25039623 100644
--- a/media-gfx/gimp/gimp-3.1.2.ebuild
+++ b/media-gfx/gimp/gimp-3.1.2.ebuild
@@ -223,7 +223,8 @@ src_test() {
 src_install() {
meson_src_install
 
-   python_optimize
+   python_optimize "${ED}/usr/$(get_libdir)/gimp"
+   python_fix_shebang "${ED}/usr/$(get_libdir)/gimp"
 
find "${D}" -name '*.la' -type f -delete || die
 

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 6d235af49155..40a8705c5be1 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -233,7 +233,8 @@ src_test() {
 src_install() {
meson_src_install
 
-   python_optimize
+   python_optimize "${ED}/usr/$(get_libdir)/gimp"
+   python_fix_shebang "${ED}/usr/$(get_libdir)/gimp"
 
find "${D}" -name '*.la' -type f -delete || die
 



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

2025-07-04 Thread Sam James
commit: 5b3698e08623430f0053deaf15ed7ccbda4d4182
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Wed Jun 25 21:45:21 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  4 18:33:05 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3698e0

media-gfx/gimp: 3.1.2 development release version bump

Release notes:
https://www.gimp.org/news/2025/06/23/gimp-3-1-2-released/

Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42597
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest  |   1 +
 media-gfx/gimp/gimp-3.1.2.ebuild | 246 +++
 2 files changed, 247 insertions(+)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index f2d699665c77..bd3e46ea3ab1 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,3 +2,4 @@ DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccf
 DIST gimp-3.0.0.tar.xz 27043544 BLAKE2B 
fe33a4f59850791867111d8c775ce74f083c75f789243ea8f622137ebae045f0c21b12d2b288e97ca611e68d4cb219d05825b082cf2594742ebbbd277ac9d2a8
 SHA512 
bb75b68054cda06a3fd6e9278fc535914cd1ea4af27d82c8f5e3480233ff4b8f6d6c479ffcd868c4fa3f1980aee741d7cf992273b09d1e862ae2b84164d038a3
 DIST gimp-3.0.2.tar.xz 27019468 BLAKE2B 
dd853b67c47d93882ff9393b808f085eab24eff337e61ed317372f186d2d94994778763e06523131bc8e1d43d077607d8c88c6a8ccb4d23115e28eb37cf473d8
 SHA512 
e5f72f9f1447ff3ec5ab78bc589831767c00be91a0f337b1ab2d5beee3f79b01464c3de0dc1a518fd72180b4232be5b8d7121d186425a766090842b550f534df
 DIST gimp-3.0.4.tar.xz 27060240 BLAKE2B 
eecca35ed8a97bc7bdbe8ad9dcbdd293b12acb125b795ceb99e2182cc61777175a7204b7a8b7b4ad265f079570cd450b7c465f8ec0ca975339d05835867ef77c
 SHA512 
7a83768caae458b75883522c87d5297e9642b64b0516c482804034b8b9acc6af6afc89d1b4a549fd26de3e33816136c31d440f554f9c8ccd43536260916a
+DIST gimp-3.1.2.tar.xz 49360004 BLAKE2B 
3d728a82081c3f386e996de22b60db12653dd499d5891bdf6bdc26fd04e6e7691fe2868b9404f3c0c0da0f3ee8982eaaa459637e55aed0e342077ed0fdcbfe6b
 SHA512 
1e0ccd7a5726fec78297e9e1d7c9e6d95838e078228e93cad55590badbafead1f63829f9ba9cfdba4885d6afe54e1626a488d0ad2feae19a72950d2c352fef3b

diff --git a/media-gfx/gimp/gimp-3.1.2.ebuild b/media-gfx/gimp/gimp-3.1.2.ebuild
new file mode 100644
index ..0ff36aabca60
--- /dev/null
+++ b/media-gfx/gimp/gimp-3.1.2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{11..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"
+
+IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland 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-1.3.1:1.0=
+   >=media-libs/babl-0.1.114[introspection,lcms,vala?]
+   >=media-libs/fontconfig-2.12.6
+   >=media-libs/freetype-2.10.2
+   >=media-libs/gegl-0.4.62: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,wayland?,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/

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

2025-07-04 Thread Sam James
commit: d604eb583e241f656d60eeab8c82f0d4b245d0a1
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sat Jun 14 17:09:53 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  4 18:33:04 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d604eb58

media-gfx/gimp: 3.0.4-r1, fix 'gir' and 'plugins' build deps

Closes: https://bugs.gentoo.org/951863
Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42597
Signed-off-by: Sam James  gentoo.org>

 ...gimp-3.0.4_fix_gir_and_plugins_build_deps.patch | 52 ++
 media-gfx/gimp/gimp-3.0.4-r1.ebuild|  4 ++
 2 files changed, 56 insertions(+)

diff --git 
a/media-gfx/gimp/files/gimp-3.0.4_fix_gir_and_plugins_build_deps.patch 
b/media-gfx/gimp/files/gimp-3.0.4_fix_gir_and_plugins_build_deps.patch
new file mode 100644
index ..7ebe330ffe71
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-3.0.4_fix_gir_and_plugins_build_deps.patch
@@ -0,0 +1,52 @@
+From 452622cc1a96032ff22ac41d362e4ff7fdce Mon Sep 17 00:00:00 2001
+From: Natanael Copa 
+Date: Wed, 21 May 2025 15:12:20 +0200
+Subject: [PATCH] Issue #13657: fix build dependencies
+
+We need the gir and plugins to be able to generate the splash image(s).
+Add those as dependencies to gimp executable to ensure they are there
+when needed.
+
+Fixes: https://gitlab.gnome.org/GNOME/gimp/-/issues/13657
+---
+ meson.build | 2 +-
+ plug-ins/common/meson.build | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index d408232e9e..7780a5869f 100644
+--- a/meson.build
 b/meson.build
+@@ -1980,7 +1980,7 @@ if meson.can_run_host_binaries() and 
have_gobject_introspection
+   else
+ gimp_real_exe = gimpmain_exe
+   endif
+-  gimp_exe_depends = [gimp_real_exe]
++  gimp_exe_depends = [gimp_real_exe, libgimp_gir, libgimpui_gir] + 
plugin_custom_targets
+   gimp_run_env.set('GIMP_SELF_IN_BUILD', gimp_real_exe.full_path())
+ 
+   menu_paths=meson.global_build_root() / 'menus:' + 
meson.global_source_root() / 'menus'
+diff --git a/plug-ins/common/meson.build b/plug-ins/common/meson.build
+index b6aa62d895..e172603779 100644
+--- a/plug-ins/common/meson.build
 b/plug-ins/common/meson.build
+@@ -186,6 +186,7 @@ if get_option('webkit-unmaintained')
+   }
+ endif
+ 
++plugin_custom_targets = []
+ foreach plugin : common_plugins_list
+   plugin_name = plugin.get('name')
+   plugin_sources = [ plugin.get('sources', plugin_name + '.c') ]
+@@ -243,7 +244,7 @@ foreach plugin : common_plugins_list
+ 
+   # Ugly trick to copy executables into subfolders so that we can run GIMP 
from
+   # the build directory without installing it.
+-  custom_target('test-' + plugin_name,
++  plugin_custom_targets += custom_target('test-' + plugin_name,
+ input: [ plugin_exe ],
+ output: [ plugin_name + '.dummy' ],
+ command: [ python, meson.project_source_root() / 
'build/meson/cp-plug-in-subfolder.py',
+-- 
+GitLab
+

diff --git a/media-gfx/gimp/gimp-3.0.4-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
index 6871a768f5ae..3bf6d6d7461a 100644
--- a/media-gfx/gimp/gimp-3.0.4-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
@@ -116,6 +116,10 @@ BDEPEND="
 
 DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
 
+PATCHES=(
+   "${FILESDIR}/${P}_fix_gir_and_plugins_build_deps.patch" # Bugs 951863 
(fix build with app-alternatives/ninja[samurai])
+)
+
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }



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

2025-07-04 Thread Sam James
commit: 38d2d6791ba622aa436a9a86f7a311d7939d0914
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sat Jun 14 17:00:56 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  4 18:33:03 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d2d679

media-gfx/gimp: 3.0.4, drop REQUIRED_USE exactly-one-of ( X wayland )

Closes: https://bugs.gentoo.org/956402
Bug: https://bugs.gentoo.org/957967
Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42597
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/{gimp-3.0.4.ebuild => gimp-3.0.4-r1.ebuild} | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.4.ebuild 
b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
similarity index 99%
rename from media-gfx/gimp/gimp-3.0.4.ebuild
rename to media-gfx/gimp/gimp-3.0.4-r1.ebuild
index ff57d5fe89f9..6871a768f5ae 100644
--- a/media-gfx/gimp/gimp-3.0.4.ebuild
+++ b/media-gfx/gimp/gimp-3.0.4-r1.ebuild
@@ -23,7 +23,6 @@ REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
test? ( X )
xpm? ( X )
-   ^^ ( X wayland )
 "
 
 RESTRICT="!test? ( test )"



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

2025-06-15 Thread WANG Xuerui
commit: 2d2befecca878c6dd8d68ea8704525ff7a0160c8
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sat May 31 10:13:01 2025 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Mon Jun 16 03:27:24 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d2befec

media-gfx/gimp: keyword 3.0.2-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 media-gfx/gimp/gimp-3.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.2-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.2-r1.ebuild
index 7a4709a03cad..201d7db2be10 100644
--- a/media-gfx/gimp/gimp-3.0.2-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~loong"
 
 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="



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

2025-05-21 Thread Sam James
commit: 50f257f3213a32c8631a14f61f9744092f583291
Author: Filip Kobierski  pm  me>
AuthorDate: Tue May 13 09:30:46 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 21 21:26:47 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f257f3

media-gfx/gimp: metadata: complete upstream

Signed-off-by: Filip Kobierski  pm.me>
Part-of: https://github.com/gentoo/gentoo/pull/42068
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 23efd9862ca5..7cd7ed5b57f7 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -14,6 +14,9 @@
Enable support for vector icons 
(experimental)


+   https://www.gimp.org/bugs/
+   https://www.gimp.org/release-notes/
+   https://www.gimp.org/docs/
GNOME/gimp

 



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

2025-05-21 Thread Sam James
commit: 65f82d4888c4a1551eab0b5d5a1d59148deca302
Author: Filip Kobierski  pm  me>
AuthorDate: Tue May 13 09:31:14 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 21 21:26:48 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f82d48

media-gfx/gimp: metadata: add USE=alsa description

I do not know if it is helpful but it is better
than the generic one.

Signed-off-by: Filip Kobierski  pm.me>
Part-of: https://github.com/gentoo/gentoo/pull/42068
Closes: https://github.com/gentoo/gentoo/pull/42068
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 7cd7ed5b57f7..2b1fa7ac6a48 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -10,6 +10,7 @@
Proxy Maintainers


+   Enable ALSA support in midi input 
controller
Enable support for loading/exporting FITS 
images
Enable support for vector icons 
(experimental)




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

2025-05-21 Thread Sam James
commit: 090e2767abb07926d6b9249bcac10833b01ee944
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Mon May 19 18:06:44 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 21 20:58:26 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090e2767

media-gfx/gimp: 3.0.4 version bump

Bug: https://bugs.gentoo.org/936290
Bug: https://bugs.gentoo.org/943164
Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42157
Closes: https://github.com/gentoo/gentoo/pull/42157
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest  |   1 +
 media-gfx/gimp/gimp-3.0.4.ebuild | 248 +++
 2 files changed, 249 insertions(+)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 192b769ee067..f2d699665c77 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,4 @@
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-3.0.0.tar.xz 27043544 BLAKE2B 
fe33a4f59850791867111d8c775ce74f083c75f789243ea8f622137ebae045f0c21b12d2b288e97ca611e68d4cb219d05825b082cf2594742ebbbd277ac9d2a8
 SHA512 
bb75b68054cda06a3fd6e9278fc535914cd1ea4af27d82c8f5e3480233ff4b8f6d6c479ffcd868c4fa3f1980aee741d7cf992273b09d1e862ae2b84164d038a3
 DIST gimp-3.0.2.tar.xz 27019468 BLAKE2B 
dd853b67c47d93882ff9393b808f085eab24eff337e61ed317372f186d2d94994778763e06523131bc8e1d43d077607d8c88c6a8ccb4d23115e28eb37cf473d8
 SHA512 
e5f72f9f1447ff3ec5ab78bc589831767c00be91a0f337b1ab2d5beee3f79b01464c3de0dc1a518fd72180b4232be5b8d7121d186425a766090842b550f534df
+DIST gimp-3.0.4.tar.xz 27060240 BLAKE2B 
eecca35ed8a97bc7bdbe8ad9dcbdd293b12acb125b795ceb99e2182cc61777175a7204b7a8b7b4ad265f079570cd450b7c465f8ec0ca975339d05835867ef77c
 SHA512 
7a83768caae458b75883522c87d5297e9642b64b0516c482804034b8b9acc6af6afc89d1b4a549fd26de3e33816136c31d440f554f9c8ccd43536260916a

diff --git a/media-gfx/gimp/gimp-3.0.4.ebuild b/media-gfx/gimp/gimp-3.0.4.ebuild
new file mode 100644
index ..ff57d5fe89f9
--- /dev/null
+++ b/media-gfx/gimp/gimp-3.0.4.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{11..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 ~arm"
+
+IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+   lua? ( ${LUA_REQUIRED_USE} )
+   test? ( X )
+   xpm? ( X )
+   ^^ ( X wayland )
+"
+
+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-1.3.1:1.0=
+   >=media-libs/babl-0.1.114[introspection,lcms,vala?]
+   >=media-libs/fontconfig-2.12.6
+   >=media-libs/freetype-2.10.2
+   >=media-libs/gegl-0.4.62: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,wayland?,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/

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

2025-05-21 Thread Sam James
commit: 20a34f246d1cc42b98880edef15abd07de26ed5b
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Mon May 19 17:59:37 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 21 20:58:25 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a34f24

media-gfx/gimp: 3.0.2-r2 revbump, depend on [X?] instead of [X=]

Compared with gimp-3.0.2-r1 add USE="wayland" with forced disabling
of 'x11_target', add 'append-cflags -DGENTOO_GTK_HIDE_WAYLAND' or
'append-cflags -DGENTOO_GTK_HIDE_X11' depend on USE='wayland' or 'X'

Closes: https://bugs.gentoo.org/943164
Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42157
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.2-r2.ebuild | 248 
 1 file changed, 248 insertions(+)

diff --git a/media-gfx/gimp/gimp-3.0.2-r2.ebuild 
b/media-gfx/gimp/gimp-3.0.2-r2.ebuild
new file mode 100644
index ..e7ab1ad049f6
--- /dev/null
+++ b/media-gfx/gimp/gimp-3.0.2-r2.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{11..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 ~arm"
+
+IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript test udev unwind vala vector-icons wayland webp wmf 
xpm"
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+   lua? ( ${LUA_REQUIRED_USE} )
+   test? ( X )
+   xpm? ( X )
+   ^^ ( X wayland )
+"
+
+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-1.3.1:1.0=
+   >=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.58: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,wayland?,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() {
+   [[ $

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

2025-05-13 Thread Sam James
commit: efc289411c3663fe667da4238f7760c9fc32ce97
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue May 13 18:30:08 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 14 03:00:53 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc28941

media-gfx/gimp: drop python 3.10 compat and unused eclass

Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42074
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.0-r1.ebuild | 2 +-
 media-gfx/gimp/gimp-3.0.2-r1.ebuild | 2 +-
 media-gfx/gimp/gimp-.ebuild | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.0-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.0-r1.ebuild
index 8c20955574de..639dda71d8d6 100644
--- a/media-gfx/gimp/gimp-3.0.0-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 VALA_USE_DEPEND=vapigen
 
 inherit flag-o-matic lua-single meson python-single-r1 toolchain-funcs vala xdg

diff --git a/media-gfx/gimp/gimp-3.0.2-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.2-r1.ebuild
index 964ef4295300..7a4709a03cad 100644
--- a/media-gfx/gimp/gimp-3.0.2-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 VALA_USE_DEPEND=vapigen
 
 inherit flag-o-matic lua-single meson python-single-r1 toolchain-funcs vala xdg

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index de9f90e5bb96..6d235af49155 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -4,10 +4,10 @@
 EAPI=8
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 VALA_USE_DEPEND=vapigen
 
-inherit git-r3 lua-single flag-o-matic meson python-single-r1 toolchain-funcs 
vala xdg
+inherit git-r3 lua-single meson python-single-r1 toolchain-funcs vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";



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

2025-05-13 Thread Sam James
commit: b85ccb304ff80c5f64ad148e48d48932ad867544
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue May 13 18:28:17 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 14 03:00:52 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b85ccb30

media-gfx/gimp: return to using media-gfx/mypaint-brushes:1.0

Closes: https://bugs.gentoo.org/955838
Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42074
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-2.10.38-r2.ebuild | 4 +---
 media-gfx/gimp/gimp-3.0.0-r1.ebuild   | 4 +---
 media-gfx/gimp/gimp-3.0.2-r1.ebuild   | 4 +---
 media-gfx/gimp/gimp-.ebuild   | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/media-gfx/gimp/gimp-2.10.38-r2.ebuild 
b/media-gfx/gimp/gimp-2.10.38-r2.ebuild
index 733c6f83c7bc..fa82a23c0adf 100644
--- a/media-gfx/gimp/gimp-2.10.38-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38-r2.ebuild
@@ -27,7 +27,7 @@ COMMON_DEPEND="
>=dev-libs/glib-2.56.2:2
>=dev-libs/json-glib-1.2.6
>=gnome-base/librsvg-2.40.6:2
-   >=media-gfx/mypaint-brushes-2.0.2:=
+   >=media-gfx/mypaint-brushes-1.3.1:1.0=
>=media-libs/babl-0.1.98
>=media-libs/fontconfig-2.12.4
>=media-libs/freetype-2.1.7
@@ -100,8 +100,6 @@ PATCHES=(
 )
 
 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
 

diff --git a/media-gfx/gimp/gimp-3.0.0-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.0-r1.ebuild
index e8102180cf2b..8c20955574de 100644
--- a/media-gfx/gimp/gimp-3.0.0-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.0-r1.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
dev-libs/libxml2:2=
dev-libs/libxslt
>=gnome-base/librsvg-2.57.3:2
-   >=media-gfx/mypaint-brushes-2.0.2:=
+   >=media-gfx/mypaint-brushes-1.3.1:1.0=
>=media-libs/babl-0.1.112[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6
>=media-libs/freetype-2.10.2
@@ -129,8 +129,6 @@ 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

diff --git a/media-gfx/gimp/gimp-3.0.2-r1.ebuild 
b/media-gfx/gimp/gimp-3.0.2-r1.ebuild
index 3b94d0b7d238..964ef4295300 100644
--- a/media-gfx/gimp/gimp-3.0.2-r1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.2-r1.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
dev-libs/libxml2:2=
dev-libs/libxslt
>=gnome-base/librsvg-2.57.3:2
-   >=media-gfx/mypaint-brushes-2.0.2:=
+   >=media-gfx/mypaint-brushes-1.3.1:1.0=
>=media-libs/babl-0.1.112[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6
>=media-libs/freetype-2.10.2
@@ -129,8 +129,6 @@ 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

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index d6414bb99fac..de9f90e5bb96 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND="
dev-libs/libxml2:2=
dev-libs/libxslt
>=gnome-base/librsvg-2.57.3:2
-   >=media-gfx/mypaint-brushes-2.0.2:=
+   >=media-gfx/mypaint-brushes-1.3.1:1.0=
>=media-libs/babl-[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6
>=media-libs/freetype-2.10.2
@@ -132,8 +132,6 @@ 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



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

2025-05-13 Thread Sam James
commit: d54c15d014dee29b578536b4f1ed1140d15d48ff
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue May 13 18:13:22 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 14 03:00:52 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d54c15d0

media-gfx/gimp: 2.10.38, add dev-libs/libxml2 subslot for ABI break

Signed-off-by: Sergey Torokhov  yandex.ru>
Part-of: https://github.com/gentoo/gentoo/pull/42074
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/{gimp-2.10.38-r1.ebuild => gimp-2.10.38-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-2.10.38-r1.ebuild 
b/media-gfx/gimp/gimp-2.10.38-r2.ebuild
similarity index 99%
rename from media-gfx/gimp/gimp-2.10.38-r1.ebuild
rename to media-gfx/gimp/gimp-2.10.38-r2.ebuild
index 74d5c6cb1ae3..733c6f83c7bc 100644
--- a/media-gfx/gimp/gimp-2.10.38-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38-r2.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
 
 DEPEND="
${COMMON_DEPEND}
-   dev-libs/libxml2:2
+   dev-libs/libxml2:2=
dev-libs/libxslt
 "
 



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

2025-05-13 Thread Sam James
commit: 2a70ca660c082e1e677b451a6afbf1cf54aaccd6
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sat May  3 15:43:40 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 14 03:00:51 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a70ca66

media-gfx/gimp: add dev-libs/libxml2 subslot op for incoming ABI break

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42074
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/{gimp-3.0.0.ebuild => gimp-3.0.0-r1.ebuild} | 2 +-
 media-gfx/gimp/{gimp-3.0.2.ebuild => gimp-3.0.2-r1.ebuild} | 2 +-
 media-gfx/gimp/gimp-.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.0.ebuild 
b/media-gfx/gimp/gimp-3.0.0-r1.ebuild
similarity index 99%
rename from media-gfx/gimp/gimp-3.0.0.ebuild
rename to media-gfx/gimp/gimp-3.0.0-r1.ebuild
index 93de4f4da202..e8102180cf2b 100644
--- a/media-gfx/gimp/gimp-3.0.0.ebuild
+++ b/media-gfx/gimp/gimp-3.0.0-r1.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
>=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/libxml2:2=
dev-libs/libxslt
>=gnome-base/librsvg-2.57.3:2
>=media-gfx/mypaint-brushes-2.0.2:=

diff --git a/media-gfx/gimp/gimp-3.0.2.ebuild 
b/media-gfx/gimp/gimp-3.0.2-r1.ebuild
similarity index 99%
rename from media-gfx/gimp/gimp-3.0.2.ebuild
rename to media-gfx/gimp/gimp-3.0.2-r1.ebuild
index 39f1aa9bd9d7..3b94d0b7d238 100644
--- a/media-gfx/gimp/gimp-3.0.2.ebuild
+++ b/media-gfx/gimp/gimp-3.0.2-r1.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
>=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/libxml2:2=
dev-libs/libxslt
>=gnome-base/librsvg-2.57.3:2
>=media-gfx/mypaint-brushes-2.0.2:=

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 7fd42627a4c6..d6414bb99fac 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -38,7 +38,7 @@ COMMON_DEPEND="
>=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/libxml2:2=
dev-libs/libxslt
>=gnome-base/librsvg-2.57.3:2
>=media-gfx/mypaint-brushes-2.0.2:=



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

2025-05-06 Thread Sam James
commit: 59c5f30b48d486ae9850397e687c560af4abb8e8
Author: Ian Jordan  gmail  com>
AuthorDate: Wed May  7 06:10:07 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May  7 06:43:05 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59c5f30b

media-gfx/gimp: Revert -std=gnu17

Gimp have merged c23 enforcing compiler support into master which means we can 
revert forcing -std=gnu17 on the live ebuild now.

Upstream have also said this will be in 3.0.4 release as well.

Bug: https://bugs.gentoo.org/944284
Signed-off-by: Ian Jordan  gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/41971
Closes: https://github.com/gentoo/gentoo/pull/41971
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 0f04ed813692..7fd42627a4c6 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -164,9 +164,6 @@ _adjust_sandbox() {
 src_configure() {
_adjust_sandbox
 
-   # bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
-   append-cflags -std=gnu17
-
use vala && vala_setup
 
local emesonargs=(



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

2025-04-28 Thread Sam James
commit: 23160260944650f799b4cf5f8ba526066637dbe9
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 28 14:02:57 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 28 14:02:57 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23160260

Revert "media-gfx/gimp: Stabilize 3.0.0 amd64, #954952"

This reverts commit 455b59daf5df690ae3a3a9304af035a00c70e7da.

This isn't ready yet.

Bug: https://bugs.gentoo.org/954952
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.0.ebuild b/media-gfx/gimp/gimp-3.0.0.ebuild
index 765da42c1010..93de4f4da202 100644
--- a/media-gfx/gimp/gimp-3.0.0.ebuild
+++ b/media-gfx/gimp/gimp-3.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="amd64"
+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="



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

2025-04-17 Thread Pacho Ramos
commit: 0048cdea5dac22baf73cc061ee3ea13c782efee3
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Apr 16 21:26:18 2025 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Apr 17 16:35:40 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0048cdea

media-gfx/gimp-arrow-brushes: update HOMEPAGE

Closes: https://bugs.gentoo.org/953889
Signed-off-by: Pacho Ramos  gentoo.org>

 media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild 
b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
index f56f4afcbd89..7d6010f5ecbc 100644
--- a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
+++ b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Brushes for GIMP with the styles arrow, handpointer, button arrow 
and cursor"
-HOMEPAGE="https://www.gimphelp.org/";
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage";
 
 # http://www.gimphelp.org/DL/ refuses wget without user-agent
 SRC_URI="



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

2025-04-17 Thread Pacho Ramos
commit: 58bf04a2e502463ed51b476f67201a7724b3b9b9
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Apr 17 16:24:03 2025 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Apr 17 16:35:40 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58bf04a2

media-gfx/gimp-arrow-brushes: Fix QA warnings

Signed-off-by: Pacho Ramos  gentoo.org>

 media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild 
b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
index 7d6010f5ecbc..9c99ab88fd68 100644
--- a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
+++ b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
@@ -21,16 +21,11 @@ SRC_URI="
https://dev.gentoo.org/~pacho/${PN}/checkmark_brushes-1.0.tar.bz2
https://dev.gentoo.org/~pacho/${PN}/star_brushes.tar.bz2
 "
+S="${WORKDIR}"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}"
 
 src_install() {
for i in */*.gbr; do



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

2025-04-04 Thread Sam James
commit: 2bb769f15395cb3947892c5bdb8a7fa9bde57e4c
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  4 15:44:11 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  4 15:44:11 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb769f1

media-gfx/gimp: Keyword 3.0.2 arm, #951566

Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-3.0.2.ebuild b/media-gfx/gimp/gimp-3.0.2.ebuild
index cfaa4a83b853..39f1aa9bd9d7 100644
--- a/media-gfx/gimp/gimp-3.0.2.ebuild
+++ b/media-gfx/gimp/gimp-3.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 
 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="



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

2025-04-03 Thread Sam James
commit: 357bcc41a794e3fa204f9b1fc109ee996dfff2bd
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Wed Apr  2 18:44:02 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  3 20:56:49 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357bcc41

media-gfx/gimp: drop gimp-3.0.0-rc{1,2-r1,3}

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest|   3 -
 .../gimp-3.0.0_rc3_debug_self_gdb_optional.patch   |  65 -
 media-gfx/gimp/gimp-3.0.0_rc1.ebuild   | 263 
 media-gfx/gimp/gimp-3.0.0_rc2-r1.ebuild| 263 
 media-gfx/gimp/gimp-3.0.0_rc3.ebuild   | 266 -
 5 files changed, 860 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 2671dea0c5a0..192b769ee067 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,6 +1,3 @@
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
-DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B 
d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196
 SHA512 
844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985
-DIST gimp-3.0.0-RC2.tar.xz 26980968 BLAKE2B 
56b98a7863df22cf81015a9da5d7535cfef5a154c47418b1b6c6212cc76423e0769a4aa8d76714d2eb22595b1f6e2c623ee35675db5fe7e40c8820fe71dd
 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
 DIST gimp-3.0.2.tar.xz 27019468 BLAKE2B 
dd853b67c47d93882ff9393b808f085eab24eff337e61ed317372f186d2d94994778763e06523131bc8e1d43d077607d8c88c6a8ccb4d23115e28eb37cf473d8
 SHA512 
e5f72f9f1447ff3ec5ab78bc589831767c00be91a0f337b1ab2d5beee3f79b01464c3de0dc1a518fd72180b4232be5b8d7121d186425a766090842b550f534df

diff --git a/media-gfx/gimp/files/gimp-3.0.0_rc3_debug_self_gdb_optional.patch 
b/media-gfx/gimp/files/gimp-3.0.0_rc3_debug_self_gdb_optional.patch
deleted file mode 100644
index 76c92ba95515..
--- a/media-gfx/gimp/files/gimp-3.0.0_rc3_debug_self_gdb_optional.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Gentoo issue: https://bugs.gentoo.org/949910
-Upstream issue: https://gitlab.gnome.org/GNOME/gimp/-/issues/12904
-
-From c3bc4e53363bdad44f01826f665d88c48fcedd99 Mon Sep 17 00:00:00 2001
-From: Jehan 
-Date: Mon, 24 Feb 2025 18:13:09 +0100
-Subject: [PATCH] Issue #12904: make debugging self with gdb optional with
- -Ddebug-self-in-build.
-
-Some people reported cases where gdb doesn't even seem to understand
-Python scripts (the error in #12904 implies it is looking for standard
-gdb commands, because apparently -x option allows both styles).
-Others had issues in sandbox building (#12956).
-
-I don't really want to spend too much time understanding each case,
-especially as it's a self-debugging tool, not absolutely necessary for a
-successful compilation.
-
-So let's just make this optional, and default to "false".

- meson.build| 3 +++
- meson_options.txt  | 2 ++
- tools/in-build-gimp.sh | 2 +-
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 5fb07c6f13..2cfd7acb89 100644
 a/meson.build
-+++ b/meson.build
-@@ -1959,6 +1959,9 @@ subdir('app-tools')
- gimp_run_env=environment()
- gimp_run_env.set('GIMP_GLOBAL_BUILD_ROOT',  meson.global_build_root())
- gimp_run_env.set('GIMP_GLOBAL_SOURCE_ROOT', meson.global_source_root())
-+if get_option('debug-self-in-build')
-+ gimp_run_env.set('GIMP_DEBUG_SELF', '1')
-+endif
- 
- if meson.can_run_host_binaries() and have_gobject_introspection
-   if enable_console_bin
-diff --git a/meson_options.txt b/meson_options.txt
-index b9da5211dd..f6adb1313d 100644
 a/meson_options.txt
-+++ b/meson_options.txt
-@@ -66,3 +66,5 @@ option('vector-icons',  type: 'boolean', value: true,   
description: 'Use ve
- option('vala',  type: 'feature', value: 'auto', description: 
'Bui

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

2025-04-03 Thread Sam James
commit: 8690bda2925e84c4317a70713e873987cb235ea0
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Wed Apr  2 18:32:21 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  3 20:56:48 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8690bda2

media-gfx/gimp: 3.0.2 remove sandbox adjustment

It seems issues below aren't reprodusable for media-gfx/gimp:3

Bug: https://bugs.gentoo.org/569738
Bug: https://bugs.gentoo.org/574038
Bug: https://bugs.gentoo.org/589198
Bug: https://bugs.gentoo.org/591214
Bug: https://bugs.gentoo.org/684886
Thanks-to: sin-ack  protonmail.com>
Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.2.ebuild | 16 
 1 file changed, 16 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.2.ebuild b/media-gfx/gimp/gimp-3.0.2.ebuild
index 9ce6ebc9d03f..cfaa4a83b853 100644
--- a/media-gfx/gimp/gimp-3.0.2.ebuild
+++ b/media-gfx/gimp/gimp-3.0.2.ebuild
@@ -144,23 +144,7 @@ src_prepare() {
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
 



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

2025-04-03 Thread Sam James
commit: 70aaf0f983762d8cffc04992ed58b196da0a950a
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Wed Apr  2 18:24:45 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  3 20:56:47 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70aaf0f9

media-gfx/gimp: 3.0.2 version bump

Still affected "fails test "gimp:app / core" TIMEOUT" issue

Bug: https://bugs.gentoo.org/936290
Closes: https://bugs.gentoo.org/952932
Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest  |   1 +
 media-gfx/gimp/gimp-3.0.2.ebuild | 258 +++
 2 files changed, 259 insertions(+)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 7ef064ac7e0b..2671dea0c5a0 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -3,3 +3,4 @@ DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B 
d9e1ae51809d1c8e5084a9e85b660cd0f3a7
 DIST gimp-3.0.0-RC2.tar.xz 26980968 BLAKE2B 
56b98a7863df22cf81015a9da5d7535cfef5a154c47418b1b6c6212cc76423e0769a4aa8d76714d2eb22595b1f6e2c623ee35675db5fe7e40c8820fe71dd
 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
+DIST gimp-3.0.2.tar.xz 27019468 BLAKE2B 
dd853b67c47d93882ff9393b808f085eab24eff337e61ed317372f186d2d94994778763e06523131bc8e1d43d077607d8c88c6a8ccb4d23115e28eb37cf473d8
 SHA512 
e5f72f9f1447ff3ec5ab78bc589831767c00be91a0f337b1ab2d5beee3f79b01464c3de0dc1a518fd72180b4232be5b8d7121d186425a766090842b550f534df

diff --git a/media-gfx/gimp/gimp-3.0.2.ebuild b/media-gfx/gimp/gimp-3.0.2.ebuild
new file mode 100644
index ..9ce6ebc9d03f
--- /dev/null
+++ b/media-gfx/gimp/gimp-3.0.2.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.58: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[${

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

2025-03-18 Thread Sam James
commit: 7a71f8186fffc22dbcda9bd7c4943fb33a78d628
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue Mar 18 19:01:00 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 18 19:22:31 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a71f818

media-gfx/gimp: 3.0.0 version bump

QA warning is presented:
QA Notice: Package triggers severe warnings which indicate that it  

   │
   may exhibit random runtime failures. 

   │
extensions/goat-exercises/goat-exercise-vala.p/goat-exercise-vala.c:303:24:
warning: assignment to ‘GtkBox *’ {aka ‘struct _GtkBox *’}
from incompatible pointer type ‘GtkWidget *’ {aka ‘struct _GtkWidget *’}
[-Wincompatible-pointer-types]

Still affected "fails test "gimp:app / core" TIMEOUT" issue (936290)

Remove workaround with renaming to zzz-gimp.desktop (#679220)

Bug: https://bugs.gentoo.org/936290
Closes: https://bugs.gentoo.org/679220
Bug: https://bugs.gentoo.org/947607
Bug: https://bugs.gentoo.org/769350
Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest   |  1 +
 .../gimp/{gimp-.ebuild => gimp-3.0.0.ebuild}  | 19 ++-
 media-gfx/gimp/gimp-.ebuild   |  4 
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index dd827da81ebc..7ef064ac7e0b 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,3 +2,4 @@ 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 
56b98a7863df22cf81015a9da5d7535cfef5a154c47418b1b6c6212cc76423e0769a4aa8d76714d2eb22595b1f6e2c623ee35675db5fe7e40c8820fe71dd
 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

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-3.0.0.ebuild
similarity index 90%
copy from media-gfx/gimp/gimp-.ebuild
copy to media-gfx/gimp/gimp-3.0.0.ebuild
index d3f55c7cdc88..93de4f4da202 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-3.0.0.ebuild
@@ -7,13 +7,15 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{10..13} )
 VALA_USE_DEPEND=vapigen
 
-inherit git-r3 lua-single flag-o-matic meson python-single-r1 toolchain-funcs 
vala xdg
+inherit flag-o-matic lua-single meson python-single-r1 toolchain-funcs vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
-EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git";
+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="
@@ -42,10 +44,10 @@ COMMON_DEPEND="
dev-libs/libxslt
>=gnome-base/librsvg-2.57.3:2
>=media-gfx/mypaint-brushes-2.0.2:=
-   >=media-libs/babl-[introspection,lcms,vala?]
+   >=media-libs/babl-0.1.112[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6
>=media-libs/freetype-2.10.2
-   >=media-libs/gegl-[cairo,introspection,lcms,vala?]
+   >=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
@@ -122,11 +124,6 @@ pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
python-single-r1_pkg_setup
use lua && lua-single_pkg_setup
-
-   if has_version ">=media-libs/babl-" || has_version 
">=media-libs/gegl-"; then
- 

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

2025-02-28 Thread Sam James
commit: 27ecdf59f33a237b3c682ffe8966247635fa0b42
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Thu Feb 27 18:33:38 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 28 13:01:53 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ecdf59

media-gfx/gimp: 3.0.0_rc3 version bump

Still affected fails test "gimp:app / core" TIMEOUT issue

Bug: https://bugs.gentoo.org/936290
Bug: https://bugs.gentoo.org/949910
Closes: https://bugs.gentoo.org/949641
Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/40800
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest|  1 +
 .../gimp-3.0.0_rc3_debug_self_gdb_optional.patch   | 65 ++
 .../{gimp-.ebuild => gimp-3.0.0_rc3.ebuild}| 22 
 media-gfx/gimp/gimp-.ebuild|  3 +-
 4 files changed, 80 insertions(+), 11 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 6cc41942d6a9..dd827da81ebc 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,4 @@
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B 
d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196
 SHA512 
844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985
 DIST gimp-3.0.0-RC2.tar.xz 26980968 BLAKE2B 
56b98a7863df22cf81015a9da5d7535cfef5a154c47418b1b6c6212cc76423e0769a4aa8d76714d2eb22595b1f6e2c623ee35675db5fe7e40c8820fe71dd
 SHA512 
c0a6e096d954f3048cb68fe4ff71dd2f49c802f800014ab8a3089a0e097e7d6f595e5716230c06e7edfddba948f0d01da14800935aa6ceb9dc2e12fb7f19d7e6
+DIST gimp-3.0.0-RC3.tar.xz 27043600 BLAKE2B 
6dd3a64ab8a7ec3481fdc2c4d7aeeb34546fbd493f9f6663f154f8ff47616190df0fa3719ea17debde56ed9f32120b6d03d4acf45b9e98740fd2ebc11c429878
 SHA512 
f6da664aadc312cdfac248fb1d3d8eb681aff50b8b0dee6f5c23cfa768eb4899386f470d19e797d0b1ee24746c88c7c12b609c3dc091acd2a625baf0b028285f

diff --git a/media-gfx/gimp/files/gimp-3.0.0_rc3_debug_self_gdb_optional.patch 
b/media-gfx/gimp/files/gimp-3.0.0_rc3_debug_self_gdb_optional.patch
new file mode 100644
index ..76c92ba95515
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-3.0.0_rc3_debug_self_gdb_optional.patch
@@ -0,0 +1,65 @@
+Gentoo issue: https://bugs.gentoo.org/949910
+Upstream issue: https://gitlab.gnome.org/GNOME/gimp/-/issues/12904
+
+From c3bc4e53363bdad44f01826f665d88c48fcedd99 Mon Sep 17 00:00:00 2001
+From: Jehan 
+Date: Mon, 24 Feb 2025 18:13:09 +0100
+Subject: [PATCH] Issue #12904: make debugging self with gdb optional with
+ -Ddebug-self-in-build.
+
+Some people reported cases where gdb doesn't even seem to understand
+Python scripts (the error in #12904 implies it is looking for standard
+gdb commands, because apparently -x option allows both styles).
+Others had issues in sandbox building (#12956).
+
+I don't really want to spend too much time understanding each case,
+especially as it's a self-debugging tool, not absolutely necessary for a
+successful compilation.
+
+So let's just make this optional, and default to "false".
+---
+ meson.build| 3 +++
+ meson_options.txt  | 2 ++
+ tools/in-build-gimp.sh | 2 +-
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5fb07c6f13..2cfd7acb89 100644
+--- a/meson.build
 b/meson.build
+@@ -1959,6 +1959,9 @@ subdir('app-tools')
+ gimp_run_env=environment()
+ gimp_run_env.set('GIMP_GLOBAL_BUILD_ROOT',  meson.global_build_root())
+ gimp_run_env.set('GIMP_GLOBAL_SOURCE_ROOT', meson.global_source_root())
++if get_option('debug-self-in-build')
++ gimp_run_env.set('GIMP_DEBUG_SELF', '1')
++endif
+ 
+ if meson.can_run_host_binaries() and have_gobject_introspection
+   if enable_console_bin
+diff --git a/meson_options.txt b/meson_options.txt
+index b9da5211dd..f6adb1313d 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -66,3 +66,5 @@ option('vector-icons',  type: 'boolean', value: true,   
description: 'Use ve
+ option('vala',  type: 'feature', value: 'auto', description: 
'Build VAPI and Vala plugins')
+ option('javascript',type: 'feature', value: 'auto', description: 
'Install Javascript plug-ins')
+ option('lua',   type: 'boolean', value: false,  description: 
'Install Lua plug-ins (experimental)')
++
++option('debug-self-in-build', type: 'boolean', value: false, description: 
'Run in-build GIMP within gdb for debugging purpose')
+diff --git a/tools/in-build-gimp.sh b/tools/in-build-gimp.sh
+index 913fd19c80..878e351ccc 100755
+---

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

2025-02-21 Thread Sam James
commit: 49ac77b5f4ffddc828c0aec07ea52d0038ebf6c9
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Feb 20 10:36:01 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 21 13:09:55 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ac77b5

media-gfx/gimp: fix python path sed

Upstream commit: de3cf104e393b5aedb61d5b0df8fd86a6ddcda30

Signed-off-by: Alfred Wingate  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40670
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/{gimp-3.0.0_rc2.ebuild => gimp-3.0.0_rc2-r1.ebuild} | 2 +-
 media-gfx/gimp/gimp-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.0_rc2.ebuild 
b/media-gfx/gimp/gimp-3.0.0_rc2-r1.ebuild
similarity index 98%
rename from media-gfx/gimp/gimp-3.0.0_rc2.ebuild
rename to media-gfx/gimp/gimp-3.0.0_rc2-r1.ebuild
index 4fb8488213ef..6e00ae9d9f6b 100644
--- a/media-gfx/gimp/gimp-3.0.0_rc2.ebuild
+++ b/media-gfx/gimp/gimp-3.0.0_rc2-r1.ebuild
@@ -139,7 +139,7 @@ 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_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

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 31b624a374d0..dc9f4d6c6012 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -141,7 +141,7 @@ 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_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



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

2025-02-19 Thread Sam James
commit: abafcded6b538a32c608eeeae45b541a42f6e671
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 19 18:25:29 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 19 18:25:29 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abafcded

media-gfx/gimp: forward-port -std=gnu17 to 3.x too

In d3d83c6a06a57241395a389970cf2fb8495a36ba, I said I wasn't going to do this,
but it hasn't been merged upstream yet still, so whatever. Let's avoid
an unnecessary build failure for people.

Closes: https://bugs.gentoo.org/944284
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.0_rc1.ebuild | 7 +--
 media-gfx/gimp/gimp-3.0.0_rc2.ebuild | 7 +--
 media-gfx/gimp/gimp-.ebuild  | 5 -
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.0_rc1.ebuild 
b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild
index 00639d92cbe4..88005560e5f9 100644
--- a/media-gfx/gimp/gimp-3.0.0_rc1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{10..13} )
 VALA_USE_DEPEND=vapigen
 
-inherit lua-single meson python-single-r1 toolchain-funcs vala xdg
+inherit lua-single flag-o-matic meson python-single-r1 toolchain-funcs vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -162,6 +162,9 @@ _adjust_sandbox() {
 src_configure() {
_adjust_sandbox
 
+   # bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
+   append-cflags -std=gnu17
+
use vala && vala_setup
 
local emesonargs=(

diff --git a/media-gfx/gimp/gimp-3.0.0_rc2.ebuild 
b/media-gfx/gimp/gimp-3.0.0_rc2.ebuild
index 1f159711d6dd..4fb8488213ef 100644
--- a/media-gfx/gimp/gimp-3.0.0_rc2.ebuild
+++ b/media-gfx/gimp/gimp-3.0.0_rc2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{10..13} )
 VALA_USE_DEPEND=vapigen
 
-inherit lua-single meson python-single-r1 toolchain-funcs vala xdg
+inherit lua-single flag-o-matic meson python-single-r1 toolchain-funcs vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -162,6 +162,9 @@ _adjust_sandbox() {
 src_configure() {
_adjust_sandbox
 
+   # bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
+   append-cflags -std=gnu17
+
use vala && vala_setup
 
local emesonargs=(

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 8c2e550fc140..31b624a374d0 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{10..13} )
 VALA_USE_DEPEND=vapigen
 
-inherit git-r3 lua-single meson python-single-r1 toolchain-funcs vala xdg
+inherit git-r3 lua-single flag-o-matic meson python-single-r1 toolchain-funcs 
vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -164,6 +164,9 @@ _adjust_sandbox() {
 src_configure() {
_adjust_sandbox
 
+   # bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
+   append-cflags -std=gnu17
+
use vala && vala_setup
 
local emesonargs=(



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

2025-02-19 Thread Sam James
commit: cf32b973fed4b5b00d384d70524e56d1e7a0360d
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue Feb 18 13:34:34 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 19 18:22:00 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf32b973

media-gfx/gimp: , rm g-ir-doc meson option

[sam: I'm merging this despite bug #944910 given not everyone has gdb
installed and this change is definitely right as it is anyway.]

Bug: https://bugs.gentoo.org/949910
Closes: https://bugs.gentoo.org/949365
Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/40634
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 918db05ef232..8c2e550fc140 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -106,7 +106,6 @@ BDEPEND="
dev-util/gdbus-codegen
>=sys-devel/gettext-0.21
doc? (
-   app-text/yelp-tools
dev-libs/gobject-introspection[doctool]
dev-util/gi-docgen
)
@@ -196,7 +195,6 @@ src_configure() {
$(meson_feature wmf)
$(meson_feature X xcursor)
$(meson_feature xpm)
-   $(meson_use doc g-ir-doc)
$(meson_use lua)
$(meson_use unwind libunwind)
$(meson_use vector-icons)



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

2025-02-11 Thread Sam James
commit: d3d83c6a06a57241395a389970cf2fb8495a36ba
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 11 15:30:29 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 12 04:59:33 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d83c6a

media-gfx/gimp: add gnu17 for 2.x

Not bothering for 3.x as immolo reported it upstream already & there's
an MR pending, so it should be fixed there soon.

Bug: https://bugs.gentoo.org/944284
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-2.10.38-r1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gimp/gimp-2.10.38-r1.ebuild 
b/media-gfx/gimp/gimp-2.10.38-r1.ebuild
index 8e4df871c08f..74d5c6cb1ae3 100644
--- a/media-gfx/gimp/gimp-2.10.38-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 GNOME2_EAUTORECONF=yes
 WANT_AUTOMAKE=
 
-inherit autotools gnome2 toolchain-funcs virtualx
+inherit autotools flag-o-matic gnome2 toolchain-funcs virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -134,6 +134,9 @@ _adjust_sandbox() {
 src_configure() {
_adjust_sandbox
 
+   # bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
+   append-cflags -std=gnu17
+
local myconf=(
GEGL="${EPREFIX}"/usr/bin/gegl-0.4
GDBUS_CODEGEN="${EPREFIX}"/bin/false



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

2024-12-30 Thread Sam James
commit: fa1e14f1090789e1e5304fccf4beafa8384edf94
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Mon Dec 30 23:28:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 30 23:40:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa1e14f1

media-gfx/gimp: 3.0.0_rc2 version bump

Still affected fails test "gimp:app / core" TIMEOUT issue

Bug: https://bugs.gentoo.org/936290
Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/39915
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/Manifest  |   1 +
 media-gfx/gimp/gimp-3.0.0_rc2.ebuild | 260 +++
 2 files changed, 261 insertions(+)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 74114bf9c2e6..6cc41942d6a9 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,2 +1,3 @@
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B 
d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196
 SHA512 
844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985
+DIST gimp-3.0.0-RC2.tar.xz 26980968 BLAKE2B 
56b98a7863df22cf81015a9da5d7535cfef5a154c47418b1b6c6212cc76423e0769a4aa8d76714d2eb22595b1f6e2c623ee35675db5fe7e40c8820fe71dd
 SHA512 
c0a6e096d954f3048cb68fe4ff71dd2f49c802f800014ab8a3089a0e097e7d6f595e5716230c06e7edfddba948f0d01da14800935aa6ceb9dc2e12fb7f19d7e6

diff --git a/media-gfx/gimp/gimp-3.0.0_rc2.ebuild 
b/media-gfx/gimp/gimp-3.0.0_rc2.ebuild
new file mode 100644
index ..1f159711d6dd
--- /dev/null
+++ b/media-gfx/gimp/gimp-3.0.0_rc2.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2024 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 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)/${PN}-$(ver_cut 1-3)-RC2.tar.xz"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)-RC2"
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/3"
+
+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.110[introspection,lcms,vala?]
+   >=media-libs/fontconfig-2.12.6
+   >=media-libs/freetype-2.10.2
+   >=media-libs/gegl-0.4.52: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.16: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:= )
+  

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

2024-12-27 Thread Andreas Sturmlechner
commit: 56d923212c5fece61e07190a17979c3f55fd2b0a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 16 23:37:32 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 27 11:17:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d92321

media-gfx/gimp: drop versions

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/gimp/Manifest|   3 -
 .../files/gimp-2.10.36_fix_strict-aliasing.patch   |  34 ---
 media-gfx/gimp/gimp-2.10.34-r3.ebuild  | 219 
 media-gfx/gimp/gimp-2.10.36-r3.ebuild  | 218 
 media-gfx/gimp/gimp-2.10.36-r4.ebuild  | 221 -
 media-gfx/gimp/gimp-2.99.18-r1.ebuild  | 269 
 media-gfx/gimp/gimp-2.99.18-r2.ebuild  | 275 -
 7 files changed, 1239 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index b19973e7b755..74114bf9c2e6 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,5 +1,2 @@
-DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 
0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc
 SHA512 
4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a
-DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B 
d033cd1407df3399b5968b7e3f7838d288143080b516476a5dd46599b6a84ac2efca591521368cef7a1c3d9935b45ed3262fb469e1ae36ccf60a1199f5cfa44d
 SHA512 
dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
-DIST gimp-2.99.18.tar.xz 25418968 BLAKE2B 
ccb76bb5c375925d4d71505f3e1546f05ba0e20533859b1b6250a4d9054efb6bec4927a5e0c525272fa24d5a6bdf4fb7881d60a1d34b1210ee38b90e661ef707
 SHA512 
151ccd0322601e76ed0198b40832ab0b6c138428f2e75806dd558e29c9b3437d9226a243142bf4a86113fa5ea4f5965b99cf7cd0ab0ecb7bdfc48036de35a9c6
 DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B 
d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196
 SHA512 
844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985

diff --git a/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch 
b/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch
deleted file mode 100644
index 2acf31361278..
--- a/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Gentoo issue: https://bugs.gentoo.org/917497
-Upstream issue: https://gitlab.gnome.org/GNOME/gimp/-/issues/10359
-Upstream patch:
-
-From b45a304df4f038eccb64e098f3643ae35d8f3e77 Mon Sep 17 00:00:00 2001
-From: Alx Sa 
-Date: Sun, 19 Nov 2023 13:54:00 +
-Subject: [PATCH] core: Fix strict-aliasing error on ASE load
-
-Resolves #10359
-
-When compiled with -Werror=strict-aliasing, the build fails
-on this line due to converting pointer datatypes.
-This patch switches to using memcpy () instead.

- app/core/gimppalette-load.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c
-index 7605b92fcfb..e9813ebb168 100644
 a/app/core/gimppalette-load.c
-+++ b/app/core/gimppalette-load.c
-@@ -1095,7 +1095,7 @@ gimp_palette_load_ase (GimpContext   *context,
- 
-   /* Convert 4 bytes to a 32bit float value */
-   tmp = GINT32_FROM_BE (tmp);
--  pixels[j] = *(gfloat *) &tmp;
-+  memcpy (&pixels[j], &tmp, 4);
- }
- 
-   if (! valid_color)
--- 
-GitLab
-

diff --git a/media-gfx/gimp/gimp-2.10.34-r3.ebuild 
b/media-gfx/gimp/gimp-2.10.34-r3.ebuild
deleted file mode 100644
index d1af397feaf9..
--- a/media-gfx/gimp/gimp-2.10.34-r3.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-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 ~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="
-   >=app-accessibility/at-spi2

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

2024-12-01 Thread Sam James
commit: 81e8a3f8cfea8b14d29fd04bd8fcd365bf21977c
Author: Ian Jordan  gmail  com>
AuthorDate: Fri Nov  8 17:33:37 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  1 11:52:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e8a3f8

media-gfx/gimp: enable py3.13

Signed-off-by: Ian Jordan  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-3.0.0_rc1.ebuild | 2 +-
 media-gfx/gimp/gimp-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.0_rc1.ebuild 
b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild
index 357b6ffb72e4..00639d92cbe4 100644
--- a/media-gfx/gimp/gimp-3.0.0_rc1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 VALA_USE_DEPEND=vapigen
 
 inherit lua-single meson python-single-r1 toolchain-funcs vala xdg

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 473f80d33404..918db05ef232 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 VALA_USE_DEPEND=vapigen
 
 inherit git-r3 lua-single meson python-single-r1 toolchain-funcs vala xdg



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

2024-11-08 Thread Joonas Niilola
commit: 9309da14bd6d1f721f81c92a251190473c3e6b27
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Thu Nov  7 23:15:32 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov  8 13:26:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9309da14

media-gfx/gimp: 2.99.18-r2 revbump, fix USE="X" dependencies

Closes: https://bugs.gentoo.org/942358
Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-2.99.18-r2.ebuild | 275 ++
 1 file changed, 275 insertions(+)

diff --git a/media-gfx/gimp/gimp-2.99.18-r2.ebuild 
b/media-gfx/gimp/gimp-2.99.18-r2.ebuild
new file mode 100644
index ..9166dcd6ee43
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.99.18-r2.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{10..12} )
+VALA_USE_DEPEND=vapigen
+
+inherit 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"
+
+IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript python test udev unwind vala vector-icons webp wmf 
xpm"
+REQUIRED_USE="
+   lua? ( ${LUA_REQUIRED_USE} )
+   python? ( ${PYTHON_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="
+   >=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.46.0: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.48: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.16: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:= )
+   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=] )
+   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? (
+   app-text/yelp-tools
+   dev-libs/gobject-introspection[doctool]
+   dev-util/gi-docgen
+   )
+   virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
+)
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+   use lua && lua-single_pkg_setup
+
+   if use

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

2024-11-08 Thread Joonas Niilola
commit: c86536ef9e674ac987ab17b7549d1f472abd6a74
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Thu Nov  7 23:23:30 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov  8 13:26:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c86536ef

media-gfx/gimp: 3.0.0_rc1 version bump (dev preview)

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/39237
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/Manifest  |   1 +
 media-gfx/gimp/gimp-3.0.0_rc1.ebuild | 260 +++
 2 files changed, 261 insertions(+)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 579449a517b7..b19973e7b755 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,3 +2,4 @@ DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 
0b2d3a81abf89684bb90e2101896db3479a25
 DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B 
d033cd1407df3399b5968b7e3f7838d288143080b516476a5dd46599b6a84ac2efca591521368cef7a1c3d9935b45ed3262fb469e1ae36ccf60a1199f5cfa44d
 SHA512 
dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-2.99.18.tar.xz 25418968 BLAKE2B 
ccb76bb5c375925d4d71505f3e1546f05ba0e20533859b1b6250a4d9054efb6bec4927a5e0c525272fa24d5a6bdf4fb7881d60a1d34b1210ee38b90e661ef707
 SHA512 
151ccd0322601e76ed0198b40832ab0b6c138428f2e75806dd558e29c9b3437d9226a243142bf4a86113fa5ea4f5965b99cf7cd0ab0ecb7bdfc48036de35a9c6
+DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B 
d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196
 SHA512 
844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985

diff --git a/media-gfx/gimp/gimp-3.0.0_rc1.ebuild 
b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild
new file mode 100644
index ..357b6ffb72e4
--- /dev/null
+++ b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{10..12} )
+VALA_USE_DEPEND=vapigen
+
+inherit 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)/${PN}-$(ver_cut 1-3)-RC1.tar.xz"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)-RC1"
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/3"
+
+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.110[introspection,lcms,vala?]
+   >=media-libs/fontconfig-2.12.6
+   >=media-libs/freetype-2.10.2
+   >=media-libs/gegl-0.4.50: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.16: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_US

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

2024-11-08 Thread Joonas Niilola
commit: 52de32cb9dcc454b4f4acebd4c74f750235256b4
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Thu Nov  7 23:19:25 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov  8 13:26:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52de32cb

media-gfx/gimp: update .ebuild

Signed-off-by: Sergey Torokhov  yandex.ru>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 36 +---
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 906f16b47136..473f80d33404 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -15,10 +15,12 @@ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git";
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 
-IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr 
openmp postscript test udev unwind vala vector-icons webp wmf xpm"
+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 )"
@@ -38,7 +40,7 @@ COMMON_DEPEND="
>=dev-libs/json-glib-1.4.4
dev-libs/libxml2:2
dev-libs/libxslt
-   >=gnome-base/librsvg-2.40.21:2
+   >=gnome-base/librsvg-2.57.3:2
>=media-gfx/mypaint-brushes-2.0.2:=
>=media-libs/babl-[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6
@@ -53,13 +55,13 @@ COMMON_DEPEND="
>=media-libs/tiff-4.1.0:=
net-libs/glib-networking[ssl]
sys-libs/zlib
-   >=x11-libs/cairo-1.16.0
+   >=x11-libs/cairo-1.16.0[X=]
>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
-   >=x11-libs/gtk+-3.24.16:3[introspection]
-   >=x11-libs/pango-1.50.0
-   >=x11-libs/libXmu-1.1.4
+   >=x11-libs/gtk+-3.24.16: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= )
@@ -76,8 +78,13 @@ COMMON_DEPEND="
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 )
+   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 )
 "
 
@@ -167,11 +174,13 @@ src_configure() {
-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)
@@ -235,15 +244,12 @@ src_install() {
 
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-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-2.99 
/usr/bin/gimp-test-clipboard
-   dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool
+   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
 }



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

2024-10-18 Thread Sam James
commit: b4b9f72802b4d4be021e6fa77198c5d3d0d1a4d1
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Thu Oct 17 14:08:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 18 12:25:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b9f728

media-gfx/gimp: gimp-2.10.x, fix media-libs/libheif-1.18 compat

Closes: https://bugs.gentoo.org/940915
Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/39017
Signed-off-by: Sam James  gentoo.org>

 ...mp-2.10_libheif-1.18_unconditional_compat.patch | 23 ++
 ...mp-2.10.34-r2.ebuild => gimp-2.10.34-r3.ebuild} |  6 +-
 ...{gimp-2.10.36.ebuild => gimp-2.10.36-r3.ebuild} |  6 +-
 ...mp-2.10.36-r2.ebuild => gimp-2.10.36-r4.ebuild} |  6 +-
 ...{gimp-2.10.38.ebuild => gimp-2.10.38-r1.ebuild} |  4 
 5 files changed, 42 insertions(+), 3 deletions(-)

diff --git 
a/media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch 
b/media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch
new file mode 100644
index ..cc1e565b6c6d
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch
@@ -0,0 +1,23 @@
+Gentoo issue: https://bugs.gentoo.org/940915
+
+diff '--color=auto' -Naur a/configure.ac b/configure.ac
+--- a/configure.ac
 b/configure.ac
+@@ -1843,13 +1843,13 @@
+ can_import_avif=no
+ can_export_avif=no
+ if test "x$have_libheif" = xyes; then
+-  can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif`
+-  can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif`
++  can_import_heic=yes
++  can_export_heic=yes
+   if test "x$can_import_heic" = xyes; then
+ MIME_TYPES="$MIME_TYPES;image/heif;image/heic"
+   fi
+-  can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif`
+-  can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif`
++  can_import_avif=yes
++  can_export_avif=yes
+   if test "x$can_import_avif" = xyes; then
+ MIME_TYPES="$MIME_TYPES;image/avif"
+   fi

diff --git a/media-gfx/gimp/gimp-2.10.34-r2.ebuild 
b/media-gfx/gimp/gimp-2.10.34-r3.ebuild
similarity index 96%
rename from media-gfx/gimp/gimp-2.10.34-r2.ebuild
rename to media-gfx/gimp/gimp-2.10.34-r3.ebuild
index 697f118424cd..d1af397feaf9 100644
--- a/media-gfx/gimp/gimp-2.10.34-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.34-r3.ebuild
@@ -94,6 +94,10 @@ src_prepare() {
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
 
+   if use heif ; then
+   has_version -d ">=media-libs/libheif-1.18.0" && eapply 
"${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
+   fi
+
gnome2_src_prepare  # calls eautoreconf
 
sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' 
-i configure || die #615144
@@ -192,7 +196,7 @@ src_install() {
# precedence on PDF documents by default
mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
 
-   find "${D}" -name '*.la' -type f -delete || die
+   find "${ED}" -name '*.la' -type f -delete || die
 
# Prevent dead symlink gimp-console.1 from downstream man page 
compression (bug #433527)
local gimp_app_version=$(ver_cut 1-2)

diff --git a/media-gfx/gimp/gimp-2.10.36.ebuild 
b/media-gfx/gimp/gimp-2.10.36-r3.ebuild
similarity index 96%
rename from media-gfx/gimp/gimp-2.10.36.ebuild
rename to media-gfx/gimp/gimp-2.10.36-r3.ebuild
index 2407c368ab63..e0082d3fdfdb 100644
--- a/media-gfx/gimp/gimp-2.10.36.ebuild
+++ b/media-gfx/gimp/gimp-2.10.36-r3.ebuild
@@ -93,6 +93,10 @@ src_prepare() {
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
 
+   if use heif ; then
+   has_version -d ">=media-libs/libheif-1.18.0" && eapply 
"${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915
+   fi
+
gnome2_src_prepare  # calls eautoreconf
 
sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' 
-i configure || die #615144
@@ -191,7 +195,7 @@ src_install() {
# precedence on PDF documents by default
mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
 
-   find "${D}" -name '*.la' -type f -delete || die
+   find "${ED}" -name '*.la' -type f -delete || die
 
# Prevent dead symlink gimp-console.1 from downstream man page 
compression (bug #433527)
local gimp_app_version=$(ver_cut 1-2)

diff --git a/media-gfx/gimp/gimp-2.10.36-r2.ebuild 
b/media-gfx/gimp/gimp-2.10.36-r4.ebuild
similarity index 96%
rename from media-gfx/gimp/gimp-2.10.36-r2.ebuild
rename to media-gfx/gimp/gimp-2.10.36-r4.ebuild
index 3f4740a9243d..1acf5d818486 100644
--- a/media-gfx/gimp/gimp-2.10.36-r

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

2024-10-05 Thread Viorel Munteanu
commit: c88b46eda51200d7c8e5053b7b9b49e8d27deeb3
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue Sep 24 20:22:40 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sat Oct  5 07:31:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c88b46ed

media-gfx/gimp: , option 'lua' changed to type boolean

Closes: https://bugs.gentoo.org/939850
Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/38760
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 477c892d26a4..906f16b47136 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -176,7 +176,6 @@ src_configure() {
$(meson_feature javascript)
$(meson_feature jpeg2k jpeg2000)
$(meson_feature jpegxl jpeg-xl)
-   $(meson_feature lua)
$(meson_feature mng)
$(meson_feature openexr)
$(meson_feature openmp)
@@ -189,6 +188,7 @@ src_configure() {
$(meson_feature X xcursor)
$(meson_feature xpm)
$(meson_use doc g-ir-doc)
+   $(meson_use lua)
$(meson_use unwind libunwind)
$(meson_use vector-icons)
)



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

2024-09-25 Thread Joonas Niilola
commit: 22b7e47589732722d0d1efafa0465b4c59618d60
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Sep 25 13:59:09 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Sep 25 13:59:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b7e475

media-gfx/gimp: Stabilize 2.10.38 x86, #940054

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-2.10.38.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-2.10.38.ebuild 
b/media-gfx/gimp/gimp-2.10.38.ebuild
index 672109542ab5..013da52ecc68 100644
--- a/media-gfx/gimp/gimp-2.10.38.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38.ebuild
@@ -12,7 +12,7 @@ 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 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~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"
 



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

2024-09-25 Thread Joonas Niilola
commit: 2301a32f3eb5f26d9cf24ad4f50027b2465c59fc
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Sep 25 13:57:18 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Sep 25 13:58:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2301a32f

media-gfx/gimp: Stabilize 2.10.38 amd64, #940054

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-2.10.38.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-2.10.38.ebuild 
b/media-gfx/gimp/gimp-2.10.38.ebuild
index 077e5d533e45..672109542ab5 100644
--- a/media-gfx/gimp/gimp-2.10.38.ebuild
+++ b/media-gfx/gimp/gimp-2.10.38.ebuild
@@ -12,7 +12,7 @@ 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 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~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"
 



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

2024-08-30 Thread Joonas Niilola
commit: 3fe5313bcd3fccd8f16874a10560ce10351b1a10
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Mon Aug 19 21:17:29 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Aug 30 12:05:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe5313b

media-gfx/gimp: -, make python plug-ins mandatory (rm USE=python)

Closes: https://bugs.gentoo.org/937801
Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/38211
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 30 +-
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 122443176973..477c892d26a4 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -15,10 +15,10 @@ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git";
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 
-IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr 
openmp postscript python test udev unwind vala vector-icons webp wmf xpm"
+IUSE="X aalib alsa doc 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} )
-   python? ( ${PYTHON_REQUIRED_USE} )
 "
 
 RESTRICT="!test? ( test )"
@@ -26,6 +26,10 @@ 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
@@ -36,10 +40,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.98[introspection,lcms,vala?]
+   >=media-libs/babl-[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6
>=media-libs/freetype-2.10.2
-   >=media-libs/gegl-0.4.48:0.4[cairo,introspection,lcms,vala?]
+   >=media-libs/gegl-[cairo,introspection,lcms,vala?]
>=media-libs/gexiv2-0.14.0
>=media-libs/harfbuzz-2.6.5:=
>=media-libs/lcms-2.13.1:2
@@ -69,12 +73,6 @@ COMMON_DEPEND="
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:= )
@@ -116,11 +114,12 @@ pkg_pretend() {
 
 pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
+   python-single-r1_pkg_setup
use lua && lua-single_pkg_setup
 
-   if use python; then
-   python-single-r1_pkg_setup
+   if has_version ">=media-libs/babl-" || has_version 
">=media-libs/gegl-"; then
+   ewarn "Please make sure to rebuid media-libs/babl- and 
media-libs/gegl- packages"
+   ewarn "before building media-gfx/gimp- to have their latest 
master branch versions."
fi
 }
 
@@ -182,7 +181,6 @@ src_configure() {
$(meson_feature openexr)
$(meson_feature openmp)
$(meson_feature postscript ghostscript)
-   $(meson_feature python)
$(meson_feature test headless-tests)
$(meson_feature udev gudev)
$(meson_feature vala)
@@ -229,9 +227,7 @@ src_test() {
 src_install() {
meson_src_install
 
-   if use python; then
-   python_optimize
-   fi
+   python_optimize
 
# Workaround for bug #32 to give GIMP the least
# precedence on PDF documents by default



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

2024-07-13 Thread Joonas Niilola
commit: af933cd2593644887a0dc19ba3b00283056cf6b2
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue Jun 11 21:20:04 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jul 13 08:03:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af933cd2

media-gfx/gimp: 2.99.18-r1 bump; Add USE="fits", disable "ilbm"

Closes: https://bugs.gentoo.org/934007
Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/37124
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/{gimp-2.99.18.ebuild => gimp-2.99.18-r1.ebuild} | 5 -
 media-gfx/gimp/metadata.xml| 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-2.99.18.ebuild 
b/media-gfx/gimp/gimp-2.99.18-r1.ebuild
similarity index 96%
rename from media-gfx/gimp/gimp-2.99.18.ebuild
rename to media-gfx/gimp/gimp-2.99.18-r1.ebuild
index 48f5c21117db..a206f158550c 100644
--- a/media-gfx/gimp/gimp-2.99.18.ebuild
+++ b/media-gfx/gimp/gimp-2.99.18-r1.ebuild
@@ -16,7 +16,7 @@ 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 
openmp postscript python test udev unwind vala vector-icons webp wmf xpm"
+IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng 
openexr openmp postscript python test udev unwind vala vector-icons webp wmf 
xpm"
 REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
python? ( ${PYTHON_REQUIRED_USE} )
@@ -57,6 +57,7 @@ COMMON_DEPEND="
>=x11-libs/libXmu-1.1.4
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= )
@@ -173,11 +174,13 @@ src_configure() {
-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)

diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 7f947b8fb0b5..23efd9862ca5 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -10,6 +10,7 @@
Proxy Maintainers


+   Enable support for loading/exporting FITS 
images
Enable support for vector icons 
(experimental)





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

2024-06-23 Thread Viorel Munteanu
commit: 0b15a5d54e8aacdc57ba851e75d4e90b00b45e72
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun May  5 13:59:56 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jun 23 07:15:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b15a5d5

media-gfx/gimp: 2.10.38 version bump

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/36570
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-gfx/gimp/Manifest|   1 +
 media-gfx/gimp/gimp-2.10.38.ebuild | 226 +
 2 files changed, 227 insertions(+)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index b5ca0b16e48e..579449a517b7 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,4 @@
 DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 
0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc
 SHA512 
4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a
 DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B 
d033cd1407df3399b5968b7e3f7838d288143080b516476a5dd46599b6a84ac2efca591521368cef7a1c3d9935b45ed3262fb469e1ae36ccf60a1199f5cfa44d
 SHA512 
dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66
+DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 
58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d
 SHA512 
343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-2.99.18.tar.xz 25418968 BLAKE2B 
ccb76bb5c375925d4d71505f3e1546f05ba0e20533859b1b6250a4d9054efb6bec4927a5e0c525272fa24d5a6bdf4fb7881d60a1d34b1210ee38b90e661ef707
 SHA512 
151ccd0322601e76ed0198b40832ab0b6c138428f2e75806dd558e29c9b3437d9226a243142bf4a86113fa5ea4f5965b99cf7cd0ab0ecb7bdfc48036de35a9c6

diff --git a/media-gfx/gimp/gimp-2.10.38.ebuild 
b/media-gfx/gimp/gimp-2.10.38.ebuild
new file mode 100644
index ..3746698cb6e8
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.38.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+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"
+
+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="
+   >=app-accessibility/at-spi2-core-2.50.1
+   app-arch/bzip2
+   app-arch/xz-utils
+   >=app-text/poppler-0.50[cairo]
+   >=app-text/poppler-data-0.4.7
+   >=dev-libs/glib-2.56.2:2
+   >=dev-libs/json-glib-1.2.6
+   >=gnome-base/librsvg-2.40.6:2
+   >=media-gfx/mypaint-brushes-2.0.2:=
+   >=media-libs/babl-0.1.98
+   >=media-libs/fontconfig-2.12.4
+   >=media-libs/freetype-2.1.7
+   >=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
+   media-libs/libjpeg-turbo:=
+   >=media-libs/libmypaint-1.6.1:=
+   >=media-libs/libpng-1.6.25:0=
+   >=media-libs/tiff-3.5.7:=
+   net-libs/glib-networking[ssl]
+   sys-libs/zlib
+   >=x11-libs/cairo-1.12.2
+   >=x11-libs/gdk-pixbuf-2.31:2
+   >=x11-libs/gtk+-2.24.32:2
+   x11-libs/libX11
+   x11-libs/libXcursor
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXmu
+   >=x11-libs/pango-1.29.4
+   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:= )
+   jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+   jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+   mng? ( media-libs/libmng:= )
+   openexr? ( >=media-libs/openexr-1.6.1:= )
+   postscript? ( app-text/ghostscript-gpl:= )
+   udev? ( dev-libs/libgudev )
+   unwind? ( >=sys-libs/libunwind-1.1.0:= )
+   webp? ( >=media-libs/libwebp-0.6.0:= )
+   wmf? ( >=media-libs/libwmf-0.2.8 )
+   xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+   ${COMMON_DEPEND}
+   x11-themes/hicolor-icon-theme
+   gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-libs/libxml2:2
+   dev-libs/libxslt
+"
+
+BDEPEND="
+   >=dev-build/gtk-doc-am-1
+   >=dev-lang/perl-5.10.0
+   dev-libs/appstream-glib
+   dev-util/gtk-update-

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

2024-06-02 Thread Joonas Niilola
commit: 28dfc09c66014db25324148ec901a4f5e3f25f06
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sun May  5 12:00:30 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jun  2 08:09:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28dfc09c

media-gfx/gimp: update live ebuild, fix plugins dir path

Closes: https://bugs.gentoo.org/931152

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/36563
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/gimp/gimp-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index 6ed419a59545..122443176973 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -208,7 +208,7 @@ _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
+   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



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

2024-04-13 Thread Sam James
commit: cbeba5596a173b1609357abfd9e8bce44f257792
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Sat Apr 13 22:07:34 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 14 00:42:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbeba559

media-gfx/gimp: 2.99.18,  enable py3.12

Closes: https://bugs.gentoo.org/929619

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/36232
Signed-off-by: Sam James  gentoo.org>

 media-gfx/gimp/gimp-2.99.18.ebuild | 2 +-
 media-gfx/gimp/gimp-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gimp/gimp-2.99.18.ebuild 
b/media-gfx/gimp/gimp-2.99.18.ebuild
index 9ac105ac99cb..48f5c21117db 100644
--- a/media-gfx/gimp/gimp-2.99.18.ebuild
+++ b/media-gfx/gimp/gimp-2.99.18.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 VALA_USE_DEPEND=vapigen
 
 inherit lua-single meson python-single-r1 toolchain-funcs vala xdg

diff --git a/media-gfx/gimp/gimp-.ebuild b/media-gfx/gimp/gimp-.ebuild
index f320108fe6ce..6ed419a59545 100644
--- a/media-gfx/gimp/gimp-.ebuild
+++ b/media-gfx/gimp/gimp-.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 VALA_USE_DEPEND=vapigen
 
 inherit git-r3 lua-single meson python-single-r1 toolchain-funcs vala xdg



  1   2   3   4   >