gentoo resync : 25.01.2018

3 files changed, 14 insertions, 17 deletions

diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 015d65fe32ec..fe0a6dd6f2d1 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,10 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r1 220 BLAKE2B 3e7111d8b49bc52626343960d2609f084032c8015c06d700883d47c8ce7569ef5bcb881b682c68a2a911d5f24bcbf554a0e098722f4bf0f1477b80243c6978b0 SHA512 ea685e6eb901b841e54aeb9b530d5a0d2a367d8b598019f7f0d2ae69b013be7cf3986c68fabbbaa30c51c9fb5406dc45b07ff15914c7cf18a7aceacf466328e5
-DIST dropbox-lnx.x86-40.3.44.tar.gz 70138971 BLAKE2B e83a278e986987cec2b472fe7ac90e4bb4b9c934998707eb3616eeecd60cf5a7dc444efd74a3cd4217adf546b2281d8c9c28f32d84dd831e79d512c4a6105627 SHA512 20f8e574c0b88e83fca85de061319b06fdde6fee007f560180a2327922f5c2950394ecb6fdbd8b5a912ce8edd381c3520216cae7f83ba5254c37370238970938
 DIST dropbox-lnx.x86-41.3.76.tar.gz 70413240 BLAKE2B 1404c7975b9f58d288c8519c09734d3e0e52a714824158867d19a7965f0275e3e13d77d725ea030cce50d785f10ca6304e35d55ee89216a1a810f91aa732f4d7 SHA512 98fec83f92d5465ae61d56b0a02209d6145da1017c29d71ef4eb7e8684f28e6bcfadc77a055cddf7f5512eaf02d8235f1dc273b1f22deccbbcb70d7047ee8df8
-DIST dropbox-lnx.x86_64-40.3.44.tar.gz 74167220 BLAKE2B 46d89e6e8fe56e67a2d6dc6e1dca380e047659c3769cef14155f1cef48a3e58c82e65c2095f3c91cf7f1b1a1f4b10665e00265611562c1fadd912f436dee14a8 SHA512 a7d04c3581459bfc72dd799db424b6b5020bc3e8a65ceb280bc424c662783af78527488e5e575558c0ee7ff0eaba2b89863c329f12806c8b0e088d47afefdea5
+DIST dropbox-lnx.x86-43.3.47.tar.gz 108318530 BLAKE2B 0627385c672b4ee024c9062b9da837fad97e728d43afe6476bbbd5108eda4c729ac6230d2be8851381e3c3be98d3a86cb492719e645d9f07a10e579482eb6230 SHA512 23df4e4e2c3cd99d16890091a7c2d3f61341806241462b6ef095b86d5db4b663090e12848038c731014079dd77adaef47fb721b1eac8bc84e945daaae3ee438a
 DIST dropbox-lnx.x86_64-41.3.76.tar.gz 74449460 BLAKE2B 7983f0e48839fc6c3386b06c4380649e83977a2619bcc888b68a67b0e61996e72133935143a144798d5555595cd6d00063af3aef8c4b293e61eda18dff4ea96a SHA512 ea8cce634d7ed9e77d1d5f30dc7f89396d32783e3c3644d6fca52619d7cff958b407ecf21a1a6478091d148f1d0a42d68b6283e7dbe2652a48adb8f36554fd03
