gentoo resync : 16.01.2021

3 files changed, 141 insertions, 0 deletions

diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 85626ee9ea35..acb67a1f2324 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,6 +1,8 @@
+AUX spotify-wrapper 647 BLAKE2B 6bb43ce4667ff954d301a99fbbd862a5c814c140a3ab56b16dd7adf520e9ebb51f6527ce07796bac058afc3a7c4cc97a85f9e996c6e3ffee8b2b29b731b4d718 SHA512 1202e39f6d3a47cac353ec9519695a424aaf51afe24d8ca6f3ec0ec79ec19020bbc7c6e43352121684b2b7789e2c7be32d4942ad4883d3076b19ad9eee4ab1c1
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.1.72.439.gc253025e_amd64.deb 117803268 BLAKE2B 4ca2ca2df9ef5626483d4eca9c5a6f32fba63efdcd9e930379e83a2f8d40c112ab95ac4ade79fec365ae18b3e4aff089b5f07b6af02a5d080f64f14995099ea7 SHA512 65cec95448d936b7be93b0d16f29927a298b5b56aa2bc4834a5d357e341c78486fa69e61b3b6cf9fbe7da88c8d3b6ce3bccb5e963ed1b5a23320c0c808ccb385
 EBUILD spotify-1.0.72-r1.ebuild 3208 BLAKE2B dbe0adc8f45c8c83d2a6734b36439ac0ce67b48ea518ae9153a5006c1ef4e923cd768a983495c35bac8d1469d4e7f5b5c26e73284f43ff9d5d84dd23e80c6740 SHA512 8955f11f24a1a50827b2dc9c37e03ac0c24ad8d352cf91598a3d39c65679f54cd3b8660f21e5a8f1347e408ec1fea8e23a962fd7e2c93b64f034d74a9304ae26
 EBUILD spotify-1.1.72-r1.ebuild 4187 BLAKE2B ea2a85532926be54d20a1974dd726a8f34da51935cb2a64dc0a49a0daebe480d169b462a06c24370a4186c6bef33dfd7c05aa0a15bb05a0f2d71c06fafc9f705 SHA512 cdc5d3dcb5e1f0998b8d61a6076e99db9c5aaa58e5a8a62b6118e2df963c030cca9d0bce0132be7e89b98ad3dcfbde7aed00871d33db006083d3a58bce632991
+EBUILD spotify-1.1.72-r2.ebuild 3471 BLAKE2B e811845414f94846031d111a983755f4fc0eb340a8593def1ba9323bfe627c13de0c69381015e9bcc0586bd6c126e039240de5a099b43802bf772e22ac56b5c5 SHA512 6aa4511ed47f4a17646ff831edb217acafab6fad30cebe25cf605f36b2578c109b1c02c51ac1a8c30bc5ffc0e4a5b4ec3306a6ab749656b450c849f3d6dd2767
 EBUILD spotify-1.1.72.ebuild 3441 BLAKE2B 90000daf87d9578758f37ed1bca2da1a185ff6887cca06525e72c2e3c5e2d4fb2a8e6a68d79b015d0bad45468eeda20b0a5597158ec00f76671f1497b1693932 SHA512 f63014c8d4852c1c76d2f9d6dc0d55fedc333f6d3c0969bf280ae6bba21f672cca564c8cff66297caa31d3bff61dff9089441aac63bab94ade5d8068fb9289f1
 MISC metadata.xml 633 BLAKE2B acdcc4b02017e86b02be5f5e7fb56a292c5c0be9bceebf2a6d2caa4512ef240f5c1dc9d1ee6f48b1d8391556dccd81e94cda1e7233af5cd666536f5c6cb35a1e SHA512 c7b74768267009ac22c3ed90da61a60ea3ef6bb6a35c859f58ab2707af310f5201f35a526182402d669639b470ca47cd59f5a7b820b170122c4989b15f960fcc
diff --git a/media-sound/spotify/files/spotify-wrapper b/media-sound/spotify/files/spotify-wrapper
new file mode 100644
index 000000000000..db8f8b948780
--- /dev/null
+++ b/media-sound/spotify/files/spotify-wrapper
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+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 command -v 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
+	spotify-tray \
+		--client-path="$SPOTIFY_HOME/spotify" --toggle $minimized -- "$@"
+else
+	echo "Neither gnome-integration-spotify nor spotify-tray are installed."
+	echo "Launching spotify without systray integration."
+	exec "$SPOTIFY_HOME/spotify" "$@"
+fi
diff --git a/media-sound/spotify/spotify-1.1.72-r2.ebuild b/media-sound/spotify/spotify-1.1.72-r2.ebuild
new file mode 100644
index 000000000000..d3f98c51dd26
--- /dev/null
+++ b/media-sound/spotify/spotify-1.1.72-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature pax-utils unpacker xdg
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/download/linux/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="439.gc253025e"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify local-playback pax-kernel pulseaudio"
+RESTRICT="mirror strip"
+
+BDEPEND="
+	>=dev-util/patchelf-0.10
+	sys-devel/gettext
+"
+RDEPEND="
+	dev-libs/nss
+	dev-python/dbus-python
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/openssl:0=
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/harfbuzz
+	media-libs/mesa[X(+)]
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-sound/apulse )
+	local-playback? ( media-video/ffmpeg:0/56.58.58 )
+	x11-libs/gtk+:3
+	app-accessibility/at-spi2-atk
+	x11-libs/libxkbcommon
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libSM
+	x11-libs/libICE
+"
+	#sys-libs/glibc
+
+S="${WORKDIR}/"
+
+QA_PREBUILT="
+	opt/spotify/spotify-client/spotify
+	opt/spotify/spotify-client/libEGL.so
+	opt/spotify/spotify-client/libGLESv2.so
+	opt/spotify/spotify-client/libcef.so
+	opt/spotify/spotify-client/libvk_swiftshader.so
+	opt/spotify/spotify-client/libvulkan.so.1
+	opt/spotify/spotify-client/swiftshader/libEGL.so
+	opt/spotify/spotify-client/swiftshader/libGLESv2.so
+"
+
+src_prepare() {
+	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
+	SPOTIFY_HOME=${SPOTIFY_HOME} LIBDIR=$(get_libdir) \
+		envsubst '$SPOTIFY_HOME $LIBDIR' \
+		< "${FILESDIR}/spotify-wrapper" > "${D}/usr/bin/spotify" || die
+	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"
+
+	optfeature "Gnome specific systray integration" gnome-extra/gnome-integration-spotify
+	optfeature "systray integration on non-Gnome DEs" media-sound/spotify-tray
+}