gentoo Easter resync : 12.04.2020

5 files changed, 86 insertions, 93 deletions

diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index f92fa476959b..4ef00dcb8707 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,4 +1,4 @@
-AUX nautilus-dropbox-0.7.0-system-rst2man.patch 463 BLAKE2B fdb1996d7144cd9c6943111cf1a4abd9a55f9a594131985c1f0c40eec7c203b2d2839fdf2e673480bb329735dce27e31cbcdee8bdd2c019df678620d374095aa SHA512 5a34c3e6ff51a1a14eac11e0619a81afeec05979944d128ed37076cadb9a79edd839918ee289c409c537be73a913ee3bc58f19cc2227cda8762328e2f0fbd7eb
-DIST nautilus-dropbox-1.6.2.tar.bz2 354408 BLAKE2B 7a3d1cee88dc595fc43f92d84328cf112755d2aa98a99e84e24d132b6167fb5378cc4e9914c31510d38deadc952caed1debdea7ae07dcd0a7b58e72790af428a SHA512 696808a7e5a1d8bbe06903b5ab075e0aa32d0b35c44363d7874fcdd48d339650bdf80190e37cba5782b31565ca9b233573a3d2ee74866add169ff5ea1d0b62d3
-EBUILD nautilus-dropbox-1.6.2.ebuild 2139 BLAKE2B 7b061bb4b6fa19284064f1a6bd2f18744ab54456fb2a744d3ca30e941dbe38c466af17ea1d70f259d9c661a289179995911c433df711b6ccf1c09ce886736882 SHA512 11fe5db76463c33572a66fc3755863c21fd44da7726b51775b3e2bbc64e6791f6a67876af31ff41fe5952462e205453cd77a1d123f2af6d10645afa9fa7a07fa
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+AUX nautilus-dropbox-2019-system-rst2man.patch 464 BLAKE2B c0f25a56ee504a6070efdae70670e1a925a1718cfb5e1345d3acfdb0face02d1278d10f2f7172e172056834f99f309d50bbf5899f37fa6023e743042f6ffd7b8 SHA512 98c9e85a491991fd2afee3a12c8be4ab708ee47a42d08d4a11daefc1e964cb3031ffb94a27ab7758b3f1c71f7343dd4b0a49d24cb8aa2848baf65f83879a6cfb
+DIST nautilus-dropbox-2019.02.14.tar.bz2 381416 BLAKE2B 0765196974d88caa477d962311efe05941cd2d25e35fa028720c8abed5120fea5abede74f39e00cb2ac9eb08d6d4bbdf1d1fe6db8d604c1803570209e654d55a SHA512 c5758d97fa40af1b27388c23289e5d1d98ef1c6db04ed7fb5cfee387723f72c34f3583fb6e0158a39f30d5ff649cb2de6d92fc4ad6e976e301dc239bda9d554b
+EBUILD nautilus-dropbox-2019.02.14.ebuild 1350 BLAKE2B b291d6448e63efa89255fe1301cef00ff3aa8026c7876971f59e1b81ba517c1a8f5253e00690c64c5924c15ea179799e03e5cf91c214577d08d82e894e26af3d SHA512 4d228a24ffeed366e40224c29356f169180ff50480e8c72dbe07aa87c78283a3f3e4ea753f7bdda39f1620dc13064c5b52ee4bb89dd1dd291b4a3b26f78ab297
+MISC metadata.xml 552 BLAKE2B e6c9aca580f306553603321af76571b8c386646d110c73bfae250ab6d6efed3a16a67fbcb70cf051c13c143d15215f9402820328fe9113b2b304d506cb0ec2ff SHA512 300bebe2d4755eb54dc33fde5b7fa0c3b2b6116625356de05675b892125fa7ee23acc0bffa849eaf4f9b908d22cd093f54df898c7a12cd849ee5235e7a7049a5
diff --git a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-2019-system-rst2man.patch
index ea0053b4bbb6..06e592291641 100644
--- a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch
+++ b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-2019-system-rst2man.patch
@@ -1,12 +1,12 @@
-Index: nautilus-dropbox-0.7.0/configure.in
+Index: nautilus-dropbox-0.7.0/configure.ac
 ===================================================================
