gentoo resync : 15.01.2020

6 files changed, 13 insertions, 254 deletions

diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 4f7482cddf21..f6bf1f1728c1 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,18 +2,12 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 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-85.3.138.tar.gz 95798182 BLAKE2B 25cda9b6841c027b3dc919606b7f9c7aa6cba4f73949068792e613f46db20a6c6e4d9dc5e9b8f0c565c9c74b786a3bcbbc16cce664f79d80ca2b291d8ff996b7 SHA512 e1c3b91b8b81a13468a2041d73f40feec31d25a860031d3e3f415692389739c73eadbbb4e37827452b7634559a314674e1a595ebae47d793a87245fef11193fb
-DIST dropbox-lnx.x86-85.4.155.tar.gz 95826112 BLAKE2B fc20ee2495729a573a2c5b02672690a0d012a1a3b1509bef2c9089ce4875cc559e00fb43f66d721e1d18d9b7d431ff15a194469fa7f72c72022df985901b9150 SHA512 640ac43d382796aeb68ef41fe83493e777492e1d1f20694aa49fb5682dae30087f411eeb60bf7d35ecf48ea94cf38dbe4543f8d179756efb86abc47543043d1f
-DIST dropbox-lnx.x86-86.4.146.tar.gz 96400468 BLAKE2B 42ff29c98fbd5c7517a5156af421d8e6deea02772818e744081f90abc259149b9e84e1642a20ab8098bee7ae00d602d8f458f7f825b7a1a748527cb6691a1738 SHA512 6fdcdaf899e9b7f3ea64a7d4ddce276e949b5452b0cdef5b45be44d8fcd16fd1c2af811f38185e636915bc5c71cd0ff306e069f9ef73b1130fc033dd8fc53be1
+DIST dropbox-lnx.x86-88.4.172.tar.gz 97905927 BLAKE2B fe40384888edb4c9bebc1a1af54b58e81466cecc309191bca018213c756129d18a26eb550c1c16a95f858a30dd07868be160502715c7f1bba80393dd030a9ec1 SHA512 4475a28420346cc6d0524f454cc6f25b863aab86a71a5153dd40a5dec6dec2d17e04124adaa128812ae6e944998d8d50c62cdf7c1f459d39eb2626cd6234e875
+DIST dropbox-lnx.x86-89.3.268.tar.gz 92308961 BLAKE2B 4b1a229eca8e96b49360404fc3a03277343f1dcea9b2065b637d8531b266233215e3f3c21163d20ed104db90b4d37dcd873bc1353036a14f89ac50b78180a518 SHA512 25195ef1f44641ca3aee00c4b5cb52006d9610b9d067ea1ade4717dd47729db98e5b0556b5c61ea881ee84e8f8aafec868555591d8d3f4c1ecc81974159e3321
 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
-DIST dropbox-lnx.x86_64-85.3.138.tar.gz 100138034 BLAKE2B d7499b31afa7c8cac56d0a785b083c187ce97946bee8c76020bc277284c26e0441477ea9988d3c1928aa706a5519eb7dba9e55bbaed62d192c2383c2b0e86e4c SHA512 94890e958173c76940ff932744af267096327f37c454c913ffcda4b4b9815afeb0877e38fea6be99b7f0d53a6951f72e0400a9405b2b65e8c7d9c5c197a6d1d9
-DIST dropbox-lnx.x86_64-85.4.155.tar.gz 100174580 BLAKE2B 247d9c429f160cc3535a5741ef150e81f499ffa44fe68a7836255d4679c4a75532ffaf68b3f2d8e9b73ee311536c8c25148c370232b52fdbf2b945ae64908446 SHA512 870b3f1b2a6711d2e797a485db9fdbb78e63c9a66b240265f2ef5c907caf00a7cd748f796861fb2bcb46123bd00f52d7aa022fefbd5bb959cd1f966e270adae6
-DIST dropbox-lnx.x86_64-86.4.146.tar.gz 100750434 BLAKE2B 5b415e3a06aefd8851ec3fb1389ba89fc258609e0026592de2d2fea074f14bfbe5993a5296b6637ca28df33e9b90bfed7d986b270162e11b23e202676cf85ddf SHA512 6c6a7ca84dbc802405e05e56481f3640fd0837e757138aae7ad004dd545e5773ca0297d7ab8e23f2e843958c2c85f3cea6216098d769fbac926578a9ae1edd97
+DIST dropbox-lnx.x86_64-88.4.172.tar.gz 102549714 BLAKE2B 32df6ec80ff6d5e841bdb8620af2b4a0e820f879b8c104e79a861ea4540477de7e5d68504579bb134c229f433f5472f61663ee7508c1f9cbaa1a2363e8cf93de SHA512 0af742edce083a61c1abf57f93bab9e849f9aa8653e1483e7ca9058580b60af17d8566f650f86ae820c686052acf676c7b76f79ca575da719a64c0845764f04c
+DIST dropbox-lnx.x86_64-89.3.268.tar.gz 96723713 BLAKE2B 5bfb7721303b466f9015709f1a235045263fa0db46ff4f0ad7e772c4dc1261b8c7549d63c0ac4a9d98e35581c630ad5ed851d0c63334267b196bec7dc93c0ddf SHA512 627bf49df5a6da76bf04484912c7be686f4e9adc51be619fd613b56fdd514088c173c39cab5fb5a6757074130efc54edf192c7df43090965ba9066de5d0f1755
 EBUILD dropbox-83.4.152.ebuild 2857 BLAKE2B 4018ebd8749c24f4b321789d6c31c990f83757381f54310b755eb46d218b0fc227f7d97e106730c0da9891e53070d25f803239ec805a8abc73e66ffeb32d18fa SHA512 b4208396c6bedf47278f0507a5c14c9ac184bf8a91d2a8433708178c4c92484d26fc1d32dc3781f8a85623f4dcea8dbf2e9f34720ca76c695c0e9cf2878629e5
