commit: 34a374a91cc5b8abd8d8e80dd9b38cc3bad58f4e Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Sun Jul 8 18:22:41 2018 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Sun Jul 8 18:22:41 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34a374a9
media-gfx/gimp: Sync 9999 with 2.10.2 Closes: https://bugs.gentoo.org/643416 Package-Manager: Portage-2.3.40, Repoman-2.3.9 media-gfx/gimp/gimp-9999.ebuild | 61 ++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 2ac820e3f5b..c52ce69853a 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -3,8 +3,9 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) +GNOME2_EAUTORECONF=yes -inherit virtualx autotools eutils gnome2 multilib python-single-r1 git-r3 +inherit virtualx autotools gnome2 multilib python-single-r1 ltprune git-r3 DESCRIPTION="GNU Image Manipulation Program" HOMEPAGE="https://www.gimp.org/"; @@ -15,9 +16,9 @@ SLOT="2" KEYWORDS="" LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" -IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm" +IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm" -RDEPEND=">=dev-libs/glib-2.40.0:2 +RDEPEND=">=dev-libs/glib-2.54.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache @@ -29,25 +30,27 @@ RDEPEND=">=dev-libs/glib-2.40.0:2 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] - >=media-libs/fontconfig-2.2.0 + >=media-gfx/mypaint-brushes-1.3.0 + >=media-libs/fontconfig-2.12.4 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme - >=media-libs/babl-0.1.30 - >=media-libs/gegl-0.3.20:0.3[cairo] + >=media-libs/babl-0.1.50 + >=media-libs/gegl-0.4.2:0.4[cairo] >=dev-libs/glib-2.43 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 - jpeg2k? ( media-libs/jasper:= ) - >=media-libs/lcms-2.7:2 + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) + >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) - pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 ) - >=media-libs/libpng-1.6.25:0 + >=app-text/poppler-0.44[cairo] + >=app-text/poppler-data-0.4.7 + >=media-libs/libpng-1.6.25:0= python? ( ${PYTHON_DEPS} >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] @@ -65,8 +68,9 @@ RDEPEND=">=dev-libs/glib-2.40.0:2 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )" DEPEND="${RDEPEND} - dev-util/gdbus-codegen + >=dev-lang/perl-5.10.0 dev-libs/appstream-glib + dev-util/gtk-update-icon-cache sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 @@ -75,7 +79,7 @@ DEPEND="${RDEPEND} >=sys-devel/libtool-2.2 >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 - dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453) + dev-util/gtk-doc-am" DOCS="AUTHORS ChangeLog* HACKING NEWS README*" @@ -88,25 +92,10 @@ pkg_setup() { } src_prepare() { - eapply_user - 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 - echo '#!/bin/sh' > py-compile - chmod a+x py-compile || die - sed -i -e 's:\$srcdir/configure:#:g' autogen.sh - local myconf - if ! use doc; then - myconf="${myconf} --disable-gtk-doc" - fi - ./autogen.sh ${myconf} || die - - # Fix "libtoolize --force" of autogen.sh (bug #476626) - rm install-sh ltmain.sh || die - _elibtoolize --copy --install || die - - gnome2_src_prepare + 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 @@ -114,7 +103,8 @@ src_prepare() { src_configure() { local myconf=( - GEGL=/usr/bin/gegl-0.3 + GEGL="${EPREFIX}"/usr/bin/gegl-0.4 + GDBUS_CODEGEN="${EPREFIX}"/bin/false --enable-default-binary --disable-silent-rules @@ -124,14 +114,15 @@ src_configure() { $(use_with alsa) $(use_enable altivec) --with-appdata-test + --with-bug-report-url=https://bugs.gentoo.org/ --without-webkit - $(use_with jpeg2k libjasper) + $(use_with jpeg2k jpeg2000) $(use_with postscript gs) $(use_enable cpu_flags_x86_mmx mmx) $(use_with mng libmng) $(use_with openexr) $(use_with webp) - $(use_with pdf poppler) + --without-libheif $(use_enable python) $(use_enable smp mp) $(use_enable cpu_flags_x86_sse sse) @@ -158,7 +149,7 @@ src_compile() { addwrite /dev/ati/ # bug 589198 addwrite /proc/mtrr # bug 589198 - export XDG_DATA_DIRS=/usr/share # bug 587004 + export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 gnome2_src_compile } @@ -170,7 +161,7 @@ _clean_up_locales() { einfo "- keeping ${lang}" continue } - rm -Rf "${ED}"/usr/share/locale/"${lang}" || die + rm -Rf "${ED%/}"/usr/share/locale/"${lang}" done } @@ -187,12 +178,12 @@ 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 + mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die prune_libtool_files --all # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die + mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die _clean_up_locales }
