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 1B900138350 for ; Wed, 22 Apr 2020 23:48:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7147E0AC0; Wed, 22 Apr 2020 23:48:24 +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 AF2EEE0AC0 for ; Wed, 22 Apr 2020 23:48:24 +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 B31D934F08B for ; Wed, 22 Apr 2020 23:48:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B1C31F1 for ; Wed, 22 Apr 2020 23:48:20 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1587599266.f301c1af86e4f38f3e8fe674ef253adfb5aed4e7.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libjcat/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libjcat/libjcat-0.1.1.ebuild X-VCS-Directories: dev-libs/libjcat/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: f301c1af86e4f38f3e8fe674ef253adfb5aed4e7 X-VCS-Branch: master Date: Wed, 22 Apr 2020 23:48:20 +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: dc484361-8423-44a1-bd0e-a4629ee3e49d X-Archives-Hash: 17925a03d7093a441ba4c032f822e8d3 commit: f301c1af86e4f38f3e8fe674ef253adfb5aed4e7 Author: Marek Szuba gentoo org> AuthorDate: Wed Apr 22 23:27:43 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Wed Apr 22 23:47:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f301c1af dev-libs/libjcat: add explicit build-time dependency on Python libjcat build scripts run an external Python script to generate a map file for the library. In the current version of libjcat Meson invokes that script using the same Python as itself (it depends on the same Python packages as said script), however upstream has recently changed this to an explicit request for an implementation providing XML support and setuptools - and when I tried the very same approach in the course of investigating Bug #715670, without an explicit dependency it would abort configuration unless the necessary modules were provided by the default python3. Besides, implicitly depending on modules used by Meson itself goes against the whole "I am written in Python but you are not supposed to pay any attention to it" thing. Signed-off-by: Marek Szuba gentoo.org> dev-libs/libjcat/libjcat-0.1.1.ebuild | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dev-libs/libjcat/libjcat-0.1.1.ebuild b/dev-libs/libjcat/libjcat-0.1.1.ebuild index 8a87c2a8b19..06f0e8d33d0 100644 --- a/dev-libs/libjcat/libjcat-0.1.1.ebuild +++ b/dev-libs/libjcat/libjcat-0.1.1.ebuild @@ -3,7 +3,10 @@ EAPI=7 -inherit meson vala xdg-utils +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="xml" + +inherit meson python-any-r1 vala xdg-utils DESCRIPTION="Library and tool for reading and writing Jcat files " HOMEPAGE="https://github.com/hughsie/libjcat" @@ -25,6 +28,9 @@ RDEPEND="dev-libs/glib:2 dev-lang/vala:=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig + $(python_gen_any_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') gtk-doc? ( dev-util/gtk-doc ) man? ( sys-apps/help2man ) test? ( net-libs/gnutls[tools] )" @@ -35,6 +41,10 @@ PATCHES=( "${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch ) +python_check_deps() { + has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]" +} + src_prepare() { xdg_environment_reset # TODO: make vala optional