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 28AA8138359 for ; Sat, 22 Aug 2020 06:16:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21453E0837; Sat, 22 Aug 2020 06:16:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 0B62AE0788 for ; Sat, 22 Aug 2020 06:16:49 +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 DC270340E08 for ; Sat, 22 Aug 2020 06:16:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A38A32C for ; Sat, 22 Aug 2020 06:16:47 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1598077002.3087daa00dedaf6dbc07e35d1efdd668fc22e5ca.mgorny@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: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3087daa00dedaf6dbc07e35d1efdd668fc22e5ca X-VCS-Branch: master Date: Sat, 22 Aug 2020 06:16:47 +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: 9c5f23dd-1eb7-4ae8-8e7b-ff05dab5eb96 X-Archives-Hash: cf253b62cf4d665f5c982e0172b1808d commit: 3087daa00dedaf6dbc07e35d1efdd668fc22e5ca Author: Sergey Torokhov yandex ru> AuthorDate: Sat Aug 22 00:08:57 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Aug 22 06:16:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3087daa0 media-gfx/gimp: update live-ebuild Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/17207 Signed-off-by: Michał Górny gentoo.org> media-gfx/gimp/gimp-9999.ebuild | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 1ba63b65960..4bab1cc4f0b 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -36,11 +36,11 @@ COMMON_DEPEND=" 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.78[introspection,lcms,vala] + >=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.24:0.4[cairo,introspection,lcms,vala] + >=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 @@ -118,6 +118,10 @@ 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/== "xquartz"/= "xquartz"/' configure.ac || die #494864 sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144