gentoo resync : 17.02.2020

7 files changed, 3 insertions, 230 deletions

diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index ce766ea8a915..cf5043038dcc 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,13 +1,5 @@
-AUX polybar-3.3.1-eventstruct.patch 1703 BLAKE2B ea25a8a04c511f51eaf6097f2662119c4d3d63aff08a128512a46b51806b686b7086aa2e202368edc40db279bba390a3e86cf48635ea1e53ca242b8b91aae8e1 SHA512 fe50c627b3375525441867ff4d7b7ecd3d60342b61545fc8e85db0dc708f41d9c94f660ab460675f009770049c01e5ab2ed84be3ee77cdd778b731482e3c9ada
-AUX polybar-3.3.1-gcc9.patch 1363 BLAKE2B 77c1880a87790218fbb4550e2f09c968574c52f2efc45bc5c8c42edb2041490b0b8772b523d18a95f0c05796fbd178bb0c1fcd760373989109c23465624a3b5b SHA512 b99aafb383a2279a19e860ab1b2baf93ff859888f5599bce93d6eec577a1a897c3ba23a34ab61e9e14c72946f6c97204f7f710cd0ae689c61d96ffd22a589fd6
-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 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
 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
+EBUILD polybar-3.4.2-r1.ebuild 1824 BLAKE2B 7c4b4365b75d2d4d6103f2231810f5e7189f06fd170ecf06150b687f5802359db8992dfab2ee7ab3b1a41e5a6efa6a1a7732544b2708941e8c5e764f042a77b7 SHA512 19cbde22158c9e5c8924c5ee4f706473ae900c9d7e42466ab25c24ea63dc4deffccc7821868130ec97211c35c1560a6270220b18cea7252d86f7fd351695e1d7
 MISC metadata.xml 582 BLAKE2B bd70511d8795f71413b5134b7f2203882a3f7ef8e190ef05b109baf9d1164a47fd4ec9f3f955076cf3634fea7469990b1a725bf151f03a0112604113633262a9 SHA512 447e0e0dfa1cc9563ef6399d6fbd4c1bc49db4eac60263ce6abc1d7b488f3881247b74e16f421ef73061ebbd285491d271554cc468e4a44a9c9f9f25b08e1b3a
