Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

glorious funtoo updates

merged:

  gentoo: f8a8d962e2976dd3b932ae0acdcf3e46c56592a2
  funtoo-overlay: ef7828ebe514146e6c9e4938303bc60bb003f31d
  foo-overlay: 8298ae4a92dd6e9925442616a6fc83e73c965abf
  bar-overlay: 6c956f1ca6178fed85bda46013da787239706d7c
  flora: af90b055af5f35900a7041e45dafe06e5ae7cfeb
  • Loading branch information...
commit 1e1fcedae5af9479b82511b4c9a9cd53f2a81944 1 parent 3ffdaa6
@danielrobbins danielrobbins authored
View
4 media-sound/spotify/Manifest
@@ -1,2 +1,2 @@
-DIST spotify-client-qt_0.6.6.10.gbd39032.58-1_amd64.deb 9448994 RMD160 b707041f969ea35747536c08c4a2e98e9bf4d58a SHA1 711b89d85ec885f0538ae183a5fb7e875dceec6e SHA256 8c5445bab2df988fa61e94cf7571b400d733e3526fa78826ae1e7942d96bc463
-DIST spotify-client-qt_0.6.6.10.gbd39032.58-1_i386.deb 8015104 RMD160 586ca6d1d598502802c39b834e280059e31919a5 SHA1 f57937b854cebc0814d05ba27abff9550c9d031e SHA256 439460a27aaf8ab2eddc37fd1acf3973ff6943f9ef9e56d73a1c462c05df9ca0
+DIST spotify-client_0.8.3.278.g21c7566.632-1_amd64.deb 33346436 RMD160 4946d70c461895408f1d4f6e57cd45b6ae253b2d SHA1 146931f7c2df76e446b6704c5c043aa166c3f8e0 SHA256 a37a13b1c1a8088a811054c732d85b9d6ccf0bd92ad4da75bfee6d70dc344b5e
+DIST spotify-client_0.8.3.278.g21c7566.632-1_i386.deb 29783606 RMD160 7a909ab6e555785a5cebb026499d06c7d9daaf66 SHA1 62cec802f3530b95d0cd81e01ef0fe978a55400d SHA256 7f587585365498c5182bd7f3beafaf511d883102f5cece66cf84f4f94077765b
View
47 media-sound/spotify/spotify-0.6.6.10.ebuild
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-MY_PN="spotify-client-qt"
-MY_PV="${PV}.gbd39032.58"
-MY_P="${MY_PN}_${MY_PV}"
-
-DESCRIPTION="A proprietary peer-to-peer music streaming desktop application"
-HOMEPAGE="http://www.spotify.com"
-REPO_URI="http://repository.spotify.com/pool/non-free/s/spotify"
-SRC_URI="amd64? ( ${REPO_URI}/${MY_P}-1_amd64.deb )
- x86? ( ${REPO_URI}/${MY_P}-1_i386.deb )"
-
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/qt-dbus-4.5.0
- >=x11-libs/qt-webkit-4.5.0
- >=x11-libs/qt-core-4.5.0
- >=x11-libs/qt-gui-4.5.0
- >=dev-libs/openssl-0.9.8s-r1"
-
-src_unpack() {
- unpack ${A} ./data.tar.gz
-}
-
-src_install() {
- insinto /opt/${PN}
- into /opt/${PN}
- dobin usr/bin/spotify
- dosym /opt/${PN}/bin/spotify /usr/bin/spotify
- newdoc usr/share/doc/spotify-client-qt/changelog.Debian.gz changelog.gz
-
- doins -r usr/share/spotify/theme
- # hardcoded path fix
- dodir /usr/share/spotify
- dosym /opt/${PN}/theme /usr/share/spotify/theme
-
- insinto /usr/share
- doins -r usr/share/applications
- doins -r usr/share/pixmaps
-}
View
103 media-sound/spotify/spotify-0.8.3.278.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+MY_PV="${PV}.g21c7566.632-1"
+MY_P="${PN}-client_${MY_PV}"
+
+DESCRIPTION="A proprietary peer-to-peer music streaming desktop application"
+HOMEPAGE="http://www.spotify.com"
+REPO_URI="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}/"
+SRC_URI="amd64? ( ${REPO_URI}/${MY_P}_amd64.deb )
+ x86? ( ${REPO_URI}/${MY_P}_i386.deb )"
+
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pulseaudio"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/gdk-pixbuf
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ x11-libs/qt-webkit:4
+ x11-libs/qt-dbus:4
+ x11-libs/gtk+:2
+ x11-libs/cairo
+ x11-libs/pango
+ dev-libs/atk
+ dev-libs/libgcrypt
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ dev-libs/openssl
+ gnome-base/gconf:2
+ media-libs/alsa-lib
+ media-libs/freetype
+ media-libs/fontconfig
+ media-libs/libpng:1.2
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/zlib
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )"
+
+RESTRICT="mirror strip"
+
+src_unpack() {
+ mkdir "${P}"
+ cd "${P}"
+ unpack ${A} ./data.tar.gz
+}
+
+src_prepare() {
+ # link against openssl-1.0.0 as it crashes with 0.9.8
+ sed -i \
+ -e 's/\(lib\(ssl\|crypto\).so\).0.9.8/\1.1.0.0/g' \
+ usr/share/spotify/spotify || die "sed failed"
+ # different NSPR / NSS library names for some reason
+ sed -i \
+ -e 's/\(lib\(nss3\|nssutil3\|smime3\).so\).1d/\1.12/g' \
+ -e 's/\(lib\(plc4\|nspr4\).so\).0d\(.\)/\1.9\3\3/g' \
+ usr/share/spotify/libcef.so || die "sed failed"
+}
+
+src_install() {
+ dodoc usr/share/doc/spotify-client/changelog.Debian.gz
+ dodoc usr/share/doc/spotify-client/copyright
+ insinto /usr/share/applications
+ doins usr/share/applications/*.desktop
+ insinto /usr/share/pixmaps
+ doins usr/share/pixmaps/*.png
+
+ # install in /opt/spotify
+ SPOTIFY_HOME=/opt/spotify
+ dodir ${SPOTIFY_HOME}
+ insinto ${SPOTIFY_HOME}
+ doins -r usr/share/spotify/*
+ fperms +x ${SPOTIFY_HOME}/spotify
+ dodir /usr/bin
+ dosym ../share/spotify/spotify /usr/bin/spotify
+ dodir /usr/share
+ dosym ${SPOTIFY_HOME} /usr/share/spotify
+
+ # revdep-rebuild produces a false positive because of symbol versioning
+ dodir /etc/revdep-rebuild
+ cat <<-EOF >"${D}"/etc/revdep-rebuild/10${PN}
+ SEARCH_DIRS_MASK="${SPOTIFY_HOME}"
+ EOF
+}
+
+pkg_postinst() {
+ ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+ ewarn "To remove the cache:"
+ ewarn "rm -rf ~/.cache/spotify"
+}
View
10 metadata/md5-cache/media-sound/spotify-0.6.6.10
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A proprietary peer-to-peer music streaming desktop application
-EAPI=3
-HOMEPAGE=http://www.spotify.com
-KEYWORDS=~amd64 ~x86
-LICENSE=Spotify
-RDEPEND=>=x11-libs/qt-dbus-4.5.0 >=x11-libs/qt-webkit-4.5.0 >=x11-libs/qt-core-4.5.0 >=x11-libs/qt-gui-4.5.0 >=dev-libs/openssl-0.9.8s-r1
-SLOT=0
-SRC_URI=amd64? ( http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_0.6.6.10.gbd39032.58-1_amd64.deb ) x86? ( http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_0.6.6.10.gbd39032.58-1_i386.deb )
-_md5_=e00e0a155e267456cfe52c4df519f493
View
12 metadata/md5-cache/media-sound/spotify-0.8.3.278
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare unpack
+DESCRIPTION=A proprietary peer-to-peer music streaming desktop application
+EAPI=4
+HOMEPAGE=http://www.spotify.com
+IUSE=pulseaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=Spotify
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/gdk-pixbuf x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-webkit:4 x11-libs/qt-dbus:4 x11-libs/gtk+:2 x11-libs/cairo x11-libs/pango dev-libs/atk dev-libs/libgcrypt dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/openssl gnome-base/gconf:2 media-libs/alsa-lib media-libs/freetype media-libs/fontconfig media-libs/libpng:1.2 net-print/cups sys-apps/dbus sys-libs/zlib pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( http://repository.spotify.com/pool/non-free/s/spotify//spotify-client_0.8.3.278.g21c7566.632-1_amd64.deb ) x86? ( http://repository.spotify.com/pool/non-free/s/spotify//spotify-client_0.8.3.278.g21c7566.632-1_i386.deb )
+_md5_=5d8e70c970a9e16dab21b934cc15e072
View
2  metadata/md5-cache/sys-boot/boot-update-1.6.0-r1
@@ -12,4 +12,4 @@ RESTRICT=mirror
SLOT=0
SRC_URI=https://www.github.com/funtoo/boot-update/tarball/1.6.0 -> boot-update-1.6.0.tar.gz
_eclasses_=multilib 5782800349f728f725f9378105c6a2ab python 1a2be1ad82e0d83243e3808e4edb70c5 toolchain-funcs e575dd4d4682fc3539829c52d8382856
-_md5_=af5292d7db21e30e03f71bb35a0d6eab
+_md5_=14de1b9582991f5b0ab04bded3bb9f05
View
13 sys-boot/boot-update/boot-update-1.6.0-r1.ebuild
@@ -5,7 +5,6 @@ EAPI="4-python"
PYTHON_MULTIPLE_ABIS="1"
PYTHON_RESTRICTED_ABIS="2.5 3.1 *-jython *-pypy-*"
-
inherit multilib python
DESCRIPTION="Funtoo Core Boot Framework for global boot loader configuration"
@@ -29,12 +28,14 @@ src_unpack() {
mv "${WORKDIR}/${GITHUB_USER}-${PN}"-??????? "${S}" || die
}
-src_install() {
- insinto /usr/$(get_libdir)/`eselect python show --python2`/site-packages
- cd ${S}/python/modules
- doins -r .
+install_into_site_packages() {
+ insinto $(python_get_sitedir)
+ cd ${S}/python/modules
+ doins -r .
+}
- cd ${S}
+src_install() {
+ python_execute_function install_into_site_packages
dodoc doc/*.rst
Please sign in to comment.
Something went wrong with that request. Please try again.