[gentoo-commits] repo/gentoo:master commit in: media-sound/spotify/, media-sound/spotify/files/

[Andrew Ammerlaan]

commit:     c9552fb8ed7a6fc725deb83c1092d4490710e0f7
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 10:27:38 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Oct  9 10:40:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9552fb8

media-sound/spotify: remove references to media-sound/spotify-tray

media-sound/spotify-tray is masked for removal because spotify
now has its own tray icon and the package is no longer needed.

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 media-sound/spotify/files/spotify-wrapper                     | 11 -----------
 .../{spotify-1.2.20-r2.ebuild => spotify-1.2.20-r3.ebuild}    |  4 +---
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/media-sound/spotify/files/spotify-wrapper 
b/media-sound/spotify/files/spotify-wrapper
index 862fa4c680d6..0d7295af5ca1 100644
--- a/media-sound/spotify/files/spotify-wrapper
+++ b/media-sound/spotify/files/spotify-wrapper
@@ -5,17 +5,6 @@ export LD_LIBRARY_PATH="/usr/$LIBDIR/apulse"
 if command -v spotify-dbus.py > /dev/null; then
         echo "Launching spotify with Gnome systray integration."
         spotify-dbus.py "$@"
-elif [ -e "$SPOTIFY_HOME/spotify-tray" ] > /dev/null; then
-        echo "Launching spotify with generic systray integration."
-        minimized=
-        for arg; do
-                if [ "$arg" = --minimized ]; then
-                        minimized=$arg
-                        break
-                fi
-        done
-        GDK_BACKEND="x11" "$SPOTIFY_HOME/spotify-tray" \
-                --client-path="$SPOTIFY_HOME/spotify" --toggle $minimized -- 
"$@"
 else
     if pgrep -f "Spotify/[0-9].[0-9].[0-9]" > /dev/null; then
         busline="org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 
org.mpris.MediaPlayer2.Player.OpenUri ${1}"

diff --git a/media-sound/spotify/spotify-1.2.20-r2.ebuild 
b/media-sound/spotify/spotify-1.2.20-r3.ebuild
similarity index 96%
rename from media-sound/spotify/spotify-1.2.20-r2.ebuild
rename to media-sound/spotify/spotify-1.2.20-r3.ebuild
index 7d4a9417eaec..333a0fd7c799 100644
--- a/media-sound/spotify/spotify-1.2.20-r2.ebuild
+++ b/media-sound/spotify/spotify-1.2.20-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop optfeature pax-utils unpacker xdg
+inherit desktop pax-utils unpacker xdg
 
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/download/linux/";
@@ -127,6 +127,4 @@ pkg_postinst() {
        ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
        ewarn "To remove the cache:"
        ewarn "rm -rf ~/.cache/spotify"
-
-       optfeature "systray integration on non-Gnome DEs" 
media-sound/spotify-tray
 }