gentoo resync : 13.06.2020

4 files changed, 1 insertions, 114 deletions

diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index a962e94ab455..77b92bd18a6f 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,6 +1,3 @@
-AUX tracker-2.patch 821 BLAKE2B 748b88d6487780c35f51fda765fe6539d2ff137123a34f5dc2779332c8d5445a3f7dd40aebbfc0080acf812a766e18b7119b64f283f76552b44c025c9a1370c4 SHA512 0a07de349129f7a81e2e02ec99008d091544b0961efd3188a2309489c3c48385d485194615bbb4d7817c0e651ec6a6a197861cb5f2d5841c990d2d540f58672d
-DIST nemo-4.0.6.tar.gz 1449313 BLAKE2B 0d80e23a503c34e52f126635a7b3df54f7f0d336a637f14e11ac8e1d252a4b7bd43173c362ea0f24602fc4eceb71c97d651ddec2f2922d70c32518fbc8d15424 SHA512 87006f345317b37093daed1081880a4c28eb84438b9c43f9b62211824306074969e5e21df57cfc5fa163d66d16bcf7ba6c26674e27353cfd8a91cf2bfe82099f
 DIST nemo-4.4.2.tar.gz 1462269 BLAKE2B 365cd98a05c0c4aa1c86a3e7a565904852bd02d92ace8593043ae8a58f5b9d3eda71e8b0d329a177ed59c0d8f1330ae61f5bcc6671110e82bbd9baad84faa9f0 SHA512 b951c401f93d04061a0ef0accc810ecc7f0487617f089960ab58886a6ca6ecd0af3a98c47e9a620a4d6f8f530a11af9cae20903d089177e69bfa12f9ca31ec5c
-EBUILD nemo-4.0.6.ebuild 2021 BLAKE2B b7a9026c2515f7b91eb747249a15b86f6f59102273ec8871463ff99ae1939ae13db957872d9aceabd963deb1033e76433f4ab8618c308e00c319874ee8cb1835 SHA512 eacd7f0ce6a3f4974262bfa35c2acdf9e63165817ee7d94412c486a7c47741975f23e94c8f6ed3094cc260929ca734e54e787a2000e64a5fd39846a26df1ecce
 EBUILD nemo-4.4.2.ebuild 1809 BLAKE2B 5641d649cca2dcb39fdc2f9c9984455bc7bb3f76e3a1b706c061380a93c0931837f6d67e676b2bf72b557e62fe557086e7239198e4a732c140b189fa558c6e3a SHA512 8cf22e8df511caf4d79817a7af8865d4dceb4c72683b7de7e20627762cf372ddefa64c02ce3835100d1011be464ae7da41e871335214956be2069f1afa29d954
-MISC metadata.xml 760 BLAKE2B 9e5b520914469c8db824cec45e04fc18b80c99138cd0c79f8b40c3e0745bd8424f4a9b49be0d4c34eed51ddfda5389ea2ddfbe70afbd96d426c35b8909f6c173 SHA512 cde8aa9f7c5353a1755d512c6c476e830c6b0eec4beeb6a3d06afc4fe4ba0dd8768e92e4616cec3f9e1e8de0a376d5b813e7dd43744a8bded53e80259f72e6a6
+MISC metadata.xml 566 BLAKE2B 5b9437b6487572f856a8d902a1442e19497bd323b8a33fd476edeb3a7509e845709304004e50b54660eede052e418d669169c0bc3cfdc61d4f2d842f823f69e5 SHA512 f896fbe26ffa321b4a1e6f0d63aecfad8203e0ddfb7bb0ba959e37fe30870f40ee0eaab2c6deae050033107ac2b1f2ca721ebcfc0035557883ab8b806e22df75
diff --git a/gnome-extra/nemo/files/tracker-2.patch b/gnome-extra/nemo/files/tracker-2.patch
deleted file mode 100644
index 22b7c121a787..000000000000
--- a/gnome-extra/nemo/files/tracker-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8010ff6706fdc32c21b4d5d96cf9000a841a090d Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 20:46:42 +0200
-Subject: [PATCH] meson: Try tracker-2
-
----
- meson.build | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 028d5b2..d0bcbab 100644
---- a/meson.build
-+++ b/meson.build
-@@ -90,7 +90,10 @@ tracker_enabled = false
- if trackerChoice != 'false'
-   trackerRequired = (trackerChoice == 'true')
-   # Check all the possible versions
-+    tracker_sparql = dependency('tracker-sparql-2.0',  required: false)
-+  if not tracker_sparql.found()
-     tracker_sparql = dependency('tracker-sparql-1.0',  required: false)
-+  endif
-   if not tracker_sparql.found()
-     tracker_sparql = dependency('tracker-sparql-0.18', required: false)
-   endif
--- 
-2.17.0
-
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
index 519e96b93408..531825b14a69 100644
--- a/gnome-extra/nemo/metadata.xml
+++ b/gnome-extra/nemo/metadata.xml
@@ -13,10 +13,6 @@
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
-	<use>
-		<flag name="packagekit">Use packagekit to search for programs to open unknown file types</flag>
-		<flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">linuxmint/nemo</remote-id>
 	</upstream>
diff --git a/gnome-extra/nemo/nemo-4.0.6.ebuild b/gnome-extra/nemo/nemo-4.0.6.ebuild
deleted file mode 100644
index 662f989624c1..000000000000
--- a/gnome-extra/nemo/nemo-4.0.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit meson eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-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 x86"
-IUSE="exif +introspection +nls packagekit selinux tracker xmp"
-RESTRICT=test
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.10:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/xapps-1.4.0
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:= )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-
-PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065
-
-src_configure() {
-	meson_src_configure \
-		-Dexif=$(usex exif true false) \
-		-Dtracker=$(usex tracker true false) \
-		-Dxmp=$(usex xmp true false) \
-		-Dselinux=$(usex selinux true false)
-}
-
-src_install() {
-	meson_src_install
-}