gentoo resync : 02.09.2020

23 files changed, 101 insertions, 330 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0138e504d9c5..62e58eeb9a85 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index 3b5c8d88d34b..743d12112cac 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,6 +1,4 @@
 AUX org.freedesktop.Notifications.service 94 BLAKE2B 1a97aac2db9c803c9e4babf9067283b564a1eecb1d251aee3a5e66b8a4f63d2554e3e09ea06749383ce3d5b8e77c8cc3bd87ae2dde48ae8feb4886ecaf7a3c27 SHA512 0575cbfc094455c0a2f04faa534a5e0d9cc41e6d9566ab9bcb0fcbce99e142213ded786ad00c36dc434ae1b9208d34d234a341dfc86adb72925dad0ee2b25f97
-DIST mate-notification-daemon-1.22.1.tar.xz 340472 BLAKE2B 09a4fd8f14ffcde530bf3f95aa5d38f5ab1d105dd854464eb698fa3f42594e4559a48d034a0e25a021f2cd2382d02fbe357269636ea2603f940d666467ba4058 SHA512 5faec84a2c25b3d17db5e0e564081a5712a0ae9a648b61e7d6233f7c6671a137cb9e0d2328eccad4e634eb99cae72cf235589f3667b9bf29e66c3734f7ed8bc7
 DIST mate-notification-daemon-1.24.0.tar.xz 392588 BLAKE2B 480272848b3403d34eaa1f555a573dbf74a4e8e45e76c4726943bda4c29d7002f00d1a828e318d51dd07a44df1c64902c38bbe41c1c14339e8cb8710f7008f36 SHA512 0fd2da98001c60672d4833e974ac74dd561f54ca6f3fd74f8d6620e3b28768add46dd891d7446b01426b6aed09d4966d902cbde45aac3498fdcbb837e531a147
-EBUILD mate-notification-daemon-1.22.1.ebuild 1010 BLAKE2B 0db390170a60ac80a322b6a53c6e1dca1ee9df124bfe4c09a4462aa5ab033b6892846046533f269da9b209bad1fe2fe5675ab8f84044a7723b5f33d8d1dc7282 SHA512 3e63812692ea6e8c8ad57c279e9389abd8c9ce6cb6d20108b3bfcbfec2b9c6c9d0c6e5e150198cf6ec76f689848f719568658bb4addab036e7e8e9bb058dcfb4
 EBUILD mate-notification-daemon-1.24.0.ebuild 1028 BLAKE2B 628a6b16802acc6b15febaaa876d4ef6f7fd053e2d2bc3930c4658c13d72dc460f585db90865594179c359551774b1bcf800fea2e72b0235663abb4530075d0e SHA512 df275daceeb8e1d5ee36f37f3c7007710a69540ca4d528c93a28eea494e087510cd64c6753cf7cecfc1a008b9512033f676922ac00480474d0f39ccc88c6e1b8
 MISC metadata.xml 353 BLAKE2B 774bcae8807bbb16a1ee8bc12320e487ec817fb45d3169f4929cbd8c3f7f33a35eb1aad2682e5d87131567c56e6ffe8f2bdbda612c58926ddc3d78b14cb69e53 SHA512 3f46b4bb5e12fdb448e7b7f54db4f4a4683cbdbd89019156601abf80be0333690b65670fb110120cf613dd42ecdfb38b329ddde67fd265257d6ddb32e24bfbbd
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.1.ebuild
deleted file mode 100644
index aafe19993722..000000000000
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=sys-apps/dbus-1
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	virtual/libintl
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libwnck-3:3
-	>=media-libs/libcanberra-0.4:0[gtk3]
-	!x11-misc/notify-osd
-	!x11-misc/qtnotifydaemon
-	!x11-misc/notification-daemon"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure
-}
-
-src_install() {
-	mate_src_install
-
-	insinto /usr/share/dbus-1/services
-	doins "${FILESDIR}/org.freedesktop.Notifications.service"
-}
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index c3aadb6a8c63..40d991cd3164 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,3 @@
-DIST mozo-1.22.2.tar.xz 172644 BLAKE2B 15e643cfdceb1d62f7fd1499a42bb92a4dd8485adc764d304a2b3f31ffac962fa48f2af402564a6c1598fc97ae19288f4281bc19e9ba6855aeb329ec09bbe4ab SHA512 c5122b37036291ea7a2ecdb2a2ca37bf63d88404f8fb608c45917a28f4e5996d862764ea5e33544027f8f1f144387de40e204aa69b07d5a590b76aca29e1ad71
 DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
