gentoo auto-resync : 04:12:2022 - 09:02:03

4 files changed, 2 insertions, 149 deletions

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 088e8705faf3..f8132e2d4b30 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,12 +1,9 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 AUX 42.0-optional-gstreamer.patch 1590 BLAKE2B eb251337ef8f2cba7b0fa9e1643c1155aa36bbc9234f4c5bf6baddd7f91d69e2713172685687a0bbf8fc646a97df857cfbce2a73768beb4eb5dae32ace893d07 SHA512 5f90d946c7bea63da2ca20397b0606747383b781dc972051082596d4fd0522a22c0d40440129e41ff4faeb5e9fcdfc5abb14318a9dade5b0343003bf86c7e339
 AUX 43.0-docs-build.patch 1086 BLAKE2B 449456236c807c28905698c5fc0f4b40b26ab300f40308d65b2889fa5f37ca8225eb564e682b5055b060529903d5c68a8a620d23ff8941229da5465918fa6b1c SHA512 f5847babcaee256c6718d499070029f3582a90f9fcb472c91d53d67fec63c0ac624dd6282ba81909f742244da5c715ba1b05b740c1ad187a75bd0b92a7f4d36e
-AUX 43.0-fix-clang-build.patch 1809 BLAKE2B 75b4bbaec1781ed8d89c7c1dcd24ec2b76b8967ef59d0acccded31e0f982d5d71b2f6d4542f94316e7139c461a1574eb3f7894adf7aeeccf8a593484f4e27b3c SHA512 023a9ff1ec8e4b376c4cd2aaa08c9873768dec0a69cf1217e73e744dba90f08cef4ca5bc20aa4b903a0f7505cdabe79dc6f681258a72c7d7704fe90d8921bb09
 AUX 43.0-optional-gstreamer.patch 1269 BLAKE2B 2a4599771977e44f9e1b25d2334f838a2016d1bfd6eea48c004ce410442ec12152e69efec389b6d373d1e187f00b78ac3fd617f4992e90acaf69a5a3325b7a2d SHA512 7f578859a3c8100f4d8783851b91a40c1c3d2d702851772e91bb08bade7802271ffa0524861e968004c6ea6450060da0ca6cf917808c4542ad5853bcb7d3ae45
 DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
-DIST nautilus-43.0.tar.xz 3165200 BLAKE2B 460df75af37c1c038bbbc9442d061a45ef3fbf09b2af016cd8340674c6eddf59b37a92011cf6e46d84168c859d4cd543d95fe140b322a00e2866bfdf5421a909 SHA512 c880125c2339be02852470e45cd4d589470e0df7723acc44b80df35c18cb1375c5f85cb46c7e53efbab1b51eedb4fd51ffa455773d4913d44c59070dafa22b49
 DIST nautilus-43.1.tar.xz 3162772 BLAKE2B 5150f1453328d3861b343bdd7070ee5eaea95a96b5b52db928eeb16e0aefad05cc0281295cb26c28cf3808e6ea3d76a2efff0fd9fc670b173ef3d3ad8c9ed9f3 SHA512 f09362584f2d4a04870c7e6b64ec3d23c90f20c8d37aa7103277985f182db49f3306f6e130966c6cfc97463fd5322f454564f713e70b839fea177545214dced2
 EBUILD nautilus-42.2.ebuild 3340 BLAKE2B f2968baf0c7af84edc0d048a40e4edf84d83338d35d57a146bc6ad8dc10867ca3403c7248d0b1b8b530d451cae7299f35a201dca2b100115073acd79e208931d SHA512 465f03fa321f14ef1b8cef926e2c34b4eaa1f648a13f96e273521f193eca174b8b94539701e377f8de9119a1fa2fbbae8cf733511955db6d674007474872b5be
-EBUILD nautilus-43.0.ebuild 3350 BLAKE2B 40c2019fc34988af6593fe02a483a7de5fc1e42a07fb28c506218ff200db66a6b420b9a83829b3a1eacc7426259c859b51d6f9fbbb4081921975af4978ebdd0f SHA512 300cb5eb50a863661b79826b643e6a010fc1d6cfea548b9d3ce6d2fb0dd34a3d2bd8862988826a63e9b0739f2baab40c262ba6e6cc0bc705e9afc95c3501b480
-EBUILD nautilus-43.1.ebuild 3243 BLAKE2B def2805c28be93a142274d123d1696d87b3960d8dddb9e2ef821a4260c403d2c474db6648e3e8fb56322636cbd15e629128b616798f8365b7db283973c87acd9 SHA512 7dd3cdd99efa11b4d5422b019efb2db2581c85cb0c30691411380ad92c589a847a09b3f381ab41c22aafc208179dbcf8da72e05117031edfe1e729f3a352020c
+EBUILD nautilus-43.1.ebuild 3285 BLAKE2B c82c359d45f640c536e5cb1fc94d429e09ad3e736974d9f5905543624a39318d91eedad700b97dc3a6688b834693e3b2349d07dc3791ad341f347090a5640624 SHA512 ba790a1d6c2be8ed37e81d602abb2e53dd45fcb7a49bcf1da25d4496992a04463e54d1a14b7944bfd1533c63f1b3086445b0d0f944f2f489f480b02374cfbd32
 MISC metadata.xml 662 BLAKE2B 0d7e1a575749fe5e00899852e51bc0eb184f7b2a55f2fe0eaade6ca087961ceb673d7523b9c6b71d4ac266b8488ad599de1651fb7e6fb0b2c7c160384dc059f5 SHA512 696cc099a35c07475920b8ee5785820ab6f0505bf3a14fc67f6372d8762012f5d21e3c4fa573fee1d7e6cff4e7233dacfb9c78c5f7f025a03f50e6374f3ebb67
