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 96DB61382C5 for ; Thu, 25 Jun 2020 08:08:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA6E1E08C4; Thu, 25 Jun 2020 08:08:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B54DEE08C4 for ; Thu, 25 Jun 2020 08:08:27 +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 8905034F019 for ; Thu, 25 Jun 2020 08:08:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A53962C2 for ; Thu, 25 Jun 2020 08:08:21 +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: <1593072462.86f4ec082cdb2eed86350d71ac917b486b6105b4.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gimp/gimp-9999.ebuild X-VCS-Directories: media-gfx/gimp/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 86f4ec082cdb2eed86350d71ac917b486b6105b4 X-VCS-Branch: master Date: Thu, 25 Jun 2020 08:08:21 +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: 015d6ec1-2eeb-4420-84b4-22369851c15e X-Archives-Hash: 3efa7b1285d085a9974180b9952651f8 commit: 86f4ec082cdb2eed86350d71ac917b486b6105b4 Author: Sergey Torokhov yandex ru> AuthorDate: Mon May 25 02:36:33 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Jun 25 08:07:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86f4ec08 media-gfx/gimp: update babl, gegl dependencies in 9999.ebuild vala support is always currently enabled because of upstream broken configure phase with '--without-vala' option: "configure: error: conditional "ENABLE_VAPIGEN" was never defined. Usually this means the macro was only invoked conditionally." Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/15958 Signed-off-by: Joonas Niilola gentoo.org> media-gfx/gimp/gimp-9999.ebuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index f73b18199f4..1ba63b65960 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -5,8 +5,10 @@ EAPI=6 PYTHON_COMPAT=( python3_{6,7,8} ) GNOME2_EAUTORECONF=yes +VALA_MIN_API_VERSION="0.40" +VALA_USE_DEPEND=vapigen -inherit autotools git-r3 gnome2 python-single-r1 virtualx +inherit autotools git-r3 gnome2 python-single-r1 vala virtualx DESCRIPTION="GNU Image Manipulation Program" HOMEPAGE="https://www.gimp.org/" @@ -29,16 +31,16 @@ COMMON_DEPEND=" >=app-text/poppler-0.69[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.4.0 - >=dev-libs/glib-2.56.0:2 + >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 - >=media-libs/babl-0.1.74[introspection] + >=media-libs/babl-0.1.78[introspection,lcms,vala] >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 - >=media-libs/gegl-0.4.20:0.4[cairo,introspection] + >=media-libs/gegl-0.4.24:0.4[cairo,introspection,lcms,vala] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 @@ -99,6 +101,7 @@ DEPEND=" >=dev-util/gtk-doc-1.0 dev-util/gtk-doc-am ) + $(vala_depend) " DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" ) @@ -125,6 +128,8 @@ src_prepare() { gnome2_src_prepare # calls eautoreconf + 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 } @@ -156,6 +161,7 @@ src_configure() { --with-appdata-test --with-bug-report-url=https://bugs.gentoo.org/ --with-xmc + --with-vala --without-libbacktrace --without-webkit --without-xvfb-run