commit: b85ccb304ff80c5f64ad148e48d48932ad867544 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Tue May 13 18:28:17 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 14 03:00:52 2025 +0000 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 <torokhov-s-a <AT> yandex.ru> Part-of: https://github.com/gentoo/gentoo/pull/42074 Signed-off-by: Sam James <sam <AT> 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(-) 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-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index d6414bb99fac..de9f90e5bb96 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.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-9999[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
