Version bump, bug #496932

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

6 files changed, 14 insertions, 200 deletions

diff --git a/app-backup/spideroak-bin/ChangeLog b/app-backup/spideroak-bin/ChangeLog
index 3fcef17a94ef..f9012d99e738 100644
--- a/app-backup/spideroak-bin/ChangeLog
+++ b/app-backup/spideroak-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-backup/spideroak-bin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/ChangeLog,v 1.41 2013/12/24 01:58:55 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/ChangeLog,v 1.42 2014/01/04 15:01:28 blueness Exp $
+
+*spideroak-bin-5.1.1 (04 Jan 2014)
+
+  04 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  +spideroak-bin-5.1.1.ebuild, -files/spideroak-bin-4.8.3-headless.patch,
+  -spideroak-bin-4.1.9860.ebuild, -spideroak-bin-4.8.3-r1.ebuild,
+  -spideroak-bin-5.0.1.ebuild, metadata.xml:
+  Version bump, bug #496932
 
   24 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/headless.patch,
   -files/opt-path.patch:
diff --git a/app-backup/spideroak-bin/files/spideroak-bin-4.8.3-headless.patch b/app-backup/spideroak-bin/files/spideroak-bin-4.8.3-headless.patch
deleted file mode 100644
index eef9085a8c59..000000000000
--- a/app-backup/spideroak-bin/files/spideroak-bin-4.8.3-headless.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- usr/bin/SpiderOak.orig	2012-08-26 08:10:42.387011624 +0200
-+++ usr/bin/SpiderOak	2012-08-26 08:10:48.899956298 +0200
-@@ -5,4 +5,4 @@
- QT_PLUGIN_PATH= ; export QT_PLUGIN_PATH
- SpiderOak_EXEC_SCRIPT=$(cd `dirname $0` ; pwd)/SpiderOak
- export SpiderOak_EXEC_SCRIPT
--exec "/opt/SpiderOak/lib/SpiderOak" "$@"
-+exec "/opt/SpiderOak/lib/SpiderOak" --headless "$@"
diff --git a/app-backup/spideroak-bin/metadata.xml b/app-backup/spideroak-bin/metadata.xml
index 74e3462f3835..73f055887b85 100644
--- a/app-backup/spideroak-bin/metadata.xml
+++ b/app-backup/spideroak-bin/metadata.xml
@@ -13,6 +13,5 @@
 </maintainer>
 <use>
 	<flag name='headless'>Build without graphic frontend</flag>
