From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79AEA13832E for ; Mon, 15 Aug 2016 20:14:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6BCA21C043; Mon, 15 Aug 2016 20:14:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA6CE21C043 for ; Mon, 15 Aug 2016 20:14:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6610340F37 for ; Mon, 15 Aug 2016 20:13:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 140252455 for ; Mon, 15 Aug 2016 20:13:58 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1471292005.fb864aa258b2a542cb8a99f9b8058bcf72a8cc6a.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/spotify/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/spotify/spotify-1.0.36-r1.ebuild media-sound/spotify/spotify-1.0.36.ebuild X-VCS-Directories: media-sound/spotify/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: fb864aa258b2a542cb8a99f9b8058bcf72a8cc6a X-VCS-Branch: master Date: Mon, 15 Aug 2016 20:13:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 313aaaec-3638-406d-98b6-77fc14778c1a X-Archives-Hash: 7b9077a90997be55fe3b4f54f214157a commit: fb864aa258b2a542cb8a99f9b8058bcf72a8cc6a Author: Matthew Thode gentoo org> AuthorDate: Mon Aug 15 20:13:25 2016 +0000 Commit: Matt Thode gentoo org> CommitDate: Mon Aug 15 20:13:25 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb864aa2 media-sound/spotify: stable Package-Manager: portage-2.2.28 media-sound/spotify/spotify-1.0.36-r1.ebuild | 2 +- media-sound/spotify/spotify-1.0.36.ebuild | 117 --------------------------- 2 files changed, 1 insertion(+), 118 deletions(-) diff --git a/media-sound/spotify/spotify-1.0.36-r1.ebuild b/media-sound/spotify/spotify-1.0.36-r1.ebuild index f72eb5b..c6b34e7 100644 --- a/media-sound/spotify/spotify-1.0.36-r1.ebuild +++ b/media-sound/spotify/spotify-1.0.36-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.120.g536a862f-20_amd64.deb ) x86? ( ${SRC_BASE}${PN}-client_${PV}.120.g536a862f-2_i386.deb )" LICENSE="Spotify" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnome pax_kernel pulseaudio" RESTRICT="mirror strip" diff --git a/media-sound/spotify/spotify-1.0.36.ebuild b/media-sound/spotify/spotify-1.0.36.ebuild deleted file mode 100644 index e310745..0000000 --- a/media-sound/spotify/spotify-1.0.36.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -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/" -SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/" -SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.120.g536a862f-20_amd64.deb ) - x86? ( ${SRC_BASE}${PN}-client_${PV}.120.g536a862f-2_i386.deb )" -LICENSE="Spotify" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnome pax_kernel pulseaudio" -RESTRICT="mirror strip" - -DEPEND="" -# zenety needed for filepicker -RDEPEND=" - ${DEPEND} - 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 - net-print/cups[ssl] - x11-libs/gtk+:2 - x11-libs/libXScrnSaver - x11-libs/libXtst - dev-python/pygobject:3 - dev-python/dbus-python - pulseaudio? ( media-sound/pulseaudio ) - gnome? ( 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 GNOME integration - if use gnome ; then - sed -i \ - -e 's/spotify \%U/spotify-dbus.py \%U/g' \ - usr/share/spotify/spotify.desktop || die "sed failed" - fi - default -} - -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 - 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 "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 - fdo-mime_mime_database_update - fdo-mime_desktop_database_update -}