From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- media-sound/spotify/Manifest | 4 +- media-sound/spotify/spotify-1.0.72-r1.ebuild | 2 +- media-sound/spotify/spotify-1.1.10-r1.ebuild | 106 ++++++++++++++++++++++++++ media-sound/spotify/spotify-1.1.10.ebuild | 108 --------------------------- 4 files changed, 109 insertions(+), 111 deletions(-) create mode 100644 media-sound/spotify/spotify-1.1.10-r1.ebuild delete mode 100644 media-sound/spotify/spotify-1.1.10.ebuild (limited to 'media-sound/spotify') diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index e3e447005666..9b5d3537db58 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -1,5 +1,5 @@ DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8ebccdc889b723ac6e9f5275dddec97d35142606ece32d1edb1ed288d1c517d41027de22da77421a76f8c00ea90ddc868b74dd46ba07cff60a581b12a SHA512 f004083eee00600a51e50d7dee03846293b5ccd6966786e91055564c7963917b9aaa917de41f299a0f5b7baecea5f466fb37722b8631743ff2ca15f43851f5f4 -EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c -EBUILD spotify-1.1.10.ebuild 3188 BLAKE2B 6a20f81c52e9f5232ec672da83d53c8b38f5115421a61fb39f11cdc9b30add11462338abacfea61b8c2ef021431ca143198339d7094edc901eda1ac04c140431 SHA512 5760f276e7907ccb4bc96436a92c8435ef33c97a68621addafe5e97204bcb1b67510d65e8de204ed07e225a4b9e528a0ba72217877ca9b0b99fda148c12f191d +EBUILD spotify-1.0.72-r1.ebuild 3210 BLAKE2B cd775bd0a132bd9a32e64445f815e42fb271d4f30025b65d33efb6013049005749e60e309daea7031cbe1bbb1afc16fd94f5a12e283d28d3e56051541d60ba40 SHA512 d21a4c6bfa78352f3dc0679373fca05eaef3043c8d77611f9b9c6b789f42964f95492d8e6530f012df32eba364772abd9ce0d25f68ce1205003892beade2db81 +EBUILD spotify-1.1.10-r1.ebuild 3142 BLAKE2B d75a9f42f9c2870d4fc2159bb6a9009fdae9880e8be52b77738bf895805d8d14be388ed349049710dfeffd5a31b5b00511e49983564031022c0a716e6624ac02 SHA512 f2558d039f2e0261d0ff74780e5519001dfdb9612da935a2619c678047b5154f955ccdc4d2b65d229d1191cf1360d4b1db1056d29fe5407e50a818b0bc776b37 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316 diff --git a/media-sound/spotify/spotify-1.0.72-r1.ebuild b/media-sound/spotify/spotify-1.0.72-r1.ebuild index da0339466e17..ef72a8936d6f 100644 --- a/media-sound/spotify/spotify-1.0.72-r1.ebuild +++ b/media-sound/spotify/spotify-1.0.72-r1.ebuild @@ -28,7 +28,7 @@ RDEPEND=" media-libs/alsa-lib media-libs/harfbuzz media-libs/fontconfig - media-libs/mesa + media-libs/mesa[X(+)] net-misc/curl[ssl,curl_ssl_openssl] net-print/cups[ssl] x11-libs/gtk+:2 diff --git a/media-sound/spotify/spotify-1.1.10-r1.ebuild b/media-sound/spotify/spotify-1.1.10-r1.ebuild new file mode 100644 index 000000000000..3089e3b8847a --- /dev/null +++ b/media-sound/spotify/spotify-1.1.10-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit desktop pax-utils unpacker xdg + +DESCRIPTION="Spotify is a social music platform" +HOMEPAGE="https://www.spotify.com/ch-de/download/previews/" +SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/" +BUILD_ID_AMD64="546.ge08ef575-19" +SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" +LICENSE="Spotify" +SLOT="0" +KEYWORDS="~amd64" +IUSE="libnotify libressl systray pax_kernel" +RESTRICT="mirror strip" + +BDEPEND=">=dev-util/patchelf-0.10" +RDEPEND=" + dev-libs/nss + dev-python/dbus-python + dev-python/pygobject:3 + gnome-base/gconf + libnotify? ( x11-libs/libnotify ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + media-libs/alsa-lib + media-libs/fontconfig + media-libs/harfbuzz + media-libs/mesa[X(+)] + net-misc/curl[ssl] + net-print/cups[ssl] + || ( media-sound/pulseaudio media-sound/apulse ) + systray? ( gnome-extra/gnome-integration-spotify ) + x11-libs/gtk+:2 + x11-libs/libXScrnSaver + x11-libs/libXtst +" + #sys-libs/glibc + +S=${WORKDIR}/ + +QA_PREBUILT="opt/spotify/spotify-client/spotify" + +src_prepare() { + # Fix desktop entry to launch spotify-dbus.py for systray integration + if use systray ; then + sed -i \ + -e 's/spotify \%U/spotify-dbus.py \%U/g' \ + usr/share/spotify/spotify.desktop || die "sed failed" + fi + default + + # Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo. + patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \ + || die "failed to patch libcurl library dependency" +} + +src_install() { + gunzip usr/share/doc/spotify-client/changelog.gz || die + dodoc usr/share/doc/spotify-client/changelog + + SPOTIFY_PKG_HOME=usr/share/spotify + insinto /usr/share/pixmaps + doins ${SPOTIFY_PKG_HOME}/icons/*.png + + # install in /opt/spotify + SPOTIFY_HOME=/opt/spotify/spotify-client + insinto ${SPOTIFY_HOME} + doins -r ${SPOTIFY_PKG_HOME}/* + fperms +x ${SPOTIFY_HOME}/spotify + + dodir /usr/bin + cat <<-EOF >"${D}"/usr/bin/spotify || die + #! /bin/sh + LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\ + exec ${SPOTIFY_HOME}/spotify "\$@" + EOF + fperms +x /usr/bin/spotify + + local size + for size in 16 22 24 32 48 64 128 256 512; do + newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \ + "spotify-client.png" + done + domenu "${S}${SPOTIFY_PKG_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 z "${ED}${SPOTIFY_HOME}/${PN}" || die + pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die + eqawarn "You have set USE=pax_kernel meaning that you intend to 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 +} + +pkg_postinst() { + xdg_pkg_postinst + + ewarn "If Spotify crashes after an upgrade its cache may be corrupt." + ewarn "To remove the cache:" + ewarn "rm -rf ~/.cache/spotify" +} diff --git a/media-sound/spotify/spotify-1.1.10.ebuild b/media-sound/spotify/spotify-1.1.10.ebuild deleted file mode 100644 index 77cf183a980e..000000000000 --- a/media-sound/spotify/spotify-1.1.10.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop pax-utils unpacker xdg - -DESCRIPTION="Spotify is a social music platform" -HOMEPAGE="https://www.spotify.com/ch-de/download/previews/" -SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/" -BUILD_ID_AMD64="546.ge08ef575-19" -SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" -LICENSE="Spotify" -SLOT="0" -KEYWORDS="~amd64" -IUSE="libnotify libressl systray pax_kernel" -RESTRICT="mirror strip" - -BDEPEND=">=dev-util/patchelf-0.10" -# zenity needed for filepicker -RDEPEND=" - dev-libs/nss - dev-python/dbus-python - dev-python/pygobject:3 - gnome-base/gconf - gnome-extra/zenity - libnotify? ( x11-libs/libnotify ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - media-libs/alsa-lib - media-libs/fontconfig - media-libs/harfbuzz - media-libs/mesa - net-misc/curl[ssl] - net-print/cups[ssl] - || ( media-sound/pulseaudio media-sound/apulse ) - systray? ( gnome-extra/gnome-integration-spotify ) - x11-libs/gtk+:2 - x11-libs/libXScrnSaver - x11-libs/libXtst -" - #sys-libs/glibc - -S=${WORKDIR}/ - -QA_PREBUILT="opt/spotify/spotify-client/spotify" - -src_prepare() { - # Fix desktop entry to launch spotify-dbus.py for systray integration - if use systray ; then - sed -i \ - -e 's/spotify \%U/spotify-dbus.py \%U/g' \ - usr/share/spotify/spotify.desktop || die "sed failed" - fi - default - - # Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo. - patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \ - || die "failed to patch libcurl library dependency" -} - -src_install() { - gunzip usr/share/doc/spotify-client/changelog.gz || die - dodoc usr/share/doc/spotify-client/changelog - - SPOTIFY_PKG_HOME=usr/share/spotify - insinto /usr/share/pixmaps - doins ${SPOTIFY_PKG_HOME}/icons/*.png - - # install in /opt/spotify - SPOTIFY_HOME=/opt/spotify/spotify-client - insinto ${SPOTIFY_HOME} - doins -r ${SPOTIFY_PKG_HOME}/* - fperms +x ${SPOTIFY_HOME}/spotify - - dodir /usr/bin - cat <<-EOF >"${D}"/usr/bin/spotify || die - #! /bin/sh - LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\ - exec ${SPOTIFY_HOME}/spotify "\$@" - EOF - fperms +x /usr/bin/spotify - - local size - for size in 16 22 24 32 48 64 128 256 512; do - newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \ - "spotify-client.png" - done - domenu "${S}${SPOTIFY_PKG_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 z "${ED}${SPOTIFY_HOME}/${PN}" || die - pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die - eqawarn "You have set USE=pax_kernel meaning that you intend to 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 -} - -pkg_postinst() { - xdg_pkg_postinst - - ewarn "If Spotify crashes after an upgrade its cache may be corrupt." - ewarn "To remove the cache:" - ewarn "rm -rf ~/.cache/spotify" -} -- cgit v1.2.3