6 files changed, 7 insertions, 377 deletions
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index fa42bddfa1e2..25e299690530 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,17 +2,10 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r1 220 BLAKE2B 3e7111d8b49bc52626343960d2609f084032c8015c06d700883d47c8ce7569ef5bcb881b682c68a2a911d5f24bcbf554a0e098722f4bf0f1477b80243c6978b0 SHA512 ea685e6eb901b841e54aeb9b530d5a0d2a367d8b598019f7f0d2ae69b013be7cf3986c68fabbbaa30c51c9fb5406dc45b07ff15914c7cf18a7aceacf466328e5
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
-DIST dropbox-lnx.x86-48.3.56.tar.gz 108876564 BLAKE2B b809a220605265685026657e791aff3e716f7ff51e1fc5074d66df87eb8dc473c63c7513c94ca0715844c600fe71aaa3c42a108be4baee2e3e72baade97e3429 SHA512 3174c41e19a01cbd986c111711bc0df80b68882d595a5c869b81bfa1982b3f219da4cda852168bf7fdc9d67b91f52260017f4d25508f6372efd470536a6b96c8
-DIST dropbox-lnx.x86-58.3.88.tar.gz 73782589 BLAKE2B 406758f056dce4348706d181f1620a16199f99d82c6a24b2cbe7773de32b8f64dc10199b88b8c0b7c3a577deb8658e5de18ce28fb00e509a46a5cd21db890f89 SHA512 455b6e0f78b4307d65f6420b76454229b7542475aba089961117d387290ae60df44a659bb6f8d22975cc6f51827d80b3141cb09832fe327fb5cf9861337b08d3
-DIST dropbox-lnx.x86-81.4.195.tar.gz 93761227 BLAKE2B de0349126a701166eb9d1be64dbfad3d3386518dada09bf9544422336a92d69cbe01d252c04ce3141d55f32232f36823ec680d91c7161d80ba01af1c880d391d SHA512 4d78400bcad4492eb82ba692fab0ce518c653a9ddf04c57a668ddb60da63652be69b74c09f74c2770bccb4a7e9ca57d4774214622a1858606c0e45276b317ca1
-DIST dropbox-lnx.x86-82.4.155.tar.gz 94112380 BLAKE2B bcff1c01c6ed8e30285defbd186bd51707eca05813dbb75cd1dcb15c03aa794bfdb0c9dd24b5b703bf6d37a2dde8d8dcb9d34cb43a2f551309e89752e0498469 SHA512 c9b005f7d99d023b74d59a6306b31d7a97af9455c71b54ad54513a64758cf3af8c03923746be645853a17734882adbc91174966f9f71b5d433dbbd1569386b2c
-DIST dropbox-lnx.x86_64-48.3.56.tar.gz 114940928 BLAKE2B 7d678344b59aa12bdbd28f3e425c0b80b15feae403911ef25a03150d1dfa47e94da1eb17d4b703feea6721d2fdfa721da54fab92e1a56b6b8f31456482bc3614 SHA512 cbd3eed71286be079aa8c898929dea305a4cefb9b5e2e41b196d07f68bfc3b5f2839f78d676a3fd7df62644fe00b9ad1930121bde88a6eea9c864d956ccb6f8e
-DIST dropbox-lnx.x86_64-58.3.88.tar.gz 77899313 BLAKE2B ecf729f4cf8c8fabed0f6ca19a9c908f7adec1a58719fae8ef3a6cc80f26b453c678d241af987339e26ccbe988db45f57402ea497c54245691cb702a868fc2dd SHA512 50199f6e60f34a13376725d0deee7c0e6aa31e63574ecdcaf69b43427d262fb35dbf979798b704d6a5a33756e9cea5867591d9a632a311b111d6645123f3385e
-DIST dropbox-lnx.x86_64-81.4.195.tar.gz 98084742 BLAKE2B a21a9237b9f507d654de51f488c114a0a98d8b9e3659dc01713d14c8af94527724145bca1b4d39b3610828c625c1acec7b36ddd8090b49f77dc752d788e42a45 SHA512 684ca4e643d9e662bb6273def6bd3bfcba358b3e3279d88ec2fbf60c90d57026af7b83fc92ecb3e882633501433f1f7e6331213291879f28b70cc4d19003680f
-DIST dropbox-lnx.x86_64-82.4.155.tar.gz 98437566 BLAKE2B 972d9132a3225408844e4679d1c065a3fb9e6f2135eb6f99341848cff1235d6d1a5719c1a50539ba0e0051d99939c1636b34722d55a509e88be3ba85281da070 SHA512 a829eedebfc6d8814fec2a04834f392b5c32ae334289376cc736cb6c9473bbfdcd29b063805ef1def7a22134771cc246569e85f337a4adee9eec9f34a929c272
-EBUILD dropbox-48.3.56.ebuild 3053 BLAKE2B d20ac8f0f864a757c0e37b8187aaa90818960bf2ab6a064d969bd4aadf1dfae6b103ccf3ec98cb242f333b3f2f5b5de166fbcb230c8d4a670a1472416550ab28 SHA512 a0dd103afa32c328a3a3c8e96aba25b2a8d530dec35739af01fb8860607e516cd55bf707978e2a6e4b080dd0e27d791acceaa75c43f496242a7d61b2468d1608
-EBUILD dropbox-58.3.88-r1.ebuild 3031 BLAKE2B 8cc71679628fe2b0ce777d141eaeca8849ad6d5e976597c8f338952cfcc423745133c427ce4e50e9ab8137677c9bb3dd325d3e0cff3d311cdf4df9826f72577f SHA512 fafe75fb1cd941590530b3e52dd20a23ad60645832f5395633adc9a5925303c5a93b85f0c1e31cac47a4e8c88776207b14b41921cad1bdd43e1ecc13f2e5fc91
-EBUILD dropbox-58.3.88.ebuild 3043 BLAKE2B 4f2638f01a5b705bc1fdae3112bbd7b6cdcdf3884c757a3685aed0612ebdac7eb8c2c8ed72aeba7cb01a0f02e346c963ce7040d23b9f2487cd44fd72cef40b1b SHA512 c7cacbd6e86712ba3a69e0707f08fc6a99925a8f9e98d5034de864c0dde720af28dd913f35b3a1d25bed05caf1b043fd3ff007aa533e77f85dbc57cfd2d8e041
-EBUILD dropbox-81.4.195.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
-EBUILD dropbox-82.4.155.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
+DIST dropbox-lnx.x86-83.4.152.tar.gz 94612498 BLAKE2B ddf86853785ee4806cc96f2427a300b2db751bf3a5b12ec1508bdbc68ba7ff35d2d65e83e86b5a09ad4a7cc160e0f94e7cd141a819d35f9be87aea7f3cb8dd0d SHA512 75793878c15ecd7224f0ef1897e38c1050d36e11ddf1c30db8e79c22dcb40ceed48fd6e4be204b19c54fe4ef7a2c68d5528df6e10a041cbe4220d9c129619a4b
+DIST dropbox-lnx.x86-84.4.170.tar.gz 95127426 BLAKE2B 09f985565839c5411647fba7eaf84c88a69941456c6e64b23e6e2ca0cc21b8f393153210db23be7ddc4ee0deb3771c9af8ac2b5fefb2325227e8ae3b52a3be0a SHA512 69ab398860bd7559d971ecc42a271a432839b00ab920b8c068d317d420bd521b1ffc1c74912c98d56627b72cd972c059a5eb0ab89c53bb50ab766179baeda448
+DIST dropbox-lnx.x86_64-83.4.152.tar.gz 98772192 BLAKE2B c023fe81128217b8e11b287afdf6d5cd74d7dd4229c7845aa8e96065f03912720dfe3531995bacc45c50a2971dac0bb7e10364206c531fe5f4e23ce6c617a1d4 SHA512 55874247f3dcfafc62d07aad459a6b3d951c87e675a28f6e66c9c51c9190ca8e4dc32bce5339e338694d31036bc8e1b039f54460b84bce0ee1fff9dd3d6aa684
+DIST dropbox-lnx.x86_64-84.4.170.tar.gz 99360343 BLAKE2B 05dd47e681f03757a622079121001060a73f4c0415fc6508d74738026388f8d27f4b59b41535280a793d2f95976fbf6da9e1c0ec963cc002ad2f14ab46dd73be SHA512 e89e6b727699a439c7cf1fed57f5c7db6fd98c7ef484c9530b2c4ce0b09a86de59a50934afd4d18fd591db024eb92d57181d75574d3d32e587dd76682524b871
+EBUILD dropbox-83.4.152.ebuild 2857 BLAKE2B 4018ebd8749c24f4b321789d6c31c990f83757381f54310b755eb46d218b0fc227f7d97e106730c0da9891e53070d25f803239ec805a8abc73e66ffeb32d18fa SHA512 b4208396c6bedf47278f0507a5c14c9ac184bf8a91d2a8433708178c4c92484d26fc1d32dc3781f8a85623f4dcea8dbf2e9f34720ca76c695c0e9cf2878629e5
+EBUILD dropbox-84.4.170.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
 MISC metadata.xml 503 BLAKE2B e87633e1962a70d62a58006f874a93170d1a5e2729ef6158bf44ab331b5dde53c848266b942fe21579bdc83fda10a421795f630276b96e1c71a954a54ba3436f SHA512 b766938aa2c74e5e9d4558fe882c2d0354c14c9744a7e5eac664ed5234cb723601fc5d04d65e19877c3bb60d8bdaa305eb1c8273704ac2fa1a5779de60d9484f
