Depend on either libgcrypt:11/11 or libgcrypt:0/11. Drop ~amd64 keyword. Remove old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 17 insertions, 374 deletions

diff --git a/media-sound/spotify/ChangeLog b/media-sound/spotify/ChangeLog
index 7a35a17dd4e3..38a203c247e4 100644
--- a/media-sound/spotify/ChangeLog
+++ b/media-sound/spotify/ChangeLog
@@ -1,6 +1,14 @@
 # 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.31 2014/06/12 01:21:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/ChangeLog,v 1.32 2014/06/12 01:30:04 floppym Exp $
+
+*spotify-0.9.4.183-r7 (12 Jun 2014)
+
+  12 Jun 2014; Mike Gilbert <floppym@gentoo.org> +spotify-0.9.4.183-r7.ebuild,
+  -spotify-0.9.4.183-r4.ebuild, -spotify-0.9.4.183-r5.ebuild,
+  -spotify-0.9.4.183-r6.ebuild:
+  Depend on either libgcrypt:11/11 or libgcrypt:0/11. Drop ~amd64 keyword.
+  Remove old.
 
 *spotify-0.9.10.17-r1 (12 Jun 2014)
 
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 729e06b2a900..2aabd99f81be 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -5,15 +5,13 @@ DIST spotify-client_0.9.10.17.g4129e1c.78-1_amd64.deb 54248886 SHA256 3fd81bc68e
 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.10.17-r1.ebuild 5332 SHA256 1be9714dc0f3441626cf0481b822b7ac2c59769b95d4250a75c5c899b5cc5113 SHA512 04f261f9bd601a896ccce4a4341d6c7cf7c4682d0907a763cf4525a6e199b782d47d3f8d1008f738d5dc847c67bb2fc80013c0bd74d547ae360c43e05e6a970b WHIRLPOOL c888efc4c1482c6040d0fe1d18a36c799b0c0ea62d7120e46fae2f337fbf234d64f9e36e69a1eded362a26a5c26f818df43016c483a10263096909b5dda4b4be
-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
-EBUILD spotify-0.9.4.183-r6.ebuild 5606 SHA256 51ae476e07a3d6f8c9c99fbaf55e500ec2c0ca3b9b70834805596600a9793e86 SHA512 a3b31c2ea04d81a7047f8229715c08dedc1a2d7cf8bd5dd0163330adc5934e2e8e1c34a73846c17e0c2ddb7ce61bc67d7bb2f5f7b9611c628e8f4805724f493c WHIRLPOOL 552d15c45c84441957d92c96511952f8c5c2f33f770ebbc5ce3f017915f977265e1a714163b625dc985541cb1935dfa63c00124b0b7f610bec8b0cb0b5fe3f6b
-MISC ChangeLog 5301 SHA256 1cd8d0f8d0a19e18c9a26b37645f86f39a14c87d0b94befa308f9f0cb0c220bf SHA512 c9879c60f94f694bde2962b16cf03b8b6e3b5af4044e48bc6f11f39a4cb8447b8b63c7d554f7e0e8c7d17dbe9c4f77f84b5a8a91412ed9c7df84e8edc2d20cac WHIRLPOOL 3f19a2d6f20fc4c948cab25acd5c065a7c2f955dbe9dadaee8d2d8f21f7028dfa75a758dee50f6811a5d902c9e9cf4c38ca94ec76d6c8ebffa632c59a88b821d
+EBUILD spotify-0.9.4.183-r7.ebuild 5623 SHA256 a7cfdf4ddef7d33287fd289d44175a9e89db035ba7ad5c1391768f9f02381f6f SHA512 13aaf869636f489ad29b48f6e9be7a7cbed6cdeee637e1d07646059ae06f7fb13f797f746aff8ac4768cc94811cd7ddf72011ccd9a4bd5cba31ac96c945b593c WHIRLPOOL a958f9991ab65e469ed37482b78f5674e2f3d445ce587b1892e7c7de643750d7d3dee42fd7656ecb3c949a3c0e6eefbf33406a75e4019044bd6e989fcafbece3
+MISC ChangeLog 5601 SHA256 94fbe8dcde4af0a19eea3ddd2b9d3fc7c6c2e3db96e335372e94424474496079 SHA512 12198a914270160536a91235ca58d1a9b404f028a1c3b87da1dc283d549cd461e6cb7ab1e585673d573e3bfbba5849f6bff6272565af4eb8a191ce16d058576e WHIRLPOOL ce5fd18b081eff108fd5266333eed96b23f6aeac301730c6e08a6aa1b50c5098a9d89448803bd4ccaf149e544a8dc1433fdd67aab49622937754251cd4251d0a
 MISC metadata.xml 383 SHA256 2b8b3f4b10decd35022fb1973384e6d8ac74c439bcd104263651faada927b728 SHA512 b7be1a1ea17efea5c3d01d812a79e8c84137219c36d9a4ce511f473d99102953df615ce119e5d993253cf1ec65967a2df06f8e23eb2bfb2debe1e03049ffed29 WHIRLPOOL 431d2deed63c25a74019050e19618a1e1d5482b81c03f9d14cc8b01218cb96ca1bc703a94ecaa54a487c02608e6b0ac7080082a4f30ae49b3e8f22a3a81a3fea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlOZAK4ACgkQC77qH+pIQ6Si1wEAsKRMKxisVN+VK8IVPR058Onf
