fixing r6 for bug 499144

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

3 files changed, 202 insertions, 15 deletions

diff --git a/media-sound/spotify/ChangeLog b/media-sound/spotify/ChangeLog
index edc645a8e9bd..038c2e430f14 100644
--- a/media-sound/spotify/ChangeLog
+++ b/media-sound/spotify/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/spotify
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/ChangeLog,v 1.28 2014/01/28 04:24:21 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/ChangeLog,v 1.29 2014/04/24 07:02:32 prometheanfire Exp $
+
+*spotify-0.9.4.183-r6 (24 Apr 2014)
+
+  24 Apr 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +spotify-0.9.4.183-r6.ebuild:
+  fixing r6 for bug 499144
 
   28 Jan 2014; Matthew Thode <prometheanfire@gentoo.org>
   spotify-0.9.4.183-r5.ebuild:
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 04d3af979bdc..2706d0a5e521 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -5,22 +5,23 @@ DIST spotify-client_0.9.4.183.g644e24e.428-1_amd64.deb 47355040 SHA256 dd0d07201
 DIST spotify-client_0.9.4.183.g644e24e.428-1_i386.deb 41740148 SHA256 ca45d057357e4c30efee3838dd941222500463ddd0a1db6981e4d48d7ad986f2 SHA512 0f31fbf2274ca6cf16144bc85c8e71cfe347ad2994c100917a5912b413e976b2f913c3aea4d6cc7fd83bdf9d3c2836cc4d758f90f7afdb1078a14c93c23436d9 WHIRLPOOL bcce68c713606a3c092cf82356f56f4ad84f1e70046eef68ba9263ced73c0e101de082362e44050640ac8bfa968716d2ef7ca97f9e3cd2323e91ee4403b3b58d
 EBUILD spotify-0.9.4.183-r4.ebuild 5901 SHA256 9c50dc1367d9d913f88cba5a8606c632668011d05ba428c84bee98d7cd8c7704 SHA512 8e030b086d45421dda8b8456f5bf7c71fbb52c5d4b7d4818b7d69e019e4d46b19e96b543430146560f31bd6a35b63383d0df91d26efabec38114111a19c1dbcc WHIRLPOOL f91517dbb20820e7fb64a5a389a93335fda85a0f5b0e3f872c6f614a9cf0b82faee7696caf0b32b791ba77844f9ca61d7cfce49d9dca7e4b73d96f7cd92516a2
 EBUILD spotify-0.9.4.183-r5.ebuild 5605 SHA256 59c1e7d862add06d5ede6b1759d3f28ac9efafe30b4e9e7b46303326e2be1683 SHA512 b78555c698009d1709a5aa047ea081f78bb446b2041eee04aea3544d1d6b5aa06b00feef147c51cac0623f387c9b42dda2b0c0848d780a173b21a424415bbccb WHIRLPOOL e125358b9c8932bfa6a46111af928941ac80f203b7e18397f9aed278f7e7e709ad5f8f79ebe929121c8ce5aef27e413f1d16f601a4c47771f42c8ea9faf43c4b