-	<flag name='qt-bundled'>Use bundled Qt4 libraries</flag>
 </use>
 </pkgmetadata>
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild
deleted file mode 100644
index 1057885023d2..000000000000
--- a/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2013 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.1.9860.ebuild,v 1.6 2013/03/23 19:44:29 vapier Exp $
-
-EAPI=4
-
-inherit eutils versionator unpacker
-
-REV=$(get_version_component_range 3)
-SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
-
-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 )"
-RESTRICT="mirror strip"
-
-LICENSE="spideroak"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus headless qt-bundled"
-
-RDEPEND=">=dev-libs/glib-2.12.0
-	dbus? ( sys-apps/dbus )
-	>=sys-devel/gcc-4
-	>=sys-libs/glibc-2.7
-	!headless? (
-		>=media-libs/fontconfig-2.4.0
-		>=media-libs/freetype-2.3.5
-		>=x11-libs/libICE-1.0.0
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrender
-		!qt-bundled? ( dev-qt/qtgui:4[accessibility,dbus] )
-	)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# change /usr/ to /opt/SpiderOak/ in start script
-	sed -i 's:/usr/lib:/opt:g' usr/bin/SpiderOak || die "sed failed"
-	# change /usr/ to /opt/ in .desktop file
-	sed -i 's:/usr/bin/SpiderOak:/opt/bin/SpiderOak:g' usr/share/applications/spideroak.desktop || die "sed failed"
-
-	# disable GUI if headless useflag is enabled
-	if use headless; then
-		sed -i 's:"$@":--headless "$@":' usr/bin/SpiderOak || die "sed failed"
-	fi
-
-	# remove shipped libstdc++.so.6 as it does not provide LIBCXX_3.4.11
-	# and it seems to work alright with the one from >=gcc-4
-	rm usr/lib/SpiderOak/libstdc++.so.6 || die "rm libstdc++.so.6 failed"
-
-	if ! use qt-bundled || use headless; then
-		# rm precompiled and bundled qt libs
-		rm usr/lib/SpiderOak/libQt*.so.4 || die "rm libQt*.so.4 failed"
-	fi
-}
-
-src_install() {
-	insinto /opt/SpiderOak
-	doins -r usr/lib/SpiderOak/*
-
-	exeinto /opt/SpiderOak
-	doexe usr/lib/SpiderOak/SpiderOak
-
-	exeinto /opt/bin
-	doexe usr/bin/SpiderOak
-
-	if use dbus; then
-		insinto /etc/dbus-1
-		doins -r etc/dbus-1/*
-	fi
-
-	if ! use headless; then
-		domenu usr/share/applications/spideroak.desktop
-		doicon usr/share/pixmaps/spideroak.png
-	fi
-}
-
-pkg_postinst() {
-	if use headless ; then
-		einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:"
-		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
-}
diff --git a/app-backup/spideroak-bin/spideroak-bin-5.0.1.ebuild b/app-backup/spideroak-bin/spideroak-bin-5.0.1.ebuild
deleted file mode 100644
index 111ab6c842bb..000000000000
--- a/app-backup/spideroak-bin/spideroak-bin-5.0.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-5.0.1.ebuild,v 1.2 2013/05/25 13:19:13 blueness Exp $
-
-EAPI="4"
-
-inherit eutils unpacker
-
-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&version=${PV} -> ${P}_x86.deb )
-	amd64? ( ${SRC_URI_BASE}&arch=x86_64&version=${PV} -> ${P}_amd64.deb )"
-RESTRICT="mirror strip"
-
-LICENSE="spideroak"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus headless"
-
-DEPEND="dev-util/patchelf"
-RDEPEND="
-	app-crypt/mit-krb5[keyutils]
-	dbus? ( sys-apps/dbus )
-	!headless? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		dev-libs/glib:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	use headless && epatch "${FILESDIR}"/${P}-headless.patch
-
-	# Set RPATH for preserve-libs handling (bug #400979).
-	cd "${S}/opt/SpiderOak/lib" || die
-	local x
-	for x in `find` ; do
-		# Use \x7fELF header to separate ELF executables and libraries
-		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
-		patchelf --set-rpath '$ORIGIN' "${x}" || \
-			die "patchelf failed on ${x}"
-	done
-}
-
-src_install() {
-	#install the wrapper script
-	exeinto /usr/bin
-	doexe usr/bin/SpiderOak
-
-	# inotify_dir_watcher needs to be marked executable, bug #453266
-	#chmod a+rx opt/SpiderOak/lib/inotify_dir_watcher
-
-	#install the executable
-	exeinto /opt/SpiderOak/lib
-	doexe opt/SpiderOak/lib/SpiderOak
-	doexe opt/SpiderOak/lib/inotify_dir_watcher
-	rm -f opt/SpiderOak/lib/{SpiderOak,inotify_dir_watcher}
-
-	#install the prebundled libraries
-	insinto /opt/SpiderOak
-	doins -r opt/SpiderOak/lib
-
-	#install the config files
-	use dbus || rm -rf etc/dbus-1
-	insinto /
-	doins -r etc
-
-	#install the manpage
-	doman usr/share/man/man1/SpiderOak.1.gz
-
-	if ! use headless ; then
-		domenu usr/share/applications/spideroak.desktop
-		doicon usr/share/pixmaps/SpiderOak.png
-	fi
-}
-
-pkg_postinst() {
-	if use headless; then
-		einfo "For instructions on running SpiderOak without a GUI, please read the FAQ:"
-		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
-}
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.8.3-r1.ebuild b/app-backup/spideroak-bin/spideroak-bin-5.1.1.ebuild
index e3529882cacb..c03278dcd517 100644
--- a/app-backup/spideroak-bin/spideroak-bin-4.8.3-r1.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-5.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.8.3-r1.ebuild,v 1.3 2013/03/24 17:55:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-5.1.1.ebuild,v 1.1 2014/01/04 15:01:28 blueness Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils unpacker
 
@@ -42,7 +42,7 @@ S=${WORKDIR}
 QA_PREBUILT="*"
 
 src_prepare() {
-	use headless && epatch "${FILESDIR}"/${P}-headless.patch
+	use headless && epatch "${FILESDIR}"/${PN}-5.0.1-headless.patch
 
 	# Set RPATH for preserve-libs handling (bug #400979).
 	cd "${S}/opt/SpiderOak/lib" || die