gentoo resync : 15.01.2020

5 files changed, 27 insertions, 99 deletions

diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 2fba58e7f19f..ce766ea8a915 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -3,10 +3,11 @@ AUX polybar-3.3.1-gcc9.patch 1363 BLAKE2B 77c1880a87790218fbb4550e2f09c968574c52
 AUX polybar-3.3.1-i3ipcpp-gcc9.patch 1107 BLAKE2B 9fae68b6d05387c12fe9eb039fb503e704a6686d117b210bad924ca20e601b6ceb00749a5625c975315609b7c754af612983f45674fae1e652717e274ca6942e SHA512 fb695c4aebf5a8660b4ef756c6f434d220d6eb6f3ce905dfed8a7451fc6424c776dc4418ba81a717b9ad6a71c6b165b6740d56fb01afb4cc2e0c3a18a8d53f91
 AUX polybar-3.3.1-xpp-gcc9.patch 736 BLAKE2B e041631bcd110768edf6c56864d574082436f23419bc058f4640e6e19f04ee00301480b9638dc078be4feb1e0430010f6b74cb05205f2d35b9f599bf9523d023 SHA512 cc84e00c13f42b36791e63ae0fad0a51ec3035dc2ebc7d56d7eb0cb895c172741a3173283ded6291cdbea890fd6fb0aedd7aad97d15cfb91ec725e61d9ee9c27
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
-DIST polybar-3.2.1.tar.gz 242327 BLAKE2B eb7bfe6e6d58fb4389016b8e5c73feea3984ce3ccefdb1acf202c6d2873a634e4d096658b850e8534c5c8c56e42ac66b3b8e80dabf5625491e5f56523b043ddf SHA512 e93c33738029b2e56a5dda75cbf3ee804c0d89c406444da6991ea8a5dd00e5544ef51d20f3d67ec293fc55ab7095e8e3057aaf8d1c08af61cf0531297e55a18d
+DIST i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz 191599 BLAKE2B 85488a6c2ab9c6f653b499ceaa6d8e803dd8b32cd701a7fbbe151f7f3ea2dc30555c520ded53f023a21b119be97c2b07ae1ab413479cfde677e2073f3d48e36b SHA512 0000ba136bd531899ce9e87d458bd6f7d16f45509def37e4fd7aafc16d0e122fe5f56d0eb9dbc3e722dbb6c9812913a7aafa4b749a9c727ab0988908b1e2a425
 DIST polybar-3.3.1.tar.gz 248790 BLAKE2B 30c2cd2ff537f3a2fe2fe7ce489b5a0ab76a54cd42bbdf8b3727e5f4298898e289c6ea10a460385d8bcdc8ab11749255573bf7d728a01eae895a1ed8a2214c27 SHA512 c0bfaf99dcd19f8fcca8bd041c0f9e5f11fb822c92cf12edc2c59e67896f566ee46d1a0d75f5583d393af3a1958c3244a4eb28224f6336e9eaa98a50d740f834