diff --git a/gnome-base/nautilus/files/43.0-fix-clang-build.patch b/gnome-base/nautilus/files/43.0-fix-clang-build.patch
deleted file mode 100644
index ec8fbd90ac1a..000000000000
--- a/gnome-base/nautilus/files/43.0-fix-clang-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 68b050ac0f60b1f02767276643cba8eb701f9884 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
- <leohdz172@protonmail.com>
-Date: Fri, 30 Sep 2022 17:35:50 -0500
-Subject: [PATCH] fix conflicting types for nautilus_file_get{u,g}id
-
-when building with clang
----
- src/nautilus-file.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nautilus-file.h b/src/nautilus-file.h
-index 9b0613e98..57cca177f 100644
---- a/src/nautilus-file.h
-+++ b/src/nautilus-file.h
-@@ -244,9 +244,9 @@ gboolean                nautilus_file_can_get_owner                     (Nautilu
- gboolean                nautilus_file_can_set_owner                     (NautilusFile                   *file);
- gboolean                nautilus_file_can_get_group                     (NautilusFile                   *file);
- gboolean                nautilus_file_can_set_group                     (NautilusFile                   *file);
--uid_t                   nautilus_file_get_uid                           (NautilusFile                   *file);
-+const uid_t             nautilus_file_get_uid                           (NautilusFile                   *file);
- char *                  nautilus_file_get_owner_name                    (NautilusFile                   *file);
--gid_t                   nautilus_file_get_gid                           (NautilusFile                   *file);
-+const gid_t             nautilus_file_get_gid                           (NautilusFile                   *file);
- char *                  nautilus_file_get_group_name                    (NautilusFile                   *file);
- GList *                 nautilus_get_user_names                         (void);
- GList *                 nautilus_get_all_group_names                    (void);
--- 
-GitLab
-
diff --git a/gnome-base/nautilus/nautilus-43.0.ebuild b/gnome-base/nautilus/nautilus-43.0.ebuild
deleted file mode 100644
index be6a810c6785..000000000000
--- a/gnome-base/nautilus/nautilus-43.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="Default file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
-
-DEPEND="
-	>=dev-libs/glib-2.72.0:2
-	>=media-libs/gexiv2-0.14.0
-	>=x11-libs/gdk-pixbuf-2.30.0:2
-	gstreamer? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	>=app-arch/gnome-autoar-0.4.0
-	>=gnome-base/gnome-desktop-43:4=
-	>=gnome-base/gsettings-desktop-schemas-42
-	>=gui-libs/gtk-4.7.2:4[X,introspection?]
-	>=gui-libs/libadwaita-1.2:1
-	>=dev-libs/libportal-0.5:=[gtk]
-	>=x11-libs/pango-1.28.3
-	selinux? ( >=sys-libs/libselinux-2.0 )
-	>=app-misc/tracker-3.0:3
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-libs/libcloudproviders-0.3.1
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	>=app-misc/tracker-miners-3.0:3=
-" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
-BDEPEND="
-	>=dev-util/gdbus-codegen-2.51.2
-	dev-util/glib-utils
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		dev-util/gi-docgen
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk(+)]
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
-
-PATCHES=(
-	"${FILESDIR}"/43.0-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
-	"${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
-	"${FILESDIR}"/43.0-fix-clang-build.patch # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/996
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-
-	# Disable test-nautilus-search-engine-tracker; bug #831170
-	sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
-		$(meson_use gstreamer) # gstreamer audio-video-properties extension
-		$(meson_use introspection)
-		-Dpackagekit=false
-		$(meson_use selinux)
-		-Dprofiling=false
-		-Dtests=$(usex test all none)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	meson_src_install
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	# TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/nautilus/nautilus-43.1.ebuild b/gnome-base/nautilus/nautilus-43.1.ebuild
index 5831492dd557..b15e42260d35 100644
--- a/gnome-base/nautilus/nautilus-43.1.ebuild
+++ b/gnome-base/nautilus/nautilus-43.1.ebuild
@@ -11,6 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+REQUIRED_USE="gtk-doc? ( introspection )"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"