commit: a69c91963a8f026a84c8434d878390c8c300aebb Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Tue Mar 3 12:50:47 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 3 21:54:55 2026 +0000 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 <parona <AT> protonmail.com> Part-of: https://codeberg.org/gentoo/gentoo/pulls/205 Signed-off-by: Sam James <sam <AT> 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..000000000000 --- 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.15.0 - >=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 ) - 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-icon-cache - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.19.8 - >=dev-build/libtool-2.2 - virtual/pkgconfig -" - -DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) - -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070) - "${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148 - "${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}/${PN}-2.10.38-ZDI-CAN-27823.patch" #965334 -) - -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 - grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test - - export CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -_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 - - # segfault in tests with gcc-15 - filter-lto - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/bin/false - - --enable-default-binary - - --disable-check-update - --disable-python - --enable-mp - --with-appdata-test - --with-bug-report-url=https://bugs.gentoo.org/ - --with-xmc - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable debug) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with jpeg2k jpeg2000) - $(use_with jpegxl) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -# for https://bugs.gentoo.org/664938 -_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.0/plug-ins || die - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg" - mv ${plugin}/{,${prename}}${plugin} || die - mv {,${prename}}${plugin} || die - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || 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) - mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - # Remove gimp devel-docs html files if user doesn't need it - if ! use doc; then - rm -r "${ED}"/usr/share/gtk-doc || die - fi - - _rename_plugins || die -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild deleted file mode 100644 index 001f09924467..000000000000 --- a/media-gfx/gimp/gimp-3.0.6.ebuild +++ /dev/null @@ -1,260 +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/"; -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.15.0 - >=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 ' - 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/libXfixes - >=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? ( - sys-apps/dbus - 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-libs/libxslt - >=dev-util/gdbus-codegen-2.80.5-r1 - >=sys-devel/gettext-0.21 - doc? ( - >=dev-libs/gobject-introspection-1.82.0-r2[doctool] - dev-util/gi-docgen - ) - virtual/pkgconfig -" - -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() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - python-single-r1_pkg_setup - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - - # 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 - - # 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_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 - - # 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() { - # defang automagic dependencies. Bug 943164 - use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND - use X || append-cppflags -DGENTOO_GTK_HIDE_X11 - - use vala && vala_setup - - local emesonargs=( - -Denable-default-bin=enabled - - -Dcheck-update=no - -Ddebug-self-in-build=false - -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) - $(meson_feature jpegxl jpeg-xl) - $(meson_feature mng) - $(meson_feature openexr) - $(meson_feature openmp) - $(meson_feature postscript ghostscript) - $(meson_feature test headless-tests) - $(meson_feature udev gudev) - $(meson_feature vala) - $(meson_feature webp) - $(meson_feature wmf) - $(meson_feature X xcursor) - $(meson_feature xpm) - $(meson_use lua) - $(meson_use unwind libunwind) - $(meson_use vector-icons) - ) - - meson_src_configure -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - meson_src_compile -} - -# for https://bugs.gentoo.org/664938 -_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/3.0/plug-ins || exit 1 - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg" - mv ${plugin}/{,${prename}}${plugin} || exit 1 - mv {,${prename}}${plugin} || exit 1 - fi - done - ) -} - -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 -} - -src_install() { - meson_src_install - - python_optimize "${ED}/usr/$(get_libdir)/gimp" - python_fix_shebang "${ED}/usr/$(get_libdir)/gimp" - - # 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 - dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter - 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 -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -}
