[gentoo-commits] repo/gentoo:master commit in: media-sound/spotify/

[Matt Thode]

commit:     989d1d19310093318a624fdc4e611700c52003ab
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 22:47:27 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 22:47:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=989d1d19

media-sound/spotify: updated again...

Package-Manager: portage-2.2.26

 media-sound/spotify/Manifest                  |   2 -
 media-sound/spotify/spotify-1.0.24.104.ebuild | 116 --------------------------
 media-sound/spotify/spotify-1.0.26.125.ebuild |   2 +-
 3 files changed, 1 insertion(+), 119 deletions(-)

diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index f588724..8540225 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,4 +1,2 @@
-DIST spotify-client_1.0.24.104.g92a22684-29_amd64.deb 76099516 SHA256 d87703ba78c70934ab827f1b996aa34d626dc7bb7b371bf94889dae046e8d15f SHA512 5590706a4f5a04ad01d1c133f4f439e8d7312e1ecb803f9ba5533db082bee4d3a7bef2ee37fecea346918e14d51e68fa87047db5e95b35fbcafb333c8fa8ddc4 WHIRLPOOL 110fdd1f52ac1bb7b672ed921d3d736b6c01fd3ddda71c9f43a657e95b9d06f5681dbbc2329dbc6d9c098b99e0c993c6e3af49220e3688f851790cd87f025205
-DIST spotify-client_1.0.24.104.g92a22684-9_i386.deb 79184172 SHA256 d9d8e4dc7c0859f00346cf13046d5ab880fcf2c09754bf73213ce6121c9535a1 SHA512 57020ac4f07e9ec936f2a793b70aec2c6b354037c9d9f1dc911c776099b567c28e3c429751a0f9b0708cadb1bd3fcd3e52b8e57e02a2f17849caef732f32f6fe WHIRLPOOL 0693e5f5d09007420de0d7945e396e14cca9e47335b16e60f892f317c925d762c0668ec1843ad0bf8de2a0afd8a7d8b4a21ff8c37b3043601794f4c06b6fe693
 DIST spotify-client_1.0.26.125.g64dc8bc6-15_amd64.deb 76862466 SHA256 e15b159dd2f20f8c00067545d5899f40f991fa89e1cf246b280289944396c407 SHA512 de30313a58288dd6f29fadf9f2c74c556cdf3002edbc0aedc657c3e79555feb07bf5793e8e08ae0011413cc52eefb9781b538e39904e8341468117dcd1b06a8a WHIRLPOOL 171f6ab59d068922294267617a1873aa3eb9ee6ce756dfd2338bfb360709e87a7c5b821b9438f4bcc177ab1acf5a8df4e1e6bf8fe6467408d33c07a0e52388bc
 DIST spotify-client_1.0.26.125.g64dc8bc6-5_i386.deb 79948634 SHA256 13dfa424106762821765a900612ab40982a32d640e13c266c0a5102cdc6cea5a SHA512 3e19ae1cf72511648de65e80ed0cb85c3c39c49ef75d7a63cb952c35f878343580bb69540a2e9e728dbce7e98341efb955881019687cb09a60ac84448bf3059e WHIRLPOOL 8549c2dab6f48630af3c0d00a794078f674de39c961f7370e0f8442e78de85826ca6d964f31423fc4e01118f764adc0bc7052ad6bfd1d31adb5ae67dd16eddb6

diff --git a/media-sound/spotify/spotify-1.0.24.104.ebuild b/media-sound/spotify/spotify-1.0.24.104.ebuild
deleted file mode 100644
index d48c55c..0000000
--- a/media-sound/spotify/spotify-1.0.24.104.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-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/"
-MY_PV="${PV}.g92a22684"
-MY_P="${PN}-client_${MY_PV}"
-SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
-SRC_URI="amd64? ( ${SRC_BASE}${MY_P}-29_amd64.deb )
-	x86? ( ${SRC_BASE}${MY_P}-9_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
-	net-print/cups[ssl]
-	sys-libs/glibc
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	pulseaudio? ( media-sound/pulseaudio )
-	gnome? ( gnome-extra/gnome-integration-spotify )"
-
-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
-}
-
-src_install() {
-	dodoc usr/share/doc/spotify-client/changelog.Debian.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.26.125.ebuild b/media-sound/spotify/spotify-1.0.26.125.ebuild
index 88f90f3..9581f1e 100644
--- a/media-sound/spotify/spotify-1.0.26.125.ebuild
+++ b/media-sound/spotify/spotify-1.0.26.125.ebuild
@@ -14,7 +14,7 @@ SRC_URI="amd64? ( ${SRC_BASE}${MY_P}-15_amd64.deb )
 	x86? ( ${SRC_BASE}${MY_P}-5_i386.deb )"
 LICENSE="Spotify"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome pax_kernel pulseaudio"
 RESTRICT="mirror strip"