+DIST polybar-3.4.2.tar.gz 253194 BLAKE2B 136dd32d524902fccbf9db2b2fa8ed582d45565aa0e834af9610e6f692ef70d3e5e066c6021060df9cedf2e1aa2c92753e4fc4ce9c0935795ef4b0056c273687 SHA512 2205847ebc03040e8d2a2581d2c70e940157c5dba71e0c2d086c0f0971a6ffd83c42846a85dd93165512f35710e3f3af8b4494bcd695f71ef0ac501f74753dfd
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
-EBUILD polybar-3.2.1.ebuild 1788 BLAKE2B c44044b3a7e3db34d10c9e018e52f192920f8a42fa6ea93e27c3cd0109143d8331c5f28e74958ed90fd569c632aa88257132c61625b0f5fb30cdfdb09f91b460 SHA512 db2abec6f14c08ed7beeff4fe90b2d832b5f249b64e5b0e4897316de597675bf06e4704ae8aa8635ec40fb3eca0e9be81c38889e82ddb7e98b73d99a69529980
-EBUILD polybar-3.3.1.ebuild 1995 BLAKE2B fd192654a14c2843fb90b0e18260923f74e443d1350a7b0cac97ac8d38c980537d160626a92f4ada943ab6f5e083b899c02804b16cb0b1005d763bb64186edee SHA512 4fc06d174eed2b8a0483c5f1dc179e5553985e5f6dec2283d093d7a676282005c5e94ebadc7d174f2ddf34e6e83847cc74d0a72b9b52d300bfa0c377b1e39023
-EBUILD polybar-9999.ebuild 1841 BLAKE2B a87b383b2af09f0f3bea7e62625c3308b6584f0c251fda9cdf7e1c71532e61dc89a3fa246fbbcf7a6a2dd231f67c2d28d4f5cbef535fbab769b04bf915f0e39e SHA512 2f0c7459c3a8cde6c492bfebf73df841aed24580ab3e6ab7df8582930dfb76912a1aa768d1e6c3b37a701d6d29ad013207298ba6811361636105ffc8ccb7ae76
-MISC metadata.xml 580 BLAKE2B 965fdbd2a3799e0c8a9b6f03bfb7e21f1f413a226bd4748d860f4711d60bfadc2d6c2fdb37f3bf9933f2c494e7e6e0c0705c9a0ebef943ec2978f3aaf65c0176 SHA512 15b64a04e588b5edeec9aa5e579881c3e7c5a7f3fb66ed4443f32d50b850c437f65bc9050960710f2bb1e80ea52ccca9ecb19e8bf68fe66edddc8896a58aeeb9
+DIST xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz 83974 BLAKE2B 6ea8599136288c006b6993bd6c704ec32d82773153733b4bc6a9c3f326eaf6f3b155d92f270eeb14d57b399f7b5ea0f6bdd5cee41bb5bdf4c1650f337b77f857 SHA512 92874b25305b3be777e739122ff82f1ba16b8e2e445e8ee4891918074ea8ea371f2016d7901cfc477d0286a9e15910c4cee431a11eb71e32728bfbf561313e4f
+EBUILD polybar-3.3.1-r1.ebuild 2000 BLAKE2B 25e5a1a09aebc6cf22e708fe0143855b3fe8e88e6245cf756226b5df99f6b6bfcea1cc69b25a05b4802d0a2a3cd66cb660f5f8dfd32622890a9c1dd63c87f84b SHA512 8c1561a3aea06fc221c1a9040b0ae9ac9ecee29ed906db5135e87374ef36fa3a3b3d02941a8f20818692e5bfc557475af63ecbec11ffc5fa9fad609af81d7a56
+EBUILD polybar-3.4.2-r1.ebuild 1777 BLAKE2B 4ae2551bec85db3081df235a8ec2c611d0f1308dcd6bdceaa55fa0abacb500bcf5d62123ce0ab3042e6760dbc9fb8a152b8d37ea051213cc8f3615c457b4c8b8 SHA512 7b44b4d2687f95f11585ce062797346db58a98e93a235b73dddd7e05fb578a07c2f5093a1ff25ac3df1d07d5204195ba593ffbc8c776b403a2c937be70fa125a
+MISC metadata.xml 582 BLAKE2B bd70511d8795f71413b5134b7f2203882a3f7ef8e190ef05b109baf9d1164a47fd4ec9f3f955076cf3634fea7469990b1a725bf151f03a0112604113633262a9 SHA512 447e0e0dfa1cc9563ef6399d6fbd4c1bc49db4eac60263ce6abc1d7b488f3881247b74e16f421ef73061ebbd285491d271554cc468e4a44a9c9f9f25b08e1b3a
diff --git a/x11-misc/polybar/metadata.xml b/x11-misc/polybar/metadata.xml
index 7a2477b509ec..39fc36198607 100644
--- a/x11-misc/polybar/metadata.xml
+++ b/x11-misc/polybar/metadata.xml
@@ -12,6 +12,6 @@
 		<flag name="network">Enable network support</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">jaagr/polybar</remote-id>