-EBUILD mozo-1.22.2.ebuild 1307 BLAKE2B e4c08af9d630349234bd45a8173cec99adb987c2c5ce49b1191c6ee2d3ac9127399e6c5c89a2e2407bea7a9170f2ab02445bb339cc2a0927ae37905b480cf6b3 SHA512 09c705c33cc6d9c65c3087d6daa4004a5f99b60b5a5ef7042e9edcde938f1238ac662d8b99713025cddb081cdd41795f0a30ee5c2e9baa9d6b8d3ff1751e3baf
 EBUILD mozo-1.24.0.ebuild 1311 BLAKE2B 31a5bb689aff98fe1f37caea0a4f856262592214f24621ed6be18fba2563c601e0c41f37e96e2605104f2bae7473135e27bf0a7a7530480cec2eab00ba22cf8a SHA512 d7ffdb97ca09abe2814c244accd3d622fced0e385c1723ac22d925ca97e7b9358382540718cb877996dc7d3108156b9a9fc5c866f34e564eb055202d74e7bb56
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.22.2.ebuild b/x11-misc/mozo/mozo-1.22.2.ebuild
deleted file mode 100644
index 2aef03eb2fc2..000000000000
--- a/x11-misc/mozo/mozo-1.22.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=mate-base/mate-menus-1.21.0[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.22:3[introspection]
-	virtual/libintl
-	!!x11-misc/mate-menu-editor"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir mate_src_configure \
-		--disable-icon-update
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	installing() {
-		mate_src_install
-
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i mozo || die
-
-		python_doscript mozo
-	}
-
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/x11-misc/primus/Manifest b/x11-misc/primus/Manifest
index a994a981442f..2eec8ba86b75 100644
--- a/x11-misc/primus/Manifest
+++ b/x11-misc/primus/Manifest
@@ -1,3 +1,5 @@
+AUX primus-0.2-libglvnd-workaround.patch 662 BLAKE2B c2a4af4171487405ca08248c162e7ea38cdf7af0ee32636f19f867741794d18dfbd66490163c7eb38de975f5adf29b69dabb47ec8c6196a5d36781e25be58c24 SHA512 529d62808a488237b0730aee9e83448d0d9910f4b3b1f707012724a571a3a94362d5e19f8f347b94f999ee3c4b7ff9260113718bc8a4d7450264579de8ee7fff
 DIST primus-0.2.tar.gz 26248 BLAKE2B 5e7822e66f3abadc442c30792c03dc731814a084ca2911b9e0333efda1fdfd36ce3c31be612426ae3747d7be0575aca2e7562054ba4ae719812cf800ffc04ff5 SHA512 4108f4e721c9cd8f8dc592a41706230b29bbcfcb8ba49e61d1f07f715c81304471e0d00407bc59a314568b3b42e19f0962ba1dbb8ef1996fe0d4ac13af2e3d2b
+EBUILD primus-0.2-r1.ebuild 1576 BLAKE2B 377050ecf80c04894149a9b69ddd8cf51fbb0b080cdcd7cc389d98d81be3a57ec947c1f93d4047c9f6f10f1f21b59af2a54cae679d9773d6497fa8d4de09d41b SHA512 151ec75b8bdc6a673e85d977c771ba0758155027c591129ae86e2c828f6d0e6aa6f2b4c1483153dfc324d9a4eacc478a2a3dda1b8d7009b579c73976751e8a36
 EBUILD primus-0.2.ebuild 919 BLAKE2B b1eb99e7e0b18b69e24a7ade73729228b6829a36da518539072bb7919dd54c338c0c9bedcf8a69a557563bcc85e7a61d716ad851e2ae084ebf767c8fa0827635 SHA512 9c967343163ac52b2ef9e5e061b8ca6be8d3cb0b7be1e51ad0a913c8fd9953ee486fa70a697b41814440d5739eebf39f3d6b84f09d2c3cdbc4082a75ee7debe3
-MISC metadata.xml 330 BLAKE2B 81c08f8c927d9be08433569cb570a334c5eb6597fefcbdc1b19f66635d64344682804dfc257e2d23f8113c4d5460da2ec6c2b9b9b179737477d8cc0cef3ca4f5 SHA512 1dc5d48fe52eeb8db3b6f369ce5acad4c7f03811d02cf4e6175aea37ffe117763e5601cc02124a3b7218d85d380504f5db6dddf18be6e04a469b4f6b27ded552
+MISC metadata.xml 423 BLAKE2B b55ae11da7b5968ec0b88042f4180c690d818c28690824eaf0511890dd747d64d0bd12510c2389e067e5ad190d295c27ed6a6e8ca43b8fd1abffbc22a3581096 SHA512 7d9a32f2d32a8973f17679e8658ebf461c7c88ba028f85209629767c097f66c4bfd0e3e1c9fd80d7a6b88bd4d6ccc52bd56a5650a61a68f6259278b172aab72d
diff --git a/x11-misc/primus/files/primus-0.2-libglvnd-workaround.patch b/x11-misc/primus/files/primus-0.2-libglvnd-workaround.patch
new file mode 100644
index 000000000000..f64757b7e340
--- /dev/null
+++ b/x11-misc/primus/files/primus-0.2-libglvnd-workaround.patch
@@ -0,0 +1,23 @@
+From 6ff7b3ee8c38830a72b5fc087d6f4f12cf421920 Mon Sep 17 00:00:00 2001
+From: Gary Gatling <gsgatlin@ncsu.edu>
+Date: Thu, 2 Mar 2017 14:50:47 -0500
+Subject: [PATCH] primus needs this variable workaround for libglvnd enabled
+ mesa
+
+---
+ primusrun | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/primusrun b/primusrun
+index 81e2dc0..33f0eef 100755
+--- a/primusrun
++++ b/primusrun
+@@ -1,5 +1,8 @@
+ #!/bin/bash
+ 
++# primus needs this variable workaround for libglvnd enabled mesa
++export __GLVND_DISALLOW_PATCHING=1
++
+ # Readback-display synchronization method
+ # 0: no sync, 1: D lags behind one frame, 2: fully synced
+ # export PRIMUS_SYNC=${PRIMUS_SYNC:-0}
diff --git a/x11-misc/primus/metadata.xml b/x11-misc/primus/metadata.xml
index 7eea5579ed48..80d44a9dc986 100644
--- a/x11-misc/primus/metadata.xml
+++ b/x11-misc/primus/metadata.xml
@@ -2,9 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>zx2c4@gentoo.org</email>
-		<name>Jason A. Donenfeld</name>
+		<email>NP-Hardass@gentoo.org</email>
+		<name>Adam Feldman</name>
 	</maintainer>
+	<use>
+		<flag name="libglvnd">Use <pkg>media-libs/libglvnd</pkg> for dispatch</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">amonakov/primus</remote-id>
 	</upstream>
diff --git a/x11-misc/primus/primus-0.2-r1.ebuild b/x11-misc/primus/primus-0.2-r1.ebuild
new file mode 100644
index 000000000000..b17cd30fb649
--- /dev/null
+++ b/x11-misc/primus/primus-0.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-build
+
+DESCRIPTION="Faster OpenGL offloading for Bumblebee"
+HOMEPAGE="https://github.com/amonakov/primus"
+SRC_URI="https://github.com/amonakov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/amonakov/${PN}.git"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+libglvnd"
+
+RDEPEND="
+	x11-misc/bumblebee
+	x11-drivers/nvidia-drivers[libglvnd(-)=]
+"
+DEPEND="virtual/opengl"
+
+PATCHES=( "${FILESDIR}/primus-0.2-libglvnd-workaround.patch" )
+
+src_prepare() {
+	default
+	# Exported values don't always seem to be used.  Until source fixed,
+	# patch primusrun script
+	if use libglvnd; then
+		sed -i "/libGLa/a export PRIMUS_libGLa='\/usr\/\$LIB\/libGLX_nvidia.so.0'" primusrun || die
+		sed -i "/libGLd/a export PRIMUS_libGLd='\/usr\/\$LIB\/libGLX.so.0'" primusrun || die
+	else
+		sed -i "/libGLa/a export PRIMUS_libGLa='\/usr\/$$LIB\/opengl\/nvidia\/lib/libGL.so.1'" primusrun || die
+	fi
+}
+
+src_compile() {
+	if use libglvnd; then
+		export PRIMUS_libGLa='/usr/$$LIB/libGLX_nvidia.so.0'
+		export PRIMUS_libGLd='/usr/$$LIB/libGLX.so.0'
+	else
+		export PRIMUS_libGLa='/usr/$$LIB/opengl/nvidia/lib/libGL.so.1'
+	fi
+	mymake() {
+		emake LIBDIR=$(get_libdir)
+	}
+	multilib_parallel_foreach_abi mymake
+}
+
+src_install() {
+	sed -i -e "s#^PRIMUS_libGL=.*#PRIMUS_libGL='/usr/\$LIB/primus'#" primusrun
+	dobin primusrun
+	myinst() {
+		insinto /usr/$(get_libdir)/primus
+		doins "${S}"/$(get_libdir)/libGL.so.1
+	}
+	multilib_foreach_abi myinst
+}
diff --git a/x11-misc/pypanel/Manifest b/x11-misc/pypanel/Manifest
deleted file mode 100644
index ac81a75d351e..000000000000
--- a/x11-misc/pypanel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyPanel-2.4.tar.gz 29857 BLAKE2B 55a47dd186aaaa79fd77068b2a7715ac5a5172517a38a49fc5df0d0065e91ef3dec36deefb7bda6c8b1668032d041acb7ce2602ec568ffb7832abe01f48f58c0 SHA512 acda16cbf4f725ee3f0e97e11f04177fc819f6c09d0bcc864c9de1fc0c1bc0bfe2593233e5b8b85399ad41bc07763ad87d7045bac4dece9dc15d6eaf3136895e
-EBUILD pypanel-2.4-r2.ebuild 568 BLAKE2B e1fd93563f9ba5bf7604b6200fd608747adadab902a74eaecbaa618f10765731fe7a5d7d3628060cd3e87f4c8b37246fce01af07ae1b7ecbfe93ed9813cd4926 SHA512 ce66dfc3d7d612638aeeb353751ba54271ccb15a905767c21796cfba8b537482a80385faf2a9feb61fc91f010cc707278431252499b0ef3d1ed590ce6094b7e7
-MISC metadata.xml 841 BLAKE2B 41f862939833f0aa86dca64168cbf35b674c805c1c07dc040732ba4fbcabcf0a8613ebe3d88612f402ad7e7a9f33920f402ec1dae282374b57b4a5e25ccd4362 SHA512 b37b25700ac1fbaec3050a47fc8f2260b4611c3da72b5f192eff3a64f18a6e4aee8dfdf9a8203e12f7b8bfcaa912f64471bc874decf1324ef16f9d6e9fb88a08
diff --git a/x11-misc/pypanel/metadata.xml b/x11-misc/pypanel/metadata.xml
deleted file mode 100644
index b6a5bfce49f3..000000000000
--- a/x11-misc/pypanel/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
-	<longdescription>
-PyPanel is a lightweight panel/taskbar for X11 window managers that can
-be easily customized to match any desktop theme or taste.
-
-Some of the customizable features include transparency w/ shading, panel
-dimensions and location, font type and colors, button events/actions,
-clock and workspace name display.
-
-PyPanel should work with any WM that supports the EWMH specification.
-The following have been tested: Kahakai, Openbox3, PekWM, WindowMaker.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">pypanel</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/pypanel/pypanel-2.4-r2.ebuild b/x11-misc/pypanel/pypanel-2.4-r2.ebuild
deleted file mode 100644
index c1c3381177d7..000000000000
--- a/x11-misc/pypanel/pypanel-2.4-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN/pyp/PyP}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A lightweight panel/taskbar for X11 window managers"
-HOMEPAGE="http://pypanel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXft
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	media-libs/imlib2[X]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index a0c74a29121f..b0069b1fcfca 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -3,6 +3,6 @@ DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a7
 DIST shared-mime-info-1.15.tar.xz 772708 BLAKE2B 763c7b5f1128882cb8a027ee7fb35daa5d141ccab07ba7aeae5139b94c1ed1c5702741b30c8803b7796bb6eb66fa02fde41d14e078b1960003bd3ba5e0de4e1a SHA512 3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2
 DIST shared-mime-info-2.0.tar.xz 5015272 BLAKE2B 8bac4790177f8b72a8c74799d7abca360ad11a922635aa1207eead78674192b300cf0096f5943a65aa3991c8403b145adb24f5e7746db7ea6ceeab64978608c3 SHA512 f4a1ea9a408ffcff325e57585dec5862405e9fd6c79e444048039f3061676501c40168cecf8935d002644a702a21f08f0f7c680ef6a65fdf188e0d892f3cc085
 EBUILD shared-mime-info-1.10-r1.ebuild 1773 BLAKE2B bd008173ac18b6b06be56cfad43cddaf9e0495853c5f7526f1b236e81cd1e2f7c0730148bb020dd414e42c106e51825d02ee5c6d0234c36a33a361a290424dea SHA512 cdd5dfbc93748884a3defb0447afb0bf24283c06df886085f6880400018bdbd5b764cf056d8b4ef9c60066c16b0f08b4085f3400d7379b5eb48968df40dca453
