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

[Ben Kohler]

commit:     9a0749b4a7d30ff75c76acb0c7fd10ffd9f1f2a2
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 21:35:37 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 21:44:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a0749b4

net-misc/dropbox: bump to 81.4.195 w/ misc fixes

Bump to new version.  Removed (afaict) completely unused python deps &
eclass usage.  Fix up installed .desktop file.  Add dep on new
libffi-compat for libffi.so.6.

Closes: https://bugs.gentoo.org/695804
Closes: https://bugs.gentoo.org/673184
Closes: https://bugs.gentoo.org/673096
Closes: https://bugs.gentoo.org/650590
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 net-misc/dropbox/Manifest                |   2 +
 net-misc/dropbox/dropbox-81.4.195.ebuild | 116 +++++++++++++++++++++++++++++++
 net-misc/dropbox/metadata.xml            |   4 ++
 3 files changed, 122 insertions(+)

diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 6689b56b951..a086beb608c 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,4 +1,6 @@
 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_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

diff --git a/net-misc/dropbox/dropbox-81.4.195.ebuild b/net-misc/dropbox/dropbox-81.4.195.ebuild
new file mode 100644
index 00000000000..48e763d95e0
--- /dev/null
+++ b/net-misc/dropbox/dropbox-81.4.195.ebuild
@@ -0,0 +1,116 @@
+# 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="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-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/metadata.xml b/net-misc/dropbox/metadata.xml
index 7e45457c326..c92c1a21368 100644
--- a/net-misc/dropbox/metadata.xml
+++ b/net-misc/dropbox/metadata.xml
@@ -7,6 +7,10 @@
   <maintainer type="person">
     <email>naota@g.o</email>
   </maintainer>
+  <maintainer type="person">
+    <email>bkohler@g.o</email>
+    <name>Ben Kohler</name>
+  </maintainer>
   <use>
     <flag name="librsync-bundled">Use bundled librsync library</flag>
   </use>