bumping spotify for bug 474010, wish upstream were not slow

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 30 insertions, 174 deletions

diff --git a/media-sound/spotify/ChangeLog b/media-sound/spotify/ChangeLog
index 446e57346fc8..f37784ed76a0 100644
--- a/media-sound/spotify/ChangeLog
+++ b/media-sound/spotify/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/spotify
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/ChangeLog,v 1.18 2013/06/10 20:27:04 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/ChangeLog,v 1.19 2013/07/21 04:24:01 prometheanfire Exp $
+
+*spotify-0.9.1.55 (21 Jul 2013)
+
+  21 Jul 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +spotify-0.9.1.55.ebuild, -spotify-0.9.0.133-r1.ebuild,
+  -spotify-0.9.0.133.ebuild:
+  bumping spotify for bug 474010, wish upstream were not slow
 
 *spotify-0.9.0.133-r1 (10 Jun 2013)
 
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index e616dda8653c..378ea542d5b7 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,26 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST spotify-client_0.9.0.133.gd18ed58.259-1_amd64.deb 37550916 SHA256 035cb6586bbdfadd19e6b900a03618c700d4263246a761ce37d243e2e08c7650 SHA512 daaea1ee5365d767aba4238986aba36a7d918b6adeaba6812bfbd62d6ae23e51fe5dfb5acdb6fe50878fbda08355676e5b7f9fc5147142bfc3e75ec00a56170d WHIRLPOOL 0e3003cec3adc8d5c47683a48da08e4ec4c89b98a1bf355b4489653db135112092949eab7110c323c04431c183cc1d6da2813afa3eccce8b05b108d938899d34
-DIST spotify-client_0.9.0.133.gd18ed58.259-1_i386.deb 33136142 SHA256 36ecbd35ed58f7d23a82f31af2599995afc2c00fb81f278c48a9de6128e56b96 SHA512 912882f658e2cf8cfd7bcf889b3b25346a6916221791dbbd1ca7e4e55e7487151f0af4d6a5285bf6c8284a44e88900c7828fed00898c8c776cf47fc4c6f52484 WHIRLPOOL 06747014de6b9c0b67140c6087da77dfce4b5b516a54ef6b94a76dca7412ae72ca851f88a9e047c60f0eeb87cd2c7c9945d6ed797d6d02324bf1f9870d940d80
-EBUILD spotify-0.9.0.133-r1.ebuild 4913 SHA256 a403619519e5742a61409bbbbeaca88c22aa0575c3e2698d9d0ae3aa1ff7f26d SHA512 079c7c7048e3a3d0162e82a44ae0da80446472d2525aa71968b21586945544d944fbe7f06d1f375e6366a46053c0b6a7e01486d52398bd3f0dd7fc07a84c68ca WHIRLPOOL 9963c4350bfd52c3d413c6b4bc2e8e0a66915992db881273118b654f3600d70d65d4e2c45ffd29b442109af77b7e54eb1560f940ceee4b5eb4604dda1d6992c3
-EBUILD spotify-0.9.0.133.ebuild 4646 SHA256 cc0e4e729de5947abce035887b3ccfc94fa16b36b0f4915f08a2416de6af19ee SHA512 f18dc0d8a536962c2b4f5036d29a221a3889dc3ed65b4144b4e41a0cab70f6e824c98e0df3a90e97ed33f7b1c494c85a5d083ddb4787d741354f1bc22fb0e296 WHIRLPOOL f5365c554862a5ded556a3114032ca09f0cf7d274e3b2ba94d4214c52d6c1267e1b6ef339afed12096c059f79bc9de1977228695a633e73082eb3a514e858e13
-MISC ChangeLog 3157 SHA256 c2665e660857f4c73d9a5a732af96e2c35087c32f3f1d67e1792f642c9a043b0 SHA512 80a25764bac21954a90dbc46654658c179a5443f50cc187d8deeed0212dcf119235cb5e4ff0d155e275966614bf64c7b96b2d5053c9c348750f55c2cd1ab7147 WHIRLPOOL 1e4eecfd1d1b50bf19ec43b3360c4dbd674761610fb435dc830c6ad1275d68ed5141a190354b22d3f9e6e1f9af39fad4d7405184d2e0a2f26428ea30d45e542e
+DIST spotify-client_0.9.1.55.gbdd3b79.203-1_amd64.deb 41726600 SHA256 7e00cac3b13949ba3aa87ced011f3cd0260b832e0c936a6d827dc985ee90ff82 SHA512 559fef5238f649af768cf189fa0963854747f7bca64cddd6f6347986f35ad3d343ee62306fa602bd3b3bd3b3f35ab5e79b2990564cb5a61ca88bb6a96c3942c6 WHIRLPOOL 74af9ed681dfba2b4b0bb84cad8d10748d4f8d9b5c7e8002cc942d48327990417cddf17c1881a7641e55163de292d4bc294eb327e30fca996831a6803f224387
+DIST spotify-client_0.9.1.55.gbdd3b79.203-1_i386.deb 37243500 SHA256 8c0b5fcc904d2f80d189dade6a239359a81bc7f99accb58c08009c82d6239aea SHA512 d5ab8566128dcee1a24e4590cab5bd84d9ee31394a074f51f1fdd8c09070664f514f7c9b2007e09b0706de4e7a1377d78b0ac13fdda17f22d3c371b596043e9f WHIRLPOOL 26a00ef965fe74ff7f6b923b9696ccd047ea249b963d99fb48ecb5c0100879ddb2dc80db351328aef88c3cb299ab72f62dbd758758e47b1f4fa9c6aaae9d41d9
+EBUILD spotify-0.9.1.55.ebuild 4922 SHA256 df8e9a7e38aa6cdeb701df850a19d67c70b2b7f5d17226710dd044cfc893b749 SHA512 1f5269593bb8fe738d024ae784f7bfdbf00fc7a42e3a981cd29eebfaa64a98b04f7d0f5deeea328cb836600becb01c109c05f5fcbf9ada42c9eee61d9717291d WHIRLPOOL 0333f066f7225efc96c7efbe1dd64eaef59f291d236ae5f17f6b62c28081f7710ed3d3919bf89c6fbdd0db4ae75f7d843c479b538f277962870f83899912d268
+MISC ChangeLog 3397 SHA256 a26951b3c9ac95dae901943b8f736406938189ab1ec6d46235021f042fd7314e SHA512 5978e04edb0030dc152552d55a12d0a15aec12256da55d2ba8e475e1a5ddd11340c08ee7c840e8657adbb1d6c2dca50c7224e69e55fa72a6e8baaca14fffd1bd WHIRLPOOL 46555de8baf4833cd0855a29e3b269545fd4f1f3ee699b3544609831b474e1b6a4e892fab17d5811e3766885e879886d15c580be7070267332b3782dd9de2a95
 MISC metadata.xml 383 SHA256 2b8b3f4b10decd35022fb1973384e6d8ac74c439bcd104263651faada927b728 SHA512 b7be1a1ea17efea5c3d01d812a79e8c84137219c36d9a4ce511f473d99102953df615ce119e5d993253cf1ec65967a2df06f8e23eb2bfb2debe1e03049ffed29 WHIRLPOOL 431d2deed63c25a74019050e19618a1e1d5482b81c03f9d14cc8b01218cb96ca1bc703a94ecaa54a487c02608e6b0ac7080082a4f30ae49b3e8f22a3a81a3fea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRtjagAAoJECRx6z5ArFrD8y0QAM6h8cNs9Ho6o+CUy43RCuRM
