update cleaning some stuff up and fixing bug 498272

Package-Manager: portage-2.2.7/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 06916cd878d3..fbac0874b813 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.26 2014/01/25 02:22:02 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/ChangeLog,v 1.27 2014/01/28 04:11:42 prometheanfire Exp $
+
+*spotify-0.9.4.183-r5 (28 Jan 2014)
+
+  28 Jan 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +spotify-0.9.4.183-r5.ebuild:
+  update cleaning some stuff up and fixing bug 498272
 
   25 Jan 2014; Matthew Thode <prometheanfire@gentoo.org>
   -spotify-0.9.4.183-r3.ebuild:
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index f243bd00a772..faed4ddb422e 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -4,22 +4,23 @@ Hash: SHA256
 DIST spotify-client_0.9.4.183.g644e24e.428-1_amd64.deb 47355040 SHA256 dd0d072013918498a65dbc26bfb3dda0aacd7ee122e300bccd39731d8da5d1fa SHA512 f596c79cc69508ec47f7579e73033127c403bed9209cef5b9c1cb88805054f85ebb38eaa28037ae2955a5fb14cc8b3c76b3c2d7668316e4d5a2c80d6fdd6c571 WHIRLPOOL 088c73004fb273d1d0ea143f4da212402a82109f9eb7464cf829f96cd8e0446a8adc976ecc16020a664653d2c8e6bc521b843d075a52c5867d97bbfac1b8cba3
 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
-MISC ChangeLog 4505 SHA256 e31cbfe469184e5f0b211096bb7652a52d8cc05c8b85bf6ad561054708690c1a SHA512 adb55915160645fa766c876167eb777cb308ae84ae9c93ef0693c5136e1ed251cfe29b2cdbc72a8ee46f5160e676b2f6586cdeaee2f68ac477992e15956b5eb9 WHIRLPOOL a6af0f0e494f6996e8daf65d5ead6d1821bcba5fa29304751d331f3d8965df49f39fd0706a07992e7f9662d3cd4e574cbec614ca5bc07662e09ea11cc808fca7
+EBUILD spotify-0.9.4.183-r5.ebuild 5626 SHA256 f0ccaf47a4c740dec7cab1632d25a34357d8ac3717cdf62c8822d49a4f73e29c SHA512 cda57f904e75ad689eca333ab3d636d7c1fce9ba51eca8c419447e913f3c63c91aca5fcb6c5585799cf03de033821a0a1b8c3a78874006800787766cbefe04f8 WHIRLPOOL a53d488fff098c25ca3d9087c95349bacc727d26aff4421c1468c7ba3a5bebf9174fef55fc3d6097736b24d58fd6acea1c7c1aa704bab72b507df3abb9ed6bf1
+MISC ChangeLog 4686 SHA256 1ab3b815812faffe8718ccc11478993972f4cc40d69b24c307770422a1fcf59b SHA512 2acc736d9345f3438e50fb9105c84f94e686471e927e9be231dce477a41a9201647a67903c82f2895dbf771582615ead002c69af6a28330cca91a8324a5881b6 WHIRLPOOL c8121a754f4bfb5ae9e99478ad2f206ce7a694aa05081c47ca6ecbeedaa6601ceb7c21993ed92883713facb0f112083a7a92d9389651064e5d3f51bdda7ec03c
 MISC metadata.xml 383 SHA256 2b8b3f4b10decd35022fb1973384e6d8ac74c439bcd104263651faada927b728 SHA512 b7be1a1ea17efea5c3d01d812a79e8c84137219c36d9a4ce511f473d99102953df615ce119e5d993253cf1ec65967a2df06f8e23eb2bfb2debe1e03049ffed29 WHIRLPOOL 431d2deed63c25a74019050e19618a1e1d5482b81c03f9d14cc8b01218cb96ca1bc703a94ecaa54a487c02608e6b0ac7080082a4f30ae49b3e8f22a3a81a3fea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS4yAAAAoJECRx6z5ArFrDeNwP/35r6CTZsScfavvrupbd/TlU
