gentoo resync : 15.12.2017

3 files changed, 11 insertions, 131 deletions

diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 458d02923d44..7193c4380d29 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,10 +1,7 @@
-DIST spotify-client_1.0.64.407.g9bd02c2d-26_amd64.deb 93425432 SHA256 8c97a95ade46ce9f8e2bbe565cd2e79396ed31fc4f0646a907a6f3e028db887d SHA512 78352ed0cd116b8ef8c2b9ffc3c186d2fecd3dd5f49f0f732ccf0a3a796b72faf60cd4997355bb4f34f450f8af0b7684e28e8e21a14b7902cba2ea49fe4a81eb WHIRLPOOL db9d74ce31d57704184e6a00b18b3cc417cdffeb6e582d0c41ddc0ba5c822fa4dfebad9d9cf151ebecc46d3b3892714e0fec91ced356d57f3c51dd94a8cce370
-DIST spotify-client_1.0.64.407.g9bd02c2d-26_i386.deb 97705428 SHA256 0e32bc8b21d591f8def932403b8ef3632e95eba4b5628506dfdf6d521dce7941 SHA512 43342faf26b7530dbb3fecafebcb7dac6ed6b7323c845f373bb63760ab309f4f01c6f4dd1cb4ab1bfd9a97b383fb863ba5f2aa7e73d32d1575bf8964dcdf30a5 WHIRLPOOL f3c42136e0682bddaec17829a05a9237d95b6d8f79b9ed27e2cdd77d011ea015fb4532d5f5878c03e15661207779a65e7e228a46821c13899b17513f12612863
-DIST spotify-client_1.0.66.478.g1296534d-39_amd64.deb 90932368 SHA256 a2e739c0ee009df1c899e42c095735bca231312b75b82e311147d41fb72404c1 SHA512 cd8b073f981b5bf793d87de22922054df141dbf58c5eac96eb55e44f1672b8057c79ee950a14a8a34aaa5d59e961b87df56198f382330d079553212189a1975c WHIRLPOOL 5c3cfe26e3c7eaee53e506eeb72e3ab4fa13601f4debb6f003804abb0953c6c8796ff49fa983aa734750b773889d9d23d4634655a4c8526918e3f45e4c269a37
-DIST spotify-client_1.0.66.478.g1296534d-39_i386.deb 95213590 SHA256 29795bd5c226e54d531621e645ffe7bd2cc6b4e5c69956c63bdcaade165cb8d9 SHA512 5c1b56787930a672da9a8ead8246cb779c6680dce6e5514c098e81712c9b131b77d45afa2ccedb95635b5387aab4db8c7e7f6dddb0cefb3cbdfb573d60920af7 WHIRLPOOL 5cfaa8fb5ede2bcec27c2bd557cc3c2dbda8e75cb140c48cecae21dfdfb18129996a1d6a7707b97ecfab1227c1a1f4b0420a44b16146233641141882ac5b19bf
-DIST spotify-client_1.0.67.582.g19436fa3-28_amd64.deb 90723508 BLAKE2B 9551bcaae09895fd73b35b2e95a0dd4fff64e0cd70af9bd88fcf1a288f79195f99dae89852164fe66e6aebc6efb45ea6b258457e39727c0f6081cf68ff95cc42 SHA512 f9db71c5bce18fc4e2121316e1f229f06ca5510211698f79f75b5ff6b297d9603ff50810bf2b7dae38d8625ed9c5a09c17549d6989eaef1ebe1f856e63858b3c
-DIST spotify-client_1.0.67.582.g19436fa3-28_i386.deb 95004956 BLAKE2B 751e14573f5dd7aac7134545f147da293b1051dbcb37c055ad18224e5df4c155ba7142997ed77e5f90940850982e4a7162b66aa621ea5133d782b12e5cb9fb3a SHA512 7fcfb0b39bdbe1427c35c56f78cc5129d07630863553c025505a5bbe9c216f4dd8af123512e9853c75f9791b0a0a819e076d95a20788cd759ea8033b485b47e3
+DIST spotify-client_1.0.64.407.g9bd02c2d-26_amd64.deb 93425432 BLAKE2B ffa3e929fbbded412fca680708c15ed0ab5a4358e713fa70932788bc4780cb7a291f6f176abfb6a219b98b311be48b687d423df7046e5328e06c4348fc86bebe SHA512 78352ed0cd116b8ef8c2b9ffc3c186d2fecd3dd5f49f0f732ccf0a3a796b72faf60cd4997355bb4f34f450f8af0b7684e28e8e21a14b7902cba2ea49fe4a81eb
+DIST spotify-client_1.0.64.407.g9bd02c2d-26_i386.deb 97705428 BLAKE2B 99222d772c401ba03cc4e452628c84fd71c59b07bdabbe7191724d7f2dee23ab1e28cd4319cd967300276db54a5dd152be2cda039b5eae77cd62d479877669bf SHA512 43342faf26b7530dbb3fecafebcb7dac6ed6b7323c845f373bb63760ab309f4f01c6f4dd1cb4ab1bfd9a97b383fb863ba5f2aa7e73d32d1575bf8964dcdf30a5
+DIST spotify-client_1.0.69.336.g7edcc575-39_amd64.deb 89614954 BLAKE2B a489aa2ad52d06e3651dc7aeb53adadf5f0447d959fca95e7bd49b943188622c8d96868e19d3d3761e4d01432548240a219107de07f1262bc7b8d630cdd64e77 SHA512 cc0cdc5065d21ebb2fa3d05f088b43c49ce95a7ddbedbb474841a11b6a6a79771767e939828cc18ec8f21bb6ba5a3931c6c62ba69321990ed72911c8cd872c04
+DIST spotify-client_1.0.69.336.g7edcc575-39_i386.deb 93798286 BLAKE2B 2ef644a6da0c497aab2347b4fea49966f17ca89b36c85ca48cc1ba6496bd49745028cab934a4077c82968875870243bb84fe5a7576f2319663fc3490ce371427 SHA512 41ab715a247029e1d380387962c554153af734e4eaf6965d1e175f9370d71cefe7559e358b0d402162955bb069a72cd24249d341b1bb7c75fc40b9b65bbc80da
 EBUILD spotify-1.0.64.ebuild 3268 BLAKE2B a979ae00949a41f7944d3d9c2e681669f1fff34625820d8f29c2d456ece43b8b7d1e3532aa48f4eef8199e4fff2cff8eb6b5fb53ecbdd3a2fc83af67c3a9eb01 SHA512 ef1ee3f6edce9364be0a39e0a135a7c3b073fea88d7767e39401d72299f7f582b1bb45c7835e409b4a53c1693dcb2477d9c49e0a1fea197d26df2f827611a6b6