-iqcJVpg1QUse3VRYPIjVxNmOYpBMdD5dH7il7w4bd6ENcviOMT7YSZIOS+uumMEF
-aT2Z1HDDnnYuJhYaTgOzGeoVj7qwD3GCefVrJ2Ik5Cz88AC2N+NDf9yrAdEzxJgD
-4Yl/Q6xMvl44otJNCJtBWsjtbCfkhkpfcEykL3hVHWt9XMF2m0YnzPB9FyVhhxEH
-GkP/VzDbExk3UzQaR+7EeQBvmz7nHKCvtKkzODElzr9IRimmWSwnsxt/OY0wx5pU
-QOMNFm0qeJ/01mlPp/qkRLnjjDGfpv3bbZ5jwabfoEAk/L0ysxB1jlhMmm7RUpXS
-VqANZsGN4RS4Sk3ObgAnGT6ztqniVGH1lCbPF4vkEZnJ3h61W/iIjCqxLToS539t
-UQK8jpMUQRUTtB9j7MN7TpaQgtKrDiaETE5uPr0Vi2P7f0pHZK2yxO7/5E+KPHpg
-bRmKOgfls66rkI5gB8lLr3D1P+aI3QtS1uOVesS+i51RO+TwqThC57GwTzSzDA2S
-Y1P+WleRF8BbawgETC2wla2TpmdUS3J1oCRuFiqNhPvISmqK3VQgh8Tb55jKCJmW
-0HPKcpE2Jt2/Jh0vruge/CxFt2fH350u+qyXmQe0JVUtYlOYO7HR2af9dsjtzeEY
-dY3KkcMBvH7zzREopEZW
-=GrIK
+iQIcBAEBCAAGBQJR62KcAAoJECRx6z5ArFrDNM0P/3C54UAf8FilSgZYj+/neetl
+kY1CyFQqv6B2u5vUXazLY6VTOA4ZbRMKee+AYhedarWAp1c8Yrl4B0SikysldrRI
+f8dpn9icOQjGS8K49iYwgduHOOh12fIP9q9XpylIlm6sEXQFL/vsTWxog2IYSXrm
+aAqkmrjmRYDBWqZgvfOzva/BdZFvbcYlWmAN7L+shtwSIT7tshc5atrbE7iKkHmG
+QV+Au+tWOd0O4fogytR4rRoodXYq0Ikv5GCy57urQninIYIGLjCt8H0VndOC6eb0
+lRlSpGTx3tNOILPsuehrfi8gh0wC6FoVdmRffn3ktpnvSzfMK87UcpawTSjkJmc0
+uA23t9m3C4wEmocp57qVlJDrBmeEm98jcMvSioYh8qQLjis952x8bCdPHL28/uiH
+a9s6GrKozH8RCWZxntP8LSE2Lj648H39o21jcXHFH+53FeUF0M5vo1vIQ1Ivs1uW
+rChXoTE737SFqFP30Z/lQFtly/VUS3cGjXfeqnpL/4Ez0yrKH4HrLrs+A7Cct1yS
+tx59eYmZjilPQ/Q4w+dBvV1mlg0iyOAtecqXq8T10fSMGoFIJjsB4rMqrOG4yQF/
+mlYUFgtgHwivQEV3ZjE2Bo7lTFOF/IVesL4UfxuyKrXoeGq66Kgcr3jYT4LDnnm2
+AWnAPDdXv9SBZyuzld07
+=JTtI
 -----END PGP SIGNATURE-----
