gentoo resync : 25.08.2018

4 files changed, 123 insertions, 24 deletions

diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 4bdb21ebdd26..a762d2b9bda7 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,7 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.0.80.480.g51b03ac3-13_amd64.deb 97542898 BLAKE2B a89f3f607c9fb03327886fc1b6eb8d433b32913aa7ff32e95f626a8ef7710c4d6102721b76e9a83f1342d1ac6f6941d85376b4cb878cf641f42f3c3756582eb9 SHA512 a46b1d28e6c40dbe9a86a38794186f2cdf31341fff953eaa5a5fdbb37c27c00ffe14a918b2552df0996d2842f009e6700bf8683e0667fc671dfd5b343251f20e
-EBUILD spotify-1.0.72.ebuild 3417 BLAKE2B ea84409bbe8dc6eb029fe6ee0393aacb9e8fbc15f018cca4887e4f7c1ff13c6417aa0b750fe0bc08860126a0c53e39e14f2ab8f291deca5536ce5b436b3e58d4 SHA512 a9d1fced3b9ec9518a7e0eab950895c270e77d377211ee68d8a49b673bf1ee77dceb9180e417b8dc5323b82f1a44b44e15b28b287602218bb7bcca86a88ba51b
-EBUILD spotify-1.0.80.ebuild 3643 BLAKE2B 6e890c7c44aefb42842f51febc5e357b4df6600e904dbb6a189beba956e511fadd91f0936113dbcfa6f7b7959ea2e02496902a68137c09b2ad643e89697b1505 SHA512 59490d8f948f090c7c101f0f3d489b7955bedca2d19b7c080c038e13c36c2b2c9d823f462033f021dabad3b50f8ef9b461080cf547f7be1ea464381117b65b9a
+DIST spotify-client_1.0.88.353.g15c26ea1-14_amd64.deb 103367590 BLAKE2B 90de37c58643cd864b35e26f2d97507872adfa3a6d9b7832d46d0caf9d3383673c67b2e4d7d7015075912cc2ae3754f575f968bd6b743760d7a910d90581d25c SHA512 30592c34a2b1b9d546c753d03a8ead7459d83bd5f420e1dab92a1f2ff40ac2daa0f4f447b95cd499a30328aea1afe8949e05fdd0668b9caf637abdecf5e45742
+EBUILD spotify-1.0.72.ebuild 3153 BLAKE2B 9b6a5885f84ad3380abbdceff28cdc0c124fb8b5e49b98ad07afcb0155b07ffcc22b5b8600408bd3a80a94122830cc084b8f976aeda933ee9958635e21885105 SHA512 be69b2a2ac5258244123132a10035acaeab07ade9ff36a9dcea282a1ec08ed262866238333142ebf2b43dee1c4c5b7febccc7f7a4c7db1a1e9d2b7b9e718082e
+EBUILD spotify-1.0.80.ebuild 3379 BLAKE2B da3e12406fd9d04ca447a8a8f690262c05c76b7397be06e40169c435d1883330d4c2800797e3d58976513c8fedadaa20f49e3b114f72a77a325f400f5cba0782 SHA512 cea23c3af5d75616742273f55468b45c72a38c359b3f0758ae6b5d54545ee868ef68f8f1ab7d5443dee2b1f707b38f6d62aea91744c4ec3ad6d80732fc545d5e
+EBUILD spotify-1.0.88-r1.ebuild 3379 BLAKE2B 9c4f894b4900725fd22fd17d193d050f8184e7ecd614aef00a3855fa26d002fbd62bd5d573f4e8ec1d69a7a98a9cc2d9b4a57ff2ed48bdf9741f22876c2dfa1e SHA512 7343ae6120d9cbee976619497ad0a143cc7eebd6c766777139dd8b3fc73876117f11f647a10b58ff681072e9efe04d79377c49ca673765352cc8313187cd19f4
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.72.ebuild b/media-sound/spotify/spotify-1.0.72.ebuild
index 3b8d57bd25aa..b4ac3c597ade 100644
--- a/media-sound/spotify/spotify-1.0.72.ebuild
+++ b/media-sound/spotify/spotify-1.0.72.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils xdg-utils gnome2-utils pax-utils unpacker
+inherit gnome2-utils pax-utils unpacker xdg-utils
 
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
@@ -19,7 +19,7 @@ IUSE="libnotify systray pax_kernel pulseaudio"
 RESTRICT="mirror strip"
 
 DEPEND=""
-# zenety needed for filepicker
+# zenity needed for filepicker
 RDEPEND="
 	${DEPEND}
 	dev-libs/nss
@@ -94,10 +94,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update
@@ -106,11 +102,6 @@ pkg_postinst() {
 	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
 	ewarn "To remove the cache:"
 	ewarn "rm -rf ~/.cache/spotify"
-	ewarn
-	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
-	ewarn "Run"
-	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
-	ewarn "Then log out and log in back to KDE."
 }
 
 pkg_postrm() {
diff --git a/media-sound/spotify/spotify-1.0.80.ebuild b/media-sound/spotify/spotify-1.0.80.ebuild
index da910ba96d62..ae609de2a96e 100644
--- a/media-sound/spotify/spotify-1.0.80.ebuild
+++ b/media-sound/spotify/spotify-1.0.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils xdg-utils gnome2-utils pax-utils unpacker
+inherit gnome2-utils pax-utils unpacker xdg-utils
 
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
@@ -19,7 +19,7 @@ IUSE="libnotify systray pax_kernel pulseaudio"
 RESTRICT="mirror strip"
 
 DEPEND=">=dev-util/patchelf-0.9_p20180129"
-# zenety needed for filepicker
+# zenity needed for filepicker
 RDEPEND="
 	dev-libs/openssl:0
 	dev-libs/nss
@@ -98,10 +98,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update
@@ -110,11 +106,6 @@ pkg_postinst() {
 	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
 	ewarn "To remove the cache:"
 	ewarn "rm -rf ~/.cache/spotify"
-	ewarn
-	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
-	ewarn "Run"
-	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
-	ewarn "Then log out and log in back to KDE."
 }
 
 pkg_postrm() {
diff --git a/media-sound/spotify/spotify-1.0.88-r1.ebuild b/media-sound/spotify/spotify-1.0.88-r1.ebuild
new file mode 100644
index 000000000000..8bff5d699d5b
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.88-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils pax-utils unpacker xdg-utils
+
+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="353.g15c26ea1-14"
+#BUILD_ID_X86=""
+#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify systray pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=">=dev-util/patchelf-0.9_p20180129"
+# zenity needed for filepicker
+RDEPEND="
+	dev-libs/openssl:0
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	libnotify? ( x11-libs/libnotify )
+	pulseaudio? ( media-sound/pulseaudio )
+	systray? ( gnome-extra/gnome-integration-spotify )"
+	#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() {
+	dodoc usr/share/doc/spotify-client/changelog.gz
+
+	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
+		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() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}