-EBUILD shared-mime-info-1.15.ebuild 1274 BLAKE2B 0c17cc9a27afbf1f678dae46af667d3f661c408a8738b199579e5084212a7a65b81da72716eb4530504cf4927802f8e13f31bd7656fda9d4dc4e0a9f97b3d1ed SHA512 5a108f4bfc9fc34e35f16849dc183ddac0296ede5166eb86c961b0da409e2a9e4516e97c0f25a3d6e6ace8fb3e21348e1909ce1a5c623ad8a33f0f54bdc021d9
-EBUILD shared-mime-info-2.0-r2.ebuild 1374 BLAKE2B 310af59675fd8f6e9d43805c53014b3f73281a67efed48f31960ba534aa103c4c496084aea712a1018a0bd5bb0049ab18ae00296655d9f33839382a000b210db SHA512 aa7225bbfcf2048749a47ff4bf6e238bf24a92a87d90220e6b57723e09b2e71fdfcab959c4f16f140425b00b78947e18df46bb3cde6a67ee6045ea5292267e00
+EBUILD shared-mime-info-1.15.ebuild 1281 BLAKE2B 940be4cf5cd2b04de6c7e38b5ff662bb19d43eede3a9a7827041f7c9c6b4e27e1a81af19233031f89eabbee9ff15050e50ae2ab52993c8d69f579933298c6f3b SHA512 3d413ccf7d70f39c2b996677d6172bdc7570673fbb8b1d849aa691e16db64c10d207b1c913722fe8d0660eaf2cc2775f6fdb2b45326e118af8263024d26fc11e
+EBUILD shared-mime-info-2.0-r2.ebuild 1381 BLAKE2B b3cc2a1960cae1dc65802ee71213a9e0ca335d8e54ec746538f8dfae2b0ef6a29a0d9f269513b8486121c93afd10b2adf213bc315516608f70836cf988d562be SHA512 c81559b5213ba0c618afb2ad2d8099eb06019f0692faa1b08c3f2574925644222440ecba1c6e0e5592d537da360cdb5fcfe5b5b2ee86fc84ecb7b219bd4745f7
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
index 35038d58bea6..46ef5331e663 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-util/itstool
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
index 714f445d6525..85e893d2bbce 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # requires installed xdgmime binary
 RESTRICT="test"
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index 6a793c1d0e0f..feb6c8a337fc 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,4 +1,4 @@
 AUX xflux-gui-1.2.0-disable-gschemas-compiled.patch 1540 BLAKE2B c1071aecced986b9bf8662de558ce8cd3c822ebfcc7d3d6601eba9ec30438bfcbc763e26eb31113b00b75e07f463125872ed8897c490ddd32cf96b0798e72557 SHA512 bd03efe531f0b55df89bbf2b6e6dbdbf7c48c214b9969d3c458d093a13603011b956efc0cc6695401abc7abfea18ed29be6501784a66edcf63f8ebd6793b3c15
 DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2
