gentoo resync : 04.05.2019

2 files changed, 16 insertions, 26 deletions

diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 8e35b9d911f6..dc0d7b619669 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,7 +1,7 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.0.98.78.gb45d2a6b-10_amd64.deb 105135826 BLAKE2B e1641a738f8e03c86d9b28ac902ed9857e1bb406b03e7a1c59c522e86a211b13cfd442bf84f79af4302d32a4b1c041e8ef7297990e70912d8c0a5108838e0500 SHA512 f20f2c998a205f189a19f332b2e738a0ec98a34520765c0e1d27d95d92f7c9c2f78da32f9edcc61146be87e8d8df7d3521d2e84b427cd25586b9fe6bec8d1602
-DIST spotify-client_1.1.0.237.g378f6f25-11_amd64.deb 104760412 BLAKE2B d6cd695a41d80a47362b694e74b7d9d34a5c6480dbce189fa22d514126ab3022387871021a3d2a1301d9eb88c3b8f70755c1a5f880f9cc34c67c5faead7d84b8 SHA512 a1fcbf3463eea13a4ff38f4b40ae999c8e138abc8adf6988b4d764e597f166ef894baf449a6506a6b9b69ba3ed92c83dcb1a1eda23ab843c0441d2b71bbb0d51
+DIST spotify-client_1.1.5.153.gf614956d-16_amd64.deb 113728674 BLAKE2B bc7930a1935c0a05dba262abc384a699720be53e3bec83393c962761bee647a247d2ddf475a6812bdb969fc1f59e9d2c283de0da398a9b8f7ddfff8f1232fef1 SHA512 db354f161c35b5f1a2d633282fad8fccf565e0061e7d258012f28422d766630391d47d4dafe22448fb60f850bf4ccbfdf82443cf107e03727c077b2c62e524be
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
 EBUILD spotify-1.0.98.ebuild 3429 BLAKE2B 436b23f7857907ba883d7ade7eedfe1ecbfe15f2b2f787c1a832bc4d888c13aa5098b9a495f38c200795775476501465d6fb63e39e1b0cbf5e6da9093ee76c48 SHA512 9f431988b6adf74319efce9aee404684bf495604db5d5b1a0cfa241c43cd026e4646bfc19ad1d66572bf451423be832761750ebfda1a43b10d50f283b37d70f2
-EBUILD spotify-1.1.0.ebuild 3430 BLAKE2B c953ba10780cc5af2142d3f32a2d2a9f6dc2045896a3ef9c0a333430fc95ddf0ae39358e75b8972eb175dd47456e0f7d706f89d94b81acbcafb2a1f0fe0505cb SHA512 caa258ec7469691b5d2241c32495cf8c8f702a745948986be8102249430955afc9bc61edc100f61fe114abcbd35c72bc48025e1db1aa0b232da1f76f1490e6e0
+EBUILD spotify-1.1.5-r1.ebuild 3078 BLAKE2B 248485abac1f97b0f4cdfcdad4d6269b4ec9023f29a2b5332c7596899ef0deff97c37f8be7f3d63ca1bf37b162611f2825f792026bdb407359495f30e0e91f3c SHA512 72ed085363ad74d5ad4b1492936f885242d749d8432b616a8a7d39414d9cbfa2e14f25f6af427d737d45a9d854117f3f57530d073a7a7f60d724f6b7db4d3f09
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.1.0.ebuild b/media-sound/spotify/spotify-1.1.5-r1.ebuild
index c00dd57ac9fe..6bb9251f650c 100644
--- a/media-sound/spotify/spotify-1.1.0.ebuild
+++ b/media-sound/spotify/spotify-1.1.5-r1.ebuild
@@ -1,44 +1,42 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit gnome2-utils pax-utils unpacker xdg-utils
+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="237.g378f6f25-11"
-#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 )"
+BUILD_ID_AMD64="153.gf614956d-16"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify systray pax_kernel pulseaudio"
+IUSE="libnotify systray pax_kernel"
 RESTRICT="mirror strip"
 
-DEPEND=">=dev-util/patchelf-0.9_p20180129"
+BDEPEND=">=dev-util/patchelf-0.10"
 # zenity needed for filepicker
 RDEPEND="
-	dev-libs/openssl:0
 	dev-libs/nss
+	dev-libs/openssl:0
+	dev-python/dbus-python
+	dev-python/pygobject:3
 	gnome-base/gconf
 	gnome-extra/zenity
+	libnotify? ( x11-libs/libnotify )
 	media-libs/alsa-lib
-	media-libs/harfbuzz
 	media-libs/fontconfig
+	media-libs/harfbuzz
 	media-libs/mesa
 	net-misc/curl[ssl]
 	net-print/cups[ssl]
+	|| ( media-sound/pulseaudio media-sound/apulse )
+	systray? ( gnome-extra/gnome-integration-spotify )
 	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}/
@@ -100,17 +98,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	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"
 }
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}