gentoo resync : 28.04.2021

4 files changed, 8 insertions, 114 deletions

diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 0e6978f7e7bd..e05ece8bfec1 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,10 +1,8 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8ebccdc889b723ac6e9f5275dddec97d35142606ece32d1edb1ed288d1c517d41027de22da77421a76f8c00ea90ddc868b74dd46ba07cff60a581b12a SHA512 f004083eee00600a51e50d7dee03846293b5ccd6966786e91055564c7963917b9aaa917de41f299a0f5b7baecea5f466fb37722b8631743ff2ca15f43851f5f4
 DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9e1f7e8d7b68059ec5aad5f71ae1e59af80fa91903941afc2e0a91e2f957860bf96ce3ce4b19884f2548426269a9a2043c2985b4bbc82c5f091f5f2b8 SHA512 af9f1beafe0e4d2313326d1a55675550e8c3fcd5cd2dc0954127094c563048b98f74f669d99a10f0ef6e3b3405856bb9d6a2561644a434ab6bade9c812296963
-DIST spotify-client_1.1.42.622.gbd112320-37_amd64.deb 126293582 BLAKE2B 909d2cba7a2d2686a4e278e315658d8011d83f3eca3b5381fcd1df574d8e4223c3fb8508f417ec9f66b37740ac8b221a6d8cf753fc2cee47700b45a867556302 SHA512 a3fe98d69460ffd641df3219c2a3d164a33e2b52c86a56276e473dd5c3a43d6304df3b77fefcf0ca6c09cb6e2c8dacab65573cf7543725b6c8d402832149e122
+DIST spotify-client_1.1.55.498.gf9a83c60_amd64.deb 133771326 BLAKE2B b4f17f3008e23cfc9b1cd7ecd806ae97b846f22b39be5ee25515111e6641b31b1cd6525f0cc6b5540d3bce03adbcc23940db26992642ec3884b46f919f499179 SHA512 395806fc064706cc6b005054ec0f5e0a9b0cebfa073ccb771b7e8cb2f6c8aa300efe9164e492f90f4c83d047a898f6553c44722562d8f3e1462947d811a2e599
 EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019cccd1a4a3307bc71e7ca897d890c9119a4a0df1d1bd5fa28156cf86b4eb56f4aeefbfc07d03ddbb4c0626e8c201aee SHA512 329198467357064fc1a556437928f2d59ab0b6262c82c0435638338b8b94adac031f94a9dc4f7cad4b11345ca5f0a5e1caa13168dcdd2d1224883f6a3aa42422
-EBUILD spotify-1.1.10-r1.ebuild 3155 BLAKE2B d3bc28ef679c0307add8cb7b496cedf3a47dededc46c624b9a14b4b2e31fd40fffaafca87f084519db86b33312fa6f30c64bb222acdbac99dcffee8cc537191b SHA512 5f9fb840160b3b5a11af49836f10735aac5d3cacf21f429e554b63d6b3d924401eb3f3d73b1ef0abeef5c2a1d74fe3be24a740f8a2eb2069c8b29b9f50fb07db
 EBUILD spotify-1.1.26-r1.ebuild 3193 BLAKE2B 35f3f47bdaeed4ce6b20b7d856f2b35b3c3930c4347edc807ab72fb9cc3b5a084729ec1223c10155f1cc2801210debd89785ebad819e9bcb265aea247f194520 SHA512 a5ca516fa5cbfcccfa7edd49a860487283e7a3feaf832f2f252291438468f2db3c8c1e855bc0d09d09ab36a995bb88298c3c321ce0ddafa66f23a64de2306553
 EBUILD spotify-1.1.26-r2.ebuild 3449 BLAKE2B 28e9a400ad3bf321efb845b7ad396bc399bda2aeb1c1a3acfdc0dbd1b747c971eb8b59c2c073b8126a0ae056e937cea6c32b4ebd648f0e753cc0a98db0e84618 SHA512 f9e16593cf0c5d8ea6c7f35f984e1a23cda928ec2ea7f2140c6635ee1e46aa80e7f1b0e6bcbd031416f92e8e60504dc07df0a8fd85b85552303086e1ed2f56b1