-EBUILD xflux-gui-1.2.0-r1.ebuild 1055 BLAKE2B e753363511a0295eddcec708f032071773f6bde25a64c8afa44cb1bd9389f24522cefdbf0faa7e47d0ddced731dd54a2cd2f36c651cf09b914e31ecbbb60e4e5 SHA512 e320e6303143952772ad3fcf6aa1fe8d9a304d80db2e0ab399a1f8b6996c96a0cab734b7bbf16a0d7478d2e0e08e6bc1156e07be51e138960f9a030d09c09682
+EBUILD xflux-gui-1.2.0-r1.ebuild 1054 BLAKE2B 0bad74c84d5d4ea532e544fea25ec0c5632612c5672441ccf63ff2ca74ab025efa28f2655bd3974e7d0c41b240ea8669194a44e7cbb7f5cc0385000b3c805053 SHA512 6fb1ea59ae0caa561d7d4e7664defffa47a700782a27ada27dfb430d5d9620851dc2482123cd4ed6f13851539d4c584aae8c7efc97ca05d3df6c96b14de7f4e6
 MISC metadata.xml 737 BLAKE2B d576868e8ee0b92e6439103d674d5a87e72d3794d202d1d8d1d200e5d479abdee76d31211520c5c04a53ed6a4567c0c6396cd2d08da0a82b3fe85c7b2c0f32d6 SHA512 60dacd24dfe19906d233434a547e0ef87d33ef5cfc9b3175df28ac65b9744fdf653bf449c4fdcc754950bdf5e859985735e889cd7755d7fae0458d067a5aba13