-EBUILD dropbox-84.4.170.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
-EBUILD dropbox-85.3.138.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
-EBUILD dropbox-85.4.155.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
-EBUILD dropbox-86.4.146.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
-MISC metadata.xml 503 BLAKE2B e87633e1962a70d62a58006f874a93170d1a5e2729ef6158bf44ab331b5dde53c848266b942fe21579bdc83fda10a421795f630276b96e1c71a954a54ba3436f SHA512 b766938aa2c74e5e9d4558fe882c2d0354c14c9744a7e5eac664ed5234cb723601fc5d04d65e19877c3bb60d8bdaa305eb1c8273704ac2fa1a5779de60d9484f
+EBUILD dropbox-88.4.172.ebuild 2843 BLAKE2B bf4b8501e9144bed80fa3b9ba208c2d3b5c8f4046f951d7b517742df99b8a4ea1ec46f89f657ad345d422e30ad563f22c5e40b97cf0e124feddee02bbd6ac4a3 SHA512 c006f1573e14c4651d33c2706729869d2d164a25b81e7fdca48b033882ff43e5150161850f153b9107739c76fe5aab1cd524c241a8197a9de4cfb610a17b3e26
+EBUILD dropbox-89.3.268.ebuild 2843 BLAKE2B bf4b8501e9144bed80fa3b9ba208c2d3b5c8f4046f951d7b517742df99b8a4ea1ec46f89f657ad345d422e30ad563f22c5e40b97cf0e124feddee02bbd6ac4a3 SHA512 c006f1573e14c4651d33c2706729869d2d164a25b81e7fdca48b033882ff43e5150161850f153b9107739c76fe5aab1cd524c241a8197a9de4cfb610a17b3e26
+MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
diff --git a/net-misc/dropbox/dropbox-85.4.155.ebuild b/net-misc/dropbox/dropbox-85.4.155.ebuild
deleted file mode 100644
index c21396bd015d..000000000000
--- a/net-misc/dropbox/dropbox-85.4.155.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils pax-utils systemd
-
-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="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"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="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/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() {
-	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" "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}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-86.4.146.ebuild b/net-misc/dropbox/dropbox-86.4.146.ebuild
deleted file mode 100644
index c21396bd015d..000000000000
--- a/net-misc/dropbox/dropbox-86.4.146.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils pax-utils systemd
-
-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="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"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="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/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() {
-	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" "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}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-84.4.170.ebuild b/net-misc/dropbox/dropbox-88.4.172.ebuild
index c21396bd015d..7a750370139e 100644
--- a/net-misc/dropbox/dropbox-84.4.170.ebuild
+++ b/net-misc/dropbox/dropbox-88.4.172.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
 
@@ -76,7 +76,7 @@ src_prepare() {
 		rm -vrf PyQt5* *pyqt5* images || die
 	fi
 	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
+		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
 	else
 		rm -vf librsync.so.1 || die
 	fi
diff --git a/net-misc/dropbox/dropbox-85.3.138.ebuild b/net-misc/dropbox/dropbox-89.3.268.ebuild
index c21396bd015d..7a750370139e 100644
--- a/net-misc/dropbox/dropbox-85.3.138.ebuild
+++ b/net-misc/dropbox/dropbox-89.3.268.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
 
@@ -76,7 +76,7 @@ src_prepare() {
 		rm -vrf PyQt5* *pyqt5* images || die
 	fi
 	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
+		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
 	else
 		rm -vf librsync.so.1 || die
 	fi
diff --git a/net-misc/dropbox/metadata.xml b/net-misc/dropbox/metadata.xml
index c92c1a213687..690936c39b8d 100644
--- a/net-misc/dropbox/metadata.xml
+++ b/net-misc/dropbox/metadata.xml
@@ -5,9 +5,6 @@
     <email>perfinion@gentoo.org</email>
   </maintainer>
   <maintainer type="person">
-    <email>naota@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
     <email>bkohler@gentoo.org</email>
     <name>Ben Kohler</name>
   </maintainer>