--- gentoo/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild 2012-10-11 16:31:01.000000000 +0200 +++ local/app-backup/spideroak-bin/spideroak-bin-4.8.3.ebuild 2013-01-03 23:53:55.374935989 +0100 @@ -1,18 +1,17 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild,v 1.3 2012/10/11 14:27:27 zmedico Exp $ +# $Header: $ EAPI="4" -inherit eutils versionator +inherit eutils -REV=$(get_version_component_range 3) -SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid" +SRC_URI_BASE="https://spideroak.com/getbuild?platform=ubuntu" DESCRIPTION="An easy, secure and consolidated free online backup, storage, access and sharing system." HOMEPAGE="https://spideroak.com" -SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&revision=${REV} -> ${P}_x86.deb ) - amd64? ( ${SRC_URI_BASE}&arch=x86_64&revision=${REV} -> ${P}_amd64.deb )" +SRC_URI="x86? ( ${SRC_URI_BASE}&arch=i386&version=${PV} -> ${P}_x86.deb ) + amd64? ( ${SRC_URI_BASE}&arch=x86_64&version=${PV} -> ${P}_amd64.deb )" RESTRICT="mirror strip" LICENSE="spideroak" @@ -37,21 +36,6 @@ x11-libs/libXrender x11-libs/libXt ) - system-libs? ( - dev-libs/openssl:$SSL_SLOT - net-misc/curl - >=sys-devel/gcc-4 - dev-libs/glib:2 - dev-libs/libpcre - media-libs/libpng:1.2 - x11-libs/qt-core:4 - x11-libs/qt-gui:4 - dev-db/sqlite:3 - net-libs/libssh2 - sys-libs/zlib - dev-lang/python:2.7 - dev-python/pycurl - ) " S=${WORKDIR} @@ -69,51 +53,6 @@ epatch "${FILESDIR}"/${PF}-opt-path.patch use headless && epatch "${FILESDIR}"/${PF}-headless.patch - # Remove bundled libraries/plugins/python interpreter. Please keep this - # mapping in sync with the RDEPEND system-libs? ( atoms ) above, and the - # list of deleted files below - # - # libcrypto.so.0.$SSL_SLOT => dev-libs/openssl:$SSL_SLOT - # libssl.so.$SSL_SLOT => dev-libs/openssl:$SSL_SLOT - # libcurl.so* => net-misc/curl - # libexpat.so* => dev-libs/expat - # libgcc_s.so => >=sys-devel/gcc-4 - # libstdc++.so* => >=sys-devel/gcc-4 - # libpcre.so* => dev-libs/libpcre - # libpng12* => media-libs/libpng:1.2 - # libQt*.so* => x11-libs/qt-core x11-libs/qt-gui - # libsqlite3.so* => dev-db/sqlite:3 - # libssh2.so* => net-libs/libssh2 - # libz.so* => sys-libs/zlib - # - # pycurl.so => dev-python/pycurl - # - # usr/lib/SpiderOak/py pyexpat.so => dev-lang/python:2.7 - # - if use system-libs; then - for lib in \ - libcrypto.so.$SSL_SLOT \ - libssl.so.$SSL_SLOT \ - libcurl.so* \ - libexpat.so* \ - libgcc_s.so* \ - libpcre.so* \ - libpng12* \ - libQt*.so* \ - libsqlite3.so* \ - libssh2.so* \ - libstdc++.so* \ - libz.so* \ - pycurl.so \ - pyexpat.so - do - rm usr/lib/SpiderOak/$lib || die "rm $lib failed" - done - - # Remove bundled python interpreter => dev-lang/python:2.7 - rm usr/lib/SpiderOak/py || die "rm py failed" - fi - # Set RPATH for preserve-libs handling (bug #400979). cd "${S}/usr/lib/SpiderOak" || die local x @@ -156,11 +95,4 @@ einfo " https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/" einfo " https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/" fi - if use system-libs; then - einfo "You have chosen to use your system libraries rather than the precompiled libraries that" - einfo "SpiderOak bundles with their software. While upstream discourages this (see bug #398313)," - einfo "there are advantages to using the system libraries, like reducing the size of the package" - einfo "on your hard drive. For more reasons why bundled librars are not a good idea, see" - einfo " https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries" - fi }