[gentoo-commits] repo/gentoo:master commit in: net-misc/dropbox/

["Ben Kohler" <bkohler@gentoo.org>]

commit:     4aa3947941b4c41c1ae10210f73b623d3d442f26
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 13:25:01 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue May  5 13:25:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aa39479

net-misc/dropbox: bump to 97.3.451, drop old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 net-misc/dropbox/Manifest                          |   6 +-
 net-misc/dropbox/dropbox-96.3.166.ebuild           | 102 ---------------------
 ...box-95.4.441.ebuild => dropbox-97.3.451.ebuild} |   2 +-
 3 files changed, 3 insertions(+), 107 deletions(-)

diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index d0ae9859d48..2567d815370 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,8 +1,6 @@
 DIST dropbox-lnx.x86-94.4.384.tar.gz 94254443 BLAKE2B 4d12d0268ea71f4d06304dbe29bcd54f3af4c39e10ba8be4892724c6dc556dd844e587f789cc957dad66d7bd44ae8fdac398cefbfb714a8b01d7f8c06b1d6d50 SHA512 710af644cdaf88a6db26f86b2cafd1bb729b4cd52aab4a3328c9c3061183db32db016adb6d8dc9c5a2fc860a55c3abc712a774ac3e635459c605e91c0178c37e
-DIST dropbox-lnx.x86-95.4.441.tar.gz 94501019 BLAKE2B 9f0a0d35bcfc75bb4a8418d0aa19448cbf5f2d5a23e0f5fe032a08e6d467ae3e157c8667abc5c73584000a347929daebd250d25051e2586ad42c58313d1dd694 SHA512 3b10df33f182faa10866b325e486b35aeed056b0cc80bc8dd8a8e44d085d114f104f51591cfda7329ea1c2d0a698c4c300765d077ef1a866464d393b60af329a
-DIST dropbox-lnx.x86-96.3.166.tar.gz 95612717 BLAKE2B 84f5d267a7f84d2a8d45f880a7e10f17a1343321ac219a82cb88898ee9eeeabab2cac9d4ea1e27647ff27d8536f3cbd2a47c32e22c5247a9f117f876a202eba6 SHA512 2c48630027685ab57adf8a1bab395a43bb2220600fca0f2a68806f18ff9e94d84e7818b4140bb01b50f9cdb378e49fb2c94c46a055c2ef3614a06037e556ef81
 DIST dropbox-lnx.x86-96.4.172.tar.gz 95619165 BLAKE2B 3d839e3ea9e1b9a7399693e8540230a8bd173b1cbe7fb9ee3a85621f6a3c59bc8c2c58d2f8e0f0998dcd9b0d77cbfcb006c9b543609546efca6ae8d85817b5ee SHA512 83ee64f7db74742c375fca8fa661da0774c3ec451cfe6cc71e5879427e8f822ae9f533ca2920bc01158b05dd52fac9f89fb3bd8928a2a71c4df4162f67547e22
+DIST dropbox-lnx.x86-97.3.451.tar.gz 96560209 BLAKE2B 9ca8b50afddb8e0435cc1e408fdb10a12a1097baebf7241033661ac26e5d8c369b09bb6dfe707d1f0f3f6a79832ff0ae097eed859b0a3612574fb69d9d74fd47 SHA512 d50ba534f3b7b87755d09ffb216cc8741f0d520c088577fbda486aa4debd7317fd87fa7a86a0131800b1cdd75a60f2ee6c1b7d264a8e75b11d7d619e509f221e
 DIST dropbox-lnx.x86_64-94.4.384.tar.gz 98561877 BLAKE2B ff1ec6a8f76b9b79ed3cfe34d5dd5642886d01631bba062ba15528929e1068425fadc403c8a7fb3242b08c2d2742a2f4ccd255c8772691ee1e4f1b8693be4dcb SHA512 e905b283ef435d7b6c0d7973f49e8c0a4a5e7c25c2570967b24bb8476ef1889f63d01e7951f1c6d78a5c6851e1a30737b9297032dede1540e3bf391c56bc0c8b
-DIST dropbox-lnx.x86_64-95.4.441.tar.gz 98809031 BLAKE2B 36dbce71cee6e2df69187e6fb4ad1a4534561bd871a9d5bdbe8952f768f658ac3ac47adca68ec68be2ccb3e4a780ac7e67b4898e33d2763ea0e6d384dd85bca4 SHA512 66f83fd4f3a770cac4879edb21635941ae11b5f83113bf8a0efd2365d957ee7ea9e65a602e635131c57cd47057092757c8c4c3f03558a5dc63863e8a0a9c7d7c
-DIST dropbox-lnx.x86_64-96.3.166.tar.gz 99942601 BLAKE2B effa062c841617b1468ef065d4f0798c0bdc27f33d0b77cc3e00d6e820334316c98cecf3a22bb2716fa3ae3bc9a11e4736d38846787faece97fe6b495365411d SHA512 cacd76cc10137fb25f35097b5df5733d5693c4515f2aa28d5cb46618c117d573d82765e64799c7b92f7070b040a2632c0f701abddf92d10b169dc74110328717
 DIST dropbox-lnx.x86_64-96.4.172.tar.gz 99944904 BLAKE2B 0b9b6c3d283de2751df9c083f7cf4ec8bd013def2a6cacc1a006e5a66ef5d0451d5c1faef3b10d7295ff3c23b941e48248126064e9eab6391e11ad7c193ebb01 SHA512 1aaf4b3e88e047f184af813d80e7754649ab33f2337ae1555c7d408d3358195e48cb0b1daaae1fe6f8a1e572ea087960eb2bda2413158f60588e022f5f01136f
+DIST dropbox-lnx.x86_64-97.3.451.tar.gz 100909755 BLAKE2B 75de9da05ebdb1c1da0d604d8e7aff3fd1fa5a6b9f281cb8ae20f673ea05f0a4af775d6c5926fc5962782c896a71aaa48651c7b49e05ed4bc783f64275b1fcce SHA512 501e8754717a91b1fe01ebe5f895341b3ab74da97633faadf3bcf81735672efd6beffa87125aad7e32e851ef656cf5ba8951e57ecc6180a2f3b77af37a629e65

diff --git a/net-misc/dropbox/dropbox-96.3.166.ebuild b/net-misc/dropbox/dropbox-96.3.166.ebuild
deleted file mode 100644
index ff550315591..00000000000
--- a/net-misc/dropbox/dropbox-96.3.166.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="+librsync-bundled selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		dev-libs/glib:2
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
-		x11-themes/hicolor-icon-theme
-	)
-	!librsync-bundled? ( <net-libs/librsync-2 )
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/libffi-compat:6
-	dev-libs/popt
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-
-	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
-	# tray icon doesnt load when removing libQt5* (bug 641416)
-	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf PyQt5* *pyqt5* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}

diff --git a/net-misc/dropbox/dropbox-95.4.441.ebuild b/net-misc/dropbox/dropbox-97.3.451.ebuild
similarity index 98%
rename from net-misc/dropbox/dropbox-95.4.441.ebuild
rename to net-misc/dropbox/dropbox-97.3.451.ebuild
index ff550315591..38f892d3ba4 100644
--- a/net-misc/dropbox/dropbox-95.4.441.ebuild
+++ b/net-misc/dropbox/dropbox-97.3.451.ebuild
@@ -66,7 +66,7 @@ src_prepare() {
 	if use X ; then
 		mv images/hicolor/16x16/status "${T}" || die
 	else
-		rm -vrf PyQt5* *pyqt5* images || die
+		rm -vrf images || die
 	fi
 	if use librsync-bundled ; then
 		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die