4 files changed, 3 insertions, 65 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index a0f44c961884..85e118fa6acb 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 7dddb30504d9..155e88d88328 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,5 +1,4 @@
 AUX polybar-3.6.3-fix-prefix.patch 350 BLAKE2B b5c1e349557ebf1ceb930564b5ab4f687c6f2c6d2f4adc9cff787f43a03b5e0d8d08dd0202f4b6c2c90f97e1ac9f94faa32bfea30f58d1ce05b658ef80bf02b5 SHA512 07da5e5409cee75f7bf32dfd4fafc8b9735d9f5a85e53cb1eae330030fb50c6a2c923a03c5703d923087994d2ed8665d09674c8028f1d28346a7289317f9195b
 DIST polybar-3.6.3.tar.gz 439838 BLAKE2B 522e95bb11e947008f0909401a769ba7ef44733e7edb4a067185bad610ac70077e1370e0e9da9fbff27b9f981b5285561f7c86e12fc5da79c383d794da6b4a86 SHA512 d8e08d2b217a353b967f58eb61907b05ed7b9c2b9e1b3a891f4cac91b37f1cf751b10b1e93e74e6414eb0beb1696f4ae64a0a43bfc6c0afa3863b72293217c2e
-EBUILD polybar-3.6.3-r1.ebuild 1568 BLAKE2B b4e124104fe2bc36ca90fa5ffe3e8309eff95f87d76bb0b420c9b4ace7617428cd9c815eeeec3420436dcbb336fc54ed23b212c7392a5b94da8b8dbaa95c7d42 SHA512 3202091e40de5251f2ec6cead882023d0e794afea7a4a979f2bae02a587a7bded3c0502519ca12c717870a9461466f4735376b5f8396eec9cace69a5f5dc4e3f
-EBUILD polybar-3.6.3.ebuild 1472 BLAKE2B 9c993dbd1171d6d96a4f0f69c1f217cbb88d53236f2be20cf02dd29ed6dbf1b30a7410c85ff1c9d37e5f70c14d347f7a0bd150fcaf993f546e90b0110073641c SHA512 f04c533c3349593dbf6eb17251c94bad8dd0d74415436c5cd9ad725c90be455c07391e4019096521573740016ccbbf8149c067cb04778d80a569bff10e331ac8
+EBUILD polybar-3.6.3-r2.ebuild 1563 BLAKE2B b78a98cc413f9ee7b6c85e857bd1b5b03dc35c647e74144e1b4017ff9acabd475c3a1531c07d231c402ca061ad1b055b805285939c4df19b71d846b1efdc9a75 SHA512 c3e020a0d7f49aa4119dabe875885d6091158f8ee46d9f34e959b63a3a3635286fe53b54114d65432be3860a62716a8d9282320f39db3b225f05a19c194cbc46
 MISC metadata.xml 585 BLAKE2B c792f265587effc07acc20f097adc1a1975d23ddf55ceb07b4bda02e61e1b48b1d20c5a07792ac18fa5f02949e0a88bc18fe6df2fffd9454406cda34ac33654b SHA512 c3f9080f68d989dbfd75492ec0c4870e4df9b0525a69256ac95bf55eea60022ac018cc1afe42677bc8f822beec75d137e1e7c8a876763c72664541a0a54b28f1
diff --git a/x11-misc/polybar/polybar-3.6.3-r1.ebuild b/x11-misc/polybar/polybar-3.6.3-r2.ebuild
index 8d59630c7314..e66908d8d41a 100644
--- a/x11-misc/polybar/polybar-3.6.3-r1.ebuild
+++ b/x11-misc/polybar/polybar-3.6.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake python-single-r1
 
@@ -24,7 +24,7 @@ DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb:=[xkb]
+	x11-libs/libxcb:=
 	x11-libs/xcb-util
 	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-image
diff --git a/x11-misc/polybar/polybar-3.6.3.ebuild b/x11-misc/polybar/polybar-3.6.3.ebuild
deleted file mode 100644
index 770a50edd7b5..000000000000
--- a/x11-misc/polybar/polybar-3.6.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="A fast and easy-to-use tool for creating status bars"
-HOMEPAGE="https://github.com/polybar/polybar"
-SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]')
-	dev-libs/libuv:=
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb:=[xkb]
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	doc? ( dev-python/sphinx )
-	i3wm? (
-		dev-libs/jsoncpp:=
-		|| ( x11-wm/i3 x11-wm/i3-gaps )
-	)
-	mpd? ( media-libs/libmpdclient )
-	network? ( dev-libs/libnl:3 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_ALSA="$(usex alsa)"
-		-DENABLE_CURL="$(usex curl)"
-		-DBUILD_DOC="$(usex doc)"
-		-DENABLE_I3="$(usex i3wm)"
-		-DBUILD_POLYBAR_MSG="$(usex ipc)"
-		-DENABLE_MPD="$(usex mpd)"
-		-DENABLE_NETWORK="$(usex network)"
-		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
-		# Bug 767949
-		-DENABLE_CCACHE="OFF"
-	)
-
-	cmake_src_configure
-}