+		<remote-id type="github">polybar/polybar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/polybar/polybar-3.3.1.ebuild b/x11-misc/polybar/polybar-3.3.1-r1.ebuild
index 9601feaf9222..38ba2d04f079 100644
--- a/x11-misc/polybar/polybar-3.3.1.ebuild
+++ b/x11-misc/polybar/polybar-3.3.1-r1.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-wm
diff --git a/x11-misc/polybar/polybar-3.2.1.ebuild b/x11-misc/polybar/polybar-3.4.2-r1.ebuild
index 480c094886de..0c63677028ce 100644
--- a/x11-misc/polybar/polybar-3.2.1.ebuild
+++ b/x11-misc/polybar/polybar-3.4.2-r1.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
+PYTHON_COMPAT=( python3_{6,7,8} )
+XPP_COMMIT="8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33"
+I3IPCPP_COMMIT="21ce9060ac7c502225fdbd2f200b1cbdd8eca08d"
 inherit cmake-utils python-single-r1
 
-XPP_VERSION="1.4.0"
-I3IPCPP_VERSION="0.7.1"
-
 DESCRIPTION="A fast and easy-to-use tool for creating status bars"
-HOMEPAGE="https://github.com/jaagr/polybar"
-SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
-	https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz
-"
+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"
-KEYWORDS="amd64 x86"
 
 IUSE="alsa curl i3wm ipc mpd network pulseaudio"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -26,14 +24,17 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
-	x11-libs/cairo[xcb]
+	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 )
-	i3wm? ( dev-libs/jsoncpp )
+	i3wm? (
+		dev-libs/jsoncpp
+		|| ( x11-wm/i3 x11-wm/i3-gaps )
+	)
 	mpd? ( media-libs/libmpdclient )
 	network? ( net-wireless/wireless-tools )
 	pulseaudio? ( media-sound/pulseaudio )
@@ -42,15 +43,13 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
-
 	rmdir "${S}"/lib/xpp || die
-	mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
+	mv "${WORKDIR}"/xpp-$XPP_COMMIT "${S}"/lib/xpp || die
 
 	rmdir "${S}"/lib/i3ipcpp || die
-	mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
+	mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_COMMIT "${S}"/lib/i3ipcpp || die
 
-	sed -i "s/.*cpp_error,.*/&\n\t  'eventstruct'   : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
+	cmake-utils_src_prepare
 }
 
 src_configure() {
@@ -63,5 +62,6 @@ src_configure() {
 		-DENABLE_NETWORK="$(usex network)"
 		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
 	)
+
 	cmake-utils_src_configure
 }
diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild
deleted file mode 100644
index adddc936af65..000000000000
--- a/x11-misc/polybar/polybar-9999.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="A fast and easy-to-use tool for creating status bars"
-HOMEPAGE="https://github.com/jaagr/polybar"
-
-if [[ ${PV} != *9999* ]]; then
-	XPP_VERSION="1.4.0"
-	I3IPCPP_VERSION="0.7.1"
-	SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
-		https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
-	EGIT_CLONE_TYPE="shallow"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="alsa curl i3wm ipc mpd network pulseaudio"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	x11-base/xcb-proto
-	x11-libs/cairo[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 )
-	i3wm? ( dev-libs/jsoncpp )
-	mpd? ( media-libs/libmpdclient )
-	network? ( net-wireless/wireless-tools )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if [[ ${PV} != *9999* ]]; then
-		rmdir "${S}"/lib/xpp || die
-		mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
-
-		rmdir "${S}"/lib/i3ipcpp || die
-		mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_ALSA="$(usex alsa)"
-		-DENABLE_CURL="$(usex curl)"
-		-DENABLE_I3="$(usex i3wm)"
-		-DBUILD_IPC_MSG="$(usex ipc)"
-		-DENABLE_MPD="$(usex mpd)"
-		-DENABLE_NETWORK="$(usex network)"
-		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
-	)
-
-	cmake-utils_src_configure
-}