From 0bff53119f08d677db6c1a991bd30741682a8a08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Jun 2018 17:13:10 +0100 Subject: Revert "gentoo resync : 02.06.2018" This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec. --- media-sound/spotify/Manifest | 4 +- media-sound/spotify/spotify-1.0.79.ebuild | 124 ++++++++++++++++++++++++++++++ media-sound/spotify/spotify-1.0.80.ebuild | 124 ------------------------------ 3 files changed, 126 insertions(+), 126 deletions(-) create mode 100644 media-sound/spotify/spotify-1.0.79.ebuild delete mode 100644 media-sound/spotify/spotify-1.0.80.ebuild (limited to 'media-sound/spotify') diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest index f8420f7d0ede..f423cba8c6d0 100644 --- a/media-sound/spotify/Manifest +++ b/media-sound/spotify/Manifest @@ -1,7 +1,7 @@ DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f DIST spotify-client_1.0.77.338.g758ebd78-41_amd64.deb 96717978 BLAKE2B 91a4e8099076e7ccb9f44e67f2ba4ee2899ef6c5c818093a62fafd7e31e84b3bd6f44aa1439d4c0c9b8818be89c6898067ca1694946bf92da19fd92ecde6d2e7 SHA512 c0c08d4f6af8ffef3d9784e176c6112975ce56c7eec961df11821f4ac52785dc090e794c25874fce004da5f3e42979402e921ef12fbe1cfc80f02034448724db -DIST spotify-client_1.0.80.480.g51b03ac3-13_amd64.deb 97542898 BLAKE2B a89f3f607c9fb03327886fc1b6eb8d433b32913aa7ff32e95f626a8ef7710c4d6102721b76e9a83f1342d1ac6f6941d85376b4cb878cf641f42f3c3756582eb9 SHA512 a46b1d28e6c40dbe9a86a38794186f2cdf31341fff953eaa5a5fdbb37c27c00ffe14a918b2552df0996d2842f009e6700bf8683e0667fc671dfd5b343251f20e +DIST spotify-client_1.0.79.223.g92622cc2-21_amd64.deb 96544088 BLAKE2B 084d0131911dff2c8913a8160375ae13f6b8c21927e533d88a16506455b6c52545d7cc426ec35bf855561328586e6d08c4b7f9bfc8aefb7ce39399ec0b9ac89e SHA512 0a45594ab920fc963cf78a71d5b77c39648b77eb4437345a5220bce5f7ee760b6a970019b4bc8fba51856c8cbc27ba0c4ee5ac0f514894fa36a68fff5ccbcd4e EBUILD spotify-1.0.72.ebuild 3417 BLAKE2B ea84409bbe8dc6eb029fe6ee0393aacb9e8fbc15f018cca4887e4f7c1ff13c6417aa0b750fe0bc08860126a0c53e39e14f2ab8f291deca5536ce5b436b3e58d4 SHA512 a9d1fced3b9ec9518a7e0eab950895c270e77d377211ee68d8a49b673bf1ee77dceb9180e417b8dc5323b82f1a44b44e15b28b287602218bb7bcca86a88ba51b EBUILD spotify-1.0.77-r1.ebuild 3643 BLAKE2B e1b1c93e01a3782b45d6b4d6424c0ae109933dbbc1275325db295f493ba513bd4d2c4ff1e06750d9c1417b0300cead228f6f17d2bef27e1eac686ff1cc3e178d SHA512 33caa3cd3b4e9f8e90409ba7f001a6d81320a5825dc51efbcb3e34d67a4e173875a6406feb74cf301a512306e94484f8fa8e2671e39adc38cd9f945b31b0c983 -EBUILD spotify-1.0.80.ebuild 3643 BLAKE2B 6e890c7c44aefb42842f51febc5e357b4df6600e904dbb6a189beba956e511fadd91f0936113dbcfa6f7b7959ea2e02496902a68137c09b2ad643e89697b1505 SHA512 59490d8f948f090c7c101f0f3d489b7955bedca2d19b7c080c038e13c36c2b2c9d823f462033f021dabad3b50f8ef9b461080cf547f7be1ea464381117b65b9a +EBUILD spotify-1.0.79.ebuild 3643 BLAKE2B 8fa1949b9e3deba87697a4b35d3090552f6d43e2cd0765ee44a90db712d0f631c0a9fc4da4c49585aa84c419c965e46dde35f1f28aa0daa293ab08e025eab996 SHA512 ec895f9999e51cffeaf9d0c09731b45e59feb3632c7e53c2fdb4dbc8238481bcb97e76692389efafc6a0e780fdd56e6aea0ac6e1ff031403812faea3b84e9c20 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316 diff --git a/media-sound/spotify/spotify-1.0.79.ebuild b/media-sound/spotify/spotify-1.0.79.ebuild new file mode 100644 index 000000000000..4d18560b4d83 --- /dev/null +++ b/media-sound/spotify/spotify-1.0.79.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils xdg-utils gnome2-utils pax-utils unpacker + +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="223.g92622cc2-21" +#BUILD_ID_X86="" +#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb ) +# x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )" +SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" +LICENSE="Spotify" +SLOT="0" +KEYWORDS="~amd64" +IUSE="libnotify systray pax_kernel pulseaudio" +RESTRICT="mirror strip" + +DEPEND=">=dev-util/patchelf-0.9_p20180129" +# zenety needed for filepicker +RDEPEND=" + dev-libs/openssl:0 + dev-libs/nss + gnome-base/gconf + gnome-extra/zenity + media-libs/alsa-lib + media-libs/harfbuzz + media-libs/fontconfig + media-libs/mesa + net-misc/curl[ssl] + net-print/cups[ssl] + x11-libs/gtk+:2 + x11-libs/libXScrnSaver + x11-libs/libXtst + dev-python/pygobject:3 + dev-python/dbus-python + libnotify? ( x11-libs/libnotify ) + pulseaudio? ( media-sound/pulseaudio ) + systray? ( gnome-extra/gnome-integration-spotify )" + #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() { + dodoc usr/share/doc/spotify-client/changelog.gz + + 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 + 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_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_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 "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon." + ewarn "Run" + ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache" + ewarn "Then log out and log in back to KDE." +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} diff --git a/media-sound/spotify/spotify-1.0.80.ebuild b/media-sound/spotify/spotify-1.0.80.ebuild deleted file mode 100644 index da910ba96d62..000000000000 --- a/media-sound/spotify/spotify-1.0.80.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils xdg-utils gnome2-utils pax-utils unpacker - -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="480.g51b03ac3-13" -#BUILD_ID_X86="" -#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb ) -# x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )" -SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb" -LICENSE="Spotify" -SLOT="0" -KEYWORDS="~amd64" -IUSE="libnotify systray pax_kernel pulseaudio" -RESTRICT="mirror strip" - -DEPEND=">=dev-util/patchelf-0.9_p20180129" -# zenety needed for filepicker -RDEPEND=" - dev-libs/openssl:0 - dev-libs/nss - gnome-base/gconf - gnome-extra/zenity - media-libs/alsa-lib - media-libs/harfbuzz - media-libs/fontconfig - media-libs/mesa - net-misc/curl[ssl] - net-print/cups[ssl] - x11-libs/gtk+:2 - x11-libs/libXScrnSaver - x11-libs/libXtst - dev-python/pygobject:3 - dev-python/dbus-python - libnotify? ( x11-libs/libnotify ) - pulseaudio? ( media-sound/pulseaudio ) - systray? ( gnome-extra/gnome-integration-spotify )" - #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() { - dodoc usr/share/doc/spotify-client/changelog.gz - - 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 - 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_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_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 "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon." - ewarn "Run" - ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache" - ewarn "Then log out and log in back to KDE." -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} -- cgit v1.2.3