-rCrbuG/Ks/TmdqSNR1oA/0lJgczC2mWfT/Rh3LipV0OfQpmHTnWO9QhG6k1se6ZW
-=Zvco
+iF4EAREIAAYFAlOZAp0ACgkQC77qH+pIQ6TJTwD+Nl2ys2enUOo0uNc/Z/zYr7TI
+Kxzl8v/IQE9sC81QyaMA/RLxTPeQUIw29Afo9l+s34SmILQqY8viigjD02JLgn1L
+=VRqZ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/spotify/spotify-0.9.4.183-r4.ebuild b/media-sound/spotify/spotify-0.9.4.183-r4.ebuild
deleted file mode 100644
index 93f1d7c74b9b..000000000000
--- a/media-sound/spotify/spotify-0.9.4.183-r4.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# 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-r4.ebuild,v 1.1 2014/01/15 19:44:27 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"
-		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 C "${ED}"/opt/${PN}/spotify-client/Data/SpotifyHelper || die
-		pax-mark z "${ED}"/opt/${PN}/spotify-client/${PN} || die
-		pax-mark z "${ED}"/opt/${PN}/spotify-client/Data/SpotifyHelper || die
-		pax-mark m "${ED}"/opt/${PN}/spotify-client/${PN} || die
-		pax-mark m "${ED}"/opt/${PN}/spotify-client/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 /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"
-
-	#TODO maybe this symlink is not needed and could be fixed with previous sed
-	dosym /opt/${PN}/spotify-client/Data/libcef.so /opt/${PN}/spotify-client/
-
-	#TODO fix for x86
-	dosym /usr/lib/libudev.so /opt/${PN}/spotify-client/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
-}
diff --git a/media-sound/spotify/spotify-0.9.4.183-r6.ebuild b/media-sound/spotify/spotify-0.9.4.183-r6.ebuild
deleted file mode 100644
index 3be096f0d7bd..000000000000
--- a/media-sound/spotify/spotify-0.9.4.183-r6.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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
-}
diff --git a/media-sound/spotify/spotify-0.9.4.183-r5.ebuild b/media-sound/spotify/spotify-0.9.4.183-r7.ebuild
index 2ffb891a755f..06a8df11895f 100644
--- a/media-sound/spotify/spotify-0.9.4.183-r5.ebuild
+++ b/media-sound/spotify/spotify-0.9.4.183-r7.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2014/01/28 04:24:21 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.4.183-r7.ebuild,v 1.1 2014/06/12 01:30:04 floppym Exp $
 
 EAPI=5
 inherit eutils fdo-mime gnome2-utils pax-utils unpacker
@@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="Spotify"
 SLOT="0"
 #amd64 and x86 keywords removed due to security concerns, see bug 474010
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~x86"
 IUSE="gnome pax_kernel pulseaudio"
 RESTRICT="mirror strip"
 
@@ -44,7 +44,7 @@ RDEPEND="${DEPEND}
 		media-libs/freetype
 		dev-libs/openssl:0
 		dev-libs/glib:2
-		dev-libs/libgcrypt:0/11
+		|| ( dev-libs/libgcrypt:11/11 dev-libs/libgcrypt:0/11 )
 		media-libs/libpng:1.2
 		dev-db/sqlite:3
 		sys-libs/zlib