-EBUILD spotify-1.1.42.ebuild 3449 BLAKE2B d63ce19c0e4279cd79d325110b4d343d2e1f9b8fd8bbda2ebebf76ef67d3fe8c366895e5efb2de35821a00b1cffc96896521a04c8463abd596b905654c6c655a SHA512 270cb9da8ee5eb4b427bc472cc1972efee50449fff30c3ac524dea57d4a313603e3642900cedfb6b6204bfef08112fff53fbb2b3c9279c2bd14ae303312ca83a
-MISC metadata.xml 542 BLAKE2B 112c082ca9d2775e0225eadf3ec24260438db4ec3122be340395edae3096f378ddb349275fe5c31435c5196d606d099812fea831d06ce2ac913ddc777e65d66d SHA512 a414c96da5c9c5af23491937a86edf26ca5207f4cd9277a187059f2196b8ce9b28cab80f0ee5a326911a9aa5945d2604bea310608bc5270e507fb8052e1bd2ef
+EBUILD spotify-1.1.55.ebuild 3512 BLAKE2B 0dfe4606a03e8e91885f5e110e9735a455007a7722853829eac7aacdaea2cccd2030a35abe0bd5aadc2e66264f679bcbaff63f56b61a8fc034f70f6c3b533213 SHA512 3f1e1c6a2df70e8ed29f48f702c9bc663e695284f7f1c2bdc985c0a18b98ae492f7061537806735c4b9651e214609a140e1763db40a873b6d7b796106b1dcd12
+MISC metadata.xml 632 BLAKE2B 4c68e175f8bfe81df9c89a76d97ea02c71cdb7a7fe1737d95ae20a49840f734372953fbcfaa8af5ecd918ee1444fabacff223487707e9d0e76993d94f6878b8d SHA512 2947ed146739cec0abed1142356d5fc2d8d32251fe117cb7f999b1e83e65223b93700106913db90a41718ca7a88f3a42661af3617ae1bde2e695907e746638ae
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
index 6e853bb00209..5f4cc456b934 100644
--- a/media-sound/spotify/metadata.xml
+++ b/media-sound/spotify/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <use>
+    <flag name="local-playback">Allows playing local files with the Spotify client</flag>
     <flag name="pax_kernel">Triggers a paxmarking of the main Spotify binary</flag>
     <flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag>
     <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
diff --git a/media-sound/spotify/spotify-1.1.10-r1.ebuild b/media-sound/spotify/spotify-1.1.10-r1.ebuild
deleted file mode 100644
index 8267b9da0b39..000000000000
--- a/media-sound/spotify/spotify-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="546.ge08ef575-19"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify libressl systray pax_kernel"
-RESTRICT="mirror strip"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-RDEPEND="
-	dev-libs/nss
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	libnotify? ( x11-libs/libnotify )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	|| ( media-sound/pulseaudio media-sound/apulse )
-	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:2
-	app-accessibility/at-spi2-atk
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/media-sound/spotify/spotify-1.1.42.ebuild b/media-sound/spotify/spotify-1.1.55.ebuild
index 4b9dc6ccaf58..544835629b0a 100644
--- a/media-sound/spotify/spotify-1.1.42.ebuild
+++ b/media-sound/spotify/spotify-1.1.55.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,12 +7,12 @@ inherit desktop pax-utils unpacker xdg
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="622.gbd112320-37"
+BUILD_ID_AMD64="498.gf9a83c60"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify libressl systray pax_kernel pulseaudio"
+IUSE="libnotify libressl local-playback pax_kernel pulseaudio systray"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -31,6 +31,7 @@ RDEPEND="
 	net-print/cups[ssl]
 	pulseaudio? ( media-sound/pulseaudio )
 	!pulseaudio? ( media-sound/apulse )
+	local-playback? ( media-video/ffmpeg:0/56.58.58 )
 	systray? ( gnome-extra/gnome-integration-spotify )
 	x11-libs/gtk+:2
 	app-accessibility/at-spi2-atk