-EBUILD spotify-1.0.66.ebuild 3270 BLAKE2B d9c471285fbd5db410d11f853bfb75100b44aad5112f12474dec68579b8e860cc5acf60bacb5fa8857cbe7a999dddbc1d6f09cc686c3ed86ee1d9a72a6832344 SHA512 b41ca3b5fbf499732ac2ca49d81fd2e31846cbe2f77ced870cc148cae29d8d160536b1d8285ec43631cbd95045aee9327bb1b8f5656e97d19f9249cf09f00137
-EBUILD spotify-1.0.67.ebuild 3267 BLAKE2B 007e3510afa8054f56c18d186067d9201abfa5f4a8c71a51deefc5484ef76342ceb28c0717ee3349ddad32897215d2fb00eb4dd920bb5bc1dff96720d4da6618 SHA512 9551655903fa73d48306918ef52eb0c1b75a4b4a05fb54a130a38dbfe044945ea2c0e185602f371d1bee0d606441af878527d78a99e7ae66023e74ea26a3fa97
+EBUILD spotify-1.0.69.ebuild 3256 BLAKE2B 9b287ea600bbf08372620f63a3a0ddb75142d4a8d3fe6faa0556a173e97be30779507e2f6bb402a3865b6276d0a35d3ac0fd83b00748ccee5d4bb52acad1e225 SHA512 28f89b901600a8e86f15f50b7b644856cd3c73c95286bef05c995198f751d855999dc2c0580d9b907068d8d9748669672eef9389db19d2899798135f4bc48cff
 MISC metadata.xml 349 BLAKE2B 961ee21c86e7e1f8bf31b6339003cf2e59c7c6bb38146e63d43b2ac44b41c71e409a6cc9c1460f8ca6a8ff8b2acfb9e7e0b56fff0f7f4260fb6a4c6efcd7a83c SHA512 e39bca3abfb9169f633c009af54681a96b0d1f26d5edd9a0cb5c0a7b2aacfd70fdc4db317bde3273a1e37c04db520fcb0dcbb67167893a40a8fa6766a6637af1
diff --git a/media-sound/spotify/spotify-1.0.66.ebuild b/media-sound/spotify/spotify-1.0.66.ebuild
deleted file mode 100644
index edc01daefd5a..000000000000
--- a/media-sound/spotify/spotify-1.0.66.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils fdo-mime gnome2-utils pax-utils unpacker
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-BUILD_ID="478.g1296534d"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-39_amd64.deb )
-	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-39_i386.deb )"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=""
-# zenety needed for filepicker
-RDEPEND="
-	${DEPEND}
-	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,curl_ssl_openssl]
-	net-print/cups[ssl]
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	dev-python/pygobject:3
-	dev-python/dbus-python
-	pulseaudio? ( media-sound/pulseaudio )
-	gnome? ( 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 GNOME integration
-	if use gnome ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-}
-
-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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_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"
-	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() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-sound/spotify/spotify-1.0.67.ebuild b/media-sound/spotify/spotify-1.0.69.ebuild
index d6e3920aea55..9a0afad07016 100644
--- a/media-sound/spotify/spotify-1.0.67.ebuild
+++ b/media-sound/spotify/spotify-1.0.69.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils fdo-mime gnome2-utils pax-utils unpacker
+inherit eutils xdg-utils gnome2-utils pax-utils unpacker
 
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-BUILD_ID="582.g19436fa3-28"
+BUILD_ID="336.g7edcc575-39"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
 SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}_amd64.deb )
 	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}_i386.deb )"
@@ -97,8 +97,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_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:"
@@ -112,6 +112,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
 }