gentoo auto-resync : 21:10:2024 - 04:04:33

6 files changed, 160 insertions, 66 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index e2dc9d06f1ab..e717205fb78e 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index 454dba7ea747..ec2878b0292c 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -5,5 +5,5 @@ DIST fvwm3-1.1.0-docs.tar.xz 230964 BLAKE2B f431011a63a8d190e01e34301e74fd40750d
 DIST fvwm3-1.1.0.tar.gz 4527424 BLAKE2B ee9a3f190ae7fa1f1dd703e17b0e12f04da63212cade30facdbc8339ded7f598de143d18f17dde39d3af8e24ff2b34855ad3e5b2b6c5ffe466072a7353895cd8 SHA512 47eea05cbdecf4da3313b9183fa938544b451b9f133d7a68062feb222c3c1af3873402f80b60485d603afe8cd23a03f3e86a503fc1f2070e1ad2e6e64d012341
 EBUILD fvwm3-1.0.9-r1.ebuild 4808 BLAKE2B 522e96330ee3730704e2544ab34a71816b5616e8565790cabacbb3a0ccfbebcf09d7b0e74acd289b1d092c9e828e58d995d6986257d32db55b58310b6aea866e SHA512 9a10669c760d02ac45339259c8d4c836dcb3cfcfaf368363838ba16bf415afc83bb20db326999d4a45c237771b0c617691d3639292517475b45961fe37174380
 EBUILD fvwm3-1.1.0-r1.ebuild 4759 BLAKE2B 562730695d29ac3f1d587ad37803719614107e8332ac96b8faab71e20186d961bd39155057875346aca7bf2c2588db6c104f2b4c84fda52752ef75c85f933176 SHA512 8740a4d2bc9a67d9f1b190f846ab07ce5fc0fb210348450bd9f120ae224d79fb6a1a9e7bb04dc6787dcb25779c760902f90416f9afa7355b01e77668eb01e0c7
-EBUILD fvwm3-9999.ebuild 4716 BLAKE2B f7a1be00bfeb6e7fc6ed8e2dea7d55a25ba9a57998dea8e2b6a95477412b301c1f9d236609217b74f822807b834e808e80aef7777e5081d4a16144182f3c2ecf SHA512 ac53c1eb13bf03a68a0a9f2103cda7928a01939798c553d0eed8050966da8286c4abab617cee31eda8248698d7affc7383de86c7ac209e42ffe91eded5a18317
+EBUILD fvwm3-9999.ebuild 4302 BLAKE2B 2bf0eddd7bdbb748712905cd0f8734d213e04ca4d372a571cf73bdc605a4bbb224c9ba84f0bcddf329394632df265419536316a195df6cb447cb4e547c8d5bbc SHA512 18234690e78758d80c3eaeb94c5e69d974e27c6c86f16b43db935435027f66e4d50a2cc6f6182799298ce103a041e594edc4b5c1c8b9f2f023bbd15aee833f7f
 MISC metadata.xml 1012 BLAKE2B 5c5d08f16521594e1425ca8efbe5162c72ce6aff0557c0c79f1e2717dfc77ba855f90c493b45ff361d2e75f00b17e549b6853ee660c77c57cdeadce1df223f32 SHA512 a53bdde33366823f867bcff8b6c90e3cae6e0808945278fd02928502fd38df9d699fa4ace2fe66c1524e74d256242202a2b3139deb1331b67ac72f2fd0e9608f
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 9a9eba17220d..f4eabc6cad94 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -8,9 +8,9 @@ EAPI=8
 # Scripting for this is in sam-gentoo-scripts.
 : ${FVWM3_DOCS_PREBUILT:=1}
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 GO_OPTIONAL=1
-inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs
+inherit flag-o-matic go-module meson python-single-r1
 
 DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm"
 HOMEPAGE="https://www.fvwm.org/"
@@ -31,9 +31,8 @@ fi
 LICENSE="GPL-2+ FVWM
 	go? ( Apache-2.0 BSD MIT )"
 SLOT="0"
-IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}"
+IUSE="bidi +go netpbm nls perl readline svg"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DOCS=( NEWS )
 
@@ -83,20 +82,15 @@ RDEPEND="${PYTHON_DEPS}
 	x11-libs/libXpm
 	x11-libs/libXrandr
 	x11-libs/libXrender
+	x11-misc/xlockmore
+	dev-lang/tk
+	dev-perl/Tk
+	>=dev-perl/X11-Protocol-0.56
 	bidi? ( dev-libs/fribidi )
-	lock? ( x11-misc/xlockmore )
-	netpbm? ( media-libs/netpbm )
-	perl? ( tk? (
-			dev-lang/tk
-			dev-perl/Tk
-			>=dev-perl/X11-Protocol-0.56
-		)
-	)
 	readline? (
 		sys-libs/ncurses:=
 		sys-libs/readline:=
 	)
