From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7CB3E1382C5 for ; Thu, 11 Mar 2021 09:08:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2BA1E09C3; Thu, 11 Mar 2021 09:08:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95CC7E09C3 for ; Thu, 11 Mar 2021 09:08:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C37B340DCC for ; Thu, 11 Mar 2021 09:08:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB868573 for ; Thu, 11 Mar 2021 09:08:07 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1615453654.e965ae13739d801437dbc4e70dd01f61c52fa968.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gegl/gegl-9999.ebuild X-VCS-Directories: media-libs/gegl/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: e965ae13739d801437dbc4e70dd01f61c52fa968 X-VCS-Branch: master Date: Thu, 11 Mar 2021 09:08:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8a5072f6-f2ec-49f1-8aae-9e6c0c841de4 X-Archives-Hash: 8c48889a1331d1237e89e4ed1d9d3568 commit: e965ae13739d801437dbc4e70dd01f61c52fa968 Author: Sergey Torokhov yandex ru> AuthorDate: Wed Mar 10 22:09:05 2021 +0000 Commit: Joonas Niilola gentoo 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 yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/19875 Signed-off-by: Joonas Niilola 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