From 6bf575618cf9022e99cbfcc64036fd9db79a749c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 5 Dec 2023 17:02:59 +0000
Subject: gentoo auto-resync : 05:12:2023 - 17:02:58

---
 dev-python/pywlroots/Manifest                   |  2 +-
 dev-python/pywlroots/pywlroots-0.16.6-r1.ebuild | 43 -------------------
 dev-python/pywlroots/pywlroots-0.16.6-r2.ebuild | 55 +++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 44 deletions(-)
 delete mode 100644 dev-python/pywlroots/pywlroots-0.16.6-r1.ebuild
 create mode 100644 dev-python/pywlroots/pywlroots-0.16.6-r2.ebuild

(limited to 'dev-python/pywlroots')

diff --git a/dev-python/pywlroots/Manifest b/dev-python/pywlroots/Manifest
index 82ef6a0f6cd6..622c61df5c6a 100644
--- a/dev-python/pywlroots/Manifest
+++ b/dev-python/pywlroots/Manifest
@@ -2,5 +2,5 @@ AUX pywlroots-0.15.24-no-import-version-check.patch 592 BLAKE2B 24ef9a82a3a7c62e
 DIST pywlroots-0.15.24.gh.tar.gz 85570 BLAKE2B 0c7ba0be6159152488785298028bb1feec20e2380357060a850dab417b3fb1fccb4a9e6cc6564d2b7f124bf4fc454789549267e9036b0b4559e5fcd4c6f06196 SHA512 b29b76cf18a65b2ef19d15ecf018a9ba44119d60ee61435967d17f06d5f7544d2117f2e9a81574734c71591a237b00c8584a5cc6d6adb928f39f11170f21ee94
 DIST pywlroots-0.16.6.tar.gz 91625 BLAKE2B d8784add8266958745fb9d9ca25d47b3bd52957cef22a70b30b051aa53996a8b870d436a44c75f8a16fd7346b7ff2c00a70eb86b376294f3928ecd8807b6646e SHA512 31588ebccbd269e45374cd42067738c23bd76ea8a0304d17aff9da33c7686a5fb9c83a676575f0ad034afd2827cb8bea7eb9334e96badcc83ffede56fbf75a1b
 EBUILD pywlroots-0.15.24-r2.ebuild 1003 BLAKE2B 19a6ce2c6c9fff501e2a4274ac1254d6cf22b693b1451c7e3e61d09f4d8ff1b93b98ef6242c683e4f48527b0d022f971bcb3b016541ad7a352c28c3cd8bf9060 SHA512 83343df9d58b79b6abd76d9706ddfd236eae1a05bb975dcfdf0561371f43687f3c34c9c194ebb8a363e005ea9c54ce84d12f70893f80d1593741425ecca81c21
-EBUILD pywlroots-0.16.6-r1.ebuild 838 BLAKE2B a2004cac7955f7c2c072868523c9ca39cb74ef418642cb8c32f4f4149ff224f970ed8993fd5bd131120a752266f58e1ce07231b09c06857aaa0dbd03ae846a92 SHA512 7a1368f44e858526236265da93eacf3f3e05e96438c61ac62760cb4529a533e956ae45e89402ff6b6ef4db5f990909db76c1067a6d013b6e20d75fddfd6c8ba1
+EBUILD pywlroots-0.16.6-r2.ebuild 1201 BLAKE2B 01ffa126ca8a48b653b9218bbd680fcb56d052c61ef960bf82895ce3f2a135aea9f21a439cb50ff1d5f0c48d3794c3d1b25bd066cb553d14285f257653c80509 SHA512 2543ef20f1882f6246b866f4894e7f3604cfd3de9a9573aaf06523181563a4c3156096f21b7b99c32810e7c32b7b63625ea35db45ef7be9a18a7a1ed14292b81
 MISC metadata.xml 351 BLAKE2B 8c8ef3ef1d58928c0a15fcd756e4d1c94b2793626c9b4e9cbeb31443119cb47fa4975063547065cbc6e06f327ec7d36beb5e74973fd3d372ad4f7feeac3410ea SHA512 b4840e4149647c29e358b64d3de99a0f2b148a4d7d123d7ef7df67cf918a3f599d3e199ed7ef4d0d39bf8ccc8e4630058db4ae3a2260119ce1c5d255bf2dd9c8
diff --git a/dev-python/pywlroots/pywlroots-0.16.6-r1.ebuild b/dev-python/pywlroots/pywlroots-0.16.6-r1.ebuild
deleted file mode 100644
index e5ef19dd6278..000000000000
--- a/dev-python/pywlroots/pywlroots-0.16.6-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python binding to the wlroots library using cffi"
-HOMEPAGE="
-	https://github.com/flacjacket/pywlroots/
-	https://pypi.org/project/pywlroots/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-
-# 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
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.24-no-import-version-check.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf wlroots || die
-	epytest
-}
diff --git a/dev-python/pywlroots/pywlroots-0.16.6-r2.ebuild b/dev-python/pywlroots/pywlroots-0.16.6-r2.ebuild
new file mode 100644
index 000000000000..bc058a1c6aff
--- /dev/null
+++ b/dev-python/pywlroots/pywlroots-0.16.6-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python binding to the wlroots library using cffi"
+HOMEPAGE="
+	https://github.com/flacjacket/pywlroots/
+	https://pypi.org/project/pywlroots/
+"
+
+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)*:=[X?]
+"
+RDEPEND="
+	${DEPEND}
+"
+
+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
+}
-- 
cgit v1.2.3