gentoo resync : 09.07.2022

3 files changed, 8 insertions, 79 deletions

diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index b70891df378e..69e1900f589e 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,6 +1,4 @@
 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
 DIST nautilus-dropbox-2020.03.04.tar.bz2 387351 BLAKE2B ff25716ef10759e014cffec8a7e9b1a40931686d6de3c69e9060c77cbf3aee65ffeed91ba809ba8cffc372f284180c74a8cb5b0ca4b342aa137d9e574a2a1abf SHA512 8f26165a48d1767b3bccb34f95f19357e8fd209f383270ac2d40f773df139d640c3fb33db28cf1fa7e2d7063a7a37b15ed7f4f22f85019e05885c097cea39a48
-EBUILD nautilus-dropbox-2019.02.14.ebuild 1338 BLAKE2B 3b2e205cdd6c28489a02f45e859713388597c66a30493d8b72977d46e596a96471c171182e391561cda8d757d36eea3b9b797f15c6c327215533649c78ab76b7 SHA512 9ae4eb6d7c9534ec48d25ef4c85728459992f6b393ca81b87cbfecfa3c9d98e2025a2049c0c5305e260d5b9edd39592d67ce26d52fb55c16b90629f1b19bad7a
-EBUILD nautilus-dropbox-2020.03.04.ebuild 1379 BLAKE2B 69127a6a87c06b0fb446116df5367f8ec0bd95ba4c193db097df15f4e1a375efd0457a32ae223900f5daf39bddf0b7f96bc55de3c7207ab74624dd9c86539f9b SHA512 57fec409e6f60acf2b8048e0abece035072be3d85d1aefe383af0d7bed5165052650c0f7a54054ff21d7b683f91ded69416cb527bddf66f9ecccd828adb3393b
+EBUILD nautilus-dropbox-2020.03.04.ebuild 1380 BLAKE2B 5f64280ae02e9bf723d7cde1e0aed8c9aeadd67d9ea2a4ee546bc08de769781ed5ca563a7508106cfafc3c3f74b14c4d6fff9003985445c2133edaf176c73aaf SHA512 165f156f5930797f95922867eb79bc7ce27206e4647d7aaa4951728c4576d8a6b35f30ec0e61db65fc5f27549ee4490b6e99e5e495b3b3619478274ae4c0d0db
 MISC metadata.xml 583 BLAKE2B 0c808eca535df63a12aa7272aec83b62cbe2c86bddfe3c605d7c189299b2bd09f60c40ffe89ca48e4b2b20aa9bf6de23248dfb5cc8fdebccbe6fca32e03eac51 SHA512 00e2a33e94a7742a9e3c0231d048f93220abae2add84d9c192c94b0a855864ce78a04b5ba6db45ecf7c114f350ab15b030ce80912d67015d5232a793f88793d0
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
deleted file mode 100644
index bd8415d16fba..000000000000
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_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_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;
-}
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild
index 76ae97342d8f..c07e55dfe255 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools python-single-r1 xdg-utils
 
@@ -15,17 +15,15 @@ LICENSE="GPL-3 CC-BY-ND-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
-
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	${PYTHON_DEPS}
 	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' )
 	dev-libs/glib:2
 	gnome-base/nautilus
 	net-misc/dropbox"
-
 DEPEND="${RDEPEND}"
-
 BDEPEND="
 	$(python_gen_cond_dep 'dev-python/docutils[${PYTHON_USEDEP}]' )
 	virtual/pkgconfig"
@@ -54,8 +52,8 @@ src_install() {
 	default
 
 	# removes files which conflicts with system dropbox
-	rm -r "${D}/usr/share/applications" || die
-	rm -r "${D}/usr/bin" || die
+	rm -r "${ED}"/usr/share/applications || die
+	rm -r "${ED}"/usr/bin || die
 }
 
 pkg_postinst() {