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 97E65138334 for ; Mon, 9 Dec 2019 16:40:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF008E0830; Mon, 9 Dec 2019 16:40:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 95404E0830 for ; Mon, 9 Dec 2019 16:40:30 +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 0961B34D63D for ; Mon, 9 Dec 2019 16:40:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3B198B1 for ; Mon, 9 Dec 2019 16:40:26 +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: <1575909608.bc2a9bed0542ca7fc32fb057fd6db4b75dbe13e1.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-0.4.18.ebuild 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: bc2a9bed0542ca7fc32fb057fd6db4b75dbe13e1 X-VCS-Branch: master Date: Mon, 9 Dec 2019 16:40:26 +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: b7307cd4-0416-4f5e-89a5-94cd988343c5 X-Archives-Hash: e89254a76cc191a9cb63426727043de9 commit: bc2a9bed0542ca7fc32fb057fd6db4b75dbe13e1 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Mon Dec 9 06:17:01 2019 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Dec 9 16:40:08 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2a9bed media-libs/gegl: Use python-any-r1.eclass again (and more correctly). Define python_check_deps() function which was previously missing. Move some dependencies from DEPEND to BDEPEND. Closes: https://bugs.gentoo.org/699522 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Joonas Niilola gentoo.org> media-libs/gegl/gegl-0.4.18.ebuild | 17 +++++++++++++---- media-libs/gegl/gegl-9999.ebuild | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild index c341a208411..53a55ca5b57 100644 --- a/media-libs/gegl/gegl-0.4.18.ebuild +++ b/media-libs/gegl/gegl-0.4.18.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) # vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen -inherit meson gnome2-utils python-r1 vala +inherit meson gnome2-utils python-any-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -26,7 +26,6 @@ SLOT="0.4" IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} svg? ( cairo ) test? ( introspection ) vala? ( introspection ) @@ -38,7 +37,6 @@ RESTRICT="!test? ( test )" # so there is no chance to support libav right now (Gentoo bug #567638) # If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! RDEPEND=" - ${PYTHON_DEPS} >=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.72[introspection?] @@ -69,12 +67,15 @@ RDEPEND=" DEPEND=" ${RDEPEND} +" + +BDEPEND=" dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig - test? ( >=dev-python/pygobject-3.2[${PYTHON_USEDEP}] ) + test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) vala? ( $(vala_depend) ) " @@ -86,6 +87,14 @@ PATCHES=( "${FILESDIR}"/${P}-meson_cpu_detection.patch ) +python_check_deps() { + has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_prepare() { default diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index ea450170416..945cf8d149c 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) # vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen -inherit meson gnome2-utils python-r1 vala +inherit meson gnome2-utils python-any-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -26,7 +26,6 @@ SLOT="0.4" IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} svg? ( cairo ) test? ( introspection ) vala? ( introspection ) @@ -38,7 +37,6 @@ RESTRICT="!test? ( test )" # so there is no chance to support libav right now (Gentoo bug #567638) # If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! RDEPEND=" - ${PYTHON_DEPS} >=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.72[introspection?] @@ -69,12 +67,15 @@ RDEPEND=" DEPEND=" ${RDEPEND} +" + +BDEPEND=" dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig - test? ( >=dev-python/pygobject-3.2[${PYTHON_USEDEP}] ) + test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) vala? ( $(vala_depend) ) " @@ -85,6 +86,14 @@ PATCHES=( "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch ) +python_check_deps() { + has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_prepare() { default