From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 app-backup/spideroak-bin/Manifest                  |  2 +-
 .../spideroak-bin/spideroak-bin-7.5.0-r1.ebuild    | 35 ++++++++++++----------
 2 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'app-backup/spideroak-bin')

diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
index a94807265958..846d10c8f4a5 100644
--- a/app-backup/spideroak-bin/Manifest
+++ b/app-backup/spideroak-bin/Manifest
@@ -1,4 +1,4 @@
 DIST spideroak-bin-7.5.0_amd64.deb 20758038 BLAKE2B ecd549ee0d479f576e8d50b44f4f7a13c4d24445af32f460d34081e5b654586f314399b34cff1c937e157582a143fee6b98641a68655552bb6d3609e532ceba4 SHA512 4af9f6b57d8748c03bccb0ab843cf27f70eac8e8cc5f11bb494c597d5fd29f475bf9c68bce8971d3cc1550a6def7bac6beed78fdfb31961b09be61ee14116ddd
 DIST spideroak-bin-7.5.0_x86.deb 24779422 BLAKE2B 8cdae243794e5de6a8326e335b539d004c0ba0f1121b85067acbffffbef67f4a0c785f3b794abb62a5eedfd459c8e4d5e48cf8848b005ba637150b286b13db22 SHA512 32504b6e6931f1e923d4202f0b3201c93190128d30767ec41ac11cf7c8c751b87094bdedcf44dda3ae8089543418366c5a78093b9236fee5f95e7f89a29141fc
-EBUILD spideroak-bin-7.5.0-r1.ebuild 2668 BLAKE2B 32c56a7d6397d39a95d0de93c30f5fd3518d072e538a514144c573f03bfbfd4401df315f0d38915d552e5bc6e0e245b11365fe16349028fb81b71a5f577100d8 SHA512 dcc39e3ff959651bf9e3db5841beccdff348c206307810ce31c99e44a5ebdd303870bdd809ece124bfcc269fce50d8ccc07dbededb0786c73cb589247b890417
+EBUILD spideroak-bin-7.5.0-r1.ebuild 2734 BLAKE2B edded335d4b603ba6a4e27a21e17f5589630a3b04900e046daca2d15cb0164a82bd400e18f538b79eabb94a55e1a7dd0a9710211bfe03563455240f7ae58a688 SHA512 3c0a3016dd35889d0873429810846f810a1aaa29e53dfdb0beb905fb88e07141475d4fffbf7543477f6048ec17292401f1ee4993ee337ea5ee935f1c92ae421c
 MISC metadata.xml 366 BLAKE2B 6e319c339d3d88f78db4ea80cb4a3cd185e86f108ee34d0df7101c6a57b2eefc43b1ebb3985d8d8517d28f0359f29a5535cc79c5a19d2b7a96f2d1333dff95e6 SHA512 20ef3b773ef34ff3936408fb034c73d4e2a5bedc5e0bd2deaa9802e208e17b73dbff8e15b03bc82a56f4d70c32b3d980f542dfa4370a7f88f3759f8573de0763
diff --git a/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild b/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
index bd12c7b9d6fd..9b91aa577c3c 100644
--- a/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit eutils unpacker
+inherit desktop unpacker
 
 DESCRIPTION="Secure free online backup, storage, and sharing system"
 HOMEPAGE="https://spideroak.com"
@@ -46,47 +46,50 @@ src_prepare() {
 	# Set RPATH for preserve-libs handling (bug #400979).
 	cd "${S}/opt/SpiderOakONE/lib" || die
 	local x
-	for x in `find` ; do
+	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
 
-	#Remove the libraries that break compatibility in modern systems
-	#SpiderOak will use the system libs instead
-	rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6"
-	rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1"
-	rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0"
-	rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1"
+	# Remove the libraries that break compatibility in modern systems
+	# SpiderOak will use the system libs instead
+	rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6" || die
+	rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1" || die
+	rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0" || die
+	rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1" || die
 
 	eapply_user
 }
 
 src_install() {
-	#install the wrapper script
+	# Install the wrapper script
 	exeinto /usr/bin
 	doexe usr/bin/SpiderOakONE
 
 	# inotify_dir_watcher needs to be marked executable, bug #453266
 	#chmod a+rx opt/SpiderOakONE/lib/inotify_dir_watcher
 
-	#install the executable
+	# Install the executable
 	exeinto /opt/SpiderOakONE/lib
 	doexe opt/SpiderOakONE/lib/SpiderOakONE
 	doexe opt/SpiderOakONE/lib/inotify_dir_watcher
-	rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher}
+	rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher} || die
 
-	#install the prebundled libraries
+	# Install the prebundled libraries
 	insinto /opt/SpiderOakONE
 	doins -r opt/SpiderOakONE/lib
 
-	#install the config files
-	use dbus || rm -rf etc/dbus-1
+	# Install the config files
+	if ! use dbus; then
+		rm -rf etc/dbus-1 || die
+	fi
+
 	insinto /
 	doins -r etc
 
-	#install the manpage
+	# Install the manpage
 	doman usr/share/man/man1/SpiderOakONE.1.gz
 
 	if use X; then
-- 
cgit v1.2.3