Remove older unstable versions, remove USE=headless, bug #521766

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

4 files changed, 22 insertions, 221 deletions

diff --git a/app-backup/spideroak-bin/ChangeLog b/app-backup/spideroak-bin/ChangeLog
index 434c6381500d..bea65b5dd783 100644
--- a/app-backup/spideroak-bin/ChangeLog
+++ b/app-backup/spideroak-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-backup/spideroak-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/ChangeLog,v 1.46 2014/08/31 15:32:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/ChangeLog,v 1.47 2014/09/28 16:03:58 blueness Exp $
+
+*spideroak-bin-5.1.8-r1 (28 Sep 2014)
+
+  28 Sep 2014; Anthony G. Basile <blueness@gentoo.org>
+  +spideroak-bin-5.1.8-r1.ebuild, -spideroak-bin-5.1.1.ebuild,
+  -spideroak-bin-5.1.3.ebuild, -spideroak-bin-5.1.8.ebuild:
+  Remove older unstable versions, remove USE=headless, bug #521766
 
   31 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
   spideroak-bin-5.1.8.ebuild:
diff --git a/app-backup/spideroak-bin/spideroak-bin-5.1.3.ebuild b/app-backup/spideroak-bin/spideroak-bin-5.1.3.ebuild
deleted file mode 100644
index df985eb809ac..000000000000
--- a/app-backup/spideroak-bin/spideroak-bin-5.1.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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-5.1.3.ebuild,v 1.2 2014/08/10 01:54:01 patrick Exp $
-
-EAPI="5"
-
-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}"/${PN}-5.0.1-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-5.1.1.ebuild b/app-backup/spideroak-bin/spideroak-bin-5.1.8-r1.ebuild
index a07a20f8f05c..11b5290853d6 100644
--- a/app-backup/spideroak-bin/spideroak-bin-5.1.1.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-5.1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-5.1.1.ebuild,v 1.2 2014/08/10 01:54:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-5.1.8-r1.ebuild,v 1.1 2014/09/28 16:03:58 blueness Exp $
 
 EAPI="5"
 
@@ -17,24 +17,22 @@ RESTRICT="mirror strip"
 LICENSE="spideroak"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dbus headless"
+IUSE="dbus"
 
 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
-	)
+	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}
@@ -42,8 +40,6 @@ S=${WORKDIR}
 QA_PREBUILT="*"
 
 src_prepare() {
-	use headless && epatch "${FILESDIR}"/${PN}-5.0.1-headless.patch
-
 	# Set RPATH for preserve-libs handling (bug #400979).
 	cd "${S}/opt/SpiderOak/lib" || die
 	local x
@@ -81,16 +77,6 @@ src_install() {
 	#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
+	domenu usr/share/applications/spideroak.desktop
+	doicon usr/share/pixmaps/SpiderOak.png
 }
diff --git a/app-backup/spideroak-bin/spideroak-bin-5.1.8.ebuild b/app-backup/spideroak-bin/spideroak-bin-5.1.8.ebuild
deleted file mode 100644
index dc6fc90544d2..000000000000
--- a/app-backup/spideroak-bin/spideroak-bin-5.1.8.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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-5.1.8.ebuild,v 1.2 2014/08/31 15:32:18 blueness Exp $
-
-EAPI="5"
-
-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}"/${PN}-5.0.1-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/31/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
-}