-MISC ChangeLog 4814 SHA256 4ee0ec7103aaa8d345082b1f4dd006275d553d2d83f8302c79f2a6256e2c14ed SHA512 af3783c88656f37de7dbceb51a6c0b965f2c4f5a267f95556f2f2186a483c29832a584cb49610eadbdbb0de2deac97d22509791c6770ca352afe48f569a16b0b WHIRLPOOL b8d8e242a30ad4792592472c5ca86bb5235264a31e61814c6e294ad185a80253d8c6ce396a813a4ccd3b0d8cc775cc7eed9c7622dabdb8973b02962edfbd2a19
+EBUILD spotify-0.9.4.183-r6.ebuild 5606 SHA256 51ae476e07a3d6f8c9c99fbaf55e500ec2c0ca3b9b70834805596600a9793e86 SHA512 a3b31c2ea04d81a7047f8229715c08dedc1a2d7cf8bd5dd0163330adc5934e2e8e1c34a73846c17e0c2ddb7ce61bc67d7bb2f5f7b9611c628e8f4805724f493c WHIRLPOOL 552d15c45c84441957d92c96511952f8c5c2f33f770ebbc5ce3f017915f977265e1a714163b625dc985541cb1935dfa63c00124b0b7f610bec8b0cb0b5fe3f6b
+MISC ChangeLog 4968 SHA256 ff25e505f15d5b701062321839c6d4ad46e91dfa0b2690c6fb6aa78e634690e9 SHA512 e7b81bd3671eb574a7e41d26e580ca0bafcf1201a9b51ffac890b93a41668574d02394511e3fd39c79cf34f97eee1139781dd0337eebf0b26feda62a7bb379ce WHIRLPOOL db07c17789762bab51617d29877f71861411bb3e17fb3a3b54ad87ac343826e9dca9b5f4b112946fbe7dfda0521a9d27e384cf9fd618d5966773f060f7e086db
 MISC metadata.xml 383 SHA256 2b8b3f4b10decd35022fb1973384e6d8ac74c439bcd104263651faada927b728 SHA512 b7be1a1ea17efea5c3d01d812a79e8c84137219c36d9a4ce511f473d99102953df615ce119e5d993253cf1ec65967a2df06f8e23eb2bfb2debe1e03049ffed29 WHIRLPOOL 431d2deed63c25a74019050e19618a1e1d5482b81c03f9d14cc8b01218cb96ca1bc703a94ecaa54a487c02608e6b0ac7080082a4f30ae49b3e8f22a3a81a3fea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5zEmAAoJECRx6z5ArFrDsWsQAJytajDRr1kIX2tLrl56B8T2
-rti/eEKg6Ag4lVgjIc1XXs1ymLJRaKQFw0fv2RtSnrbVmpMHjjUKRKPSHHDmejW5
-9MoYn3w+/GDn3Jp7aAmdcHxzBw2auCb1nPiOsyEsBEjT7eDzuK+ecalB+0CNKJmt
-lhXht1P7yjsk1tYENbfL9n671Q71MLvQ9WVb/h9RcxLVegXeuCpfJgdFUaHmqPnS
-HMumztFjUT8SGG05xBbO5FB3Kd83g0RHyIucj1JQ8hiAaM+RdHvotf+exZgtLYgS
-eW/B2q3eNT43+2GylPWSQXqBqXbPcsG2Fz4tVTKE+0blBYEhYMInx3hcDODAL94M
-wWHLR6kqTYA21Xi19pAv9xFLE2QsaRKS/hePKNqnj1zkK24rY5WeycR2FZwbphg7
-RzZanbhKGU4AJwNkAUqmXCxDiPwNX+IKSzl7BK/55W9D1n9IcXY6E9+iRCSQgIsW
-2WWlw2CfCXTv1cqYKQk3ULDdtZPLXkB4oL0uDZAMzfv2QqQT/Gxm5XIK6vXnyNwj
-DycgGWWC1tLPqc6tuIzLx5nMyAh82578q+JdSXos0tUJVvM5NrLyNEgkXiF6g8JF
-6Lrs3IVtGb2FTqOZP4eO5SMc/oiAIo4fAf5F4k6gcinKi2WRQ0TA+bgZhoVWrlMk
-Jd1luijXV3zsh0zR7mBD
-=ziIT
+iQIcBAEBCAAGBQJTWLceAAoJECRx6z5ArFrD970QAN5fCx02y+/KUEl65sfJxRRt
+0OFyF5LPAjdcdt/wm0b//FO/nSBWHKli9XluN0C6Nj1yiXicbF1EUse1aO3rE/tU
+wxwdoaeTUfjJ0Jw+8iYpGz9aS7RllVi1epzYfRwodOngQVYzaiA6nHPHAfcD7g7Q
+2osd5G9Ctzbu7YBRDGLUOi+IdJzVH7ipZ83xlQwYkL95YUbPD6Raiy0jEw75hzDU
+ORBIKnbSYvio48Y8wbkLNbqx38OGJMqPj9/d4XAho4aQUGjtM1w6HDvJi5t0e3GB
+hahoV+1lBC65SJKwyCntolNxxpt3oMtMwsTEo98ENrxCnyoS5kVEqUE7djKEvXwX
+dAeZhpI1z0KnKlUVm6BRoN0Z8wPjfmy80z7rL4BJAkP8ZIn0zZtSqAe70LxLvhj5
+1R80SWwjOxCw5kvHCQDP3feLajlnXSRzFJ7AvslZgUEz8wtzxwt5m6ODDvyQVyJS
+Y5bnefKs0rtfWERMWyBYraaW2tb4PrbT3PDrZaH+rnfMs4jVbotzss2cptK8tY/6
+hFYhDTZjYJ9gUjtZT0tVyNhHGw8pLBdJybahIQaPvcdnD7FpimHcCVMlJzaCALIY
+RowtzmjYHFMmayYmKckGT57GFn1w05iKPsi3zPOIn//0NynlGrnPTB5oV8SQkbQo
+CUf4dNTxU5WfmeLZzsOB
+=Oltw
 -----END PGP SIGNATURE-----
