Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/spotify/
Date: Fri, 02 Dec 2016 16:50:11
Message-Id: 1480697384.0e73d5da3a2dc87b414dc6b41fc5dadfc5ad8f44.prometheanfire@gentoo
1 commit: 0e73d5da3a2dc87b414dc6b41fc5dadfc5ad8f44
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 2 16:49:24 2016 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 2 16:49:44 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e73d5da
7
8 media-sound/spotify: cleanup
9
10 Package-Manager: portage-2.3.0
11
12 media-sound/spotify/Manifest | 4 -
13 media-sound/spotify/spotify-1.0.42-r1.ebuild | 117 --------------------------
14 media-sound/spotify/spotify-1.0.43.ebuild | 118 ---------------------------
15 3 files changed, 239 deletions(-)
16
17 diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
18 index dafa05a..20fea5d 100644
19 --- a/media-sound/spotify/Manifest
20 +++ b/media-sound/spotify/Manifest
21 @@ -1,6 +1,2 @@
22 -DIST spotify-client_1.0.42.151.g19de0aa6-27_i386.deb 72446928 SHA256 a7acb3929747e47669bdcb997c820101e79be3dd4dd48a3596873c5e03935a7c SHA512 160b366bcdfcb15a100d7a3b98f39812cc35ae1056b1570d2bd6a24cd43eeba3aa5d2711d52d58e5da9bc6dbce958069af936601b89e00b2fe05cfd7e312d820 WHIRLPOOL c19d55d2dce0fe346c53416cb02af42829037cddc10b853268816141df5f025b3a845a01a88d50db4bfb26bb8588de0c29e0cc34f35e95516549125b0f1eb8bb
23 -DIST spotify-client_1.0.42.151.g19de0aa6-74_amd64.deb 71187596 SHA256 905c0c87091855c9d5d354ebeca9fb3951ff60c08f0dfc1c1898bf66cc8acd15 SHA512 09975f225d0b2a71231f1a355ad19083b5b3e4cf54c3713017ea6e628f295752e3fa58ee3b8e5d283a4d154824d8b6ea98bf3a60da1fbea6bc2ffd6fb5993268 WHIRLPOOL 8d78e1523520d97347311e23ca68cfc4bba47d6904e0e53c10b1d0e00258d693202e2141b4fe359b8567bb52dd9245f3e25a3751c26a444709f1c11435040025
24 -DIST spotify-client_1.0.43.123.g80176796-24_i386.deb 74362840 SHA256 dfb6200303b617f1c8e50434ca888c5a48faae14389a1e54035f8d33bd5d319a SHA512 d4c5a1fbd167ad5c6e1af0161f5a5219f9e41fbda437fae85a23d53c591a6f2ec5eb0cacc0671c01f4c16c311d706fe126699c99fe666224f446ca4d7891f9b3 WHIRLPOOL 13c2bb844ef6e7bc93378d4f4a6e05fcec11b3adebc9a943f6d018d6414052c58ed82d3dad996399d150792f28d5b9b17ca10642c52d14e5ebfa4baf13c1f9d4
25 DIST spotify-client_1.0.43.123.g80176796-25_i386.deb 74352490 SHA256 3647c6a109203f7ce9ed3dbe99a9732ef5f6044adb277985f87ffde0e8183885 SHA512 a98d38e17895dcef06decc32dae45bf59ca21c6980f306ce21f325ca3371ccd9392f4c99d3d5dd57cd085b504b2e81954aa94d3f0cac4a744b0a725a160b4698 WHIRLPOOL 53dda2acabb6ab7f3f534261bcd365310f1773a6ccf00c8f9a6a84716bbc4819cb6d725962588a494003837a7ee99cba0407fcf4b31b3a39d1cb16c2a361bdcd
26 -DIST spotify-client_1.0.43.123.g80176796-77_amd64.deb 73109608 SHA256 42834f461a13981e0b9b9c59d6d933bfa5cc5a392f829f7f32e3740fb9a7d149 SHA512 f68bc0fab59fb8b27b18338cca5298a2e7c07774e50c410e61efd8d9e7ba212151d5d513705af8b56ac21980c694e88fe2854ce93774e95d0bfa8a829e6a7737 WHIRLPOOL 8057aeaf2743bde8de66ce768d46c4d7a4f9b4f36a292df37c1b83ae1e4dded116f8faa3cf829cc5375d183a1027ff20b9ea7aeabdcdca0badf50223827d0231
27 DIST spotify-client_1.0.43.125.g376063c5-91_amd64.deb 73159678 SHA256 7b68ede2428634b2fa1cca0bb13a73821b3a803774aa89f07b1af96622767ee2 SHA512 612ec8e06d0197460656315c314d1e1f4a1da4ab591c186288c5fc383d2902e20f9f8e0f4b1f9513e462a12a7fe98eb78ade90f650841556574164e3ad386f6e WHIRLPOOL abb4e7b90cd077e1c0ab13aa94d7cc068aadd5cfe397875121ec2e83a243898cfa880553d31b832264113cbf6defb86e63c8977ccb509ff5d870431e55ff0a0f
28
29 diff --git a/media-sound/spotify/spotify-1.0.42-r1.ebuild b/media-sound/spotify/spotify-1.0.42-r1.ebuild
30 deleted file mode 100644
31 index 53d65a2..00000000
32 --- a/media-sound/spotify/spotify-1.0.42-r1.ebuild
33 +++ /dev/null
34 @@ -1,117 +0,0 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI=6
40 -inherit eutils fdo-mime gnome2-utils pax-utils unpacker
41 -
42 -DESCRIPTION="Spotify is a social music platform"
43 -HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
44 -SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
45 -SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.151.g19de0aa6-74_amd64.deb )
46 - x86? ( ${SRC_BASE}${PN}-client_${PV}.151.g19de0aa6-27_i386.deb )"
47 -LICENSE="Spotify"
48 -SLOT="0"
49 -KEYWORDS="amd64 x86"
50 -IUSE="gnome pax_kernel pulseaudio"
51 -RESTRICT="mirror strip"
52 -
53 -DEPEND=""
54 -# zenety needed for filepicker
55 -RDEPEND="
56 - ${DEPEND}
57 - dev-libs/nss
58 - gnome-base/gconf
59 - gnome-extra/zenity
60 - media-libs/alsa-lib
61 - media-libs/harfbuzz
62 - media-libs/fontconfig
63 - media-libs/mesa
64 - net-misc/curl[ssl,curl_ssl_openssl]
65 - net-print/cups[ssl]
66 - x11-libs/gtk+:2
67 - x11-libs/libXScrnSaver
68 - x11-libs/libXtst
69 - dev-python/pygobject:3
70 - dev-python/dbus-python
71 - pulseaudio? ( media-sound/pulseaudio )
72 - gnome? ( gnome-extra/gnome-integration-spotify )"
73 - #sys-libs/glibc
74 -
75 -S=${WORKDIR}/
76 -
77 -QA_PREBUILT="opt/spotify/spotify-client/spotify"
78 -
79 -src_prepare() {
80 - # Fix desktop entry to launch spotify-dbus.py for GNOME integration
81 - if use gnome ; then
82 - sed -i \
83 - -e 's/spotify \%U/spotify-dbus.py \%U/g' \
84 - usr/share/spotify/spotify.desktop || die "sed failed"
85 - fi
86 - default
87 -}
88 -
89 -src_install() {
90 - dodoc usr/share/doc/spotify-client/changelog.gz
91 -
92 - SPOTIFY_PKG_HOME=usr/share/spotify
93 - insinto /usr/share/pixmaps
94 - doins ${SPOTIFY_PKG_HOME}/icons/*.png
95 -
96 - # install in /opt/spotify
97 - SPOTIFY_HOME=/opt/spotify/spotify-client
98 - insinto ${SPOTIFY_HOME}
99 - doins -r ${SPOTIFY_PKG_HOME}/*
100 - fperms +x ${SPOTIFY_HOME}/spotify
101 -
102 - dodir /usr/bin
103 - cat <<-EOF >"${D}"/usr/bin/spotify || die
104 - #! /bin/sh
105 - exec ${SPOTIFY_HOME}/spotify "\$@"
106 - EOF
107 - fperms +x /usr/bin/spotify
108 -
109 - local size
110 - for size in 16 22 24 32 48 64 128 256 512; do
111 - newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
112 - "spotify-client.png"
113 - done
114 - domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
115 - if use pax_kernel; then
116 - #create the headers, reset them to default, then paxmark -m them
117 - pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
118 - pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
119 - pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
120 - eqawarn "You have set USE=pax_kernel meaning that you intend to run"
121 - eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
122 - eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
123 - eqawarn "you suspect that ${PN} is being broken by this modification,"
124 - eqawarn "please open a bug."
125 - fi
126 -}
127 -
128 -pkg_preinst() {
129 - gnome2_icon_savelist
130 -}
131 -
132 -pkg_postinst() {
133 - gnome2_icon_cache_update
134 - fdo-mime_mime_database_update
135 - fdo-mime_desktop_database_update
136 -
137 - ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
138 - ewarn "To remove the cache:"
139 - ewarn "rm -rf ~/.cache/spotify"
140 - ewarn
141 - ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
142 - ewarn "Run"
143 - ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
144 - ewarn "Then log out and log in back to KDE."
145 -}
146 -
147 -pkg_postrm() {
148 - gnome2_icon_cache_update
149 - fdo-mime_mime_database_update
150 - fdo-mime_desktop_database_update
151 -}
152
153 diff --git a/media-sound/spotify/spotify-1.0.43.ebuild b/media-sound/spotify/spotify-1.0.43.ebuild
154 deleted file mode 100644
155 index 36f9d84..00000000
156 --- a/media-sound/spotify/spotify-1.0.43.ebuild
157 +++ /dev/null
158 @@ -1,118 +0,0 @@
159 -# Copyright 1999-2016 Gentoo Foundation
160 -# Distributed under the terms of the GNU General Public License v2
161 -# $Id$
162 -
163 -EAPI=6
164 -inherit eutils fdo-mime gnome2-utils pax-utils unpacker
165 -
166 -DESCRIPTION="Spotify is a social music platform"
167 -HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
168 -BUILD_ID="123.g80176796"
169 -SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
170 -SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-77_amd64.deb )
171 - x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-24_i386.deb )"
172 -LICENSE="Spotify"
173 -SLOT="0"
174 -KEYWORDS="~amd64 ~x86"
175 -IUSE="gnome pax_kernel pulseaudio"
176 -RESTRICT="mirror strip"
177 -
178 -DEPEND=""
179 -# zenety needed for filepicker
180 -RDEPEND="
181 - ${DEPEND}
182 - dev-libs/nss
183 - gnome-base/gconf
184 - gnome-extra/zenity
185 - media-libs/alsa-lib
186 - media-libs/harfbuzz
187 - media-libs/fontconfig
188 - media-libs/mesa
189 - net-misc/curl[ssl,curl_ssl_openssl]
190 - net-print/cups[ssl]
191 - x11-libs/gtk+:2
192 - x11-libs/libXScrnSaver
193 - x11-libs/libXtst
194 - dev-python/pygobject:3
195 - dev-python/dbus-python
196 - pulseaudio? ( media-sound/pulseaudio )
197 - gnome? ( gnome-extra/gnome-integration-spotify )"
198 - #sys-libs/glibc
199 -
200 -S=${WORKDIR}/
201 -
202 -QA_PREBUILT="opt/spotify/spotify-client/spotify"
203 -
204 -src_prepare() {
205 - # Fix desktop entry to launch spotify-dbus.py for GNOME integration
206 - if use gnome ; then
207 - sed -i \
208 - -e 's/spotify \%U/spotify-dbus.py \%U/g' \
209 - usr/share/spotify/spotify.desktop || die "sed failed"
210 - fi
211 - default
212 -}
213 -
214 -src_install() {
215 - dodoc usr/share/doc/spotify-client/changelog.gz
216 -
217 - SPOTIFY_PKG_HOME=usr/share/spotify
218 - insinto /usr/share/pixmaps
219 - doins ${SPOTIFY_PKG_HOME}/icons/*.png
220 -
221 - # install in /opt/spotify
222 - SPOTIFY_HOME=/opt/spotify/spotify-client
223 - insinto ${SPOTIFY_HOME}
224 - doins -r ${SPOTIFY_PKG_HOME}/*
225 - fperms +x ${SPOTIFY_HOME}/spotify
226 -
227 - dodir /usr/bin
228 - cat <<-EOF >"${D}"/usr/bin/spotify || die
229 - #! /bin/sh
230 - exec ${SPOTIFY_HOME}/spotify "\$@"
231 - EOF
232 - fperms +x /usr/bin/spotify
233 -
234 - local size
235 - for size in 16 22 24 32 48 64 128 256 512; do
236 - newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
237 - "spotify-client.png"
238 - done
239 - domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
240 - if use pax_kernel; then
241 - #create the headers, reset them to default, then paxmark -m them
242 - pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
243 - pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
244 - pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
245 - eqawarn "You have set USE=pax_kernel meaning that you intend to run"
246 - eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
247 - eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
248 - eqawarn "you suspect that ${PN} is being broken by this modification,"
249 - eqawarn "please open a bug."
250 - fi
251 -}
252 -
253 -pkg_preinst() {
254 - gnome2_icon_savelist
255 -}
256 -
257 -pkg_postinst() {
258 - gnome2_icon_cache_update
259 - fdo-mime_mime_database_update
260 - fdo-mime_desktop_database_update
261 -
262 - ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
263 - ewarn "To remove the cache:"
264 - ewarn "rm -rf ~/.cache/spotify"
265 - ewarn
266 - ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
267 - ewarn "Run"
268 - ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
269 - ewarn "Then log out and log in back to KDE."
270 -}
271 -
272 -pkg_postrm() {
273 - gnome2_icon_cache_update
274 - fdo-mime_mime_database_update
275 - fdo-mime_desktop_database_update
276 -}