commit: a324677b1a1b4908135638d39a521cc067f879e5 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Fri May 13 23:21:28 2022 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Fri May 13 23:21:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a324677b
media-sound/spotify: clean up 1.1.72 Closes: https://bugs.gentoo.org/843860 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> media-sound/spotify/Manifest | 1 - media-sound/spotify/spotify-1.1.72-r1.ebuild | 133 --------------------------- media-sound/spotify/spotify-1.1.72-r2.ebuild | 116 ----------------------- media-sound/spotify/spotify-1.1.72.ebuild | 116 ----------------------- media-sound/spotify/spotify-1.1.84.ebuild | 2 +- 5 files changed, 1 insertion(+), 367 deletions(-) diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index 39a51092c4a8..d446031b5067 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -1,3 +1,2 @@ DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f -DIST spotify-client_1.1.72.439.gc253025e_amd64.deb 117803268 BLAKE2B 4ca2ca2df9ef5626483d4eca9c5a6f32fba63efdcd9e930379e83a2f8d40c112ab95ac4ade79fec365ae18b3e4aff089b5f07b6af02a5d080f64f14995099ea7 SHA512 65cec95448d936b7be93b0d16f29927a298b5b56aa2bc4834a5d357e341c78486fa69e61b3b6cf9fbe7da88c8d3b6ce3bccb5e963ed1b5a23320c0c808ccb385 DIST spotify-client_1.1.84.716.gc5f8b819_amd64.deb 119770140 BLAKE2B 071ee877e9c6c9a64cc3e06cdd72530e5da60087c56c29ad9511ed427df987d76258142120442ad78370f2d78c282016025ed43f7f7e94b4efb44e4a201bc839 SHA512 3cc25f28ae791ac26607117a5df668f803ed8e58f0ace085010a6242fdde97766bdc1c752560850795c9b4324f3e019937fe9af2788a1946ebb70ee781f50d99 diff --git a/media-sound/spotify/spotify-1.1.72-r1.ebuild b/media-sound/spotify/spotify-1.1.72-r1.ebuild deleted file mode 100644 index b36208e04b8c..000000000000 --- a/media-sound/spotify/spotify-1.1.72-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop optfeature pax-utils unpacker xdg - -DESCRIPTION="Spotify is a social music platform" -HOMEPAGE="https://www.spotify.com/download/linux/"; -SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"; -BUILD_ID_AMD64="439.gc253025e" -SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" - -LICENSE="Spotify" -SLOT="0" -KEYWORDS="~amd64" -IUSE="libnotify local-playback pax-kernel pulseaudio" -RESTRICT="mirror strip" - -BDEPEND=">=dev-util/patchelf-0.10" -RDEPEND=" - dev-libs/nss - dev-python/dbus-python - libnotify? ( x11-libs/libnotify ) - dev-libs/openssl: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 ) - local-playback? ( media-video/ffmpeg:0/56.58.58 ) - x11-libs/gtk+:3 - app-accessibility/at-spi2-atk - x11-libs/libxkbcommon - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/libSM - x11-libs/libICE -" - #sys-libs/glibc - -S="${WORKDIR}/" - -QA_PREBUILT=" - opt/spotify/spotify-client/spotify - opt/spotify/spotify-client/libEGL.so - opt/spotify/spotify-client/libGLESv2.so - opt/spotify/spotify-client/libcef.so - opt/spotify/spotify-client/libvk_swiftshader.so - opt/spotify/spotify-client/libvulkan.so.1 - opt/spotify/spotify-client/swiftshader/libEGL.so - opt/spotify/spotify-client/swiftshader/libGLESv2.so -" - -src_prepare() { - 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 -if command -v spotify-dbus.py &> /dev/null; then - echo "Launching spotify with Gnome systray integration" - LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\ - spotify-dbus.py "\$@" -elif command -v spotify-tray &> /dev/null; then - echo "Launching spotify with generic systray integration" - TRAY_ARGS=" --client-path=${SPOTIFY_HOME}/spotify --toggle " - # seperate out the --minimized argument, parse it to spotify-tray - # propagate the rest to the spotify client itself - if [[ "\$@" == *"--minimized"* ]]; then - TRAY_ARGS+=" --minimized " - fi - LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\ - spotify-tray \${TRAY_ARGS} -- "\$@" -else - echo "Neither gnome-integration-spotify or spotify-tray installed" - echo "Launching spotify without systray integration" - LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\ - exec ${SPOTIFY_HOME}/spotify "\$@" -fi -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" - - optfeature "Gnome specific systray integration" gnome-extra/gnome-integration-spotify - optfeature "systray integration on non-Gnome DEs" media-sound/spotify-tray -} diff --git a/media-sound/spotify/spotify-1.1.72-r2.ebuild b/media-sound/spotify/spotify-1.1.72-r2.ebuild deleted file mode 100644 index d3f98c51dd26..000000000000 --- a/media-sound/spotify/spotify-1.1.72-r2.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop optfeature pax-utils unpacker xdg - -DESCRIPTION="Spotify is a social music platform" -HOMEPAGE="https://www.spotify.com/download/linux/"; -SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"; -BUILD_ID_AMD64="439.gc253025e" -SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" - -LICENSE="Spotify" -SLOT="0" -KEYWORDS="~amd64" -IUSE="libnotify local-playback pax-kernel pulseaudio" -RESTRICT="mirror strip" - -BDEPEND=" - >=dev-util/patchelf-0.10 - sys-devel/gettext -" -RDEPEND=" - dev-libs/nss - dev-python/dbus-python - libnotify? ( x11-libs/libnotify ) - dev-libs/openssl: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 ) - local-playback? ( media-video/ffmpeg:0/56.58.58 ) - x11-libs/gtk+:3 - app-accessibility/at-spi2-atk - x11-libs/libxkbcommon - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/libSM - x11-libs/libICE -" - #sys-libs/glibc - -S="${WORKDIR}/" - -QA_PREBUILT=" - opt/spotify/spotify-client/spotify - opt/spotify/spotify-client/libEGL.so - opt/spotify/spotify-client/libGLESv2.so - opt/spotify/spotify-client/libcef.so - opt/spotify/spotify-client/libvk_swiftshader.so - opt/spotify/spotify-client/libvulkan.so.1 - opt/spotify/spotify-client/swiftshader/libEGL.so - opt/spotify/spotify-client/swiftshader/libGLESv2.so -" - -src_prepare() { - 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 - SPOTIFY_HOME=${SPOTIFY_HOME} LIBDIR=$(get_libdir) \ - envsubst '$SPOTIFY_HOME $LIBDIR' \ - < "${FILESDIR}/spotify-wrapper" > "${D}/usr/bin/spotify" || die - 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" - - optfeature "Gnome specific systray integration" gnome-extra/gnome-integration-spotify - optfeature "systray integration on non-Gnome DEs" media-sound/spotify-tray -} diff --git a/media-sound/spotify/spotify-1.1.72.ebuild b/media-sound/spotify/spotify-1.1.72.ebuild deleted file mode 100644 index f19bf8d614a9..000000000000 --- a/media-sound/spotify/spotify-1.1.72.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 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/download/linux/"; -SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"; -BUILD_ID_AMD64="439.gc253025e" -SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" -LICENSE="Spotify" -SLOT="0" -KEYWORDS="amd64" -IUSE="libnotify local-playback pax-kernel pulseaudio systray" -RESTRICT="mirror strip" - -BDEPEND=">=dev-util/patchelf-0.10" -RDEPEND=" - dev-libs/nss - dev-python/dbus-python - libnotify? ( x11-libs/libnotify ) - dev-libs/openssl: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 ) - local-playback? ( media-video/ffmpeg:0/56.58.58 ) - systray? ( gnome-extra/gnome-integration-spotify ) - x11-libs/gtk+:3 - app-accessibility/at-spi2-atk - x11-libs/libxkbcommon - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/libSM - x11-libs/libICE -" - #sys-libs/glibc - -S=${WORKDIR}/ - -QA_PREBUILT=" - opt/spotify/spotify-client/spotify - opt/spotify/spotify-client/libEGL.so - opt/spotify/spotify-client/libGLESv2.so - opt/spotify/spotify-client/libcef.so - opt/spotify/spotify-client/swiftshader/libEGL.so - opt/spotify/spotify-client/swiftshader/libGLESv2.so -" - -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.84.ebuild b/media-sound/spotify/spotify-1.1.84.ebuild index 35f3010d5ffe..5a5510753d13 100644 --- a/media-sound/spotify/spotify-1.1.84.ebuild +++ b/media-sound/spotify/spotify-1.1.84.ebuild @@ -13,7 +13,7 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" LICENSE="Spotify" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="libnotify local-playback pax-kernel pulseaudio" RESTRICT="mirror strip"