-	stroke? ( dev-libs/libstroke )
 	svg? (
 		gnome-base/librsvg:2
 		x11-libs/cairo
@@ -105,14 +99,6 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto"
 
-src_prepare() {
-	default
-	use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \
-		-i bin/FvwmPrompt/Makefile.am || die )
-
-	eautoreconf
-}
-
 src_configure() {
 	# Recommended by upstream for release. Doesn't really matter for live ebuilds.
 	append-flags -fno-strict-aliasing
@@ -122,68 +108,57 @@ src_configure() {
 		use $arch && append-flags -fsigned-chars
 	done
 
-	local myconf=(
-		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
-		--enable-package-subdirs
-		$(use_enable bidi)
-		$(use_enable go golang)
-		$(use_enable nls)
-		$(use_enable nls iconv)
-		$(use_enable perl perllib)
-		$(use_with readline readline-library)
-		$(use_enable svg rsvg)
-		--enable-png
+	local emesonargs=(
+		"-Dpng=enabled"
+		"-Dsm=enabled"
+		"-Dxcursor=enabled"
+		"-Dxkbcommon=enabled"
+		"-Dxpm=enabled"
+		"-Dxrender=enabled"
+		$(meson_feature bidi)
+		$(meson_feature go golang)
+		$(meson_feature nls iconv)
+		$(meson_feature nls)
+		$(meson_feature readline) # not required for go but it won't hurt to enable it
+		$(meson_feature svg cairo) # Pick 1 of 'cairo', 'cairo-svg', or 'libsvg-cairo'; add the appropriate dependency
+		$(meson_feature svg)
+		"-Dcairo-svg=disabled"
+		"-Dlibsvg-cairo=disabled"
+		"-Ddocdir=${EPREFIX}/usr/share/doc/${PF}"
 	)
 
 	if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then
-		myconf+=(
-			--enable-mandoc
-			--enable-htmldoc
+		emesonargs+=(
+			"-Dhtmldoc=true"
+			"-Dmandoc=true"
 		)
 	else
 		# Probably not required, but let's be safe
-		myconf+=(
-			--disable-mandoc
-			--disable-htmldoc
+		emesonargs+=(
+			"-Dhtmldoc=false"
+			"-Dmandoc=false"
 		)
 	fi
 
-	use readline && myconf+=( --without-termcap-library )
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
+	meson_src_configure
 }
 
 src_install() {
 	# Since we're manually handling docs installation, let's do that first
-	# and then install the rest of the files via emake
+	# and then install the rest of the files "normally".
 	local HTML_DOCS
 	if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then
 		doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8]
 		HTML_DOCS="${WORKDIR}"/${P}-docs/html/*
-	else
-		HTML_DOCS="${S}"/doc/*.html
-		doman "${S}"/doc/*.[0-8]
 	fi
-
 	einstalldocs
 
-	emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install
-
-	exeinto /etc/X11/Sessions
-	newexe - ${PN} <<-EOF
-	#!/bin/sh
-	${PN}
-	EOF
-
-	python_scriptinto "/usr/bin"
-	python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
-
-	make_session_desktop fvwm3 /usr/bin/fvwm3
+	meson_src_install
 
+	if ! use go; then
+		python_scriptinto "/usr/bin"
+		python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
+	fi
 }
 
 pkg_postinst() {
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index c1b5603626c4..65f5cf6467c5 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,4 +1,6 @@
 AUX qtile-session-r1 1860 BLAKE2B fb9345d3acc5e0fc5694065f12e2759e02aebc765925cb0ffcb1a776ec82e959503d8a8039238e4e48a5045a3118f2e37201a88d5255fd0a0782d2f8291d8a77 SHA512 41b37ba034b5dd7f3126142d2cfc5cf8986b521fc419d47e420582fc8b516df87249bd8e14c12d77691b93205ec3cd1249bfa040ef0691e0751c669f742570ee
 DIST qtile-0.28.1.tar.gz 601217 BLAKE2B 04f24c5b628e1c3d0eca395135ef0d0093af5a57d23aea751e76197da4f148ae679a9fb650e2589e5f2e253673cab86642e3f0695ac219641c65192eb9a37274 SHA512 95b4d95206aeac4bb59d47c94eb93b55ac413681050345a0d61cdb19b71dd785bb6c13c0161757b9bfa5e8d0ce345fcf64eea04fc44b2f596a65b70f5da5d32e
-EBUILD qtile-0.28.1.ebuild 2625 BLAKE2B 2596ce6aaa668bed772fdd6f2a167245d2fca90b83dd575c57e5e2d88479d1f92702d9ced69497ee01646d0f2dd6a10560c25da64533feb3288319ce052fb028 SHA512 b8d76065f9aa7aadda26bcc45a27a8ed8a61208311c530f339d56343037661253f9f996897c89b2a02a0ef411287a25564c34eb9607c04318998a3a523686d0f
+DIST qtile-0.29.0.tar.gz 607026 BLAKE2B 71a282b08b6d15e08f616e28a59a632a76ef4a180788177606873dec7870d715fa96403ece6745de8898716e863b7462a745426f59fb13fd40ba87207be30d24 SHA512 745a9a79209c0dbac5e49b8ee90d567204fd022c63e9321afbb6a3a064f8e9376fdbbe67a5115e50b251d28129f4907761cbbd3e0b3d2e0676e047ef8369c92c
+EBUILD qtile-0.28.1.ebuild 2622 BLAKE2B 693eab081037d8b368495fd7959e04fba1da29a2bbdf3b1c9cc4e340a34252771bcb2626fe6fe7950b2227c7d03f22d4f3e77be74f3f755b3a038d33d39b81c7 SHA512 9c3520cf721e9a6fb940bb82b62f158a2b2c908698ae273d46b47cb03b7266706595c5c333ef9683cc0b9b197e4a4f97b573b4c6bc19a8fb49239d8f09717181
+EBUILD qtile-0.29.0.ebuild 2663 BLAKE2B cad5e3b1a0149cff278b0e8584a742c522781276ec82a795f73450e8dd33572052a0edb8fa925829396f2c4f2ea146ea782640cabea8fbb37d74fd7349de11ad SHA512 214db99739d5261b1dc9178c83ea292ef33d3d1668cf500ae2b45cf2686b6537b02b27bacc240cedc578fab2d1f68ca1ce4ceb908fb0bec47c6d6b0a887c8c84
 MISC metadata.xml 422 BLAKE2B 10ddda5d4485b4a3c76ff658a41e2b4ea6004413ea3d2d9d4b088a7a25de36e167ae70505c195467c2401df0396a40e2301cc29a25e7e4097ed20cc6335e8956 SHA512 5f5aeecab841345abe98b87180644e60f8e52a12fc2c354cdd3678d8ad5c8c1ba13790a1bc6fa5662587714f3af9566f6adbdbc355b18d632d0ffa3eb4e83106
diff --git a/x11-wm/qtile/qtile-0.28.1.ebuild b/x11-wm/qtile/qtile-0.28.1.ebuild
index d54d02a7d1a4..7bd2f780e08e 100644
--- a/x11-wm/qtile/qtile-0.28.1.ebuild
+++ b/x11-wm/qtile/qtile-0.28.1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	x11-libs/pango
 	pulseaudio? (
 		dev-python/pulsectl-asyncio[${PYTHON_USEDEP}]
-		media-sound/pulseaudio
+		media-libs/libpulse
 	)
 	wayland? (
 		>=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}]
diff --git a/x11-wm/qtile/qtile-0.29.0.ebuild b/x11-wm/qtile/qtile-0.29.0.ebuild
new file mode 100644
index 000000000000..c9f1f6fd843e
--- /dev/null
+++ b/x11-wm/qtile/qtile-0.29.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
+HOMEPAGE="
+	https://qtile.org/
+	https://github.com/qtile/qtile/
+	https://pypi.org/project/qtile/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pulseaudio wayland"
+
+DEPEND="
+	>=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/dbus-next[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	>=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}]
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango
+	pulseaudio? (
+		dev-python/pulsectl-asyncio[${PYTHON_USEDEP}]
+		media-libs/libpulse
+	)
+	wayland? (
+		>=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}]
+		>=dev-python/pywlroots-0.17[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/libcst[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[X]
+		x11-base/xorg-server[xephyr,xvfb]
+	)
+	wayland? (
+		>=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}]
+		>=dev-python/pywlroots-0.17[${PYTHON_USEDEP}]
+	)
+"
+
+: ${EPYTEST_TIMEOUT:=180}
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s/can_import(\"wlroots.ffi_build\")/$(usex wayland True False)/" \
+		-i setup.py || die
+
+	mkdir bin || die
+}
+
+src_compile() {
+	local -x CFFI_TMPDIR=${T}
+	distutils-r1_src_compile
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# mypy stuff
+		test/test_check.py
+		test/migrate/test_check_migrations.py
+		# TODO: this test clearly requires x11 — so why is wayland
+		# variant being run?
+		'test/backend/x11/test_window.py::test_urgent_hook_fire[wayland-2]'
+		# TODO
+		test/test_hook.py::test_net_wm_icon_change
+	)
+
+	# force usage of built module
+	rm -rf libqtile || die
+
+	# some tests expect bin/qtile
+	ln -fs "$(type -P qtile)" bin/qtile || die
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+	nonfatal epytest -p rerunfailures --reruns=5 \
+		--backend=x11 $(usev wayland '--backend=wayland') ||
+		die -n "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG README.rst )
+	distutils-r1_python_install_all
+
+	insinto /usr/share/xsessions
+	doins resources/qtile.desktop
+
+	insinto /usr/share/wayland-sessions
+	doins resources/qtile-wayland.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session-r1 ${PN}
+}