1 |
commit: 7fe0e47db35f7878976afd0ef432acceaf995f92 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 14 19:40:22 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 14 19:41:39 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fe0e47d |
7 |
|
8 |
media-sound/spotify: 1.0.64 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
11 |
|
12 |
media-sound/spotify/Manifest | 2 - |
13 |
media-sound/spotify/spotify-1.0.49.ebuild | 117 ------------------------------ |
14 |
media-sound/spotify/spotify-1.0.64.ebuild | 2 +- |
15 |
3 files changed, 1 insertion(+), 120 deletions(-) |
16 |
|
17 |
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest |
18 |
index 92ff31279e6..ddfc0e3ea31 100644 |
19 |
--- a/media-sound/spotify/Manifest |
20 |
+++ b/media-sound/spotify/Manifest |
21 |
@@ -1,4 +1,2 @@ |
22 |
-DIST spotify-client_1.0.49.125.g72ee7853-111_amd64.deb 73404932 SHA256 1d6d1cccfb7f996b835f21c8dbabc16ca4bd214878e06738dba7886640470050 SHA512 f6152f71fae3827e1f9dfb07cbe30319f090db151702ca02f3566f3deeec369da0c70f9995a548e0df92d655b593de520ab387a011201317753d3def70741e24 WHIRLPOOL b5111509c902068bd2559267bfd2febfab8b4464d73e54a302d23807338e796045901fe14b9c229e6a412553f7cfe84e903ddfc4c4c3e9a60609b23a7ecf2c3c |
23 |
-DIST spotify-client_1.0.49.125.g72ee7853-22_i386.deb 74637938 SHA256 96c02fdc77991feb0797089d701744c2de4584322f966a1c070b559df27f9b04 SHA512 4a8aab47b6b0c2ac9b349c858e4728451e713c466bcff9c1eac9c6215259ad9325a51b0fc8bd2afcfa141a6ad518f97d408b5d779a126f2ac62c9e8be93f5f93 WHIRLPOOL 9bd02e73731cc4d2e55c43b08d1bea1d3fcfecb13ebdf8fe591aa5be6961423e3463a2fd625745561ebb7f33c902246a84f406bcc1dd3f7f47ffad6b98daa451 |
24 |
DIST spotify-client_1.0.64.407.g9bd02c2d-26_amd64.deb 93425432 SHA256 8c97a95ade46ce9f8e2bbe565cd2e79396ed31fc4f0646a907a6f3e028db887d SHA512 78352ed0cd116b8ef8c2b9ffc3c186d2fecd3dd5f49f0f732ccf0a3a796b72faf60cd4997355bb4f34f450f8af0b7684e28e8e21a14b7902cba2ea49fe4a81eb WHIRLPOOL db9d74ce31d57704184e6a00b18b3cc417cdffeb6e582d0c41ddc0ba5c822fa4dfebad9d9cf151ebecc46d3b3892714e0fec91ced356d57f3c51dd94a8cce370 |
25 |
DIST spotify-client_1.0.64.407.g9bd02c2d-26_i386.deb 97705428 SHA256 0e32bc8b21d591f8def932403b8ef3632e95eba4b5628506dfdf6d521dce7941 SHA512 43342faf26b7530dbb3fecafebcb7dac6ed6b7323c845f373bb63760ab309f4f01c6f4dd1cb4ab1bfd9a97b383fb863ba5f2aa7e73d32d1575bf8964dcdf30a5 WHIRLPOOL f3c42136e0682bddaec17829a05a9237d95b6d8f79b9ed27e2cdd77d011ea015fb4532d5f5878c03e15661207779a65e7e228a46821c13899b17513f12612863 |
26 |
|
27 |
diff --git a/media-sound/spotify/spotify-1.0.49.ebuild b/media-sound/spotify/spotify-1.0.49.ebuild |
28 |
deleted file mode 100644 |
29 |
index 061ed8fe0bc..00000000000 |
30 |
--- a/media-sound/spotify/spotify-1.0.49.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,117 +0,0 @@ |
33 |
-# Copyright 1999-2017 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
-inherit eutils fdo-mime gnome2-utils pax-utils unpacker |
38 |
- |
39 |
-DESCRIPTION="Spotify is a social music platform" |
40 |
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/" |
41 |
-BUILD_ID="125.g72ee7853" |
42 |
-SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/" |
43 |
-SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-111_amd64.deb ) |
44 |
- x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-22_i386.deb )" |
45 |
-LICENSE="Spotify" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="amd64 x86" |
48 |
-IUSE="gnome pax_kernel pulseaudio" |
49 |
-RESTRICT="mirror strip" |
50 |
- |
51 |
-DEPEND="" |
52 |
-# zenety needed for filepicker |
53 |
-RDEPEND=" |
54 |
- ${DEPEND} |
55 |
- dev-libs/nss |
56 |
- gnome-base/gconf |
57 |
- gnome-extra/zenity |
58 |
- media-libs/alsa-lib |
59 |
- media-libs/harfbuzz |
60 |
- media-libs/fontconfig |
61 |
- media-libs/mesa |
62 |
- net-misc/curl[ssl,curl_ssl_openssl] |
63 |
- net-print/cups[ssl] |
64 |
- x11-libs/gtk+:2 |
65 |
- x11-libs/libXScrnSaver |
66 |
- x11-libs/libXtst |
67 |
- dev-python/pygobject:3 |
68 |
- dev-python/dbus-python |
69 |
- pulseaudio? ( media-sound/pulseaudio ) |
70 |
- gnome? ( gnome-extra/gnome-integration-spotify )" |
71 |
- #sys-libs/glibc |
72 |
- |
73 |
-S=${WORKDIR}/ |
74 |
- |
75 |
-QA_PREBUILT="opt/spotify/spotify-client/spotify" |
76 |
- |
77 |
-src_prepare() { |
78 |
- # Fix desktop entry to launch spotify-dbus.py for GNOME integration |
79 |
- if use gnome ; then |
80 |
- sed -i \ |
81 |
- -e 's/spotify \%U/spotify-dbus.py \%U/g' \ |
82 |
- usr/share/spotify/spotify.desktop || die "sed failed" |
83 |
- fi |
84 |
- default |
85 |
-} |
86 |
- |
87 |
-src_install() { |
88 |
- dodoc usr/share/doc/spotify-client/changelog.gz |
89 |
- |
90 |
- SPOTIFY_PKG_HOME=usr/share/spotify |
91 |
- insinto /usr/share/pixmaps |
92 |
- doins ${SPOTIFY_PKG_HOME}/icons/*.png |
93 |
- |
94 |
- # install in /opt/spotify |
95 |
- SPOTIFY_HOME=/opt/spotify/spotify-client |
96 |
- insinto ${SPOTIFY_HOME} |
97 |
- doins -r ${SPOTIFY_PKG_HOME}/* |
98 |
- fperms +x ${SPOTIFY_HOME}/spotify |
99 |
- |
100 |
- dodir /usr/bin |
101 |
- cat <<-EOF >"${D}"/usr/bin/spotify || die |
102 |
- #! /bin/sh |
103 |
- exec ${SPOTIFY_HOME}/spotify "\$@" |
104 |
- EOF |
105 |
- fperms +x /usr/bin/spotify |
106 |
- |
107 |
- local size |
108 |
- for size in 16 22 24 32 48 64 128 256 512; do |
109 |
- newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \ |
110 |
- "spotify-client.png" |
111 |
- done |
112 |
- domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop" |
113 |
- if use pax_kernel; then |
114 |
- #create the headers, reset them to default, then paxmark -m them |
115 |
- pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die |
116 |
- pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die |
117 |
- pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die |
118 |
- eqawarn "You have set USE=pax_kernel meaning that you intend to run" |
119 |
- eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" |
120 |
- eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" |
121 |
- eqawarn "you suspect that ${PN} is being broken by this modification," |
122 |
- eqawarn "please open a bug." |
123 |
- fi |
124 |
-} |
125 |
- |
126 |
-pkg_preinst() { |
127 |
- gnome2_icon_savelist |
128 |
-} |
129 |
- |
130 |
-pkg_postinst() { |
131 |
- gnome2_icon_cache_update |
132 |
- fdo-mime_mime_database_update |
133 |
- fdo-mime_desktop_database_update |
134 |
- |
135 |
- ewarn "If Spotify crashes after an upgrade its cache may be corrupt." |
136 |
- ewarn "To remove the cache:" |
137 |
- ewarn "rm -rf ~/.cache/spotify" |
138 |
- ewarn |
139 |
- ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon." |
140 |
- ewarn "Run" |
141 |
- ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache" |
142 |
- ewarn "Then log out and log in back to KDE." |
143 |
-} |
144 |
- |
145 |
-pkg_postrm() { |
146 |
- gnome2_icon_cache_update |
147 |
- fdo-mime_mime_database_update |
148 |
- fdo-mime_desktop_database_update |
149 |
-} |
150 |
|
151 |
diff --git a/media-sound/spotify/spotify-1.0.64.ebuild b/media-sound/spotify/spotify-1.0.64.ebuild |
152 |
index d88f039e41f..d81b0051b49 100644 |
153 |
--- a/media-sound/spotify/spotify-1.0.64.ebuild |
154 |
+++ b/media-sound/spotify/spotify-1.0.64.ebuild |
155 |
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-26_amd64.deb ) |
156 |
x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-26_i386.deb )" |
157 |
LICENSE="Spotify" |
158 |
SLOT="0" |
159 |
-KEYWORDS="~amd64 ~x86" |
160 |
+KEYWORDS="amd64 x86" |
161 |
IUSE="gnome pax_kernel pulseaudio" |
162 |
RESTRICT="mirror strip" |