---- nautilus-dropbox-0.7.0.orig/configure.in
-+++ nautilus-dropbox-0.7.0/configure.in
+--- nautilus-dropbox-0.7.0.orig/configure.ac
++++ nautilus-dropbox-0.7.0/configure.ac
 @@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI
  
  AC_PATH_PROG([PYTHON], [python])
  
--AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
+-AC_PATH_PROG([RST2MAN], [rst2man], [python3 rst2man.py])
 +AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
  AC_SUBST(RST2MAN)
  
diff --git a/gnome-extra/nautilus-dropbox/metadata.xml b/gnome-extra/nautilus-dropbox/metadata.xml
index 1b2becffa26c..55dbd3b953f8 100644
--- a/gnome-extra/nautilus-dropbox/metadata.xml
+++ b/gnome-extra/nautilus-dropbox/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<maintainer type="person">
+		<name>Jonas Licht</name>
+		<email>jonas.licht@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		A extension of nautilus to display the sync state of an Dropbox folder and add a right click menu to mange files in the Dropbox folder.
+	</longdescription>
 </pkgmetadata>
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
deleted file mode 100644
index 049f64ac504d..000000000000
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-r1 linux-info gnome2 readme.gentoo user
-
-DESCRIPTION="Store, Sync and Share Files Online"
-HOMEPAGE="https://www.dropbox.com"
-SRC_URI="https://www.dropbox.com/download?dl=packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gnome-base/nautilus
-	dev-libs/glib:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	net-misc/dropbox
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	x11-libs/libXinerama"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-python/docutils[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup() {
-	check_extra_config
-	enewgroup dropbox
-
-	DOC_CONTENTS="Add any users who wish to have access to the dropbox nautilus
-		plugin to the group 'dropbox'. You need to setup a drobox account
-		before using this plugin. Visit ${HOMEPAGE} for more information."
-
-	python_setup
-}
-
-src_prepare() {
-	G2CONF="${G2CONF} $(use_enable debug) --disable-static"
-
-	gnome2_src_prepare
-
-	# use sysem dropbox
-	sed \
-		-e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
-		-e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
-		-i dropbox.in || die
-	# us system rst2man
-	epatch "${FILESDIR}"/${PN}-0.7.0-system-rst2man.patch
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
-	AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libnautilus-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get nautilus extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D
-	extensiondir="${extensiondir#${EPREFIX}}"
-
-	use prefix || fowners root:dropbox "${extensiondir}"/libnautilus-dropbox.so
-	fperms o-rwx "${extensiondir}"/libnautilus-dropbox.so
-
-	readme.gentoo_create_doc
-
-	python_replicate_script "${ED}"/usr/bin/dropbox
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
new file mode 100644
index 000000000000..f19bab7fb147
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools python-single-r1 xdg-utils
+
+DESCRIPTION="Dropbox Nautilus Extension"
+HOMEPAGE="https://github.com/dropbox/nautilus-dropbox"
+SRC_URI="https://linux.dropboxstatic.com/packages/${P}.tar.bz2"
+
+LICENSE="GPL-3 CC-BY-ND-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	gnome-base/nautilus
+	net-misc/dropbox
+	>=dev-libs/glib-2.14
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig"
+
+# use system rst2man
+PATCHES=( "${FILESDIR}/nautilus-dropbox-2019-system-rst2man.patch" )
+
+src_prepare() {
+	default
+
+	# use system dropbox
+	sed \
+		-e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
+		-e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
+		-i dropbox.in || die
+	AT_NOELIBTOOLIZE=yes eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	# removes files which conflicts with system dropbox
+	rm -r "${D}/usr/share/applications" || die
+	rm -r "${D}/usr/bin" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update;
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update;
+}