gentoo resync : 14.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-14 13:26:14 +0000
commit: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree: 25413d1cb3a0cbfe36029db32398c0f333609215 /x11-plugins
parent: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
30 files changed, 465 insertions, 96 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 677b1826caa4..31131660e99e 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/lurch/Manifest b/x11-plugins/lurch/Manifest
index 45fe8a9090f1..9c4417b2ed02 100644
--- a/x11-plugins/lurch/Manifest
+++ b/x11-plugins/lurch/Manifest
@@ -1,3 +1,9 @@
+AUX lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch 2825 BLAKE2B 8cb3e1607a60692e0175bda4de04414f9b966e25641d73d1f27a3c5565a4c2ec0dfb4fd73b10ceafdd870093a597ee88713a5e564f2576a2e8b85410e9a70ea5 SHA512 0459141ab02fea8a6aa95a22ef04e0202d5a2b1a907a292337177a2dff723162a687f2ca64542a81561ecc5022312cbd97ec6f74488a748d03cf42660b403a06
+AUX lurch-0.6.8-libsignal-protocol-c.patch 2413 BLAKE2B 325972068267a455536b883ec4bb8c91a348c1d08440d9d09f0e3b88fbf35d6f1aea14bb410fad2b0ee88a84844170eeabc9f4a4f39a27a90e30e8e31f794a40 SHA512 5d237a46d13dd67e379bb8b671cc1b1edbd7e11abe64eb3fd19b80c82ea4fe543e6170030a50601132ce707e075f60f6042eb2d4346364b221aae022dac67ef4
+DIST axc-0.3.3.tar.gz 39497 BLAKE2B 7f13f2ee6bb98fecc3ff5ddb726e19d412d588613be50e6666e8bfdcf248e842b97c00cccbc19fef55c0df50053e0b80539f0573dfa7a54a8c88725735382bc6 SHA512 9fe494eb4a264a31c137a4f21e4a53358d55f6f6b3bd2fab0fbe43c0e85f2372127a2a85d00d2e308f3785b30cf8161de3f696aaf71c232f594ef3c54b8f6771
+DIST libomemo-0.7.0.tar.gz 23678 BLAKE2B 91b57f6c93d5f777996687ea0648d996950bc893314e4e3ee02973c70165a9e533ab6980a420bd270d7a4acaa45da7cf83b401b69e2b305b017a3fbb42d5b4d2 SHA512 f9843a35958e4a7930ed9e9f4bef1e765bd51721d6e79d2c092bad86d26f092d22d1cdd4df1c4017b9434bb84c33e226985136d35dfcbcf9b915eb3cae862fa5
 DIST lurch-0.6.8.tar.gz 398267 BLAKE2B 23211e82b80e26105f0d62510dc321abdd818eae21dd9f3e24f6ab01458748df64283acb99371a8ece34248f06e9e04edd35da30c771f45779474b3b43c3a53d SHA512 8b93523049d05a00f1d7286ec9d0d8d03c7ae46793ac72ea08c0d12cb5193324be4805fb6278d6c0f906d9c63db9d7ce6ca2a21442236df51e0ee0b48de6ef1d
+EBUILD lurch-0.6.8-r1.ebuild 2006 BLAKE2B 9baebff09485494eedbb088b70d05c3c856817fbeb6540a0b5e7d7f49fe1b66961df1800ba5f4acdff23dc589f54e2c65705bfda6d29d1f0f23e7eb8f80c5939 SHA512 e47e148356c1e7d5b06f493ae636e7ccc741d51dc5520d0fc20c34a7c8738617741566da3cd3c19638cfaf3b9ab7253f3eb68a30d042e7a8d6df84e43d0dac73
+EBUILD lurch-0.6.8-r2.ebuild 2063 BLAKE2B 2742285436fab19c64317e57ea182e451966799a1724cf72e6b6977ef6d010f643e8ab32177cbeb0a69b96bfc8a37a16beea44b84b03e71fda61918853ea6edd SHA512 fdad83c1b8ee35ce10d87d1121c14e07661922095ddbbbc8529ec5692079d050f2de8f4481da6fbb309f963df8d692ee7d15507373244a9775a967df5b1d3690
 EBUILD lurch-0.6.8.ebuild 1718 BLAKE2B 5af54a0dc7bb979a814a93dde6b6b9afd05b3aa603599276db2983ecbd64fd129e8217b62cd1a2f8dea950def9da15242595f51f911eef9c3535dca67c26d1d2 SHA512 2fe714a97502f771a239937ba3af79610da1314ecd943f0ac1127afac2a143cf6b5cfe2181e4a01b8ef91979779a2b06ed46d0e1512396c2db8bf90d792b4d3b
 MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch b/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch
new file mode 100644
index 000000000000..261c3ac57c5b
--- /dev/null
+++ b/x11-plugins/lurch/files/lurch-0.6.8-axc-0.3.3-libsignal-protocol-c.patch
@@ -0,0 +1,91 @@
+From d5c2d8902ec268a1e6f8a9f5bd6fabde1e8ddf6a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 3 Dec 2020 23:59:00 +0100
+Subject: [PATCH] axc: Use system's libsignal-protocol-c shared library
+
+---
+ Makefile | 26 ++++++++++----------------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
+diff --git a/lib/axc/Makefile b/lib/axc/Makefile
+index 601e4fb..d08dd85 100644
+--- a/lib/axc/Makefile
++++ b/lib/axc/Makefile
+@@ -14,6 +14,9 @@ GLIB_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs glib-2.0)
+ SQLITE3_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags sqlite3)
+ SQLITE3_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs sqlite3)
+ 
++LIBSIGNAL_PROTOCOL_C_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c)
++LIBSIGNAL_PROTOCOL_C_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs libsignal-protocol-c)
++
+ LIBGCRYPT_CONFIG ?= libgcrypt-config
+ LIBGCRYPT_LDFLAGS ?= $(shell $(LIBGCRYPT_CONFIG) --libs)
+ 
+@@ -24,26 +27,24 @@ TDIR = test
+ TFN = test_all
+ CDIR = coverage
+ 
+-AX_DIR=./lib/libsignal-protocol-c
+-AX_BDIR=$(AX_DIR)/build/src
+-AX_PATH=$(AX_BDIR)/libsignal-protocol-c.a
+-
+ PKGCFG_C=$(GLIB_CFLAGS) \
+ 	 $(SQLITE3_CFLAGS) \
++	 $(LIBSIGNAL_PROTOCOL_C_CFLAGS) \
+ 	 $(LIBGCRYPT_CFLAGS)
+ 
+ PKGCFG_L=$(GLIB_LDFLAGS) \
+ 	 $(SQLITE3_LDFLAGS) \
++	 $(LIBSIGNAL_PROTOCOL_C_LDFLAGS) \
+ 	 $(LIBGCRYPT_LDFLAGS)
+ 
+-HEADERS=-I$(AX_DIR)/src
++HEADERS=
+ CFLAGS += $(HEADERS) $(PKGCFG_C) -std=c11 -g -Wall -Wextra -Wpedantic \
+ 		  -Wstrict-overflow -fno-strict-aliasing -funsigned-char \
+ 		  -fno-builtin-memset
+ CPPFLAGS += -D_XOPEN_SOURCE=700 -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE
+ TESTFLAGS=$(HEADERS) $(PKGCFG_C) -g -O0 --coverage
+ PICFLAGS=-fPIC $(CFLAGS)
+-LDFLAGS += -pthread -ldl $(PKGCFG_L) $(AX_PATH) -lm
++LDFLAGS += -pthread -ldl $(PKGCFG_L) -lm
+ LDFLAGS_T= -lcmocka $(LDFLAGS)
+ 
+ all: $(BDIR)/libaxc.a
+@@ -51,7 +52,7 @@ all: $(BDIR)/libaxc.a
+ $(BDIR):
+ 	$(MKDIR_P) $@
+ 
+-client: $(SDIR)/message_client.c $(BDIR)/axc_store.o $(BDIR)/axc_crypto.o $(BDIR)/axc.o $(AX_PATH)
++client: $(SDIR)/message_client.c $(BDIR)/axc_store.o $(BDIR)/axc_crypto.o $(BDIR)/axc.o
+ 	$(MKDIR_P) $@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@/$@.o $(LDFLAGS)
+ 
+@@ -73,15 +74,8 @@ $(BDIR)/libaxc.a: $(BDIR)/axc.o $(BDIR)/axc_crypto.o $(BDIR)/axc_store.o
+ $(BDIR)/libaxc-nt.a: $(BDIR)/axc-nt.o $(BDIR)/axc_crypto.o $(BDIR)/axc_store.o
+ 	$(AR) rcs $@ $^
+ 
+-$(AX_PATH):
+-	cd $(AX_DIR) && \
+-		$(MKDIR_P) build && \
+-		cd build && \
+-		$(CMAKE) $(CMAKE_FLAGS) ..  && \
+-		$(MAKE)
+-
+ .PHONY: test
+-test: $(AX_PATH) test_store test_client
++test: test_store test_client
+ 
+ .PHONY: test_store
+ test_store: $(SDIR)/axc_store.c $(SDIR)/axc_crypto.c $(TDIR)/test_store.c
+@@ -109,6 +103,6 @@ clean:
+ 	
+ .PHONY: clean-all
+ clean-all: clean
+-	rm -rf client $(BDIR) $(CDIR) $(AX_DIR)/build
++	rm -rf client $(BDIR) $(CDIR)
+ 
+ 
+-- 
+2.27.0
+
diff --git a/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch b/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch
new file mode 100644
index 000000000000..4b3de986154d
--- /dev/null
+++ b/x11-plugins/lurch/files/lurch-0.6.8-libsignal-protocol-c.patch
@@ -0,0 +1,92 @@
+From 72f286f389236fe99cb10fdeda3ee9b474de645d Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 4 Dec 2020 00:10:17 +0100
+Subject: [PATCH] lurch: Use system's libsignal-protocol-c shared library
+
+---
+ Makefile | 37 ++++++++++++++++++++++++-------------
+ 1 file changed, 24 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 32bc9c9..937401d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,16 +28,21 @@ LIBPURPLE_LDFLAGS=$(shell $(PKG_CONFIG) --cflags purple) \
+ XML2_CFLAGS ?= $(shell $(XML2_CONFIG) --cflags)
+ XML2_LDFLAGS ?= $(shell $(XML2_CONFIG) --libs)
+ 
++LIBSIGNAL_PROTOCOL_C_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c)
++LIBSIGNAL_PROTOCOL_C_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs libsignal-protocol-c)
++
+ LIBGCRYPT_LDFLAGS ?= $(shell $(LIBGCRYPT_CONFIG) --libs)
+ 
+ PKGCFG_C=$(GLIB_CFLAGS) \
+ 	 $(LIBPURPLE_CFLAGS) \
++	 $(LIBSIGNAL_PROTOCOL_C_CFLAGS) \
+ 	 $(XML2_CFLAGS)
+ 
+ 
+ PKGCFG_L=$(shell $(PKG_CONFIG) --libs sqlite3 mxml) \
+  	$(GLIB_LDFLAGS) \
+ 	 $(LIBPURPLE_LDFLAGS) \
++	 $(LIBSIGNAL_PROTOCOL_C_LDFLAGS) \
+ 	 $(XML2_LDFLAGS) \
+ 	 $(LIBGCRYPT_LDFLAGS)
+ 
+@@ -51,7 +56,7 @@ else
+ endif
+ endif
+ 
+-HEADERS=-I$(HDIR)/jabber -I$(LOMEMO_SRC) -I$(AXC_SRC) -I$(AX_DIR)/src
++HEADERS=-I$(HDIR)/jabber -I$(LOMEMO_SRC) -I$(AXC_SRC)
+ CFLAGS += -std=c11 -Wall -g -Wstrict-overflow $(PKGCFG_C) $(HEADERS)
+ PLUGIN_CPPFLAGS=-DPURPLE_PLUGINS
+ # -D_BSD_SOURCE can be removed once nobody uses glibc <= 2.18 any more
+@@ -79,26 +84,32 @@ AXC_SRC=$(AXC_DIR)/src
+ AXC_BUILD=$(AXC_DIR)/build
+ AXC_PATH=$(AXC_BUILD)/libaxc-nt.a
+ 
+-AX_DIR=$(AXC_DIR)/lib/libsignal-protocol-c
+-AX_PATH=$(AX_DIR)/build/src/libsignal-protocol-c.a
+-
+-VENDOR_LIBS=$(LOMEMO_PATH) $(AXC_PATH) $(AX_PATH)
++VENDOR_LIBS=$(LOMEMO_PATH) $(AXC_PATH)
+ 
+ 
+ ### make rules
+ #
+-all: $(BDIR)/lurch.so
++all: $(BDIR)/lurch.so $(BDIR)/linkdummy
++
++
++$(BDIR)/linkdummy.c:
++	echo 'int main() { return 0; }' > $@
++
++$(BDIR)/liblinklurch.so: $(BDIR)/lurch.so | $(BDIR)
++	ln -f $^ $@
++
++$(BDIR)/linkdummy: $(BDIR)/linkdummy.o $(BDIR)/liblinklurch.so
++	$(CC) \
++		$(shell $(PKG_CONFIG) --libs purple) \
++		-L$(BDIR) -llinklurch \
++		$^ \
++		-o $@ \
++		$(LDFLAGS)
++
+ 
+ $(BDIR):
+ 	$(MKDIR_P) build
+ 
+-$(AX_PATH):
+-	cd $(AX_DIR)/ && \
+-	   $(MKDIR_P) build && \
+-	   cd build && \
+-	   $(CMAKE) $(CMAKE_FLAGS) .. \
+-	   && $(MAKE)
+-
+ $(AXC_PATH):
+ 	$(MAKE) -C "$(AXC_DIR)" build/libaxc-nt.a
+ 
+-- 
+2.27.0
+
diff --git a/x11-plugins/lurch/lurch-0.6.8-r1.ebuild b/x11-plugins/lurch/lurch-0.6.8-r1.ebuild
new file mode 100644
index 000000000000..67d6325288cf
--- /dev/null
+++ b/x11-plugins/lurch/lurch-0.6.8-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_MAKEFILE_GENERATOR=emake  # since top-level Makefile expects a child Makefile
+
+inherit toolchain-funcs cmake-utils
+
+LIBOMEMO_PV=0.7.0
+DESCRIPTION="OMEMO encryption for libpurple (XEP-0384)"
+HOMEPAGE="https://github.com/gkdr/lurch"
+SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz -> ${P}.tar.gz
+	https://github.com/gkdr/libomemo/archive/v${LIBOMEMO_PV}.tar.gz -> libomemo-${LIBOMEMO_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# NOTE
+# - We cannot unbundle net-libs/libsignal-protocol-c
+#   because upstream uses non-API/internal function
+#   session_builder_process_pre_key_signal_message
+# - The build systems of axc (ex-libaxolotl)
+#   at https://github.com/gkdr/axc and libomemo
+#   at https://github.com/gkdr/libomemo build static
+#   libraries only (*.a) so it is not clear when or
+#   how to best unbundle them, either
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/libgcrypt:=
+	dev-libs/libxml2
+	dev-libs/mxml
+	net-im/pidgin:=
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	"
+
+CMAKE_USE_DIR="${S}"/lib/axc/lib/libsignal-protocol-c
+BUILD_DIR="${CMAKE_USE_DIR}"/build
+
+src_prepare() {
+	# Upgrade outdated bundle of libomemo
+	rm -R lib/libomemo || die
+	mv "${WORKDIR}"/libomemo-${LIBOMEMO_PV} lib/libomemo || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF  # top-level Makefile expects .a file
+		-DCMAKE_C_FLAGS=-fPIC
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		LIBGCRYPT_CONFIG="$(tc-getPROG LIBGCRYPT_CONFIG libgcrypt-config)"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		XML2_CONFIG="$(tc-getPROG XML2_CONFIG xml2-config)"
+
+		CMAKE=/bin/true  # to stop Makefile from calling CMake, once more
+	)
+	emake "${makeargs[@]}"
+}
+
+src_install() {
+	default  # use top-level Makefile, not cmake-utils_src_install
+}
diff --git a/x11-plugins/lurch/lurch-0.6.8-r2.ebuild b/x11-plugins/lurch/lurch-0.6.8-r2.ebuild
new file mode 100644
index 000000000000..47b9bcf5495b
--- /dev/null
+++ b/x11-plugins/lurch/lurch-0.6.8-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+AXC_PV=0.3.3
+LIBOMEMO_PV=0.7.0
+
+DESCRIPTION="OMEMO encryption for libpurple (XEP-0384)"
+HOMEPAGE="https://github.com/gkdr/lurch"
+SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz -> ${P}.tar.gz
+	https://github.com/gkdr/axc/archive/v${AXC_PV}.tar.gz -> axc-${AXC_PV}.tar.gz
+	https://github.com/gkdr/libomemo/archive/v${LIBOMEMO_PV}.tar.gz -> libomemo-${LIBOMEMO_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+# NOTE
+#   The build systems of axc (ex-libaxolotl)
+#   at https://github.com/gkdr/axc and of libomemo
+#   at https://github.com/gkdr/libomemo build static
+#   libraries (*.a files) only, so it is not clear when or
+#   how to best unbundle them into standalone packages.
+#   Related yet-to-be-merged pull requests to build shared libraries
+#   exist upstream:
+#   - https://github.com/gkdr/axc/pull/17
+#   - https://github.com/gkdr/lurch/pull/151
+#   - https://github.com/gkdr/libomemo/pull/30
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/libgcrypt:=
+	dev-libs/libxml2
+	dev-libs/mxml
+	net-im/pidgin:=
+	>=net-libs/libsignal-protocol-c-2.3.2
+	"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	"
+
+PATCHES=(
+	# Unbundle net-libs/libsignal-protocol-c
+	"${FILESDIR}"/${P}-libsignal-protocol-c.patch
+	"${FILESDIR}"/${P}-axc-${AXC_PV}-libsignal-protocol-c.patch
+)
+
+src_prepare() {
+	# Upgrade outdated bundle of axc
+	rm -R lib/axc || die
+	mv "${WORKDIR}"/axc-${AXC_PV} lib/axc || die
+
+	# Upgrade outdated bundle of libomemo
+	rm -R lib/libomemo || die
+	mv "${WORKDIR}"/libomemo-${LIBOMEMO_PV} lib/libomemo || die
+
+	# Unbundle axc's bundled net-libs/libsignal-protocol-c
+	rm -R lib/axc/lib/libsignal-protocol-c || die
+
+	default
+}
+
+src_compile() {
+	local makeargs=(
+		CC="$(tc-getCC)"
+		LIBGCRYPT_CONFIG="$(tc-getPROG LIBGCRYPT_CONFIG libgcrypt-config)"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		XML2_CONFIG="$(tc-getPROG XML2_CONFIG xml2-config)"
+	)
+	emake "${makeargs[@]}"
+}
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index 407cd47337e5..db0010476b8a 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,5 +1,7 @@
 AUX pidgin-telegram-1.4.3-change-metadata-location.patch 1749 BLAKE2B ad5dd197f162223d31d802259c183e4285921ee3270010bc2d6070048d625a4ca5e0c0457c26a65396aba1fb9dbbea5bf87ef21513782a06ad3d69dd4018b47e SHA512 fc42f57d033a5f5192a104fb1c364b44a54a54059613989c147fdb741ebcb3eb1b4870a5325260e8b6f4b328ad0d74f1e236c5540f5ff837054ff99c6c9f4b14
 AUX pidgin-telegram-1.4.3-clang.patch 3674 BLAKE2B c1fb52b984168afcd576b429ab97f92b44a04bdbe39af9f98c71a76bb0a18c9b82a0b7e16a5dd0c70cbd0d743a3a597b2cae9eea9ee04cb98674699452b0fea2 SHA512 f855a52582dc05266e3ac1410af668f6ce6e7f9a074d514b07c5d7c39b317f338967c41732f56db427bd3ab33b91af67d0df354ae1d43663abc45fd4edacfd02
 DIST telegram-purple_1.4.3.orig.tar.gz 491997 BLAKE2B 30d42b34525c6553498c67f8a28cfe789442555a3a135a116195edc982611b8ccae6d7c53006358ebdca679258ae6a40b29a1d2ebb764e082bc2ee77d39584db SHA512 697d070da5c6671dd54a1709b37153d4b569ae1cd19d574a2d92a777a89ebd7884596b35829564a7f6fd49104f5d26e35cbe9634f64c678b5f061af8197fba16