diff --git a/x11-misc/polybar/files/polybar-3.3.1-eventstruct.patch b/x11-misc/polybar/files/polybar-3.3.1-eventstruct.patch
deleted file mode 100644
index 93bf034f7de0..000000000000
--- a/x11-misc/polybar/files/polybar-3.3.1-eventstruct.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 00165e1a6d5dd61bc153e1352b21ec07fc81245d Mon Sep 17 00:00:00 2001
-From: patrick96 <p.ziegler96@gmail.com>
-Date: Sun, 11 Feb 2018 21:27:52 +0100
-Subject: [PATCH] fix(generators): Add support for eventstruct
-
-Newer xcb-proto commits after the 1.12 release require the 'eventstruct'
-key in the output dictionary, otherwise the generator crashes.
-
-I don't see a need for xpp to actually support the eventstruct key and
-thus it uses a NOP lambda function
----
- generators/cpp_client.py | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/generators/cpp_client.py b/generators/cpp_client.py
-index 20d116f..709e8d8 100644
---- a/lib/xpp/generators/cpp_client.py
-+++ b/lib/xpp/generators/cpp_client.py
-@@ -3130,15 +3130,16 @@ def cpp_type_classes():
- #           }
- 
- # Must create an "output" dictionary before any xcbgen imports.
--output = {'open'    : c_open,
--          'close'   : c_close,
--          'simple'  : c_simple, # lambda x, y: None,
--          'enum'    : lambda x, y: None,
--          'struct'  : lambda x, y: None,
--          'union'   : lambda x, y: None,
--          'request' : c_request,
--          'event'   : cpp_event,
--          'error'   : cpp_error,
-+output = {'open'          : c_open,
-+          'close'         : c_close,
-+          'simple'        : c_simple, # lambda x, y: None,
-+          'enum'          : lambda x, y: None,
-+          'struct'        : lambda x, y: None,
-+          'union'         : lambda x, y: None,
-+          'request'       : c_request,
-+          'event'         : cpp_event,
-+          'error'         : cpp_error,
-+          'eventstruct'   : lambda x, y: None,
-           }
- 
- # Boilerplate below this point
diff --git a/x11-misc/polybar/files/polybar-3.3.1-gcc9.patch b/x11-misc/polybar/files/polybar-3.3.1-gcc9.patch
deleted file mode 100644
index 7df7b99fa653..000000000000
--- a/x11-misc/polybar/files/polybar-3.3.1-gcc9.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8b648b9265ed6f09802bd749ec8bf74181032b39 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20BOULMIER?= <jerome.boulmier@outlook.fr>
-Date: Sun, 7 Apr 2019 02:10:38 -0400
-Subject: [PATCH] fix(window): remove useless operator= and add default copy
- cstr
-
----
- include/x11/window.hpp | 3 +--
- src/x11/window.cpp     | 5 -----
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/include/x11/window.hpp b/include/x11/window.hpp
-index 9490c3760..9ddfe9f45 100644
---- a/include/x11/window.hpp
-+++ b/include/x11/window.hpp
-@@ -12,10 +12,9 @@ class connection;
- 
- class window : public xpp::window<connection&> {
-  public:
-+  window(const window&) = default;
-   using xpp::window<class connection&>::window;
- 
--  window& operator=(const xcb_window_t win);
--
-   window reconfigure_geom(unsigned short int w, unsigned short int h, short int x = 0, short int y = 0);
-   window reconfigure_pos(short int x, short int y);
-   window reconfigure_struts(unsigned short int w, unsigned short int h, short int x, bool bottom = false);
-diff --git a/src/x11/window.cpp b/src/x11/window.cpp
-index e22e4451e..35393ddc8 100644
---- a/src/x11/window.cpp
-+++ b/src/x11/window.cpp
-@@ -7,11 +7,6 @@
- 
- POLYBAR_NS
- 
--window& window::operator=(const xcb_window_t win) {
--  resource(connection(), win);
--  return *this;
--}
--
- /**
-  * Reconfigure the window geometry
-  */
diff --git a/x11-misc/polybar/files/polybar-3.3.1-i3ipcpp-gcc9.patch b/x11-misc/polybar/files/polybar-3.3.1-i3ipcpp-gcc9.patch
deleted file mode 100644
index beb0461885bc..000000000000
--- a/x11-misc/polybar/files/polybar-3.3.1-i3ipcpp-gcc9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d4e4786be35b48d72dc7e59cf85ec34a90d129b5 Mon Sep 17 00:00:00 2001
-From: patrick96 <p.ziegler96@gmail.com>
-Date: Sun, 6 May 2018 18:25:32 +0200
-Subject: [PATCH] fix(gcc): Fix -Wstringop-truncation warning
-
-As mentioned in [1], gcc >=8 will complain, if strncpy truncates the
-source string or gcc can prove there is no NUL terminating byte.
-
-The header_t.magic field is a non-NUL terminated 6 byte string, so we
-use memcpy here
-
-[1] https://github.com/jaagr/polybar/issues/1215
----
- src/ipc-util.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ipc-util.cpp b/src/ipc-util.cpp
-index 2e8ac8e..d9851ee 100644
---- a/lib/i3ipcpp/src/ipc-util.cpp
-+++ b/lib/i3ipcpp/src/ipc-util.cpp
-@@ -34,7 +34,7 @@ buf_t::buf_t(uint32_t  payload_size) : size(sizeof(header_t) + payload_size) {
- 	data = new uint8_t[size];
- 	header = (header_t*)data;
- 	payload = (char*)(data + sizeof(header_t));
--	strncpy(header->magic, g_i3_ipc_magic.c_str(), sizeof(header->magic));
-+	memcpy(header->magic, g_i3_ipc_magic.c_str(), sizeof(header->magic));
- 	header->size = payload_size;
- 	header->type = 0x0;
- }
diff --git a/x11-misc/polybar/files/polybar-3.3.1-xpp-gcc9.patch b/x11-misc/polybar/files/polybar-3.3.1-xpp-gcc9.patch
deleted file mode 100644
index f80a72f12793..000000000000
--- a/x11-misc/polybar/files/polybar-3.3.1-xpp-gcc9.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d2ff2aaba6489f606bbcc090c0a78a8a3f9fcd1f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20BOULMIER?= <jerome.boulmier@outlook.fr>
-Date: Sun, 7 Apr 2019 10:34:32 -0400
-Subject: [PATCH] fix(window): add default copy cstr (#16)
-
-The copy constructor must be declared explicitly since the implicit declaration is deprecated.
-Ref jaagr/polybar#1729.
----
- include/xpp/window.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/xpp/window.hpp b/include/xpp/window.hpp
-index e5c6503..3e53074 100644
---- a/lib/xpp/include/xpp/window.hpp
-+++ b/lib/xpp/include/xpp/window.hpp
-@@ -23,6 +23,7 @@ class window
-     {}
- 
-   public:
-+    window(const window&) = default;
-     using base::base;
-     using base::operator=;
- 
diff --git a/x11-misc/polybar/polybar-3.3.1-r1.ebuild b/x11-misc/polybar/polybar-3.3.1-r1.ebuild
deleted file mode 100644
index 38ba2d04f079..000000000000
--- a/x11-misc/polybar/polybar-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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[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 )
-	mpd? ( media-libs/libmpdclient )
-	network? ( net-wireless/wireless-tools )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-eventstruct.patch"
-	"${FILESDIR}/${P}-gcc9.patch"
-	"${FILESDIR}/${P}-xpp-gcc9.patch"
-	"${FILESDIR}/${P}-i3ipcpp-gcc9.patch"
-)
-
-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
-}
diff --git a/x11-misc/polybar/polybar-3.4.2-r1.ebuild b/x11-misc/polybar/polybar-3.4.2-r1.ebuild
index 0c63677028ce..1e8fb05ec227 100644
--- a/x11-misc/polybar/polybar-3.4.2-r1.ebuild
+++ b/x11-misc/polybar/polybar-3.4.2-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	x11-base/xcb-proto
+	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_MULTI_USEDEP}]')
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image