commit: e965ae13739d801437dbc4e70dd01f61c52fa968 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Wed Mar 10 22:09:05 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Mar 11 09:07:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e965ae13
media-libs/gegl: update live ebuild libpng, libjpeg, exiv2 options now are disabled in meson.build i.e. png and jpeg libraries are always required. Closes: https://bugs.gentoo.org/774756 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/19875 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-libs/gegl/gegl-9999.ebuild | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index 2dded5def55..c0ed1b98aea 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..9} ) VALA_USE_DEPEND=vapigen inherit meson gnome2-utils python-any-r1 vala @@ -62,6 +62,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" + ${PYTHON_DEPS} dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 @@ -73,21 +74,20 @@ BDEPEND=" DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) -PATCHES=( - "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch - "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch -) - python_check_deps() { + use test || return 0 has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" } -pkg_setup() { - use test && python-any-r1_pkg_setup -} - src_prepare() { default + # patch executables suffix + sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die + sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die + sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die + # skip UNEXPECTED PASSED 'matting-levin' test + sed -i -e "s/composition_tests += 'matting-levin'//" \ + -e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || die # don't require Apple's OpenCL on versions of OSX that don't have it if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then @@ -111,13 +111,10 @@ src_configure() { -Ddocs=false -Dexiv2=disabled -Dgdk-pixbuf=enabled - -Dgexiv2=disabled # - There are two checks for dot, one controllable by --with(out)-graphviz # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. -Dgraphviz=disabled -Djasper=disabled - -Dlibjpeg=enabled - -Dlibpng=enabled # - libspiro: not in portage main tree -Dlibspiro=disabled -Dlua=disabled