-9q4EGcRLnIoXrx/oRy5I6GBXPYGZNsMnuxUijSRLzM6AwUTWw47xo6G11ZGZFRpq
-6FnO25SwD23QDfhaInIq/yFCuVpuf+bmBZxZpEunONVYwUxzJ+9WPgix9UjC5SBq
-V5bi0izFADcFhF/USjo6iboUHRG3E/Q6m7oljEnk4o3bm4ZJIQp71n5gliGd8Ph1
-Mg3Swoy5l57z94jpQLjfqIiSl+lRWtW/xc3VFJV9+HtsjG6BVbEipNQT1PJpKrir
-0iZ6ZZ4dhW+FqP8raLc1Hsi3/gzuhAJFbS6FILm0Faybj7vFVaTdqhy1u2cEATwg
-D4wyN2VK2mJUNvpDd4RfUuSxDEKf0elQzlJe7juGfbEHsaKugzTcvhtD+6c2Orfx
-a+Vcl9BrDRW3aNDHLVaTC1kLWEbo/FUAwVnmtgvgKfvzT23Dy3yB3855DnaQq9eF
-Fv96KuvwmihEgT+v/cYHHd6Po77PoLzbQ4qAt2vU2ArZkzqXbG8sfwS2YG/lb6KI
-t2aqXA4PzHJ67u9X7pccP087WQ1H4Ha6uXloZU/jPSc+vqdHdJz/q5uYVQnP/AWy
-WoOtCI3qjCaRT/yEAxL5tL28qTWjaCi6yx0h9vY8ycNVzQ2UJzaqUXhQlirK5oZc
-HQHsARuT8IJ3zdlOvj8o
-=wQZl
+iQIcBAEBCAAGBQJS5y4vAAoJECRx6z5ArFrDoqAP/AtrNatDBebE4xFjDsRmRt2P
+Onboi9FGhb3zhhH6ztOhGzMKr0fxE0CanOEGusdTF9ZVAv6Nx+1+eDMoHduoinam
+TtEqqF/m0wRffADYPFVnJStsCiISV/hbYttkHV4QYXI1PHO/HPVOAX3k4LqIhk/W
+Ha8aTJO6CQIrkeV1iSYRq7r+/l4lS5TwEo9P63NJMsY8enRlTSQD2S1m3M1SUjxW
+MFeS84Q6xIvexPe8iKK1jw9hyK0pSdref53z8/aUtQDvzi+CQ3nxw++g8GIUQs2I
+lXlaHML2Ml65f/lhYHzZ2j4MiVFSRLD6vRaZbVx4a7p74YM0iCFGX9QTCUcqMmsL
+hz63fZUBg20/rlw93Zx8JzdlWZKUp4Dxdb2slzR8s2sltPQAQGUkepR9W4C9AC3g
+xH1o9f+xgN8fklPbFAflwhCmdW+aiO9sHM41SgXP4nTalnausSQu3iV7WaUvhEhl
+eoTkK5HTyA++alAXqhwBUic2CAgUOt6gbgkGg/706JPFGiyQ9K69syMrRtwZJ7ll
+o0smvFD/sB18GfpSw6qUg34XaTlypJpL1GKWVrDsBD6Y/RnS0Uw8jOCLqgOZ9p+H
+cagZBR7S3Vd1j+VBkn/JvrmgeNez0EsLfT9LTauKqFXahnzgYnrQO163n4Zii/Uf
+8E5+SKvJwr9spgF32/fD
+=uRuS
 -----END PGP SIGNATURE-----
diff --git a/media-sound/spotify/spotify-0.9.4.183-r5.ebuild b/media-sound/spotify/spotify-0.9.4.183-r5.ebuild
new file mode 100644
index 000000000000..21b7a605b97d
--- /dev/null
+++ b/media-sound/spotify/spotify-0.9.4.183-r5.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-r5.ebuild,v 1.1 2014/01/28 04:11:42 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:0/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/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}/libcef.so ${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
+}