From 3df54c7ef56a2e1d61227837262ac9d51f0b519d Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Thu, 22 May 2014 11:04:48 -0400 Subject: spotify: fix gcrypt dep again for 0.9.10.17 --- media-sound/spotify/Manifest | 1 + media-sound/spotify/spotify-0.9.10.17.ebuild | 173 +++++++++++++++++++++++ media-sound/spotify/spotify-0.9.4.183-r6.ebuild | 180 ------------------------ 3 files changed, 174 insertions(+), 180 deletions(-) create mode 100644 media-sound/spotify/spotify-0.9.10.17.ebuild delete mode 100644 media-sound/spotify/spotify-0.9.4.183-r6.ebuild diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index 7a9215b..f91908c 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -1,2 +1,3 @@ +DIST spotify-client_0.9.10.17.g4129e1c.78-1_amd64.deb 54248886 SHA256 3fd81bc68ee877284a9306b7a53ee10af257d2f2da0eec00b3f0d921a3b09ba8 SHA512 0948d3cf88ebd19f28ddba30d8d6752bc8afed8549787f4b41d70e204dbd4c142705f467a3aa456c27f30cdc6bf8aee72e91c50ac388624443119271769f8d4d WHIRLPOOL 1dc798fb09f20263ea90761f74529ff35eb8824469b25488e5ffd915fef9f10804eae2596f768a12129d0e2ac561761b647b4fa3c754f9518bea5850b8123eb8 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 diff --git a/media-sound/spotify/spotify-0.9.10.17.ebuild b/media-sound/spotify/spotify-0.9.10.17.ebuild new file mode 100644 index 0000000..18720f0 --- /dev/null +++ b/media-sound/spotify/spotify-0.9.10.17.ebuild @@ -0,0 +1,173 @@ +# 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.10.17.ebuild,v 1.1 2014/05/20 15:36:48 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}.g4129e1c.78-1" +MY_P="${PN}-client_${MY_PV}" +SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}/" +SRC_URI=" + amd64? ( ${SRC_BASE}${MY_P}_amd64.deb ) + " +# x86? ( ${SRC_BASE}${MY_P}_i386.deb ) +LICENSE="Spotify" +SLOT="0" +#amd64 and x86 keywords removed due to security concerns, see bug 474010 +KEYWORDS="~amd64" +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 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() { +# # 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 +# 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 + cat <<-EOF >"${D}"/usr/bin/spotify + #! /bin/sh + 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-r6.ebuild b/media-sound/spotify/spotify-0.9.4.183-r6.ebuild deleted file mode 100644 index c73d6e2..0000000 --- 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:0/11 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 -} -- cgit v1.2.3-65-gdbad