From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- media-sound/spotify/Manifest | 4 +- media-sound/spotify/metadata.xml | 1 + media-sound/spotify/spotify-1.1.26-r1.ebuild | 107 +++++++++++++++++++++++++++ media-sound/spotify/spotify-1.1.26.ebuild | 106 -------------------------- 4 files changed, 110 insertions(+), 108 deletions(-) create mode 100644 media-sound/spotify/spotify-1.1.26-r1.ebuild delete mode 100644 media-sound/spotify/spotify-1.1.26.ebuild (limited to 'media-sound/spotify') diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index db0a3d63757b..d167410d0c20 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -3,5 +3,5 @@ DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8 DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9e1f7e8d7b68059ec5aad5f71ae1e59af80fa91903941afc2e0a91e2f957860bf96ce3ce4b19884f2548426269a9a2043c2985b4bbc82c5f091f5f2b8 SHA512 af9f1beafe0e4d2313326d1a55675550e8c3fcd5cd2dc0954127094c563048b98f74f669d99a10f0ef6e3b3405856bb9d6a2561644a434ab6bade9c812296963 EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019cccd1a4a3307bc71e7ca897d890c9119a4a0df1d1bd5fa28156cf86b4eb56f4aeefbfc07d03ddbb4c0626e8c201aee SHA512 329198467357064fc1a556437928f2d59ab0b6262c82c0435638338b8b94adac031f94a9dc4f7cad4b11345ca5f0a5e1caa13168dcdd2d1224883f6a3aa42422 EBUILD spotify-1.1.10-r1.ebuild 3155 BLAKE2B d3bc28ef679c0307add8cb7b496cedf3a47dededc46c624b9a14b4b2e31fd40fffaafca87f084519db86b33312fa6f30c64bb222acdbac99dcffee8cc537191b SHA512 5f9fb840160b3b5a11af49836f10735aac5d3cacf21f429e554b63d6b3d924401eb3f3d73b1ef0abeef5c2a1d74fe3be24a740f8a2eb2069c8b29b9f50fb07db -EBUILD spotify-1.1.26.ebuild 3155 BLAKE2B ad28d773c7ceae34dbd8c292ed9bbb56ad82115517e4eb625adc0a5cf4e15081ef97c2b85e5aeb55f1eaeaffef6cff354175b60c26b0fd7470e9038e16e516aa SHA512 6c356e2903ad8feb9d37e741653d7bac0a38c4ef1ae198ce306b1e35492220dd425478b32a78f106041af6cf803e447bfc7f6b2e76ba7ee5aac5ebf295979537 -MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316 +EBUILD spotify-1.1.26-r1.ebuild 3193 BLAKE2B 35f3f47bdaeed4ce6b20b7d856f2b35b3c3930c4347edc807ab72fb9cc3b5a084729ec1223c10155f1cc2801210debd89785ebad819e9bcb265aea247f194520 SHA512 a5ca516fa5cbfcccfa7edd49a860487283e7a3feaf832f2f252291438468f2db3c8c1e855bc0d09d09ab36a995bb88298c3c321ce0ddafa66f23a64de2306553 +MISC metadata.xml 543 BLAKE2B 13703333c28b0f4a9898a30a9f3b8c2a56d360571ef7afed97b794c4fee154f9989c3f53309b71e1ed3135150d6a5aec8303e269117d0689dcca55d2557fd7d1 SHA512 229addc42faddeeb72208081749107adb25eda1cc8201dd629b474e3f733e78e77a4f2cbecd70c3d308e9946bdeb2d5b475a91180d2bde50447d01fdbf3428b6 diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml index 1e06c14d2fd1..ff06ccc103fe 100644 --- a/media-sound/spotify/metadata.xml +++ b/media-sound/spotify/metadata.xml @@ -3,6 +3,7 @@ Triggers a paxmarking of the main Spotify binary + Constrols the dependency on pulseaudio or apulse Pulls in dependencies needed for systray support on some desktop environments diff --git a/media-sound/spotify/spotify-1.1.26-r1.ebuild b/media-sound/spotify/spotify-1.1.26-r1.ebuild new file mode 100644 index 000000000000..2310f6ff5afb --- /dev/null +++ b/media-sound/spotify/spotify-1.1.26-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2020 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="501.gbe11e53b-15" +SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" +LICENSE="Spotify" +SLOT="0" +KEYWORDS="~amd64" +IUSE="libnotify libressl systray pax_kernel pulseaudio" +RESTRICT="mirror strip" + +BDEPEND=">=dev-util/patchelf-0.10" +RDEPEND=" + dev-libs/nss + dev-python/dbus-python + dev-python/pygobject:3 + 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] + pulseaudio? ( media-sound/pulseaudio ) + !pulseaudio? ( media-sound/apulse ) + systray? ( gnome-extra/gnome-integration-spotify ) + x11-libs/gtk+:2 + app-accessibility/at-spi2-atk + 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.26.ebuild b/media-sound/spotify/spotify-1.1.26.ebuild deleted file mode 100644 index 1d3b666674b0..000000000000 --- a/media-sound/spotify/spotify-1.1.26.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2020 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="501.gbe11e53b-15" -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 - 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 - app-accessibility/at-spi2-atk - 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