diff --git a/net-misc/dropbox/dropbox-48.3.56.ebuild b/net-misc/dropbox/dropbox-48.3.56.ebuild
deleted file mode 100644
index 2252fe9e49ab..000000000000
--- a/net-misc/dropbox/dropbox-48.3.56.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-inherit eutils gnome2-utils pax-utils systemd python-single-r1
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="${PYTHON_DEPS}
-	X? (
-		dev-libs/glib:2
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5[-gles2,xcb]
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5[-gles2]
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5[-gles2]
-		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/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() {
-	eapply_user
-
-	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.compiled._librsyncffi*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropbox_py3,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-58.3.88-r1.ebuild b/net-misc/dropbox/dropbox-58.3.88-r1.ebuild
deleted file mode 100644
index 53f28efd4d2d..000000000000
--- a/net-misc/dropbox/dropbox-58.3.88-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-inherit eutils gnome2-utils pax-utils systemd python-single-r1
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="${PYTHON_DEPS}
-	X? (
-		dev-libs/glib:2
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5[-gles2,xcb]
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5[-gles2]
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5[-gles2]
-		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/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() {
-	eapply_user
-
-	rm -vf libGL.so.1 libX11* libdrm.so.2 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.compiled._librsyncffi*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	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"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-58.3.88.ebuild b/net-misc/dropbox/dropbox-58.3.88.ebuild
deleted file mode 100644
index 6ae52f6051c8..000000000000
--- a/net-misc/dropbox/dropbox-58.3.88.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-inherit eutils gnome2-utils pax-utils systemd python-single-r1
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="${PYTHON_DEPS}
-	X? (
-		dev-libs/glib:2
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5[-gles2,xcb]
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5[-gles2]
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5[-gles2]
-		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/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() {
-	eapply_user
-
-	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.compiled._librsyncffi*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	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"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-82.4.155.ebuild b/net-misc/dropbox/dropbox-83.4.152.ebuild
index c21396bd015d..ee4f6c9229cd 100644
--- a/net-misc/dropbox/dropbox-82.4.155.ebuild
+++ b/net-misc/dropbox/dropbox-83.4.152.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 RESTRICT="mirror strip"
 
diff --git a/net-misc/dropbox/dropbox-81.4.195.ebuild b/net-misc/dropbox/dropbox-84.4.170.ebuild
index c21396bd015d..c21396bd015d 100644
--- a/net-misc/dropbox/dropbox-81.4.195.ebuild
+++ b/net-misc/dropbox/dropbox-84.4.170.ebuild