diff --git a/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
index fbb4bdea381a..a6844b5c2328 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 0a2e896c5f0c..6495f1e4b01d 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,7 +1,3 @@
-AUX xmobar-0.24.3-alsa-mixer-0.3.patch 1113 BLAKE2B bd73e83144c9544b96ecce7c0990a68e14befc8556e325d62634bb62745f9f0dd84711b2b4873d31c6b228ba1383132edb3fb75638eb0e306333e354cf2c78c6 SHA512 87e1a2461aa98d02f6b4e0602429e24fd906de86f982328affb055514151e338ce20a4294485f490ef1678e7a3633736d7bb553d66c464a9dddf1becf6dc2b58
-AUX xmobar-0.24.3-noxpm.patch 363 BLAKE2B f7bc04a5c317400501c0bfc86b403cb7c12e5407ff492a58cc252b54d4723a00fe2dbb954c0ff85f0b9d9f283b0b1739ef7b882e797f8f26125044dbd56b36ff SHA512 54e87bfac3476d0821c7b42ace5f9f3f2709ca89bdb182f3e93bdfb3e09cb0432267698e20aa325099949694120f0f81810e5c5a026839899de2b1d4550485c8
-DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3
-DIST xmobar-0.35.1.tar.gz 133251 BLAKE2B bebd535f2f29f89131b468e1226a63168321cfdb93129e4e3e6cdf9e2489bf4df6bdc02a5d3f6569d5c35d2cfe1fb05efec73587544c7526bf2f97bfe6a7e1b4 SHA512 fd7bb8710f3c877835aa0b20e0fca227f6f620c0be31acd46e6a464b4ba3f6c7da8df31cd3f345e606b03a54328dd9a298e46e8fc2935e74ebd8c5712cedbf76
-EBUILD xmobar-0.24.3-r1.ebuild 3131 BLAKE2B 9559d065d2fc80acbb5284f06fe6f7ceb1c1664663d889376f86aacb1846ead62c4f3818d8dee68638b3aea84ff42e6b0ccaeb79e84b3666a10784cb0245b3ff SHA512 a3e3295e0654c6c36d2024e53c1fbf8d3fa0b6edf9705c876a63acbe5b6f6397c76eeb32364ae4cf92aafdd7c4d3c08d8a21af019adce163d9cb274277b39442
-EBUILD xmobar-0.35.1.ebuild 4193 BLAKE2B 4cc95a1a3740458b337f8fe3881b01c799f553b42f4d4bad4d72bac8433ac1d006676c75992cd7ba7157cd6d80fe0bf008004e171c61badd42e9c20a0add5e40 SHA512 da52c03e62bed40b886adfec53e7ade451c4865bab4233b00a191a452241c0a5c81ad81e21d23d50fb7792ecbb714c23341cde38a9af070e77e5c5f23879e6cb
-MISC metadata.xml 1541 BLAKE2B 25764867ba7aa8e01234baf9fba704bd28354a251775f53f4aebac5eaeab3d2c758fea53beeaa80b87096e15555aaa7867b1a6436fead8ed54de3dc3d84a74df SHA512 910fa9e26f97f950c920b01ecb1de35c21933619f2c5a416dca4afdefbfe5a8939ac5d92c664772ce85ead5797a7f08de548e9f55e8adb03ab1288a75b7dc296
+DIST xmobar-0.36.tar.gz 136890 BLAKE2B be76faaec78d66b5f0f99542bc59330106c34413c5502f4dbef8dc47647dbf7ebfc94311de965520ca620c8cfbdc1ba68a3eab36da65e476c413ad9f8f4f3695 SHA512 abb7f9cf367fa5c03f5928006fc5f7c38434743350d5f524307b99448cb30436fb44e0c856bd274032a6803f05b64e6d4ac553f51f4bd817efd2861408007c02
+EBUILD xmobar-0.36.ebuild 4189 BLAKE2B 005c7e2eefb11a829f7fab9300d87c3ab0ff80199c8542e49b132017d999c8f0d4782df9ca7f22d8205d9a1f4c935762b99597526ecd8ac4f8d999ba15f51f3d SHA512 4a489b171410b8bd45662e28f5170dbc75444d166785a3c73da64d8e81d912a5d7fec90bfe63579fc248d4eb6fb0b35ad81bc22c6b3ccb3378b3e96c51b18610
+MISC metadata.xml 1476 BLAKE2B 250601d02fc74bfe6d62a3b2c5be23998fec089bcfa625a73db8b79955ef55a3ca7b13040c44518d51b0b141a8370fe6dedf4f53a47c70882097a7838c1711ee SHA512 b274a1a21217bde42aff7eff73de3acb3bc9c49ae21a2bdb7a1e2b44f28198922c84d4c98bad0ad9ad4593dd64416236475cd1111e484ddccf8d6c6a85cf53b3
diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch b/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch
deleted file mode 100644
index 837df1d29753..000000000000
--- a/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/Plugins/Monitors/Volume.hs
-+++ b/src/Plugins/Monitors/Volume.hs
-@@ -122,7 +122,8 @@ formatDb opts dbi = do
- runVolume :: String -> String -> [String] -> Monitor String
- runVolume mixerName controlName argv = do
-     opts <- io $ parseOpts argv
--    (lo, hi, val, db, sw) <- io readMixer
-+    (lo', hi', val', db, sw) <- io readMixer
-+    let (lo, hi, val) = (toInteger <$> lo', toInteger <$> hi', toInteger <$> val')
-     p <- liftMonitor $ liftM3 formatVol lo hi val
-     b <- liftMonitor $ liftM3 formatVolBar lo hi val
-     v <- liftMonitor $ liftM3 formatVolVBar lo hi val
-@@ -164,11 +165,11 @@ runVolume mixerName controlName argv = do
- 
-     getDB :: Maybe Volume -> IO (Maybe Integer)
-     getDB Nothing = return Nothing
--    getDB (Just v) = channel (dB v) 0
-+    getDB (Just v) = fmap toInteger <$> channel (dB v) 0
- 
-     getVal :: Maybe Volume -> IO (Maybe Integer)
-     getVal Nothing = return Nothing
--    getVal (Just v) = channel (value v) 0
-+    getVal (Just v) = fmap toInteger <$> channel (value v) 0
- 
-     getSw :: Maybe Switch -> IO (Maybe Bool)
-     getSw Nothing = return Nothing
diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch b/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch
deleted file mode 100644
index 8f4da6b78847..000000000000
--- a/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/xmobar.cabal b/xmobar.cabal
-index f6a6dae..8a17579 100644
---- a/xmobar.cabal
-+++ b/xmobar.cabal
-@@ -89,3 +89,3 @@ executable xmobar
-       Xmobar, Actions, Bitmap, Config, Parsers, Commands, Localize,
--      XUtil, XPMFile, StatFS, Runnable, ColorCache, Window, Signal,
-+      XUtil, StatFS, Runnable, ColorCache, Window, Signal,
-       Environment,
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index 3ecfd078e089..f3ba842d32a1 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="alsa">Use alsa-mixer to get the volume from soundcards</flag>
-		<flag name="conduit">Use conduit to fetch weather data.</flag>
 		<flag name="dbus">Publish a service on the session bus for controlling xmobar</flag>
 		<flag name="inotify">inotify support (modern Linux only). Required for the Mail and MBox plugins</flag>
 		<flag name="mpd">Support mpd plugin</flag>
diff --git a/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild b/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild
deleted file mode 100644
index 7cf587b82685..000000000000
--- a/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="https://xmobar.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm"
-
-RDEPEND=">=dev-haskell/http-4000.2.4:=
-	>=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
-	dev-haskell/old-locale:=
-	>=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:=
-	dev-haskell/regex-compat:=
-	>=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:=
-	>=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:=
-	>=dev-haskell/x11-1.6.1:=
-	>=dev-lang/ghc-7.8.2:=
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:=
-		>=dev-haskell/alsa-mixer-0.3:= )
-	dbus? ( >=dev-haskell/dbus-0.10:= )
-	inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= )
-	mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= )
-	mpris? ( >=dev-haskell/dbus-0.10:= )
-	timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
-			>=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
-	wifi? ( net-wireless/wireless-tools )
-	conduit? ( dev-haskell/http-conduit:=
-			dev-haskell/http-types:= )
-	xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
-	xpm? ( x11-libs/libXpm )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-noxpm.patch
-	"${FILESDIR}"/${P}-alsa-mixer-0.3.patch
-)
-
-src_prepare() {
-	default
-	# xmobar is an idle multithreaded program
-	# which sits in 'while { sleep(1); }'
-	# loops in multiple threads.
-	# It has a pathological behaviour in GHC:
-	#   everything program does is thread context switch
-	#   100 times per second. It's easily seen with
-	#
-	#       $ strace -f -p `pidof xmobar`
-	#
-	#   where rt_sigreturn() manages to enter/exit
-	# kernel 32 times in each second to do nothing
-	# This workaround allows shrinkng wakeups/thread
-	# switches down to one per second (internal xmobar's
-	# cycle).
-	# Be careful when remove it :]
-	HCFLAGS+=" -with-rtsopts=-V0"
-
-	cabal_chdeps \
-		'stm >= 2.3 && < 2.5' 'stm >= 2.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-all_extensions \
-		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag conduit with_conduit) \
-		$(cabal_flag timezone with_datezone) \
-		$(cabal_flag dbus with_dbus) \
-		$(cabal_flag inotify with_inotify) \
-		$(cabal_flag wifi with_iwlib) \
-		$(cabal_flag mpd with_mpd) \
-		$(cabal_flag mpris with_mpris) \
-		--flag=with_threaded \
-		--flag=with_utf8 \
-		$(cabal_flag uvmeter with_uvmeter) \
-		$(cabal_flag xft with_xft) \
-		$(cabal_flag xpm with_xpm)
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc samples/xmobar.config readme.md news.md
-}
diff --git a/x11-misc/xmobar/xmobar-0.35.1.ebuild b/x11-misc/xmobar/xmobar-0.36.ebuild
index 50130b0d928b..319433122f08 100644
--- a/x11-misc/xmobar/xmobar-0.35.1.ebuild
+++ b/x11-misc/xmobar/xmobar-0.36.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.6
 #hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:iwlib,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm,with_nl80211:wifi
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="http://xmobar.org"
+HOMEPAGE="https://xmobar.org"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"