gentoo resync : 02.02.2022

4 files changed, 41 insertions, 42 deletions

diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 468bdba65126..08b7028a5735 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,7 +1,6 @@
-AUX nemo-4.6-captions-fix.patch 1113 BLAKE2B 1b6abccebfcf3719559cdf7c077e71c1b20b53fad0538d15012cbf026933ad1708394d709b39b9109c6f6d880a4bcc54d528b840cfc46f05bb46515796a159c8 SHA512 444f4274af3d332efb0c3764beed5027114415dc5a6a79c644a51b440bd476c876a9efa35e9563a5848750949845d481e99e268a564bfc305d6700d454ce7fbe
 AUX nemo-5.0.3-use-detex.patch 252 BLAKE2B 24c27845065f64a58411a8d719fbc1ca41362001f08d469bc336f55601e49358c02ba3aba423c521a261955a5da9832d8ae2df49f3d372270e63256a45fafcda SHA512 142bd88c7843fa40fb30cab01f8f7dd23b2b5c338eae2ac5971c7e392f9f24a8a820ef4b17b1c4afea729cc85a66cb7ddb06ecd417ff6ad494118fe8d88f1498
-DIST nemo-4.8.4.tar.gz 1464683 BLAKE2B 10945a385defdf1bdc7fac9432306e31476ec015489a5150a5b4f9d5f31977b93da6e92241ce153cd5435c789c7a6ce16d2a86002758f26fc587a33dc5343e63 SHA512 b63ee2bd85f67e7d18271032ac3d95c7446b5110b71a3236f7e8c4ccb31e2baf11912060dde36f12ed4b90491c3bb1215a0de38c419130d692c775031cc0e11e
 DIST nemo-5.0.4.tar.gz 1487156 BLAKE2B 4ecafb315673c0939dfb2585e97957ee9d76e9621fbbece2b93d9ed10b24ec86d2c49cdd8d18ac7c8607184752fe2541508a1b626fdce763fdc8ac1b6e713e49 SHA512 e03558d336785d77c1a57d2d100906263d2015330a00d54e2cc0161d9d822740ef5c314062f90a877cee5b031b4b5caf9ebf59f22fb5e15f2e91c75bb239e488
-EBUILD nemo-4.8.4-r1.ebuild 2143 BLAKE2B cb5a7f52f156f396fede37d330153257c3f577fb4f21395d1025e02ec092a8eadd96fb9cb3d1730603f5d0e4490e5a6c81636414cec465b760f0548047b4cf4a SHA512 6ccd7e6d7b9fd97cca59bdb39dced70ac7f38982b58cb1c2818dc67eb099019513f5131f0be0dca8d58784020c94eff580a37d6fbe0bd7ee1d89763d0ba47256
-EBUILD nemo-5.0.4.ebuild 2833 BLAKE2B 8ab31858c47ea649f921557e8e1b1cc9668f34c99a5730cc529badaf745a0d4a882a3b6a2b413f59be5bcdc371e290b4c6ab9af9230f604b51aa0ec9f4a235f0 SHA512 4ef8487432ed65b868dece5e591099a63046eb51b66e4ad2ea9b704563abee3dcce097af25bf0b7adf92644f477d17d180e149b410fe24fba2026e004beec84e
+DIST nemo-5.2.3.tar.gz 1491685 BLAKE2B 55687410d9b1029accdcb446c3406a1a8c9e32aa9ccfcce2096a9afe14d0634729c180e5221ae193593f34518aece90c08e679b510394d27d36fb4defd80802b SHA512 141bf578a6df060f8ceb5778e271b7c474531d96562a148f200149bc77c92bdac409eb75684287c3d98b0ec088798dca292dca85c53c0c794a28c2949b82993b
+EBUILD nemo-5.0.4.ebuild 2832 BLAKE2B e71c00bda8dde526f21df606d8d7dd20249481cf2b914ffd2f687b91bedb3341564fc7ceb08165af5d60077e27473839d90c8aeef11782820353b3f9924b269e SHA512 246e86fdc13240f22fcdc8df68387ceb70ed52af72d9a7be97a1a0e265a4089bfea7d609a47fc40933f3ff25b492539a3cbc8aeee2aca1749cb103594c8a7d6c
+EBUILD nemo-5.2.3.ebuild 3014 BLAKE2B c901799125d09ede48ecc0fb5397dabfa2a2a2153ca082ecf96bf6e95da5e7925d59b0ee6a86967267ce068c60b3c2028fe2d8d82bb4c34914d2d72507475a9f SHA512 a7ed6d0054125514f1e97e9b35c160e0b2b935375c0f750f7231979bd348ee8a054a2c16a1b5136bf67daf6214bb0fe992b7c36e3c7be31929a062ddcecdd366
 MISC metadata.xml 580 BLAKE2B da0ac9cd13730b5c1727a6d0431f3289af829b77781baf4d3512c78139bca7b9a7d136563de8e2f5abf914520de8a5a092b1e0f2505558e5e61813fa5f9c09ad SHA512 d38cebfe673764a4a96d66a66afe55f6f04c74bf1d06d8fddc319a2eb9ed351b205e3a48c47bfeff7f3da85c89ad0512e11a420f82c228a548fc7553147b927e
