changes from bug 334664

2 files changed, 29 insertions, 28 deletions

diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 4aa5a40..fa1d806 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -4,6 +4,6 @@ DIST spotify-client_0.8.8.323.gd143501.250-1_amd64.deb 35097658 SHA256 0ebedb341
 DIST spotify-client_0.8.8.323.gd143501.250-1_i386.deb 30905262 SHA256 0624959151fe8a58d82b2b7bcdee44ab615cd3fdb1247772f626e04df100088f SHA512 6f01153f78c95cf86acdb15e2851d4779b22dc5ef15dd394287d7ed3aa51aedb80a31b388e1fae760f90c607d48f1369b732ca49710bd5a6673d5d9160b26eba WHIRLPOOL d62d9fc6b565f02230a23974b0a8920ff2a2caee6afccce7a2adad5cecb823ef8ec7bcfc49a05a8557a4fa3062ba67315fc2edf1cf075a0c2d05eb94bc150b1d
 EBUILD spotify-0.8.4.103-r2.ebuild 4041 SHA256 7db6611dd4a792a8864cdfb3b4253992fb6744eb86ff79e8ef95beab1179e518 SHA512 63b971805ce2616eb3d8d161bed339841e4fd5558977d21f835041080299f418b758f694da46ef75e3db78c437839fe0824087ea1b42649d659a80689f01ba9f WHIRLPOOL 204159303f628c4943cd4decf2e0a0611d461ae38d1b5afbfbc5f9cc0cc538fa50356b2ca3ed6433cc8b423655edd71f9b51abc1c9f9d08a860195e201c7fca4
 EBUILD spotify-0.8.4.103-r3.ebuild 4058 SHA256 d796dbf4449f399711b092b1c9ae6316eb996edaa7c3a2791920b2c91a023521 SHA512 7505d558823344e3a0af116abfa918cb1168a44dfd3581ab2af6503d9a20ada306e8fe47a01284a4bd73dc5d68faf365c6e766b27ecb1b86c7d5a54bf05ef08c WHIRLPOOL f4e3fa48c0ea714fb6c9361328c48cafc7aae8f539d2731de53e16131a36943824290f9d2e3416054de8dce608d5f4121bbe711faf1ed9787b1f8eebe8d63859
-EBUILD spotify-0.8.8.323.ebuild 4058 SHA256 75dbb57cc95f07f0400dde635edaa51facca48f0b33b8a9be4bda98236469dc8 SHA512 0d4fbf0ea6352a560c1a9a5169c5526160321f59d2864ece7a360a685fdf42faa119d18d2cd670ddd5130aac1455ec423ec693abf165ed07591d37455455b642 WHIRLPOOL 9ca7eff90fc0200b019f2125119aab21a88fee4e9a4cbc6229642fc4be3a4dca1e6039c9e9da517742f42fe7c412f8df6f95182b0baa47c74ab360570214a8a1
+EBUILD spotify-0.8.8.323.ebuild 4185 SHA256 2e6df1a1d5f9c27ac685017119a85e2da55be7916511caacc4f17aeebe95c21c SHA512 ecb1dcf930be018fbf64ab57924086193fa14d3a1b62d63c51e4745697711a5e894b510014411b11e111f21d6234f2768bfe3f5c4675c49e21a783c4bc6859e2 WHIRLPOOL 0d0a210ba7c2cc9d5b93b9143b54a552ec2790debedf9d0a8e0fe0f9f69ae913a9df4fd43973464c7ef0cfa1465ba552da92561a1fe2fd299c034c06a5253044
 MISC ChangeLog 941 SHA256 0377ceb78a51b1bb11998977025ba9c4e42dde624826f11fe0257a8dc9ed8f5b SHA512 9f6f8c39f263533a7590f30c23afd3f867cf667ca7c3ed15df99f38cba12bbf2427fd773447a5dca2324b5ad43e8699aa234353b43679f3f46a552a8148a434b WHIRLPOOL b4e1bd237bb029b37e709b0c83e0146bfd0074ff00dd992b59b19a364f0d7e8497ebc19042056f1e23e591b7a5a84801e2b52103b74b5d369622bb01126485fd
 MISC metadata.xml 383 SHA256 2b8b3f4b10decd35022fb1973384e6d8ac74c439bcd104263651faada927b728 SHA512 b7be1a1ea17efea5c3d01d812a79e8c84137219c36d9a4ce511f473d99102953df615ce119e5d993253cf1ec65967a2df06f8e23eb2bfb2debe1e03049ffed29 WHIRLPOOL 431d2deed63c25a74019050e19618a1e1d5482b81c03f9d14cc8b01218cb96ca1bc703a94ecaa54a487c02608e6b0ac7080082a4f30ae49b3e8f22a3a81a3fea
diff --git a/media-sound/spotify/spotify-0.8.8.323.ebuild b/media-sound/spotify/spotify-0.8.8.323.ebuild
index cc1a41b..b7da872 100644
--- a/media-sound/spotify/spotify-0.8.8.323.ebuild
+++ b/media-sound/spotify/spotify-0.8.8.323.ebuild
@@ -67,36 +67,37 @@ src_unpack() {
 	unpack ./data.tar.gz
 }
 
-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' \
-		usr/share/spotify/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' \
-		usr/share/spotify/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' \
-		usr/share/applications/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' \
-		usr/share/applications/spotify.desktop || die "sed failed"
-}
+#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' \
+#		usr/share/spotify/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' \
+#		usr/share/spotify/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' \
+#		usr/share/applications/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' \
+#		usr/share/applications/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/applications
-	doins usr/share/applications/*.desktop
+#	doins usr/share/applications/*.desktop
 	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/*.png
+	doins opt/spotify/spotify-client/Icons/*.png
 
 	# install in /opt/spotify
 	SPOTIFY_HOME=/opt/spotify
@@ -124,9 +125,9 @@ src_install() {
 
 	if use pax_kernel; then
 		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}"/opt/${PN}/${PN} || die
-		pax-mark z "${ED}"/opt/${PN}/${PN} || die
-		pax-mark m "${ED}"/opt/${PN}/${PN} || die
+		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"