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

[Matt Thode]

commit:     317afc44f31a97b6cbf39d8750784b1eec6a389c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 18:10:30 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 18:12:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317afc44

media-sound/spotify: 1.0.70 stable amd64 and x86 with cleanup

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-sound/spotify/Manifest                 |   2 -
 media-sound/spotify/spotify-1.0.69.ebuild    | 117 --------------------------
 media-sound/spotify/spotify-1.0.70-r1.ebuild |   2 +-
 media-sound/spotify/spotify-1.0.70.ebuild    | 118 ---------------------------
 4 files changed, 1 insertion(+), 238 deletions(-)

diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index f31a4260791..395b9027bf2 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,4 +1,2 @@
-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
 DIST spotify-client_1.0.70.399.g5ffabd56-26_amd64.deb 89572934 BLAKE2B 70fa53d8bd4fac88133cd57171721636d17ccc1863a224048572c34eba132baf2642c5b51022f4dd59bbe8abe61c43440dc9339687bc2d3c0ba6fbbe5339a0fa SHA512 f5ce65a535daffe251152f6dc1c3affe2cbdf815ce1129e204ef03b589ebf7ac1015a9be2c77d7bcdd506fa23b9f24390b961843bb311366f6839756563912bf
 DIST spotify-client_1.0.70.399.g5ffabd56-27_i386.deb 93896122 BLAKE2B 541de6cddb207440baabff6e43af6bd101ae43e8b30359a14078429506b742faf6bd32719bc6579068196bd01859a24af35677b3b53233b79ff56007fa38a30c SHA512 b72a7b4286d067a0a825b423ff62d426a82d8a7cc111500e1d5ab64df000f0cce024a6c7d9cc5cbf253800152907ae2889f55eead46556739f8d5069e7c0abf2

diff --git a/media-sound/spotify/spotify-1.0.69.ebuild b/media-sound/spotify/spotify-1.0.69.ebuild
deleted file mode 100644
index ccb79bef70d..00000000000
--- a/media-sound/spotify/spotify-1.0.69.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 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="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 )"
-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
-	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"
-	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
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

diff --git a/media-sound/spotify/spotify-1.0.70-r1.ebuild b/media-sound/spotify/spotify-1.0.70-r1.ebuild
index 6fa5db4d137..2e5150da474 100644
--- a/media-sound/spotify/spotify-1.0.70-r1.ebuild
+++ b/media-sound/spotify/spotify-1.0.70-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
 	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
 LICENSE="Spotify"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="systray pax_kernel pulseaudio"
 RESTRICT="mirror strip"
 

diff --git a/media-sound/spotify/spotify-1.0.70.ebuild b/media-sound/spotify/spotify-1.0.70.ebuild
deleted file mode 100644
index 1e34e86dd45..00000000000
--- a/media-sound/spotify/spotify-1.0.70.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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_AMD64="399.g5ffabd56-26"
-BUILD_ID_X86="399.g5ffabd56-27"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
-	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_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
-	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"
-	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
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}