diff --git a/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch b/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch
deleted file mode 100644
index 0ea0c9158ad2..000000000000
--- a/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b0c2b99b46797ca91bdba1d95fda33808174466b Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Thu, 21 Jan 2021 09:41:40 -0500
-Subject: [PATCH] nemo-icon-canvas-item.c: restore the style context after
- drawing any caption text.
-
-This seemed to be causing style recalculations to accumulate over
-time, and particularly when changing the style for window focus
-in/out events. This would eventually have a huge impact on user
-interaction.
-
-Fixes #2472
----
- libnemo-private/nemo-icon-canvas-item.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libnemo-private/nemo-icon-canvas-item.c b/libnemo-private/nemo-icon-canvas-item.c
-index d1b6cbfad..b32de357d 100644
---- a/libnemo-private/nemo-icon-canvas-item.c
-+++ b/libnemo-private/nemo-icon-canvas-item.c
-@@ -1143,6 +1143,7 @@ draw_label_text (NemoIconCanvasItem *item,
- 		gtk_render_layout (context, cr,
- 				   x, text_rect.y0 + details->editable_text_height + LABEL_LINE_SPACING + TEXT_TOP_GAP,
- 				   additional_layout);
-+        gtk_style_context_restore (context);
- 	}
- 
- 	if (item->details->is_highlighted_as_keyboard_focus) {
diff --git a/gnome-extra/nemo/nemo-5.0.4.ebuild b/gnome-extra/nemo/nemo-5.0.4.ebuild
index 33b49024deed..49839c4d1aa3 100644
--- a/gnome-extra/nemo/nemo-5.0.4.ebuild
+++ b/gnome-extra/nemo/nemo-5.0.4.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 	>=x11-libs/libnotify-0.7:=
 	x11-libs/libX11
 	>=x11-libs/pango-1.40.0
-	>=x11-libs/xapps-2.2.0
+	>=x11-libs/xapp-2.2.0
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	selinux? ( sys-libs/libselinux )
diff --git a/gnome-extra/nemo/nemo-4.8.4-r1.ebuild b/gnome-extra/nemo/nemo-5.2.3.ebuild
index f3d71f05f38e..47194cd5ea22 100644
--- a/gnome-extra/nemo/nemo-4.8.4-r1.ebuild
+++ b/gnome-extra/nemo/nemo-5.2.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
-inherit meson gnome2-utils python-single-r1 virtualx xdg
+inherit meson gnome2-utils python-single-r1 readme.gentoo-r1 virtualx xdg
 
 DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="doc exif +nls selinux test tracker xmp"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -26,12 +26,13 @@ COMMON_DEPEND="
 	>=dev-libs/gobject-introspection-0.9.12:=
 	>=dev-libs/libxml2-2.7.8:2
 	gnome-base/dconf:0=
-	>=gnome-extra/cinnamon-desktop-4.8:0=
+	>=gnome-extra/cinnamon-desktop-5.2:0=
+	gnome-extra/libgsf
 	>=x11-libs/gtk+-3.10.0:3[introspection]
 	>=x11-libs/libnotify-0.7:=
 	x11-libs/libX11
 	>=x11-libs/pango-1.40.0
-	>=x11-libs/xapps-2.0.5
+	>=x11-libs/xapp-2.2.8
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	selinux? ( sys-libs/libselinux )
@@ -45,7 +46,7 @@ RDEPEND="
 	')
 	x11-themes/adwaita-icon-theme
 
-	nls? ( >=gnome-extra/cinnamon-translations-4.8 )
+	nls? ( >=gnome-extra/cinnamon-translations-5.2 )
 "
 PDEPEND="
 	>=gnome-base/gvfs-0.1.2
@@ -64,11 +65,32 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Fix performance regression when icon captions enabled.
-	# https://github.com/linuxmint/nemo/issues/2472
-	"${FILESDIR}/${PN}-4.6-captions-fix.patch"
+	# Undo the switch to untex as it's not packaged.
+	"${FILESDIR}/${PN}-5.0.3-use-detex.patch"
 )
 
+DISABLE_AUTOFORMATTING="yes"
+FORCE_PRINT_ELOG="yes"
+DOC_CONTENTS="
+${PN} functionality can be extended by installing other packages.
+
+sys-apps/gnome-disk-utility - Mount archive files
+gnome-extra/nemo-fileroller - Extract/Create archive files
+
+${PN} search capabilities can be extended through external
+helpers. Install any of the following packages to make
+their associated file types searchable.
+
+Image metadata           - media-gfx/exif
+MP3 tags                 - media-sound/id3
+Microsoft Office .doc    - app-text/catdoc
+Microsoft Office .xls    - dev-python/xlrd
+OpenDocument/LibreOffice - app-text/odt2txt or app-office/unoconv
+PDF                      - app-text/poppler[utils]
+PostScript               - app-text/ghostscript-gpl
+TeX                      - app-text/texlive-core
+"
+
 src_prepare() {
 	default
 	python_fix_shebang files/usr/share/nemo/actions install-scripts
@@ -85,6 +107,11 @@ src_configure() {
 	meson_src_configure
 }
 
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
 src_test() {
 	virtx meson_src_test
 }
@@ -92,6 +119,7 @@ src_test() {
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {