gentoo resync : 29.01.2021

3 files changed, 132 insertions, 0 deletions

diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index e7f6d251559a..d17814a34553 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,3 +1,6 @@
+AUX nemo-4.6-captions-fix.patch 1113 BLAKE2B 1b6abccebfcf3719559cdf7c077e71c1b20b53fad0538d15012cbf026933ad1708394d709b39b9109c6f6d880a4bcc54d528b840cfc46f05bb46515796a159c8 SHA512 444f4274af3d332efb0c3764beed5027114415dc5a6a79c644a51b440bd476c876a9efa35e9563a5848750949845d481e99e268a564bfc305d6700d454ce7fbe
 DIST nemo-4.6.5.tar.gz 1468701 BLAKE2B 42b47300782745e4ae98db164ca547b0794caf8f0883db4241f2f0ed2e375e5c8564cff6d878142b55744ce41f49c60aad3f24930398ff68444e32c572d7e9bd SHA512 3c8c95e75e8bc499b56d1fd133f5ccc86ad18dae2219772b732586fd684a4a7a36e51fa61e6b734ad182ffd96636bdf276b8645d049e5ca68795fac274236eb6
+DIST nemo-4.8.4.tar.gz 1464683 BLAKE2B 10945a385defdf1bdc7fac9432306e31476ec015489a5150a5b4f9d5f31977b93da6e92241ce153cd5435c789c7a6ce16d2a86002758f26fc587a33dc5343e63 SHA512 b63ee2bd85f67e7d18271032ac3d95c7446b5110b71a3236f7e8c4ccb31e2baf11912060dde36f12ed4b90491c3bb1215a0de38c419130d692c775031cc0e11e
 EBUILD nemo-4.6.5.ebuild 1884 BLAKE2B 6073beada447e38bc02870e676ec08a4e2e7c9eef8cd8bd769fabd4d8bbb936e99c5386e2bc44560b16f097fe204b30895b976f743255dffaadab0b6417a09da SHA512 d647af0f8dd43bbcfbf2dc55162a531ff56ccd1b1e058d4b97ba73090ae9344a6f7ef677b5b9dd12288ae9646e83d68dd911afc85d19dd420aed1216885411fc
+EBUILD nemo-4.8.4.ebuild 2153 BLAKE2B 5549668523257596008a9ddadc37c4c6e813428edce4e661ddef01a071087d2b72829543f2fdac8bfb00eebea3406f8399b2c76cecac7cff698bea10414fb999 SHA512 42bd77186ff98fa55047adc52cd2a16d7893fbb4c0268d7ca53afadb6ae623b1b4602086ba0f3c8ab2c46a397fc0d87fb5463e0bbc7e152a42b99c2b95cc752a
 MISC metadata.xml 549 BLAKE2B e60bf6d13687fbd3fd8277dbfc61ad428939e2fe91f648dde5e740dd8e5cc7ac75609a95a01fdaf11f721837ac05a01dc5b7c1604c008036a8f01b006dccff27 SHA512 4bff873128b46a56e572f4d9d355ce2016518cadf3fd0ffa00ac0f6b0961fb7efac4873c8a310eacd6862f8bf4265fa1df306e4efa3130330376e03966ad5278
diff --git a/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch b/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch
new file mode 100644
index 000000000000..0ea0c9158ad2
--- /dev/null
+++ b/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch
@@ -0,0 +1,28 @@
+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-4.8.4.ebuild b/gnome-extra/nemo/nemo-4.8.4.ebuild
new file mode 100644
index 000000000000..d306690d78f6
--- /dev/null
+++ b/gnome-extra/nemo/nemo-4.8.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit meson gnome2-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo"
+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"
+IUSE="doc exif +nls selinux test tracker xmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# https://github.com/linuxmint/nemo/issues/2501
+RESTRICT="test"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.45.7:2[dbus]
+	>=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=
+	>=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
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	selinux? ( sys-libs/libselinux )
+	tracker? ( >=app-misc/tracker-2.0:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	x11-themes/adwaita-icon-theme
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.8 )
+"
+PDEPEND="
+	>=gnome-base/gvfs-0.1.2
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.31.0
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix performance regression when icon captions enabled.
+	# https://github.com/linuxmint/nemo/issues/2472
+	"${FILESDIR}/${PN}-4.6-captions-fix.patch"
+)
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	python_fix_shebang files/usr/share/nemo/actions
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif)
+		$(meson_use tracker)
+		$(meson_use xmp)
+		$(meson_use selinux)
+		$(meson_use doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}