gentoo resync : 02.02.2022

3 files changed, 3 insertions, 76 deletions

diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index f7d12d452885..6f29fa38b9ac 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,7 +1,5 @@
 DIST i3ipcpp-86ddf7102c6903ae0cc543071e2d375403fc0727.tar.gz 43693 BLAKE2B a84525b0bd00d4ab4ed8afed00fd92eee965efea9960670dcea3efaa259834df5bb7cf8e79a894dd4d4f92f28643ad1b43ccbb374ade96174c6c2f6fc63f5ddc SHA512 f4643bea5a78bd9518fecc9d56ece8d679539b99016440a6e4d45305984c02963d80e00c5375cc53ac7418e2f24f57279930428b331e077eaafa8d0717677662
-DIST polybar-3.5.6.tar.gz 282964 BLAKE2B 518e8b2e1d2e0698540c4c93cdfce5283c5479b077859dfc98d57072ad23f6140cc2e7d34c34f5af71aeaf9e86642d111f409c53baba0b9398d923ad9b4058a4 SHA512 5022f7876489cc28805a52894c8ea42c2afc0600c84f6ce27f1a7c738fcc48fbf5f5d5537472378eae4f3d5ca36fc2fc8b069b379e35b1047d12a3b294e1857f
 DIST polybar-3.5.7.tar.gz 283520 BLAKE2B 3f7cad2886c0f8352b92e636035607b2abab6dafd0966e6edb9f3b768fc6e5b180be2479f81812eb792f66edada6fe2625af5c3ecc9216763c141a393ab90474 SHA512 6336613d37ae45ca43d1cc2e1e2126bcd09247dbf81b3df979def44b240e2a736035503cf5aaeff0a86c830deb956f9ef7057c7fa1ac3da5119b8e6c1db0fe7f
 DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
-EBUILD polybar-3.5.6.ebuild 1903 BLAKE2B a6256133894fe5e4d8ec5d66c47411376246b65406d5260a6973c5a2d7fc198319e54d767846a96b238feaba64de877013eb44acb86cf0d3688f72bfd317686e SHA512 1e772151348fb9029517f184f30adcbcc1700b1a7176b487b368ceb7dd61e224dd82842af20f7beba471ffabc053d8cdd87be3fe8ea4b2d3dfef5a687d9a79a2
-EBUILD polybar-3.5.7.ebuild 1903 BLAKE2B a6256133894fe5e4d8ec5d66c47411376246b65406d5260a6973c5a2d7fc198319e54d767846a96b238feaba64de877013eb44acb86cf0d3688f72bfd317686e SHA512 1e772151348fb9029517f184f30adcbcc1700b1a7176b487b368ceb7dd61e224dd82842af20f7beba471ffabc053d8cdd87be3fe8ea4b2d3dfef5a687d9a79a2
+EBUILD polybar-3.5.7.ebuild 1905 BLAKE2B 9239ffab8b1f236a31ecd6e9c9413e587dc573a6b2878a16e0c1b676d6964f01a6cdc3581c7e037e07a842fe4ddaca663632e9ca782b38d86bf071e036f91488 SHA512 ac44318bc96f3dafc012902c31143b5ed83e108733ed9a6b5174fb3283314240498346d5131d491f9917c3cd9ec3eb715bb71c0219a69d03cb2199bb260e0b66
 MISC metadata.xml 585 BLAKE2B c792f265587effc07acc20f097adc1a1975d23ddf55ceb07b4bda02e61e1b48b1d20c5a07792ac18fa5f02949e0a88bc18fe6df2fffd9454406cda34ac33654b SHA512 c3f9080f68d989dbfd75492ec0c4870e4df9b0525a69256ac95bf55eea60022ac018cc1afe42677bc8f822beec75d137e1e7c8a876763c72664541a0a54b28f1
diff --git a/x11-misc/polybar/polybar-3.5.6.ebuild b/x11-misc/polybar/polybar-3.5.6.ebuild
deleted file mode 100644
index d36b8fef936b..000000000000
--- a/x11-misc/polybar/polybar-3.5.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6"
-I3IPCPP_COMMIT="86ddf7102c6903ae0cc543071e2d375403fc0727"
-
-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}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/polybar/xpp/archive/${XPP_COMMIT}.tar.gz -> xpp-${XPP_COMMIT}.tar.gz
-	https://github.com/polybar/i3ipcpp/archive/${I3IPCPP_COMMIT}.tar.gz -> i3ipcpp-${I3IPCPP_COMMIT}.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}]')
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	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? ( net-wireless/wireless-tools )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rmdir "${S}/lib/xpp" || die
-	mv "${WORKDIR}/xpp-${XPP_COMMIT}" "${S}/lib/xpp" || die
-
-	rmdir "${S}/lib/i3ipcpp" || die
-	mv "${WORKDIR}/i3ipcpp-${I3IPCPP_COMMIT}" "${S}/lib/i3ipcpp" || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_ALSA="$(usex alsa)"
-		-DENABLE_CURL="$(usex curl)"
-		-DBUILD_DOC="$(usex doc)"
-		-DENABLE_I3="$(usex i3wm)"
-		-DBUILD_IPC_MSG="$(usex ipc)"
-		-DENABLE_MPD="$(usex mpd)"
-		-DENABLE_NETWORK="$(usex network)"
-		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
-		# Bug 767949
-		-DENABLE_CCACHE="OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/x11-misc/polybar/polybar-3.5.7.ebuild b/x11-misc/polybar/polybar-3.5.7.ebuild
index d36b8fef936b..0086e86f6492 100644
--- a/x11-misc/polybar/polybar-3.5.7.ebuild
+++ b/x11-misc/polybar/polybar-3.5.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6"
 I3IPCPP_COMMIT="86ddf7102c6903ae0cc543071e2d375403fc0727"