commit: f9cb78e47285fabe6b53a4a61c9db0971bbe6464 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Wed Sep 9 21:23:15 2020 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Wed Sep 9 21:25:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9cb78e4
net-misc/dropbox: bump to 105.4.649 with large dep overhaul, drop old Most of the X? () deps are actually needed at runtime even for cli/headless use. I have trimmed some of the Qt5* and other libs that appear to be completely unused. Closes: https://bugs.gentoo.org/600348 Closes: https://bugs.gentoo.org/725096 Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> net-misc/dropbox/Manifest | 6 +- ...x-103.4.383.ebuild => dropbox-105.4.649.ebuild} | 40 ++++---- net-misc/dropbox/dropbox-98.4.158.ebuild | 102 --------------------- net-misc/dropbox/metadata.xml | 3 - 4 files changed, 18 insertions(+), 133 deletions(-) diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index 5b937fa2001..93dda0b7a82 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -1,6 +1,4 @@ -DIST dropbox-lnx.x86-103.4.383.tar.gz 96880620 BLAKE2B 465ae55d90a4857f3311b4ac154297b1e422316a9b6eb0bec0b466eadafb06a0f8aa64fa8bfdcab44efdf185a344f0ea4bd2baef0df6a5712830687f08e03e96 SHA512 c4cb906729277a2b470e2ff5f4840bb2ff49e947ade1fd0b0eef1edc1bc995953b1a3ad6192592eb0c8c3a09bf67a92935be1114176651e54b227c1bf9c98ab3 DIST dropbox-lnx.x86-104.4.175.tar.gz 96650490 BLAKE2B 4a74e3b8b31ba720ade57b685978c19827e53dc2eaf4519e10f736121c08e61de66caf1211568c52f624fb020ed8ba5c69c2dbf053bffa9e95d6c9308214d87d SHA512 30dbaa4061f673137f4659f201b62cabff94c827175d00fc348140926a9afe6f693e17237642988ccbe27988eb0aba516705cca65340d59d1d1889784660901c -DIST dropbox-lnx.x86-98.4.158.tar.gz 96568004 BLAKE2B fc9ae4cf5d9ad1798dd5d55bf90cd5e77e7cd7405626fb55d4693e26d028d97a81d2843eb03d60de94f552cc446fffa4caa679ba3a750098a58549fc78ff4c67 SHA512 ce6432bbec1ec024e6753a93f2d0eed3af60de521f411f52efb63767eb500a85da80102a011e077fd9953d4827403d02143b186f30137ef7a338cb01664911a2 -DIST dropbox-lnx.x86_64-103.4.383.tar.gz 100927456 BLAKE2B f16876f45c345bf1590edb5f76d4bc0cfc3ed6dd1848badfbdbafff8409264c934de48abf9946deb2661d245077af690dfbd6d69c8e2c6b8acf9c13baced7660 SHA512 d0620fdaa6b80679390a906c0d1d4c22e0907ebacbbc06a9c52a5722b6aa793194c759af70888839d806d825d02d1504024efc7b46b7022afb5e71338e2f836e +DIST dropbox-lnx.x86-105.4.649.tar.gz 96974503 BLAKE2B b14cd6891afcd7858ae7564e4f49753a60a70caef6f0c7ff56ecfef54bf1cfee629fd99f069679d210a3e16f48ab0387ca78bf49f92b2fce40ba4cdb0ec147df SHA512 5dfebc03d76465bc6a6cfd9fdb551385e0fa0b50908c8f2fab90a200815a8c5d90b2294cd8d8ff00284668b4d3e09aba031d124680b6780f5269224ee2e25376 DIST dropbox-lnx.x86_64-104.4.175.tar.gz 100702526 BLAKE2B 49d89293ce5874a01fba14204acfd1234de87b4c5e3f5dfa93cd4041f9412e0801a3e232869e376e583d46d56ea9c7635ec756f005903786dffce1caba608350 SHA512 74e4061ac00881fee06ab7f978c27a2fd0e782db7efa63d10ed7c5ce28a679fe23084521d46f819cfc2a691df6e5aad1bd6706d3c2d604d4addd50ddb99e1b3d -DIST dropbox-lnx.x86_64-98.4.158.tar.gz 100751556 BLAKE2B 8ebbfa7101852e531edf9c6b3318c14418c95a0e618ce3725411e6fb1dbae70860de9b0daeba4c824fff0b3bd5f9a9347a4fe09c1433f76be3b3cc86184d769e SHA512 00db27742f8dff9d3fb96f06fcefdb30450b675b3c3cd35df717908455a8b1ca0419efff8932022d82c89dd3fccca183bc1bb16a1fb25c0505c49dfd03b06a19 +DIST dropbox-lnx.x86_64-105.4.649.tar.gz 101001350 BLAKE2B e6aeef5bf38649fca5fba35a88080e905a2d16276927bf9ae5952fbc79e32fe7aac5552b7a53fe3cc59170d0af711f2c9c412da8a4539f7bedea6cea47986b03 SHA512 b6f3e766ee9e2b138624bab5ffed9365163b8d33017cce27c9e0beab2b2f500288e6283c59da8a96421daca36b1c6e46925658b6ffab1fdde43efc92ccf1ce18 diff --git a/net-misc/dropbox/dropbox-103.4.383.ebuild b/net-misc/dropbox/dropbox-105.4.649.ebuild similarity index 73% rename from net-misc/dropbox/dropbox-103.4.383.ebuild rename to net-misc/dropbox/dropbox-105.4.649.ebuild index 38f892d3ba4..4530b917859 100644 --- a/net-misc/dropbox/dropbox-103.4.383.ebuild +++ b/net-misc/dropbox/dropbox-105.4.649.ebuild @@ -14,7 +14,7 @@ SRC_URI=" 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" +IUSE="selinux X" RESTRICT="mirror strip" @@ -26,27 +26,22 @@ 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/glib:2 dev-libs/libffi-compat:6 - dev-libs/popt + media-libs/fontconfig + media-libs/freetype net-misc/wget - >=sys-devel/gcc-4.2.0 sys-libs/zlib - sys-libs/ncurses-compat:5" + sys-libs/ncurses-compat:5 + virtual/opengl + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 +" src_unpack() { unpack ${A} @@ -59,20 +54,17 @@ src_unpack() { 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 + # we supply all of these in RDEPEND + rm -vf libGL.so.1 libX11* libffi.so.6 || die + # some of these do not appear to be used + rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ + PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ + wmctrl libdrm.so.2 libpopt.so.0 || die if use X ; then mv images/hicolor/16x16/status "${T}" || die else rm -vrf 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 \ diff --git a/net-misc/dropbox/dropbox-98.4.158.ebuild b/net-misc/dropbox/dropbox-98.4.158.ebuild deleted file mode 100644 index fdd08dee973..00000000000 --- a/net-misc/dropbox/dropbox-98.4.158.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 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 "[email protected]" - - dodoc "${T}"/{README,ACKNOWLEDGEMENTS} -} diff --git a/net-misc/dropbox/metadata.xml b/net-misc/dropbox/metadata.xml index 690936c39b8..e8403c0e098 100644 --- a/net-misc/dropbox/metadata.xml +++ b/net-misc/dropbox/metadata.xml @@ -8,7 +8,4 @@ <email>[email protected]</email> <name>Ben Kohler</name> </maintainer> - <use> - <flag name="librsync-bundled">Use bundled librsync library</flag> - </use> </pkgmetadata>
