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 EEF7A138350 for ; Sun, 9 Feb 2020 16:29:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11154E0870; Sun, 9 Feb 2020 16:29:38 +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 DE851E0870 for ; Sun, 9 Feb 2020 16:29:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 D703034E872 for ; Sun, 9 Feb 2020 16:29:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 330CD134 for ; Sun, 9 Feb 2020 16:29:34 +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: <1581265607.1ea4db524b4253c3f1a6c458334cd59edc784be8.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-2.10.14-r1.ebuild media-gfx/gimp/gimp-2.10.14.ebuild media-gfx/gimp/gimp-2.10.8-r1.ebuild media-gfx/gimp/gimp-2.10.8-r2.ebuild media-gfx/gimp/gimp-2.8.22-r1.ebuild media-gfx/gimp/gimp-2.8.22-r2.ebuild media-gfx/gimp/gimp-2.9.8-r1.ebuild 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: 1ea4db524b4253c3f1a6c458334cd59edc784be8 X-VCS-Branch: master Date: Sun, 9 Feb 2020 16:29:34 +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: ef0bcb30-1d66-4dbc-b26e-858e0d10eec1 X-Archives-Hash: 1be676e121c5a77316d9798544c9f11b commit: 1ea4db524b4253c3f1a6c458334cd59edc784be8 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 15:01:45 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 16:26:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea4db52 media-gfx/gimp: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny gentoo.org> media-gfx/gimp/{gimp-2.10.14.ebuild => gimp-2.10.14-r1.ebuild} | 6 ++++-- media-gfx/gimp/{gimp-2.10.8-r1.ebuild => gimp-2.10.8-r2.ebuild} | 8 +++++--- media-gfx/gimp/{gimp-2.8.22-r1.ebuild => gimp-2.8.22-r2.ebuild} | 6 ++++-- media-gfx/gimp/gimp-2.9.8-r1.ebuild | 6 ++++-- media-gfx/gimp/gimp-9999.ebuild | 4 +++- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14-r1.ebuild similarity index 97% rename from media-gfx/gimp/gimp-2.10.14.ebuild rename to media-gfx/gimp/gimp-2.10.14-r1.ebuild index 63247f2f6b4..e169695de69 100644 --- a/media-gfx/gimp/gimp-2.10.14.ebuild +++ b/media-gfx/gimp/gimp-2.10.14-r1.ebuild @@ -58,8 +58,10 @@ COMMON_DEPEND=" postscript? ( app-text/ghostscript-gpl ) python? ( ${PYTHON_DEPS} - >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] - >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}] + >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] + ') ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r2.ebuild similarity index 97% rename from media-gfx/gimp/gimp-2.10.8-r1.ebuild rename to media-gfx/gimp/gimp-2.10.8-r2.ebuild index c69d663e35e..936e49178ba 100644 --- a/media-gfx/gimp/gimp-2.10.8-r1.ebuild +++ b/media-gfx/gimp/gimp-2.10.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,8 +53,10 @@ RDEPEND=">=dev-libs/glib-2.56.0:2 >=media-libs/libpng-1.6.25:0= python? ( ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] - >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] + >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}] + ') ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild similarity index 97% rename from media-gfx/gimp/gimp-2.8.22-r1.ebuild rename to media-gfx/gimp/gimp-2.8.22-r2.ebuild index 9fc5aa9cdd4..3d4251ed76a 100644 --- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild +++ b/media-gfx/gimp/gimp-2.8.22-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -45,7 +45,9 @@ RDEPEND=">=dev-libs/glib-2.30.2:2 png? ( >=media-libs/libpng-1.2.37:0 ) python? ( ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] + ') ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild index fc0e9d31d19..73a8c30f70f 100644 --- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild +++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild @@ -49,8 +49,10 @@ RDEPEND=">=dev-libs/glib-2.40.0:2 >=media-libs/libpng-1.6.25:0 python? ( ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] - >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}] + >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}] + ') ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 31756e7a18c..a8add4680ec 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -65,7 +65,9 @@ COMMON_DEPEND=" postscript? ( app-text/ghostscript-gpl ) python? ( ${PYTHON_DEPS} - >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}] + ') ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= )