Merge updates from master

app-misc/spotify-tray/Manifest

@@ -0,0 +1 @@
+DIST spotify-tray-1.3.1.tar.gz 22084 BLAKE2B ee8f269d1ac618794eee8a67b814f689f3a65f18433a1e3c2382465a2b9b247e70e16fb43f061d1c7cef9188f116d0c7e8478fe3ffe2ab5f2de54dc8ccb40808 SHA512 c1fd533e3879f2d9e451264969bc797c6b8ca35f191460d40822728fc6b637ec7487154b0794871f25cbd6e01b16c7ff5eb33806a1235ac09e45e49580d1337a

app-misc/spotify-tray/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tsmetana/spotify-tray</remote-id>
+		<bugs-to>https://github.com/tsmetana/spotify-tray/issues</bugs-to>
+	</upstream>
+</pkgmetadata>

app-misc/spotify-tray/spotify-tray-1.3.1.ebuild

@@ -0,0 +1,28 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Tray icon for the Spotify Linux client"
+HOMEPAGE="https://github.com/tsmetana/spotify-tray"
+SRC_URI="https://github.com/tsmetana/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	x11-libs/gtk+:3[X]
+"
+RDEPEND="${DEPEND}
+	media-sound/spotify
+"
+
+src_prepare() {
+	default
+	# Fix the name of the icon
+	sed -i -e 's/Icon=spotify/Icon=spotify-client/g' spotify-tray.desktop.in || die
+	eautoreconf
+}

x11-themes/qogir-icon-theme/qogir-icon-theme-2020.11.22.ebuild

@@ -35,6 +35,10 @@ src_prepare() {
 	sed -i -e "/cp.*cursors/i mkdir -p \${CURSOR_DIR}/Qogir\${color}" \
 		-e "s:\(cp.*cursors\"\).*:\1 \${CURSOR_DIR}/Qogir\${color}:" \
 		install.sh || die "Sed failed changing cursor location!"
+
+	# Use xdg-utils eclass instead
+	sed -i -e "/gtk-update-icon-cache/d" \
+		install.sh || die "Sed failed removing gtk-update-icon-cache call!"
 }
 
 src_install() {