summaryrefslogtreecommitdiff
path: root/media-gfx/gimp
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/gimp')
-rw-r--r--media-gfx/gimp/Manifest13
-rw-r--r--media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch58
-rw-r--r--media-gfx/gimp/gimp-2.10.18-r1.ebuild226
-rw-r--r--media-gfx/gimp/gimp-2.10.20-r3.ebuild (renamed from media-gfx/gimp/gimp-2.10.20-r2.ebuild)4
-rw-r--r--media-gfx/gimp/gimp-2.10.22-r1.ebuild (renamed from media-gfx/gimp/gimp-2.10.20-r1.ebuild)37
-rw-r--r--media-gfx/gimp/gimp-2.99.2.ebuild (renamed from media-gfx/gimp/gimp-2.10.18-r2.ebuild)137
-rw-r--r--media-gfx/gimp/gimp-9999.ebuild93
7 files changed, 204 insertions, 364 deletions
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index b820e28c1358..ea50841bdde1 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,9 +1,10 @@
AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
-DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
+AUX gimp-2.99.2_fix_autoconf-2.70.patch 1913 BLAKE2B 779ce5a54150ee2a89507420931f255c09602af36ab8176f7ae9f18a7c1feb12451e817d2a89251d0366af6db90f602a107108227c98ac99b73e16ddb7b1fd05 SHA512 efa8882896335d3ac4ae7fb8874b5bd568472ccdcaeaf1d771f6c6b815b138186016f39f5f2f30fa01c1018ad583649fcf564cc5a8bcece741092f7dbc22f5fa
DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
-EBUILD gimp-2.10.18-r1.ebuild 6166 BLAKE2B a0457d562c194faf821e57647a171d1152f35c567332dff9fbde3e5c69a1ad55e547f07ca94d4f3f58178be7c56005655d2c77c342b8fc983968aca93784e033 SHA512 e7dbff03388e9b651851eb54aa5c8fb61736f288747d0ada5986bb9851cd5de7fefa9b57fe81b36363de27f608b254fba3049f759d4d2ccc40b1eaf3f70308b4
-EBUILD gimp-2.10.18-r2.ebuild 6313 BLAKE2B c4858a01c8bb279ebb9f14bce5c578679bec05de6d6418a4137c012840fa7cdb707d97b74bdb602f0c9a018fe56bd67452af71bf42857b0d9a77a133caa3cc89 SHA512 eca3afb038ed0c51ae1b499e69b1af5f41e3ef2cc95b1d064241d6151b2bc8d8444e2b7a8806a84de15c4f8306a3ee07de8101827114a5a5b9c26acd0e487bca
-EBUILD gimp-2.10.20-r1.ebuild 6022 BLAKE2B 75e149312d91224b99ef93146525509c411a02cf59d87f3c727fcee60504f6769d84dc676439eb59a880edb17cfda65ae5ae2eff0062c9ee4ff74247f1f73cf0 SHA512 d1aec4d39329879101a28769a192dd92cc296c80402d99dfed07c9a5f7974363cd94dfe1765142f146bca43e005a6dad77bac45a86c47be26ae2f46be23f4d62
-EBUILD gimp-2.10.20-r2.ebuild 5652 BLAKE2B 42e8acc097cb3e25713fa144e9e1259ef29c01d0bd706f6f5ecbce4040ac2841027ab9231314d8f3225b4fd9c360e16e51a4a49be02ad5612550892be96a8031 SHA512 467eebc4200c581b91c9af811132b817a7518e41beb238921e735568d8c174052da04a98b0c1a30e7683f4f0cbef4b6a794cf01e0941076df98f5e95d27d1444
-EBUILD gimp-9999.ebuild 6461 BLAKE2B ba3eac8a82d0ebac3cc0ae18c2cddfecdb54fb922707e813d9a922d1f466564f50d42ab24a9de9dab1f63a1302dc84bcede6b4ca3dd4e38503cb64fcee565a93 SHA512 97a1d450095bfa7219672c45100403950029a5c0620ce50ab50eee318baf8e0b944fe387d6483f4f5b9a5c570b8f77b346306c62ba6cfaf673d01c9f6232861e
+DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
+DIST gimp-2.99.2.tar.bz2 32375596 BLAKE2B 3dc5af7935e3503106cf2020798974d68fe86e5034792b09683519502474022e3a7832f418dfcdb4a022e6ebe878bb567bfbbbe51a96f0ae76375adc0dfdd6e5 SHA512 0a773ab01427abfb1b7690e855a041dc4883630fc827ce9d83169ccc5b4f925ecb9a0a16928a9c0ed0592c2c351ced5832e212d3115475c0f7a6092822adc194
+EBUILD gimp-2.10.20-r3.ebuild 5652 BLAKE2B bc21e87460de992194034412240af90c0e35c15f311ddb55c191852512c8ca7472df32e7b3bea6717171a73f8faa8a486f311cad16da92b43bf8becbd9eb6b09 SHA512 2b03724793af7df9456bc7f491e075875fc5e49fc09c57d27513cf1efed44055986961b17164959cc6e3086e6593fa7c5ae20f02fd65a88d633880e4f3e172b5
+EBUILD gimp-2.10.22-r1.ebuild 5587 BLAKE2B 418e5b5cd0a3352fa8eb9362ffbdf4a6f6ffd658ad8337c5d7fdb2e19366d5be3e42d0da469ac6f0caf002b0fc385ad2bc627811785fe16fde384d4d02dd42de SHA512 2d027b4a6a7e3437feae6d4678fcc3aa9bae42fa9db413dbae5e05961860d717186aeebfecd396492903e69d78c81fe9e747e23cfae7093223eb2575aa935be6
+EBUILD gimp-2.99.2.ebuild 6485 BLAKE2B 95fba925bca3edd2582f9a478225a36acac50dd8d7911458499b9678469e1b9c466b1ced1b46c34aa0e5eb19f5eb9c19ff21d230c033634be66c4a3769caeaf7 SHA512 20bf106a3cad5d98afe3f0e5ee4e23d75bd9663e0f4fccb370d3bc9f97343f81a2680940f5fd78d1621feed62b98687ee5faf71bcc35c269404f03fafe1895f9
+EBUILD gimp-9999.ebuild 6772 BLAKE2B fb77a595d6a04d99dba7a511786dbf38414c2830e97643ee60329717b96da082077f51494e30dff0faba089057e7676358c5b11f97ae638cd400f492f6b93e02 SHA512 e8e22ad2ad22f94d988000d43c375d88a999ed8771d6c0ba1cc4a19e89c0cb5ad75a5026eac662d0548bbda11493ba4fe419d06d338283f78707c3987bddbfef
MISC metadata.xml 546 BLAKE2B 2d5b9a68c47a72325199586a142f1d8344bef770d24738169c80958f3def3a0f1ad0b4d23774d3c458d80f17a394033813e01fc5e24b8b62146d2c55b5f8c9b0 SHA512 f654d93c738c942605ae61fe0d76972a1b81bffaf4edc23a1f55bb65e71022df7f14e769a71c41e5c5c7307eef9618a667ae418dc9bc77d5ac1299bbe0c58834
diff --git a/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch b/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch
new file mode 100644
index 000000000000..732cd9381ae3
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch
@@ -0,0 +1,58 @@
+From cebeb90a87105cd6e35bcb357d53cc04c828ca21 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 25 Oct 2020 18:09:21 +0000
+Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming
+ autoconf-2.70
+
+Upcoming autoconf-2.70 exposes deficiency in configure.ac:
+
+```
+$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu
+./configure: line 1430: 5: Bad file descriptor
+checking whether is declared... ./configure: line 1432: ${+y}: bad
+```
+
+It happens because macros are called with parameters using insufficient quoting.
+
+More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html
+
+The fix only amends `--with-linux-input`. Other cases of underquoting
+will need to be handled separately.
+
+Fix-by: Zack Weinberg
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ configure.ac | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 96312f706e..63b85be07a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2135,15 +2135,14 @@ fi
+ AC_ARG_WITH(linux-input, [ --without-linux-input don't build linux input event controller module])
+
+ have_linux_input="no (linux input support disabled)"
+-if test "x$with_linux_input" != "xno"; then
+- AC_CHECK_HEADER(linux/input.h,
+- AC_CHECK_DECL(KEY_OK,
+- have_linux_input=yes,
+- have_linux_input="no (needs Linux 2.6)",
+- [#include <linux/input.h>]))
+-fi
+-
+-AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes)
++AS_IF([test "x$with_linux_input" != "xno"],
++ [AC_CHECK_HEADER([linux/input.h],
++ [AC_CHECK_DECL([KEY_OK],
++ [have_linux_input=yes],
++ [have_linux_input="no (needs Linux 2.6)"],
++ [#include <linux/input.h>])])])
++
++AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes])
+
+
+ ###############################
+--
+GitLab
+
diff --git a/media-gfx/gimp/gimp-2.10.18-r1.ebuild b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
deleted file mode 100644
index 282b14daa351..000000000000
--- a/media-gfx/gimp/gimp-2.10.18-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 python-single-r1 virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- >=app-text/poppler-0.50[cairo]
- >=app-text/poppler-data-0.4.7
- >=dev-libs/atk-2.2.0
- >=dev-libs/glib-2.56.0:2
- >=dev-libs/json-glib-1.2.6
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=gnome-base/librsvg-2.40.6:2
- >=media-gfx/mypaint-brushes-1.3.0
- >=media-libs/babl-0.1.74
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.22:0.4[cairo]
- >=media-libs/gexiv2-0.10.6
- >=media-libs/harfbuzz-0.9.19
- >=media-libs/lcms-2.8:2
- >=media-libs/libmypaint-1.3.0:=
- >=media-libs/libpng-1.6.25:0=
- >=media-libs/tiff-3.5.7:0
- net-libs/glib-networking[ssl]
- sys-libs/zlib
- virtual/jpeg
- >=x11-libs/cairo-1.12.2
- >=x11-libs/gdk-pixbuf-2.31:2
- >=x11-libs/gtk+-2.24.32:2
- x11-libs/libXcursor
- >=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.3.2:= )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
- mng? ( media-libs/libmng:= )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- postscript? ( app-text/ghostscript-gpl )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
- ')
- )
- 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-lang/perl-5.10.0
- dev-libs/appstream-glib
- dev-util/gtk-update-icon-cache
- >=dev-util/intltool-0.40.1
- sys-apps/findutils
- >=sys-devel/gettext-0.19
- >=sys-devel/libtool-2.2
- virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
- "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
- sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
- -e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
-
- 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
-
- gnome2_src_prepare # calls eautoreconf
-
- sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
- fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-}
-
-_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
-
- local myconf=(
- GEGL="${EPREFIX}"/usr/bin/gegl-0.4
- GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
- --enable-default-binary
-
- --disable-check-update
- --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 python)
- $(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 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 prepend=gimp-org-
- (
- cd "${ED%/}"/usr/$(get_libdir)/gimp/2.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 "${prepend}file-svg/${prepend}file-svg"
- mv ${plugin}/{,${prepend}}${plugin} || exit 1
- mv {,${prepend}}${plugin} || exit 1
- fi
- done
- )
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- gnome2_src_install
-
- use python && python_optimize
-
- # 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 "${D}" -name '*.la' -type f -delete || die
-
- # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
- local gimp_app_version=$(get_version_component_range 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-2.10.20-r2.ebuild b/media-gfx/gimp/gimp-2.10.20-r3.ebuild
index b608de52d4ef..b108c5a443af 100644
--- a/media-gfx/gimp/gimp-2.10.20-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.20-r3.ebuild
@@ -11,8 +11,8 @@ DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="https://www.gimp.org/"
SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+SLOT="0/2"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
diff --git a/media-gfx/gimp/gimp-2.10.20-r1.ebuild b/media-gfx/gimp/gimp-2.10.22-r1.ebuild
index 347ade7269ef..97824d5c1abc 100644
--- a/media-gfx/gimp/gimp-2.10.20-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.22-r1.ebuild
@@ -2,21 +2,19 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
GNOME2_EAUTORECONF=yes
WANT_AUTOMAKE=
-inherit autotools gnome2 python-single-r1 toolchain-funcs virtualx
+inherit autotools gnome2 toolchain-funcs virtualx
DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="https://www.gimp.org/"
SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
-SLOT="2"
+SLOT="0/2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k 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 )"
@@ -29,11 +27,11 @@ COMMON_DEPEND="
dev-libs/libxml2:2
dev-libs/libxslt
>=gnome-base/librsvg-2.40.6:2
- >=media-gfx/mypaint-brushes-1.3.0:=
+ >=media-gfx/mypaint-brushes-2.0.2:=
>=media-libs/babl-0.1.78
>=media-libs/fontconfig-2.12.4
>=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.24:0.4[cairo]
+ >=media-libs/gegl-0.4.26:0.4[cairo]
>=media-libs/gexiv2-0.10.6
>=media-libs/harfbuzz-0.9.19
>=media-libs/lcms-2.8:2
@@ -56,13 +54,6 @@ COMMON_DEPEND="
mng? ( media-libs/libmng:= )
openexr? ( >=media-libs/openexr-1.6.1:= )
postscript? ( app-text/ghostscript-gpl )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
- ')
- )
udev? ( dev-libs/libgudev:= )
unwind? ( >=sys-libs/libunwind-1.1.0:= )
webp? ( >=media-libs/libwebp-0.6.0:= )
@@ -95,14 +86,8 @@ PATCHES=(
"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
)
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
src_prepare() {
- if has_version "media-gfx/mypaint-brushes:2.0" ; then
- sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
- fi
+ 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
@@ -139,6 +124,7 @@ src_configure() {
--enable-default-binary
--disable-check-update
+ --disable-python
--enable-mp
--with-appdata-test
--with-bug-report-url=https://bugs.gentoo.org/
@@ -149,7 +135,6 @@ src_configure() {
$(use_enable cpu_flags_ppc_altivec altivec)
$(use_enable cpu_flags_x86_mmx mmx)
$(use_enable cpu_flags_x86_sse sse)
- $(use_enable python)
$(use_enable vector-icons)
$(use_with aalib aa)
$(use_with alsa)
@@ -179,14 +164,14 @@ _rename_plugins() {
einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
local prepend=gimp-org-
(
- cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
+ 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 "${prepend}file-svg/${prepend}file-svg"
- mv ${plugin}/{,${prepend}}${plugin} || exit 1
- mv {,${prepend}}${plugin} || exit 1
+ mv ${plugin}/{,${prepend}}${plugin} || die
+ mv {,${prepend}}${plugin} || die
fi
done
)
@@ -199,8 +184,6 @@ src_test() {
src_install() {
gnome2_src_install
- use python && python_optimize
-
# Workaround for bug #321111 to give GIMP the least
# precedence on PDF documents by default
mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
diff --git a/media-gfx/gimp/gimp-2.10.18-r2.ebuild b/media-gfx/gimp/gimp-2.99.2.ebuild
index ec2b8c9e32d4..f06290af12d5 100644
--- a/media-gfx/gimp/gimp-2.10.18-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.99.2.ebuild
@@ -2,68 +2,76 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
+VALA_MIN_API_VERSION="0.40"
+VALA_USE_DEPEND=vapigen
-inherit autotools gnome2 python-single-r1 virtualx
+inherit autotools gnome2 python-single-r1 toolchain-funcs vala virtualx
DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
+SLOT="0/3"
+#KEYWORDS="~amd64"
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
REQUIRED_USE="python? ( ${PYTHON_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}
COMMON_DEPEND="
- >=app-text/poppler-0.50[cairo]
- >=app-text/poppler-data-0.4.7
- >=dev-libs/atk-2.2.0
- >=dev-libs/glib-2.56.0:2
- >=dev-libs/json-glib-1.2.6
+ >=app-text/poppler-0.90.1[cairo]
+ >=app-text/poppler-data-0.4.9
+ >=dev-libs/atk-2.34.1
+ >=dev-libs/glib-2.62.6:2
+ >=dev-libs/json-glib-1.4.4
dev-libs/libxml2:2
dev-libs/libxslt
- >=gnome-base/librsvg-2.40.6:2
- >=media-gfx/mypaint-brushes-1.3.0:=
- >=media-libs/babl-0.1.74
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.22:0.4[cairo]
- >=media-libs/gexiv2-0.10.6
- >=media-libs/harfbuzz-0.9.19
- >=media-libs/lcms-2.8:2
- >=media-libs/libmypaint-1.3.0:=
- >=media-libs/libpng-1.6.25:0=
- >=media-libs/tiff-3.5.7:0
+ >=gnome-base/librsvg-2.40.21:2
+ >=media-gfx/mypaint-brushes-2.0.2:=
+ >=media-libs/babl-0.1.78[introspection,lcms,vala?]
+ >=media-libs/fontconfig-2.12.6
+ >=media-libs/freetype-2.10.2
+ >=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala?]
+ >=media-libs/gexiv2-0.10.10
+ >=media-libs/harfbuzz-2.6.5
+ >=media-libs/lcms-2.9:2
+ >=media-libs/libmypaint-1.6.1:=
+ >=media-libs/libpng-1.6.37:0=
+ >=media-libs/tiff-4.1.0:0
net-libs/glib-networking[ssl]
sys-libs/zlib
virtual/jpeg
- >=x11-libs/cairo-1.12.2
- >=x11-libs/gdk-pixbuf-2.31:2
- >=x11-libs/gtk+-2.24.32:2
+ >=x11-libs/cairo-1.16.0
+ >=x11-libs/gdk-pixbuf-2.40.0:2
+ >=x11-libs/gtk+-3.24.16:3
x11-libs/libXcursor
- >=x11-libs/pango-1.29.4
+ >=x11-libs/pango-1.42.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.3.2:= )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+ heif? ( >=media-libs/libheif-1.7.0:= )
+ javascript? ( dev-libs/gjs )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
+ lua? (
+ dev-lang/luajit
+ dev-lua/lgi
+ )
mng? ( media-libs/libmng:= )
- openexr? ( >=media-libs/openexr-1.6.1:= )
+ openexr? ( >=media-libs/openexr-2.3.0:= )
postscript? ( app-text/ghostscript-gpl )
- python? (
+ python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
')
)
- udev? ( dev-libs/libgudev:= )
+ 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 )
@@ -78,43 +86,54 @@ RDEPEND="
DEPEND="
${COMMON_DEPEND}
- >=dev-lang/perl-5.10.0
- dev-libs/appstream-glib
+ >=dev-lang/perl-5.30.3
+ >=dev-libs/appstream-glib-0.7.16
+ dev-util/gdbus-codegen
dev-util/gtk-update-icon-cache
- >=dev-util/intltool-0.40.1
+ >=dev-util/intltool-0.51.0
sys-apps/findutils
- >=sys-devel/gettext-0.19
- >=sys-devel/libtool-2.2
+ >=sys-devel/autoconf-2.54
+ >=sys-devel/automake-1.11
+ >=sys-devel/gettext-0.21
+ >=sys-devel/libtool-2.4.6
virtual/pkgconfig
+ doc? (
+ >=dev-util/gtk-doc-1.32
+ dev-util/gtk-doc-am
+ )
+ vala? ( $(vala_depend) )
"
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
# Bugs 685210 (and duplicate 691070)
PATCHES=(
"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+ "${FILESDIR}/${P}_fix_autoconf-2.70.patch"
)
pkg_setup() {
- use python && python-single-r1_pkg_setup
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
}
src_prepare() {
- if has_version "media-gfx/mypaint-brushes:2.0" ; then
- sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
- fi
+ sed -i -e 's/\[gegl_micro_version\], \[27\]/\[gegl_micro_version\], \[26\]/' configure.ac || die
- # Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
- sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
- -e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+ 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
gnome2_src_prepare # calls eautoreconf
+ use vala && vala_src_prepare
+
sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+ export CC_FOR_BUILD="$(tc-getBUILD_CC)"
}
_adjust_sandbox() {
@@ -136,7 +155,7 @@ src_configure() {
local myconf=(
GEGL="${EPREFIX}"/usr/bin/gegl-0.4
- GDBUS_CODEGEN="${EPREFIX}"/bin/false
+ GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
--enable-default-binary
@@ -151,18 +170,22 @@ src_configure() {
$(use_enable cpu_flags_ppc_altivec altivec)
$(use_enable cpu_flags_x86_mmx mmx)
$(use_enable cpu_flags_x86_sse sse)
- $(use_enable python)
+ $(use_enable doc gtk_doc)
$(use_enable vector-icons)
$(use_with aalib aa)
$(use_with alsa)
$(use_with !aqua x)
$(use_with heif libheif)
+ $(use_with javascript)
$(use_with jpeg2k jpeg2000)
+ $(use_with lua)
$(use_with mng libmng)
$(use_with openexr)
$(use_with postscript gs)
+ $(use_with python)
$(use_with udev gudev)
$(use_with unwind libunwind)
+ $(use_with vala)
$(use_with webp)
$(use_with wmf)
$(use_with xpm libxpm)
@@ -181,7 +204,7 @@ _rename_plugins() {
einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
local prepend=gimp-org-
(
- cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
+ cd "${ED%/}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
for plugin_slash in $(ls -d1 */); do
plugin=${plugin_slash%/}
if [[ -f ${plugin}/${plugin} ]]; then
@@ -201,7 +224,9 @@ src_test() {
src_install() {
gnome2_src_install
- use python && python_optimize
+ if use python; then
+ python_optimize
+ fi
# Workaround for bug #321111 to give GIMP the least
# precedence on PDF documents by default
@@ -210,13 +235,7 @@ src_install() {
find "${D}" -name '*.la' -type f -delete || die
# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
- local gimp_app_version=$(get_version_component_range 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
+ mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die
_rename_plugins || die
}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 4bab1cc4f0bf..0d94d06ee022 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -3,22 +3,22 @@
EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
GNOME2_EAUTORECONF=yes
VALA_MIN_API_VERSION="0.40"
VALA_USE_DEPEND=vapigen
-inherit autotools git-r3 gnome2 python-single-r1 vala virtualx
+inherit autotools git-r3 gnome2 python-single-r1 toolchain-funcs vala virtualx
DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="https://www.gimp.org/"
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git"
SRC_URI=""
LICENSE="GPL-3 LGPL-3"
-SLOT="2"
+SLOT="0/3"
KEYWORDS=""
-IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
@@ -26,44 +26,45 @@ 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-arch/bzip2
- >=app-arch/xz-utils-5.0.0
- >=app-text/poppler-0.69[cairo]
+ >=app-text/poppler-0.90.1[cairo]
>=app-text/poppler-data-0.4.9
- >=dev-libs/atk-2.4.0
- >=dev-libs/glib-2.56.2:2
- >=dev-libs/json-glib-1.2.6
- dev-libs/libxml2
+ >=dev-libs/atk-2.34.1
+ >=dev-libs/glib-2.62.6:2
+ >=dev-libs/json-glib-1.4.4
+ dev-libs/libxml2:2
dev-libs/libxslt
- >=gnome-base/librsvg-2.40.6:2
- >=media-gfx/mypaint-brushes-1.3.0:=
- >=media-libs/babl-0.1.80[introspection,lcms,vala]
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala]
- >=media-libs/gexiv2-0.10.6
- >=media-libs/harfbuzz-0.9.19
- >=media-libs/lcms-2.8:2
- >=media-libs/libmypaint-1.3.0:=
- >=media-libs/libpng-1.6.25:0=
- >=media-libs/tiff-3.5.7:0
+ >=gnome-base/librsvg-2.40.21:2
+ >=media-gfx/mypaint-brushes-2.0.2:=
+ >=media-libs/babl-0.1.82[introspection,lcms,vala?]
+ >=media-libs/fontconfig-2.12.6
+ >=media-libs/freetype-2.10.2
+ >=media-libs/gegl-0.4.27:0.4[cairo,introspection,lcms,vala?]
+ >=media-libs/gexiv2-0.10.10
+ >=media-libs/harfbuzz-2.6.5
+ >=media-libs/lcms-2.9:2
+ >=media-libs/libmypaint-1.6.1:=
+ >=media-libs/libpng-1.6.37:0=
+ >=media-libs/tiff-4.1.0:0
net-libs/glib-networking[ssl]
sys-libs/zlib
- virtual/jpeg:0
- >=x11-libs/cairo-1.14.0
- >=x11-libs/gdk-pixbuf-2.36:2
- >=x11-libs/gtk+-3.22.29:3
+ virtual/jpeg
+ >=x11-libs/cairo-1.16.0
+ >=x11-libs/gdk-pixbuf-2.40.0:2
+ >=x11-libs/gtk+-3.24.16:3
x11-libs/libXcursor
- >=x11-libs/pango-1.42.0
+ >=x11-libs/pango-1.42.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.3.2:= )
+ heif? ( >=media-libs/libheif-1.7.0:= )
javascript? ( dev-libs/gjs )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
- lua? ( dev-lang/luajit )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
+ lua? (
+ dev-lang/luajit
+ dev-lua/lgi
+ )
mng? ( media-libs/libmng:= )
- openexr? ( >=media-libs/openexr-1.6.1:= )
+ openexr? ( >=media-libs/openexr-2.3.0:= )
postscript? ( app-text/ghostscript-gpl )
python? (
${PYTHON_DEPS}
@@ -86,22 +87,22 @@ RDEPEND="
DEPEND="
${COMMON_DEPEND}
- >=dev-lang/perl-5.10.0
- >=dev-libs/appstream-glib-0.7.7
+ >=dev-lang/perl-5.30.3
+ >=dev-libs/appstream-glib-0.7.16
dev-util/gdbus-codegen
dev-util/gtk-update-icon-cache
- >=dev-util/intltool-0.40.1
+ >=dev-util/intltool-0.51.0
sys-apps/findutils
>=sys-devel/autoconf-2.54
>=sys-devel/automake-1.11
- >=sys-devel/gettext-0.19
- >=sys-devel/libtool-2.2
+ >=sys-devel/gettext-0.21
+ >=sys-devel/libtool-2.4.6
virtual/pkgconfig
doc? (
- >=dev-util/gtk-doc-1.0
+ >=dev-util/gtk-doc-1.32
dev-util/gtk-doc-am
)
- $(vala_depend)
+ vala? ( $(vala_depend) )
"
DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
@@ -118,24 +119,27 @@ pkg_setup() {
}
src_prepare() {
- if has_version "media-gfx/mypaint-brushes:2.0" ; then
- sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
- fi
+ 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
# Fix checking of gtk-doc.make if USE="-doc" like autogen.sh
+ # USE="doc" is currently broken for gimp-9999 due to absence of appropriate *.m4 file
if ! use doc ; then
echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
+ sed -i -e "/CLEANFILES/s/^/#/g" \
+ "${S}"/devel-docs/{libgimp,libgimpbase,libgimpcolor,libgimpconfig,libgimpmath,libgimpmodule,libgimpthumb,libgimpwidgets}/Makefile.am || die
fi
gnome2_src_prepare # calls eautoreconf
- vala_src_prepare
+ use vala && vala_src_prepare
sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+ export CC_FOR_BUILD="$(tc-getBUILD_CC)"
}
_adjust_sandbox() {
@@ -161,11 +165,11 @@ src_configure() {
--enable-default-binary
+ --disable-check-update
--enable-mp
--with-appdata-test
--with-bug-report-url=https://bugs.gentoo.org/
--with-xmc
- --with-vala
--without-libbacktrace
--without-webkit
--without-xvfb-run
@@ -187,6 +191,7 @@ src_configure() {
$(use_with python)
$(use_with udev gudev)
$(use_with unwind libunwind)
+ $(use_with vala)
$(use_with webp)
$(use_with wmf)
$(use_with xpm libxpm)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 05:45:26 +0000