+DIST telegram-purple_1.4.4.orig.tar.gz 495386 BLAKE2B 7ecac3a334f88f3d9c0367c5910d3de03b1e6749f18628a58f90c0ae3602dd04d0a1bec79b1016af236375bfe3eb7d4c40437c31fbbee0e9648e5425e40bb43d SHA512 9907da48b978294749f0697313cc7dbf26358535d6528190d8b61cdce5e478af8e756528a212af806025eb75b7f7ec90054ee763eea327f101ef469d0f4fd43e
 EBUILD pidgin-telegram-1.4.3.ebuild 1287 BLAKE2B 62c3af492fe528b4628836c27ef4fd98cccd4259713313bd71ede962aad93faab48eddc66ef579450c24cb573645805259a638e3939cb5f1925307fcb5f42427 SHA512 420a1b1e1476bdcaab4d74add52033dfa57c97b4f6e3d3dddff4957d736eda3931080d0ca205070f1d68049b9ac53fddf4f2ee0d59a73bff0c524f614d66dda5
+EBUILD pidgin-telegram-1.4.4.ebuild 1244 BLAKE2B cd472efad5a0a1567b6d0916ca34c626645e3efc09bb8bf22a53db7d290200a7aa043d724fbaa6721c9677678e2ee5db8bad80828a307919a3473f78d1175d39 SHA512 1e1d81fcee22b0605ed63433246084bc6fc61734487c2a751ff1a6f387f2144adccf0cfd80f0d22c670add666ff3ef709717ba51127711648b668665e3da3900
 MISC metadata.xml 722 BLAKE2B fb8498a592b6da08fda5cb1961fd84ea2a4e839233719330625166f487f2d01e8000860d2383488ea1c377105f8d74aae928871f349ed08efda1dd7c0420db10 SHA512 6b7e5121c5662de9943b7b7d30e6acf6c2df04b5c9d19b3ce942b6e403e62023f1a07076c4023d899ccb97f7fd2a29b331f9bf76391cb5db1c477d5bfce088c8
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild
new file mode 100644
index 000000000000..653d01bdc92e
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
+HOMEPAGE="https://github.com/majn/telegram-purple"
+SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="gcrypt libressl +nls +png +webp"
+
+RDEPEND="
+	net-im/pidgin
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	!gcrypt? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	png? ( media-libs/libpng:0= )
+	webp? ( media-libs/libwebp:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/telegram-purple"
+
+DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.3-clang.patch" )
+
+src_prepare() {
+	default
+
+	# Remove '-Werror' to make it compile
+	find -name 'Makefile*' -exec sed -i -e 's/-Werror //'  {} + || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gcrypt)
+		$(use_enable nls translation)
+		$(use_enable png libpng)
+		$(use_enable webp libwebp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index 95fd5f7ab967..f265bc949049 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -3,5 +3,5 @@ DIST wmbattery-2.51.tar.gz 164657 BLAKE2B f2432c9d31f4440a88ed67a0aa1b3bc494df25
 DIST wmbattery-2.54.tar.gz 87925 BLAKE2B 692549909d52096ecf7997de5122f07d9fd59b3e2d99c1421b871671a9e43f2bbdb9742e89f835a58114238509b8f8b03fd0619da4a66d8e43b6b787d4e5f6a9 SHA512 58c901ed85d3ea7e0c750bb968c3250706ed693162fe4684d75683a3897df7ff02ee4afbe12a5d26b1f1b632d4c6f9902713a632e6784173ea49bad312fd30aa
 EBUILD wmbattery-2.50.ebuild 780 BLAKE2B 17bbe9f6a0608703269710535f78c4a52a3cd99f3df2ffeb91499368ce501b047b8c3acc601db0cbd8f55fbe4a2f4d4fdb6978ac7a445f4e76e94a3535242c78 SHA512 a185eb5952a9653267fb6fdc9d12bd34da6a5ec9b7e473f16a1245e267d8bed82e5a05379b325196b814d7e17c8de8cfc1b5f3d173bee24cb137a869b3563a1a
 EBUILD wmbattery-2.51.ebuild 783 BLAKE2B c4ecb1e35b94f19d51be7b272596e17d296fb5f58dd493e34c701e9c27790ebaad78fae6cd2b871c35b6777b2b1b00adfb38331da5afe5b5cd8f3ce1725a9690 SHA512 b6e04bc74a30f25d7c1448ee73bba9f098b2a1c88fb2bf343e4ad0f9614ae1e095b3a1e82251845aba6acae7097d50fb31999f876a37034af18c0993179be77e
-EBUILD wmbattery-2.54.ebuild 636 BLAKE2B 63f16c203ac0567b973761a77166b4b8a890b3a0f5c3dfaee54e4a3176b711e82c4c3b8477f855c945c7f4ecb1ee8aa12ba53d1f6f3df25e00745941e8c15e03 SHA512 5f4d10ba906be632d1866dfac34134cf4ec741a7c58724852817c58ad8cead01e36a7f3d3a6ec6009031b3ac17795ff6654b348abc816fa4f30b0d88ffe6cfdb
+EBUILD wmbattery-2.54.ebuild 635 BLAKE2B e472f00d99bcc715d520c7f7964e7489ad24e66e5d70cbf99e50c64ebb90d0ffdd3a89083544addff1560b2912e427c92d016869b2420589c591cec098ea359a SHA512 45306a491f89c66500b652d531e145edf57a97c003db0048dbbaeb9968210b91cfd143b08f57b8fb191a47b99fcc5444c54a9906efe1e8bce1f23472bd72f680
 MISC metadata.xml 677 BLAKE2B 4711a784d2e1c2fc8f8daf171e64f9f8233c1f9f34734794481a906e7d97f67eb6c9e729ee76b430276dcc4d55f9bab999414c4b4c4d589f699f3ae6a367268b SHA512 d6101277d76e2e36dec42d8ffe6d99077d09ce288d8ac08b32c93cc9f4f50d6855028126edbacd1bdbfbf695150a35006f3ba3e4ea491b7b8926015d721c5fb2
diff --git a/x11-plugins/wmbattery/wmbattery-2.54.ebuild b/x11-plugins/wmbattery/wmbattery-2.54.ebuild
index 8d5e4ad61989..1163ee081469 100644
--- a/x11-plugins/wmbattery/wmbattery-2.54.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
+KEYWORDS="~amd64 ~ppc -sparc x86"
 IUSE="apm +upower"
 
 RDEPEND="apm? ( sys-apps/apmd )
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index a6586d538608..c4ba260005fc 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -5,5 +5,5 @@ DIST wmbiff-0.4.35.tar.gz 265332 BLAKE2B 049f01dafaf71af614c47379fa1e59593e6d790
 DIST wmbiff-0.4.36.tar.gz 266288 BLAKE2B 7f90ae23ff228ed775c4693beffb3e71930bc594083d75cbe25d9eb992cae3a35bc8d57699da53b034a19486846d05625dee607b0da38519ddfc50faac4cf6da SHA512 b8b14f9676ebd576f9e568bd59638c3000337713c6ef8cf5d7799ed0adea59d1ca1fe0d9c67ceb997814b1e6d26590a0c4052b1f031cee28601d7273bbd3fd23
 EBUILD wmbiff-0.4.28.ebuild 825 BLAKE2B 3e27116ec3256f882303581d48c4911aee3f360e581bb58c5da55244e94edc89a978333cd2654b2d49d2e8e141df6b05a236456c5768bb5fd5f7f0c8156518d6 SHA512 cf73dca2d7798577fed2e223f25e66261915220d198edc90884181c7d71c9b6b909e29aee41a7a9a5e284221048b4dc29b97388bba9e3a117cdad73adf2cf283
 EBUILD wmbiff-0.4.35.ebuild 854 BLAKE2B fb2e3f070a2e668f729e5748330d98876ea7108bf8c20dc91d20b49eaf52e562897879249226bd67b717ed2a659009a896c8e955615255c7d447cb18eeee75c0 SHA512 1d69747b719985f878268f8111edfde765613dd31aa135d2eb8d4569b2237b63a384514183f90c118fe47e23a73319f4fda6bf783145438d9ec1bfcae283af88
-EBUILD wmbiff-0.4.36.ebuild 751 BLAKE2B 6f58848e63988590983794fb22c373e4e665ee3091ad887ac755cca80058a4c053bd119a4f1c1ed261802d2671e0b490ef4d8e306d4fc50757cb08b7d7a633cc SHA512 180540a646beb188badb2fbef4e69c6800cf9f483775ec0d3f2ac2a648ab782b9883bb066e98937fa88ada0c99cc2f133aab1764e0a17af5faebfe89f1c3b91d
+EBUILD wmbiff-0.4.36.ebuild 749 BLAKE2B e6eec09bc83b0d23065c27efe48043d829017ffce44440094ed159ebb864b22e14e63433b7edbc7090b4559fa1d8f9d4aaaaa05125f77d9474e9264c684021bf SHA512 0eef526e14cc7e96a732eb02595790dcc703246d8551aa9049d85ae1b0d286d50a77097f2005b13cbf7ce22c1d03099a7411f9a12e15393eae29bf81a50f0b83
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
index 440e743d6035..a7c57b290a75 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="crypt"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmblob/Manifest b/x11-plugins/wmblob/Manifest
index 7d4239c8aa03..029c94478269 100644
--- a/x11-plugins/wmblob/Manifest
+++ b/x11-plugins/wmblob/Manifest
@@ -1,5 +1,5 @@
 DIST wmblob-1.0.3.tar.bz2 160657 BLAKE2B e36f7b8c6dd38466da490bd85d03ff2f378caced8d5908b00422428223aaa1fc3754bfd35dcacb2f162b0d44c8c04b509cf5c00d678d687e5b90cad886ce98a6 SHA512 4d8c7e30218d9ec7dc965c69e69b0fb5839c468f695ec2cc9fd9bb0b8fbc89b1386122e11b75906169bb16d13dae16cd8287c5bcf8bd28ccbbad4d4f057b3414
 DIST wmblob-1.0.4.tar.bz2 179284 BLAKE2B 79025a4d80c05bd8f9d1a962762680e24ae0eb09c8bf961833f4f4c59b086ecc8563ef71c28678c969da75f1f074c691c9fd6a6919358886e64f7fcb814611a3 SHA512 d325711e6c6c865a97386793a7c3f0e0833044001ccc336f2a4e9974799e5ff00936b0d90a0dc4a3280ba27a8d1f97239ba51d61e6e5b104e7cf82c8aeed5ec1
 EBUILD wmblob-1.0.3.ebuild 742 BLAKE2B b9f20004b0180beb5b3dd5261740cf517bfb0bfe65d37d84457cacef08799ca550cb9b4febddecebfd8e51939ddfe142f14de9d1e2caa253d318f1bc3162a0fc SHA512 d94b21672f157ba2da3808d4e03028a9cefaa952a83ec28a536205ec5e565cbdf1d94e6985ee5f99d112f669f7ea6cb2566477d082c31f1220fc05a220c9e832
-EBUILD wmblob-1.0.4.ebuild 735 BLAKE2B 00282b713f7ad48ee7e37e99c6caa3e28da53fa58922a7fa4c2464ed74498c953903ad8d5a952d1e7a433763f4ed59e36e51fdceb325d241b2ac6f23c1e19a89 SHA512 276dd058389c1c6c923307ba1d204721edd41809ab9dc6bf7412b42144576c0a88076070d706940e778fa1fcdda26dd78190a2a2cc009496a2d59caf646dcd46
+EBUILD wmblob-1.0.4.ebuild 732 BLAKE2B 30ff8efe3b1cb23fb76fd5ec1bf69a5827efe314e6af82c1d3e4d4dd262c805b75beaad6bed4acf1eb034b5d522f342cedef0bbf628d8649bfb22b093a529c15 SHA512 4940a898be7cf6c450aaf0d023f54326883f21797c8d1ed2f0fc7b67e590b895fd6de18af158085f502336fe034515e6edb358556d363bb25bc4f59159ab7c73
 MISC metadata.xml 326 BLAKE2B 1da63467b87683bcbb2e3e8a74094449c20b94c5a891a59fa154cb9f0ad21ee89c4bacec8b19bbc74d3ce687f18740eb972a0051e7fbb6794e3b1ef30a83ecb2 SHA512 73f3d392f88613008cd221ee98c5836f324127237cd3e64681b90f7067c3d60ed1b52855e79aada62cd70157fe78cb2c7f7d93c6cc81c58498b8b6734f2dc420
diff --git a/x11-plugins/wmblob/wmblob-1.0.4.ebuild b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
index 36809096937f..60206498e9ec 100644
--- a/x11-plugins/wmblob/wmblob-1.0.4.ebuild
+++ b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmbutton/Manifest b/x11-plugins/wmbutton/Manifest
index c168d520c603..abb94d277ec4 100644
--- a/x11-plugins/wmbutton/Manifest
+++ b/x11-plugins/wmbutton/Manifest
@@ -4,5 +4,5 @@ DIST wmbutton-0.7.0.tar.gz 48381 BLAKE2B 051a6da83e575425aca44c88e3011e1c9413d23
 DIST wmbutton-0.7.1.tar.gz 140293 BLAKE2B 55ab4926b833ae4e57e73cbd4e0fdb6177510099a140bd17d1378c31fe4f42a5fa35c1dbe58398412d465ceb99065a3c7a45a496dc3cb71d045edd879bd70f18 SHA512 61e846c2c7edf6375fdf7e86490ef80feab986b24ce83110283b7e336562a670142e326bfda24ddad832c563da0cb4bc2c3d7379e88e647954c6d93a4dcf6068
 DIST wmbutton-buttons.xpm 25003 BLAKE2B 84830b939cf22605977796ab756d03c110bae8e565eec2b75f479a5b19d9027851ef0178e170da34537b0725073f24544dc0f9c1c701f0f0089701bdfaffd87b SHA512 eb73812b8a4060a6bb13a477275224a2e6d50f7b77944f2f674c4995e0053f3d3c667d483c86dda98b69f398fd332e4c836ddf9eb3410e1e29b69449b874537c
 EBUILD wmbutton-0.7.0.ebuild 887 BLAKE2B e3eb678104beadca07744851347b5ca5566c007fc8e6fbf209669d122cf527d68556cd5e8a0cf3311d0b1ea0082d26afe75be449d7152d6b0a839e5da0a51f22 SHA512 80e0788d374244587175b8dff5268d58e27e1cc08c0a0b79a0a6af2ce24dc537c91737b4d24f62a9cb99ddc7a1971eabec27ebe3e43ba8ac669fc55f18b7cbc1
-EBUILD wmbutton-0.7.1.ebuild 473 BLAKE2B 2d0e38d99194a5725424f4c049685d357c104484272091e08b1a6fcafda062d94ad50bc8a3f14cd1a1aa5e85a4b8701ac441734fb96e7eb8c57bbef1363aaa63 SHA512 7d0835c01ed903b61947af2f0cbd42bb5dfbc0ecc191b23699b33501ac20360d28828a6d3d71d2b0a5642706ddac0805c8a43eee0f78227faf4813a0d0f7a0ac
+EBUILD wmbutton-0.7.1.ebuild 468 BLAKE2B 22dad644f40abbae6bd0966b085560cf1438924121f902751c16f2842f479754443e6d622bb36543f00d077115b5e87b3f4a760b08b208c4ab0e356e55ab9619 SHA512 f50eb462507b287e1caabf836bc4c7f028081a2f44a5660907fca5e5f4bb45a0da8a7bec1e80ee601892373d8bcf05585c660835863fdff1ca3ddc1af83d1d12
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
index a681773c8a4f..9beb0fa72849 100644
--- a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE="branding"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmcoincoin/Manifest b/x11-plugins/wmcoincoin/Manifest
index 1e2cbe4d0f89..cb074408478e 100644
--- a/x11-plugins/wmcoincoin/Manifest
+++ b/x11-plugins/wmcoincoin/Manifest
@@ -1,5 +1,5 @@
 DIST wmcoincoin-2.6.2_p20140602.tar.gz 972358 BLAKE2B a30acaa7b20e88c1d2f4b5329f02321d6a7431bf22379e9d8074b48c1953bcd411b011097546b905f406e21f5de3e9057923109f0e63136cc19d5b5bdfbc47ef SHA512 ddf1b24d9c9021e9cb02817e80f3327074ef7d09ba7d8033d5d0c8b39a25106a1d54d32f211d31a910e2175d98bbda940f309cc137edd1b02b5a656891e89b2c
 DIST wmcoincoin-2.6.3.tar.gz 973973 BLAKE2B 4dcbb79ddb23c47fb891fde56137bb385ccf841eb54ce7a34cf060d4924d859a5a2ac40d504a26e763f1fe075796e09ec6a00a0080d214add2469db6b2f3a4d4 SHA512 daffd94387a03e780250877ae43e5431a7c0710862dd9fab04efc254e02e648215fa9c301bf1ed6d1a9ca5182a2a88d10ea4c385d92752d047492e6e9ad01d2d
 EBUILD wmcoincoin-2.6.2_p20140602.ebuild 978 BLAKE2B 74c122836e1bfcd89fc77117349d48dd88566f143a37c25426c2322362a2d586d3513bcd5559e0a73f58761b1b274eb037b422c37d67a1164deb5b286fe135b9 SHA512 ad01f83b53cd4a2d5dd9da3f8daa8830eb4c2b227ebae3279302c5afcedd56183c07f6ca70ebb0b4938b8d4f90c264c161e5b655f5a237f2133befa3586eafaa
-EBUILD wmcoincoin-2.6.3.ebuild 729 BLAKE2B 3ceae2309b8ee1f9555e5f71a882ee78cbdb28ff4eb087b6fe3213eef615b2a9b1e26aacf0ab6bd78fa66a137dac2438874f45a83348c896cbed874b491ae006 SHA512 50069109011d30d09fc31fda17876030da101691d97f826ce92c287c496a4b4c4dd4847c508952101dc5372c88ba6e5cf96881de9d794531f7ef6ffaebf3350d
+EBUILD wmcoincoin-2.6.3.ebuild 742 BLAKE2B 2d420d4646b4c3e2e9f45cb57e2beefaa76ca1b743342425bc6b924fb3b2dfa29247b31a1198b33542025a72fd96465937ce784768d93a39b25bc6fad228f000 SHA512 5872e935c0db3a827b56ad2751cde3a3b532cb68359382be62f716f2376e4ef505b188f383b75eda3cdc76b7a1b688969e19218c82ec9fd99f1f949d4e7832e8
 MISC metadata.xml 641 BLAKE2B 8ceb569e438dfe8de74de91d31c6b858db7dc20508257fa371504352664cd409c0339e356401cf68f8a59a5cae8aee10dba93134ca353d6a63c47405bc07a229 SHA512 e2d77f95ba4774261ec4ec669d18bc5cdc11558e935bfb3d4e759e9755e15e7ef88b9207a7498c44bab9061f01483c36b2c9624648fc05df526dc91f5637bc64
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
index 6b23f379b40f..7ceffa19d445 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,15 +9,16 @@ SRC_URI="http://hules.free.fr/${PN}/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="nls xinerama"
 
 RDEPEND="x11-libs/gtk+:2
 	media-libs/imlib2[X]
-	x11-libs/libXext
-	x11-libs/libXpm
 	x11-libs/libX11
+	x11-libs/libXext
 	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index 2a339c331878..ae22999b1da1 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -5,5 +5,5 @@ DIST wmix-3.4.tar.gz 116220 BLAKE2B 01aac1603c34298d9b4aa45ec3425ec52e75965634f6
 DIST wmix-3.5.tar.gz 118052 BLAKE2B 54461c59d46a2ccf7f81aaf422b9e9fadf260001621396543deb996cb346a1dea5d100b38517b79974acc4d429d6a2f4fcde10e88d114e9f6978d1c0bb599d2e SHA512 ca702368cd5db55958e5f25c9703bf6659987534795fe58fd1ade426220f468ae3979e98ed1a00ffa162b094e53e37974d626a6bc48e2f6099c8c6eaa1f3dfd6
 EBUILD wmix-3.2.ebuild 674 BLAKE2B d7c082f0d5e54415ea880d0ddc08695fdecc7bb4db3916dad02069579cd7aa1101c5f2b2764e3f5a498a9e99e45d4d13758f43e3ed9e1a26bf2b72ca92616b57 SHA512 74e06a9c9b2007284e8688192c60880557208aeab1c23bd0f45ea1470b6f24a0588166ecd24ed1d3660679dca0a2ae808cf7e35ef2b37049d2ae804e1e1cf444
 EBUILD wmix-3.4.ebuild 536 BLAKE2B 940782ea3a564f33dc211a4e880a74801081d1304372c713712ab7a6e609746a382f901aff04d71994e85ab867d0f40d3a8370a76dc45365f6f535c4272fd540 SHA512 b6c13bae7f0b28fe25f37a1fbe162387fe6883e38f9c74f65ef0dbbe6ecb6e1f9045ca8d73110ad8ee33f16779f513078e3fee572fdbf66da5f4a1913b5c6db9
-EBUILD wmix-3.5.ebuild 467 BLAKE2B d20508efc34568e08b0d8fac23f0a7408c253611b1c09b32a0e9dc021d1c44111566db89ff7a940df91b8dcd5e3e501e478d9af130daad1fa9004f8783bd53dd SHA512 46eb30113c5ea43f3a8200fbbe4b32be6b2e4fcab70e885ac45211b0e3a481e15a0c2f00ef07527df5dd88a3991bbb827dfda63f1babb6fc24d8c0e611095b9d
+EBUILD wmix-3.5.ebuild 465 BLAKE2B 02456642bd0df0a9a600774a4e1f70dbe42297406be6bac10a412d28dc6e12d2aaf1063c4ee494f57095820d8ba949e28c090ffdd2e427f50beb48aa708469e1 SHA512 d396802d7ffc74cc7ecbc0d40f205fb9bceb9406e2035ca256e33a69a89528b1df20862975f3e3446b9d8a7ef30624a8c375e138dda480f6baef5a57e91d3a47
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmix/wmix-3.5.ebuild b/x11-plugins/wmix/wmix-3.5.ebuild
index a1206be91a66..1853696d8c69 100644
--- a/x11-plugins/wmix/wmix-3.5.ebuild
+++ b/x11-plugins/wmix/wmix-3.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib
diff --git a/x11-plugins/wmmaiload/Manifest b/x11-plugins/wmmaiload/Manifest
index 36da26d74023..b17d42baf081 100644
--- a/x11-plugins/wmmaiload/Manifest
+++ b/x11-plugins/wmmaiload/Manifest
@@ -3,5 +3,5 @@ AUX wmmaiload-2.2.1-gtk.patch 6148 BLAKE2B 082a2f93bde9fe08c227770789e1e1b54286f
 DIST wmmaiload-2.2.1.tar.gz 183538 BLAKE2B 5859051ca2040399d1cc3db863e89a1d779a22f9c47a171c11e5bfee6a835b03eaaaa7f47ef95ddc9cb29a24b914e84a4b448600a001959ab5471afa409ec646 SHA512 2f4cd4980feefb1022384880a57aea628d3e976dad7d1c838a23dbeb8bf86df6c061c14661bb562e36c51e2ca40d5f9ed3d465d9d26b9c7b9193fe448dbb9394
 DIST wmmaiload-2.3.0.tar.bz2 42852 BLAKE2B abee44716ff74e48a480881c3327bc4a4f02600044a587b3322429567a3454f01c733542fbaa42cb074a2da48ecd1c453d19ed42c30efc04e634c44330d729d3 SHA512 c4e63eb2868474e3b76f5f4f401bdd23172f23dfdb0e90712e3eca607494057e067805b83a53490d38b6f7b2c876e2ec8fdb1d95b871d3febeeda35369550de9
 EBUILD wmmaiload-2.2.1-r1.ebuild 1067 BLAKE2B 80def6a5e04b70b103f33ea42eddf7baf86237a8933ee6ba65d0f66670021ef48b91a5c74580f1b730e36d4774540f5d86176e97e7636b08503ba99376c359f1 SHA512 7e39a7833f6114e9d4b8da0995bd61c2f1defdeea5649728d9d81e2035d1f8d00ec41f1566853a7416b62eef6c0b6d3bd41a94e8e2d4ae1a962548944be76b63
-EBUILD wmmaiload-2.3.0-r1.ebuild 1120 BLAKE2B 081d487c09c18c9b2911125e71c7bf8482a0e1dd7a4536033ad8bed02d57a3a07aafd01ec15e0dac6a6fa28547c74aabf2d1f52bbecc245c7f0d6f0f4cdc732e SHA512 363f6778be8a30678e4ecc6f05148c5cf3a3e0d6d5e87c0685c3509c033983ff934ff53656d2db089f6575dbc09b663b7e0c4b8e4618dbc9f9e3aacbc2225743
+EBUILD wmmaiload-2.3.0-r1.ebuild 1114 BLAKE2B 30e0376578d019b240a9b5d3e1db64d0a1a37b13fd01ad86ca3914deb3a42dd6f1675266991aca78f335933f4800865f21a4d220b8684c3ba42bd1a1c56cf5a4 SHA512 d192ded9a4797a81ea1671e50b8598da7c99eadf6eec1e53e8d1ff8de7baa145043baa55a8b4d55f6cb48a5362e79f0e47f39114c70344c804ba9e97a81fca99
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
index f41d82dac80a..40f3b8d428ab 100644
--- a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
+++ b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmpasman/Manifest b/x11-plugins/wmpasman/Manifest
index ad3b9a6cd821..7ba1ba401f5d 100644
--- a/x11-plugins/wmpasman/Manifest
+++ b/x11-plugins/wmpasman/Manifest
@@ -1,8 +1,4 @@
 AUX wmpasman-0.8.5.3-list.patch 2751 BLAKE2B de34e3491f74dd8fc3340c85a665e9dfc546bfd8d056ff56542e535bd98c969e01f37a30e2852bf33d2f95accfa39c7c26752ddfd9ab598b4326da9ec4ebf0c9 SHA512 f8b5f33f7b6da03e95f000a8a7b27c1346b10cb3953635974f804e64af9279ecc7fc99eadbc1a0d534f5f434672db18fa4d46fced0498829fe2202b46ab818a1
-DIST wmpasman-0.8.5.3.tar.gz 198779 BLAKE2B f38c0fb17406f1e0ca0fd8e97eccb46f690a28c489307b453a6df4c5d3edfc3344381e7e646d107eda9820a75b624770cd56053ef45a1bbc1b79d65ef31e33b0 SHA512 d47bae993b1ea47ef2cf4cce0dc8d8f1e8e055650dbfc7854612176a0933a0a5079ad29bc85ba8e0370843e9be189d7e4d0b349590981d3eac4c3f01fe69ec87
-DIST wmpasman-2.0.tar.gz 154433 BLAKE2B c6bb3441a34252f450d1d81e83cb400dd242c0f250d2dbe8846b3e90055aeb1410543be6f43d0a5cb3a7fcaec86866eb8fa941fe6decd57cde5c56d1d0390936 SHA512 32ab415d7b87f5277c96f1253b25a9d5002d2bf188d8635d96c169ff51ab7949e0cd2c05df43136eed4e5d9c4f037affb30ee4a45977d0a6e74bc9e332b9e8be
 DIST wmpasman-2.2.tar.gz 155077 BLAKE2B d7d9bd1c3e34d4f03661babd42ed5abbf42637709fb2f31358b51fda13dcd682e083af683640a7ef75ae0087f2de179136635e9be3979f9a36a067b5b634fcd2 SHA512 2f24e2ef84d6e5cab1c3a51d032ecabbd21b22e81341ee48b1f86fc96f493d42cde42fd20cf5523f0f8462906cab4f22a2238b6c147b61b33e812f98f32c0157
-EBUILD wmpasman-0.8.5.3.ebuild 626 BLAKE2B d972dffc0fffd94470f3081a4e18db2b9589ce3a14dc51f39f952980d513b0cc5734daf1b86bdf75815de19cda176f483c464ac747cdb4c41e42dad6b5ec5b9a SHA512 8547ea9e379ca454f6431e98a5cc6e4404a127ce4fe78d3f1f298f25bcf9ea52aa2041cffd89a0adf242a9d68e90fc662acf7ae3b172ea50743a4cc8e5428dbd
-EBUILD wmpasman-2.0.ebuild 467 BLAKE2B 402c03eb19ad2a1d6054ad18b8437f84f1b304d2551e17d89bf182f9a66419a6f1f1bc177d5e70dd9b2ffce2a7a62d0cf4cd022f5ed59bff586ca6ebdb446dc2 SHA512 d63f3d5b6ebbd362e2dd4ff2e417e8092744840e6f95d43fbe92103f6cfa405da2ae668a1b4409a8f2943c2d29ec45da69f4dfb689a9c5f36eccbb972de674f0
-EBUILD wmpasman-2.2.ebuild 464 BLAKE2B 8e7cb4190eb09f853fd284be40f0310f2235ac468dbf836e630b5a44b2f0e0c94e43f48716e73888f1db7c12261da50b9486f337a1e82d9d2e597b9e0d5875f5 SHA512 5392b5b8bd60b60f9e0080f9e78f1fd89075a182c285b43bab21f9cdf201906850839d44e66e4005d8066f91fb19ac7f1208dcc3c5a37ffe8ba8446d3204c0ce
+EBUILD wmpasman-2.2.ebuild 461 BLAKE2B fd0003bc34d852ff261f13ad3eb1ea8f5948f99a3b853b079384536763d6308243d06c55133ab71949ad6addbc3a49e1b4c40ddcd89d95e5ba6a644d9d6324bf SHA512 b96df693cbc613d95bc942034f7b5f34804c9f93c2049f6011b19199e68c68e77d32fcb102c364be8f214ded8a6335db8f771bf466c8b78aff901d3e1756023d
 MISC metadata.xml 603 BLAKE2B 20e83900219fe3124a32af326c94834ffcaa2303a2fcb7d33d30d9943397c88a38b0ed09c6130307ad1a5be45ffbef36d37ccd6f9c28dce8db080f2acfa3ace9 SHA512 5cc8f2cc54d2298a15f330444e0d06f941c74efb88177e4ebb45d36688f22807c65cdf50c9b2f519a78c76336060ea6f815a67013e9df36ef2a2df1a1de0055a
diff --git a/x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild b/x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild
deleted file mode 100644
index 59c8cd68dd6f..000000000000
--- a/x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Password storage/retrieval in a dockapp"
-HOMEPAGE="https://sourceforge.net/projects/wmpasman/"
-SRC_URI="mirror://sourceforge/wmpasman/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.4.1:2
-	>=app-crypt/mhash-0.9.1
-	>=app-crypt/mcrypt-2.6.4"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	virtual/pkgconfig
-	>=x11-libs/libXpm-3.5.5"
-
-DOCS="BUGS ChangeLog README TODO WARNINGS"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-list.patch
-}
diff --git a/x11-plugins/wmpasman/wmpasman-2.0.ebuild b/x11-plugins/wmpasman/wmpasman-2.0.ebuild
deleted file mode 100644
index 1d1725c81054..000000000000
--- a/x11-plugins/wmpasman/wmpasman-2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Password storage/retrieval in a dockapp"
-HOMEPAGE="https://sourceforge.net/projects/wmpasman/"
-SRC_URI="mirror://sourceforge/wmpasman/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="app-crypt/libsecret
-	>=x11-libs/gtk+-3.8.0:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="ChangeLog WARNINGS"
diff --git a/x11-plugins/wmpasman/wmpasman-2.2.ebuild b/x11-plugins/wmpasman/wmpasman-2.2.ebuild
index 5eb588f9aab4..fea3eb770322 100644
--- a/x11-plugins/wmpasman/wmpasman-2.2.ebuild
+++ b/x11-plugins/wmpasman/wmpasman-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/wmpasman/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="app-crypt/libsecret
diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
index e06c33649c8d..579b04f1de51 100644
--- a/x11-plugins/wmsystray/Manifest
+++ b/x11-plugins/wmsystray/Manifest
@@ -1,6 +1,7 @@
-AUX wmsystray-0.1.1-Makefile.patch 1551 BLAKE2B b58ebdc03508d47d1eb6c58913493bbf86912bfff9f32268abc41f7e7dbe9c86c85299da9e0a2c9fd2932b8155718ca6df52981d7035ea23a3bb8b5938ba3111 SHA512 0ebe1530db6770556def85a99075e9bea40fc9cffa1d0a43838651d0158c50960222ee830f8c8089f271537fec5869c6975fe17283443c9f9edbdf9da1a1c1b1
+AUX wmsystray-0.1.1-Makefile.patch 1780 BLAKE2B aba3c3844f906d3f4afcc41c6fad4c424b11325bbf02e1a0b81886f63946caa0c607cd1d4b8158b5544e782d4a35cfb5d80d78e8a0c0fa466d1bc56ebfa7c11d SHA512 9cc1201dda867b7a45512b83231d63f90c4632bcb762895dd87f1febb1f7fbb85755c7053050dc959ed32b5352025aa9bd75d905d139ae947a43cedccb10740b
 AUX wmsystray-0.1.1-gcc-3.4.patch 269 BLAKE2B c3b126db45c7d2dcf38dfce5db9965f9f5c7bf9636a5f9f194d4f0209a737cf11d115ac42430b5ae6f00ad9770256a95e8f03cf47f23127251927172f2e8783a SHA512 ee03a2986af6e1f3de6751a2d90738ffeec2fff0c1f7f0ddc686cc4baeeb010bf2fca764b886e9ee1af82ac2926d4571519ae2371c172053834f3d6bac7e2570
+AUX wmsystray-0.1.1-return-type.patch 476 BLAKE2B 6bee7cbfd4f78db1034fad7e7d635b3e9b7ece29909454ff6dfc82dc40da0636a2154586a52ed0e53965895d9e5019301fb0fb9247f8f0df31f1879ed71b66fc SHA512 93a19b7e462989e7333ab6e27f600c608d784a16eab8e1ea57155b0bcae95938534c0bc8df9026e3f38ba4cd362ea7509f49c396aecfb70d0de0f0d9dc87cdd7
 AUX wmsystray.desktop 185 BLAKE2B 5d4f524ddcc939ef335a043fad6c136e03f2a2cc7fdcc9a4703e210ad301d5e101f8c03caa6c5a069ca805ca44abdf6e56a18fcb8e98596f80f469482b8927e5 SHA512 f7a2c0391257d76c9024f2804de067b07f3669fbba6fd0af6471297f4c0fb876ecfdd7cd6b931187d657d6558ff27d01766c299048f7c16c4d4eed5c4586213b
 DIST wmsystray-0.1.1.tar.bz2 18261 BLAKE2B d232dcfd3077760d7990ec8e22249aafa9dacf415e71b6a662a1a32464e233cd5460f9b99d6e1c478ce69c6ad0e9973febfce2292992d5619792d4bf4dcc1d7c SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604
-EBUILD wmsystray-0.1.1-r1.ebuild 1176 BLAKE2B ef119e6cff86bc2a4a07d86ac099ec6452ea8b1fb8e5d52f67e35090d604a05a02b3239182ad96d27e8d186c2232a9ca0e25ff2e4b3654c3814c242e161fc39d SHA512 85cf15c7ce31786d0d8551ecbb408d0d380d6e339a9d2600b84def259945ad218e12579b5f4b2054073c9db8853dda7141e433787667c9f7a7f4158c69195d81
+EBUILD wmsystray-0.1.1-r1.ebuild 1075 BLAKE2B 2ca01fe2ac8b9f934545fa359710f93e0156d7b76d7647c42d48e78c86fd0694bd82117a5e744ea9622fc6a444806f6f40890eb31990c0329e43f3df7e34dc9e SHA512 97e96278b6939fa590d2b71ee67e5a21a9e5c0f0decf137b1ed83c0d620bcaa7c8ba7687a3a8afa337766b3e1420b3c8cf3bbe4bdf36525cf2752b39d9e7a7d2
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch
index 19afa355b229..ab754703962b 100644
--- a/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-Makefile.patch
@@ -1,6 +1,6 @@
-diff -ur wmsystray-0.1.1/Makefile wmsystray-0.1.1.new/Makefile
---- wmsystray-0.1.1/Makefile	2004-03-01 05:35:47.000000000 +0100
-+++ wmsystray-0.1.1.new/Makefile	2007-06-30 18:09:59.000000000 +0200
+diff -Naur wmsystray-0.1.1.orig/Makefile wmsystray-0.1.1/Makefile
+--- wmsystray-0.1.1.orig/Makefile	2004-03-01 05:35:47.000000000 +0100
++++ wmsystray-0.1.1/Makefile	2020-12-03 11:22:13.786357942 +0100
 @@ -1,13 +1,14 @@
  prefix=/usr
  bindir = ${prefix}/bin
@@ -19,21 +19,29 @@ diff -ur wmsystray-0.1.1/Makefile wmsystray-0.1.1.new/Makefile
  
  clean:
  	make -C xembed clean
-diff -ur wmsystray-0.1.1/wmsystray/Makefile wmsystray-0.1.1.new/wmsystray/Makefile
---- wmsystray-0.1.1/wmsystray/Makefile	2004-03-01 04:54:44.000000000 +0100
-+++ wmsystray-0.1.1.new/wmsystray/Makefile	2007-06-30 18:09:59.000000000 +0200
-@@ -1,7 +1,7 @@
+diff -Naur wmsystray-0.1.1.orig/wmsystray/Makefile wmsystray-0.1.1/wmsystray/Makefile
+--- wmsystray-0.1.1.orig/wmsystray/Makefile	2004-03-01 04:54:44.000000000 +0100
++++ wmsystray-0.1.1/wmsystray/Makefile	2020-12-03 11:26:57.544595661 +0100
+@@ -1,14 +1,13 @@
  include ../Rules.make
  
- CC = gcc
+-CC = gcc
 -CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -Wall -g
 +CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -g ${EXTRACFLAGS}
  LDFLAGS = ${X11LDFLAGS} -lXpm
  
  OBJS = main.o ui.o systray.o xpms.o
-diff -ur wmsystray-0.1.1/xembed/Makefile wmsystray-0.1.1.new/xembed/Makefile
---- wmsystray-0.1.1/xembed/Makefile	2004-03-01 04:54:44.000000000 +0100
-+++ wmsystray-0.1.1.new/xembed/Makefile	2007-06-30 18:09:59.000000000 +0200
+ XEMBED_OBJS = ../xembed/xembed.o
+ 
+ wmsystray: ${OBJS} ${XEMBED_OBJS}
+-	gcc ${OBJS} ${XEMBED_OBJS} -o wmsystray ${LDFLAGS}
++	${CC} ${OBJS} ${XEMBED_OBJS} -o wmsystray ${LDFLAGS}
+ 
+ clean:
+ 	rm -f wmsystray ${OBJS}
+diff -Naur wmsystray-0.1.1.orig/xembed/Makefile wmsystray-0.1.1/xembed/Makefile
+--- wmsystray-0.1.1.orig/xembed/Makefile	2004-03-01 04:54:44.000000000 +0100
++++ wmsystray-0.1.1/xembed/Makefile	2020-12-03 11:22:13.786357942 +0100
 @@ -1,6 +1,6 @@
  include ../Rules.make
  
diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-return-type.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-return-type.patch
new file mode 100644
index 000000000000..aa2c6539b81b
--- /dev/null
+++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-return-type.patch
@@ -0,0 +1,12 @@
+diff -Naur wmsystray-0.1.1.orig/wmsystray/systray.c wmsystray-0.1.1/wmsystray/systray.c
+--- wmsystray-0.1.1.orig/wmsystray/systray.c	2004-03-01 04:54:50.000000000 +0100
++++ wmsystray-0.1.1/wmsystray/systray.c	2020-12-03 11:30:36.661776579 +0100
+@@ -338,7 +338,7 @@
+ 		XReparentWindow (main_disp, embed_wind,
+ 				DefaultRootWindow(main_disp), 0, 0);
+ 		TRACE((stderr, "REJECTED!\n"));
+-		return;
++		return 1;
+ 	}
+ 
+ 	XSelectInput (main_disp, embed_wind, StructureNotifyMask |
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
index 4756f31445fd..926644e2d5b7 100644
--- a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications"
 HOMEPAGE="https://github.com/bbidulock/wmsystray"
@@ -17,11 +17,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ~sparc x86"
 
-# Let's honour Gentoo CFLAGS and use correct install program
-# Fix for #61704, cannot compile with gcc 3.4.1:
-# it's a trivial change and does not affect other compilers...
-PATCHES=( "${FILESDIR}/${P}-Makefile.patch"
-	"${FILESDIR}/${P}-gcc-3.4.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-gcc-3.4.patch"
+	"${FILESDIR}/${P}-return-type.patch"
+)
 
 DOCS=( README HACKING AUTHORS )
 
@@ -35,7 +35,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake EXTRACFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" EXTRACFLAGS="${CFLAGS}"
 }
 
 src_install() {
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-14 13:26:14 +0000
commit	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree	25413d1cb3a0cbfe36029db32398c0f333609215 /x11-plugins
parent	9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)