diff --git a/media-sound/spotify/spotify-0.9.0.133.ebuild b/media-sound/spotify/spotify-0.9.0.133.ebuild
deleted file mode 100644
index 89b7fa89124c..000000000000
--- a/media-sound/spotify/spotify-0.9.0.133.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.0.133.ebuild,v 1.1 2013/05/03 02:50:39 prometheanfire Exp $
-
-EAPI=4
-inherit eutils pax-utils unpacker
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-MY_PV="${PV}.gd18ed58.259-1"
-MY_P="${PN}-client_${MY_PV}"
-SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}/"
-#SRC_BASE="http://download.spotify.com/preview/"
-SRC_URI="
-	x86?   ( ${SRC_BASE}${MY_P}_i386.deb )
-	amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
-	"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		x11-libs/libxcb
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXdmcp
-		x11-libs/libXScrnSaver
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtwebkit:4
-		x11-misc/xdg-utils
-		media-libs/alsa-lib
-		media-libs/fontconfig
-		media-libs/freetype
-		dev-libs/openssl:0
-		dev-libs/glib:2
-		media-libs/libpng:1.2
-		dev-db/sqlite:3
-		sys-libs/zlib
-		app-arch/bzip2
-		sys-apps/dbus
-		sys-apps/util-linux
-		dev-libs/expat
-		>=dev-libs/nspr-4.9
-		gnome-base/gconf:2
-		x11-libs/gtk+:2
-		dev-libs/nss
-		dev-libs/glib:2
-		net-print/cups
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-		gnome? ( gnome-extra/gnome-integration-spotify )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/spotify/spotify-client/spotify
-			/opt/spotify/spotify-client/libcef.so"
-
-src_prepare() {
-	# link against openssl-1.0.0 as it crashes with 0.9.8
-	sed -i \
-		-e 's/\(lib\(ssl\|crypto\).so\).0.9.8/\1.1.0.0/g' \
-		opt/spotify/spotify-client/spotify || die "sed failed"
-	# different NSPR / NSS library names for some reason
-	sed -i \
-		-e 's/\(lib\(nss3\|nssutil3\|smime3\).so\).1d/\1.12/g' \
-		-e 's/\(lib\(plc4\|nspr4\).so\).0d\(.\)/\1.9\3\3/g' \
-		opt/spotify/spotify-client/libcef.so || die "sed failed"
-	# 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' \
-		opt/spotify/spotify-client/spotify.desktop || die "sed failed"
-	fi
-	#and fix other stuff in the desktop file as well
-	sed -i \
-		-e 's/x-scheme-handler\/spotify$/x-scheme-handler\/spotify\;/g' \
-		-e 's/AudioVideo$/AudioVideo\;/g' \
-		opt/spotify/spotify-client/spotify.desktop || die "sed failed"
-}
-
-src_install() {
-	dodoc opt/spotify/spotify-client/changelog
-	dodoc usr/share/doc/spotify-client/changelog.Debian.gz
-	dodoc usr/share/doc/spotify-client/copyright
-
-	insinto /usr/share/pixmaps
-	doins opt/spotify/spotify-client/Icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r opt/spotify/spotify-client/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify
-		#! /bin/sh
-		LD_PRELOAD="\${LD_PRELOAD} ${SPOTIFY_HOME}/libcef.so"
-		export LD_PRELOAD
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	# revdep-rebuild produces a false positive because of symbol versioning
-	dodir /etc/revdep-rebuild
-	cat <<-EOF >"${D}"/etc/revdep-rebuild/10${PN}
-		SEARCH_DIRS_MASK="${SPOTIFY_HOME}"
-	EOF
-
-	for size in 16 22 24 32 48 64 128 256; do
-		newicon -s ${size} "${S}${SPOTIFY_HOME}/Icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_HOME}/spotify.desktop"
-
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}"/opt/${PN}/spotify-client/${PN} || die
-		pax-mark z "${ED}"/opt/${PN}/spotify-client/${PN} || die
-		pax-mark m "${ED}"/opt/${PN}/spotify-client/${PN} || die
-		eqawarn "You have set USE=pax_kernel meaning that you intendto 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
-
-	#hack to fix the nspr linking in spotify
-	dosym /usr/lib/libnspr4.so /opt/spotify/spotify-client/libnspr4.so.9
-	dosym /usr/lib/libplc4.so /opt/spotify/spotify-client/libplc4.so.9
-	sed -i \
-		's/libcef\.so/libcef\.so\ \/opt\/spotify\/spotify\-client\/libnspr4\.so\.9\ \/opt\/spotify\/spotify\-client\/libplc4\.so\.9/g' \
-		${ED}/usr/bin/spotify
-}
-
-pkg_postinst() {
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/media-sound/spotify/spotify-0.9.0.133-r1.ebuild b/media-sound/spotify/spotify-0.9.1.55.ebuild
index b86b673edc19..9dc84bc4bd75 100644
--- a/media-sound/spotify/spotify-0.9.0.133-r1.ebuild
+++ b/media-sound/spotify/spotify-0.9.1.55.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.0.133-r1.ebuild,v 1.1 2013/06/10 20:27:04 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.1.55.ebuild,v 1.1 2013/07/21 04:24:01 prometheanfire Exp $
 
 EAPI=4
 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}.gd18ed58.259-1"
+MY_PV="${PV}.gbdd3b79.203-1"
 MY_P="${PN}-client_${MY_PV}"
 SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}/"
-#SRC_BASE="http://download.spotify.com/preview/"
 SRC_URI="
 	x86?   ( ${SRC_BASE}${MY_P}_i386.deb )
 	amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
 	"
 LICENSE="Spotify"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+#amd64 and x86 keywords removed due to security concerns, see bug 474010
+KEYWORDS=""
 IUSE="gnome pax_kernel pulseaudio"
 RESTRICT="mirror strip"