Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 955838 - media-gfx/gimp: drop media-gfx/mypaint-brushes:2.0 use (unsupported upstream), return to using media-gfx/mypaint-brushes:1.0
Summary: media-gfx/gimp: drop media-gfx/mypaint-brushes:2.0 use (unsupported upstream)...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Sergey Torokhov
URL:
Whiteboard:
Keywords: PullRequest
Depends on: 955839
Blocks:
  Show dependency tree
 
Reported: 2025-05-11 14:02 UTC by Sam James
Modified: 2025-05-14 03:04 UTC (History)
4 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Sam James archtester Gentoo Infrastructure gentoo-dev Security 2025-05-11 14:02:53 UTC
I think the fix for bug 747487 was wrong.

Per https://gitlab.gnome.org/GNOME/gimp/-/issues/8646#note_1559250, gimp can't actually work correctly with mypaint-brushes-2 (which the sed we're doing in the ebuild is forcing).
Comment 1 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2025-05-11 14:04:58 UTC
(h/t parona for noticing this)
Comment 2 Sergey Torokhov 2025-05-11 14:44:55 UTC
Sam James, should then mypaint-brushes-1.5 is returning to portage three? It's interesting if this could be subsloting while there are only media-gfx/mypaint and media-gfx/gimp directly depends on media-gfx/mypaint-brushes?
Comment 3 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2025-05-11 15:07:52 UTC
(In reply to Sergey Torokhov from comment #2)
> Sam James, should then mypaint-brushes-1.5 is returning to portage three?
> It's interesting if this could be subsloting while there are only
> media-gfx/mypaint and media-gfx/gimp directly depends on
> media-gfx/mypaint-brushes?

I will return it to the tree in an old separate slot, so we can have both installed. Working on it.
Comment 4 Larry the Git Cow gentoo-dev 2025-05-11 15:22:09 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d356f91eba77d093825ddf5a6f56996a7dd421f9

commit d356f91eba77d093825ddf5a6f56996a7dd421f9
Author:     Sam James <sam@gentoo.org>
AuthorDate: 2025-05-11 15:16:50 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2025-05-11 15:21:39 +0000

    media-gfx/mypaint-brushes: add 1.3.1 (restore 1.x)
    
    This partly reverts commit 2a7217dafee396a1a76ef5f6d4d025c11a8c99dd.
    
    Restore 1.3.0 for GIMP to use, as GIMP doesn't really support 2.x even
    though we currently hack it into (semi-)working.
    
    I've used the same keywords as 2.x so we can fix GIMP immediately.
    
    Bug: https://bugs.gentoo.org/747487
    Bug: https://bugs.gentoo.org/955838
    Bug: https://bugs.gentoo.org/955839
    Signed-off-by: Sam James <sam@gentoo.org>

 media-gfx/mypaint-brushes/Manifest                    |  1 +
 .../mypaint-brushes/mypaint-brushes-1.3.1.ebuild      | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
Comment 5 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2025-05-11 15:24:10 UTC
(In reply to Sam James from comment #3)
> (In reply to Sergey Torokhov from comment #2)
> > Sam James, should then mypaint-brushes-1.5 is returning to portage three?
> > It's interesting if this could be subsloting while there are only
> > media-gfx/mypaint and media-gfx/gimp directly depends on
> > media-gfx/mypaint-brushes?
> 
> I will return it to the tree in an old separate slot, so we can have both
> installed. Working on it.

Done. Please do the following (in the same commit):
1. Revbump media-gfx/gimp to change the dep to media-gfx/mypaint-brushes:1.0
2. Drop the sed.

I would say `git mv` all gimp versions (both 2.x and 3.x) and do that.
Comment 6 Larry the Git Cow gentoo-dev 2025-05-14 03:01:29 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b85ccb304ff80c5f64ad148e48d48932ad867544

commit b85ccb304ff80c5f64ad148e48d48932ad867544
Author:     Sergey Torokhov <torokhov-s-a@yandex.ru>
AuthorDate: 2025-05-13 18:28:17 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2025-05-14 03:00:52 +0000

    media-gfx/gimp: return to using media-gfx/mypaint-brushes:1.0
    
    Closes: https://bugs.gentoo.org/955838
    Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru>
    Part-of: https://github.com/gentoo/gentoo/pull/42074
    Signed-off-by: Sam James <sam@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-9999.ebuild       | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)
Comment 7 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2025-05-14 03:04:41 UTC
Thank you!