diff --git a/media-sound/spotify/spotify-0.9.4.183-r6.ebuild b/media-sound/spotify/spotify-0.9.4.183-r6.ebuild
new file mode 100644
index 000000000000..3be096f0d7bd
--- /dev/null
+++ b/media-sound/spotify/spotify-0.9.4.183-r6.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.4.183-r6.ebuild,v 1.1 2014/04/24 07:02:32 prometheanfire Exp $
+
+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}.g644e24e.428-1"
+MY_P="${PN}-client_${MY_PV}"
+SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}/"
+SRC_URI="
+	x86?   ( ${SRC_BASE}${MY_P}_i386.deb )
+	amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
+	"
+LICENSE="Spotify"
+SLOT="0"
+#amd64 and x86 keywords removed due to security concerns, see bug 474010
+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[qt3support]
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4[qt3support]
+		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
+		dev-libs/libgcrypt:11/11
+		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
+		virtual/udev
+		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/Data/SpotifyHelper
+			/opt/spotify/spotify-client/Data/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"
+	sed -i \
+		-e 's/\(lib\(ssl\|crypto\).so\).0.9.8/\1.1.0.0/g' \
+		opt/spotify/spotify-client/Data/SpotifyHelper || die "sed failed"
+	# different NSPR / NSS library names for some reason
+	sed -i \
+		-e 's/\(lib\(plc4\|nspr4\).so\).9\(.\)/\1.0d\3\3/g' \
+		opt/spotify/spotify-client/Data/SpotifyHelper || die "sed failed"
+	sed -i \
+		-e 's/\(lib\(nss3\|nssutil3\|smime3\).so\).1d/\1\x00\x00\x00/g' \
+		-e 's/\(lib\(plc4\|nspr4\).so\).0d\(.\)/\1\x00\x00\3\3/g' \
+		opt/spotify/spotify-client/Data/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
+	fperms +x ${SPOTIFY_HOME}/Data/SpotifyHelper
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify
+		#! /bin/sh
+		LD_PRELOAD="\${LD_PRELOAD} ${SPOTIFY_HOME}/libnspr4.so.9 ${SPOTIFY_HOME}/libplc4.so.9"
+		LD_LIBRARY_PATH="${SPOTIFY_HOME}/Data/"
+		export LD_PRELOAD
+		export LD_LIBRARY_PATH
+		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}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark C "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || 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 "${SPOTIFY_HOME}/libnspr4.so.9"
+	dosym /usr/lib/libplc4.so "${SPOTIFY_HOME}/libplc4.so.9"
+	#TODO fix for x86
+	dosym /usr/lib/libudev.so "${SPOTIFY_HOME}/Data/libudev.so.0"
+}
+
+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 "you need to use the ld.bfd linker with openssl"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}