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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A541F158013 for ; Tue, 5 Dec 2023 14:32:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D5872BC031; Tue, 5 Dec 2023 14:32:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 411452BC031 for ; Tue, 5 Dec 2023 14:32:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8CB3533BE19 for ; Tue, 5 Dec 2023 14:32:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 077A212A0 for ; Tue, 5 Dec 2023 14:32:46 +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: <1701786761.a54012d8212bd465ffc60f25aacf61f5356f652e.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pywlroots/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pywlroots/pywlroots-0.16.6-r1.ebuild dev-python/pywlroots/pywlroots-0.16.6-r2.ebuild X-VCS-Directories: dev-python/pywlroots/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a54012d8212bd465ffc60f25aacf61f5356f652e X-VCS-Branch: master Date: Tue, 5 Dec 2023 14:32:46 +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: 79a6746e-c357-415a-9fd6-cda9b3e508f1 X-Archives-Hash: f02d41c7dd066398d43b0e25c30db9a2 commit: a54012d8212bd465ffc60f25aacf61f5356f652e Author: Michał Górny gentoo org> AuthorDate: Tue Dec 5 14:02:31 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Dec 5 14:32:41 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54012d8 dev-python/pywlroots: Fix automagic xwayland dependency Fix automagic dependency on xwayland support in gui-libs/wlroots, as well as an awfully broken logic that resulted in wlroots/_build.py file disappearing if the package was installed at build time (sigh). Closes: https://bugs.gentoo.org/919097 Signed-off-by: Michał Górny gentoo.org> ...0.16.6-r1.ebuild => pywlroots-0.16.6-r2.ebuild} | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dev-python/pywlroots/pywlroots-0.16.6-r1.ebuild b/dev-python/pywlroots/pywlroots-0.16.6-r2.ebuild similarity index 59% rename from dev-python/pywlroots/pywlroots-0.16.6-r1.ebuild rename to dev-python/pywlroots/pywlroots-0.16.6-r2.ebuild index e5ef19dd6278..bc058a1c6aff 100644 --- a/dev-python/pywlroots/pywlroots-0.16.6-r1.ebuild +++ b/dev-python/pywlroots/pywlroots-0.16.6-r2.ebuild @@ -18,25 +18,37 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~riscv ~x86" +IUSE="X" # See README for wlroots dep DEPEND=" dev-python/cffi:=[${PYTHON_USEDEP}] >=dev-python/pywayland-0.4.14[${PYTHON_USEDEP}] >=dev-python/xkbcommon-0.2[${PYTHON_USEDEP}] - =gui-libs/wlroots-$(ver_cut 1-2)*:= - x11-base/xwayland + =gui-libs/wlroots-$(ver_cut 1-2)*:=[X?] " RDEPEND=" ${DEPEND} " -PATCHES=( - "${FILESDIR}"/${PN}-0.15.24-no-import-version-check.patch -) - distutils_enable_tests pytest +src_prepare() { + local PATCHES=( + "${FILESDIR}"/${PN}-0.15.24-no-import-version-check.patch + ) + + # override automagic detection and caching that's completely broken + # by design; https://github.com/flacjacket/pywlroots/issues/132 + cat > wlroots/_build.py <<-EOF || die + has_xwayland = $(usex X True False) + EOF + sed -e "s:return.*has_xwayland$:return $(usex X True False):" \ + -i wlroots/ffi_build.py || die + + distutils-r1_src_prepare +} + python_test() { rm -rf wlroots || die epytest