-EBUILD dropbox-40.3.44.ebuild 3067 BLAKE2B b656508362e19e503fa03b65ea2f71b47bd03ce9dd5b85a092afe494b061d0026ad7791d3efe98c5f59121a2d9912ddb2b891efd32584e867e023b8528d4560a SHA512 351df4410d640e4dbe3b8373291d43957edab99858eea949ff8ea354e228d882d01eefe177dfeaebf371183964b1def71e18e68631482a8489aa6993cc9441bd
-EBUILD dropbox-41.3.76.ebuild 3069 BLAKE2B f3898ed30cfe2cf909bd8a2b7968832c6d2c0b03778b17f938d050da3c0d1bec6e11cd3d3d1ad187b7bbcc51da396f5253f45b82e7037289b142586729eaab32 SHA512 e7f218c0f8ef8d7c9cd4c5651f7c08cdec1deda754530fc2c0620f0e452521f21b0d839cea23b902b5ae35a3ae727307277c7d86c17dfd0796d91f55d8d1d605
+DIST dropbox-lnx.x86_64-43.3.47.tar.gz 114389696 BLAKE2B 63ec9fe71516715340e3bf579ff40690a56fb3d2200dbf291f6f1f58f56885e115aebf87ea3b306d3682b634d418b6b30e45abe3a16d566cc53dcfcfc004bcba SHA512 e11b01cdf67e16593822d722a8e3d822e9a02a99036a938521bb9e31a2451118168e434e1924006d9629d7b2a847bfacd2d7b0b213d6e1c90fb92fa3378629bf
+EBUILD dropbox-41.3.76.ebuild 3067 BLAKE2B cc6b02df756cd8103995f4112862aac49323af5d8b1386e150cf569b22d099060bec8cb853af00282a1aad1be5738dc7b72f394cf80f868bf0734143d034e9e3 SHA512 3e483a2dabc571c9c761d86048ba2c11406cb9421d1616d021e916d234f1b77943cd7be6caceaaad9c781890ed2760e1b1e35afce67575d21e2d59298af6f325
+EBUILD dropbox-43.3.47.ebuild 3033 BLAKE2B c5815f972322253fbd9f63179af64c9f6a06a241ed652b45ffd44f28d86f93362c565b53f9670856f66255227d5a6d9b5cb9f86abd52eb82849e685f5cb7a1f7 SHA512 94f46da3e3e50fe095b0a11df0ba935e6f03bfffa981efd4b5262d9cbe30b03b423a556da8332ca765a0f9aafb165acd25178675be16990dd4be574bd43ea80b
 MISC metadata.xml 392 BLAKE2B 19f1d26ecc891282c1930e65db36adbfc73c6cc110dbfa1a90a6ed85f87dd1936860dd1710c3c3e2593df22fea34e5aa803a4b46a812e764563dcad19320c466 SHA512 35be87e089ea5aa62a5f90ac1241953df5c5115dc59258c7f5bdbacdb7a11938c79361c07e87d366f1db2af8a172d571cf2c9061885c60b7fa39a802bd31a141
diff --git a/net-misc/dropbox/dropbox-41.3.76.ebuild b/net-misc/dropbox/dropbox-41.3.76.ebuild
index 2ea39b1ac76e..5b8bb0394c9f 100644
--- a/net-misc/dropbox/dropbox-41.3.76.ebuild
+++ b/net-misc/dropbox/dropbox-41.3.76.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="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-40.3.44.ebuild b/net-misc/dropbox/dropbox-43.3.47.ebuild
index a79ed26b4631..a4f6a2f6b6c3 100644
--- a/net-misc/dropbox/dropbox-40.3.44.ebuild
+++ b/net-misc/dropbox/dropbox-43.3.47.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_5 )
 inherit eutils gnome2-utils pax-utils systemd python-single-r1
 
 DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="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"
 
@@ -75,22 +75,19 @@ src_unpack() {
 src_prepare() {
 	eapply_user
 
-	rm -vf libbz2* libpopt.so.0 libpng12.so.0 || die
-	rm -vf libdrm.so.2 libffi.so.6 libGL.so.1 libX11* || die
-	rm -vf libQt5* libicu* qt.conf || die
-	rm -vrf wmctrl plugins/ || die
+	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
+		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
 	else
 		rm -vf librsync.so.1 || die
 	fi
-	rm -rf *.egg library.zip || die
-	ln -s dropbox library.zip || die
 	pax-mark cm dropbox
 	mv README ACKNOWLEDGEMENTS "${T}" || die
 }
@@ -100,7 +97,7 @@ src_install() {
 
 	insinto "${targetdir}"
 	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	fperms a+x "${targetdir}"/{dropbox,dropbox_py3,dropboxd}
 	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
 
 	use X && doicon -s 16 -c status "${T}"/status