gentoo resync : 16.02.1018

7 files changed, 126 insertions, 12 deletions

diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 46021a4fd9e7..ac62b6db5092 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,9 +1,12 @@
+AUX tracker-2.patch 821 BLAKE2B 748b88d6487780c35f51fda765fe6539d2ff137123a34f5dc2779332c8d5445a3f7dd40aebbfc0080acf812a766e18b7119b64f283f76552b44c025c9a1370c4 SHA512 0a07de349129f7a81e2e02ec99008d091544b0961efd3188a2309489c3c48385d485194615bbb4d7817c0e651ec6a6a197861cb5f2d5841c990d2d540f58672d
 DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
 DIST nemo-3.8.5.tar.gz 1424948 BLAKE2B fc773f7a1666d94beabfaab3b1e97c4a6f32cd61dbb2e5eefc57cb3fd577df780f5d220501d7dbc6c67955afb9a623d36d1631c8b3c5e201894529784ac1991c SHA512 8ae4eafdd056e7e33c722c96a82e8bb5b10617823397927a3247e27bde14a3083f4402cd7e7bfc6a4f7802fe8c7aed005fa912a9855b6accb36af3a7f63b3188
 DIST nemo-3.8.6.tar.gz 1425290 BLAKE2B 15e82a6b6c298e66f6d752f738bec31d1d4fab726f86baa5d58c5d47cfef2de218c18c711ee95588f68c4bd8bced41a993af3c100b8478707a746857cce906ad SHA512 88cc268aabd9fadcb87df55e3872bc69f136e68f252ad2077e1cbf86e3c53d027142390883cdd61235171d04807d8ae85893abbdc65ff34cc6207d10879b1797
 DIST nemo-4.0.2.tar.gz 1446758 BLAKE2B 37141bf514b4a17a41876a643f89cb489a7991d2ef0792a23a9b5b08ff1462733e820cde3f23dc1943dec90eb57e9d68ff1e58e526026c738d3f3b71cc0b7957 SHA512 d2c60f379092dee79902877beb2d47d2cfcb4a22b1f86fd84fafb96367c74cc2cd060bdcf8c7fef28ef5ff6df488a4a15f0c8b9fb1680eda26a13208a4a5742c
-EBUILD nemo-3.6.4.ebuild 2083 BLAKE2B a42237f3a60077c8c317c0bf986c3fa35b8850a5a76adee061c7dd036dc6f2a25623182cfe11b7aa44a6d0966575d36b853ca8828f0d1eb9e4c1742466b1f8ff SHA512 a0e21b561853d86f9dd5304112bd924b46993d163c86354e9937dba2105d830d465e872e3f5ad84b38692ea039647432b26ef4f0c9be643f92a5342c2b9eefcb
-EBUILD nemo-3.8.5-r1.ebuild 1969 BLAKE2B 51889a5ca1b76e4a460ed0ee5b22113fe4ab541e1be75a8a091ee9a3face1a621a452f1f58a93970957577918b0f28077fe054785f2e98f80f34d63f5385fbda SHA512 22be7cd23b05e32538d8e1b979e2d46970825773df03dae718fbff727fafaa39cf871082da9c5661c3ed4811b91bd0af79bdf570923ce1d5256de248a546f89b
-EBUILD nemo-3.8.6.ebuild 1966 BLAKE2B 4424c9d286bdf410e328db263ff4201a269ec81443bf0cdbcc693cb9e3e7484a014ec68c0c30a97fe2aa5c19123ce1928e963ea53c25d3f4cca079cd8f97bd5d SHA512 3b89e6f7f1b6d1e919bd1665ff9f434c7bc396a43c031f852e4c4cec5fd1293563b16e3335d1ecd26abd996045e75d951006897a923470f14f07f1b95c71f9a7
-EBUILD nemo-4.0.2.ebuild 1966 BLAKE2B cc6f9016a31eb88a7d4c3c0146af3aa5920698ec70abcde5e5978e27c36752da0d450f4a98ad5803184b50aab6ec6f88a6fb7bb1ee6197fd3dc5b16bb5d2bdcd SHA512 7e4c2c94da9f509ece08f8582cafc771c1248884dace50f25b01bedaa717f5d994199863bcce4002915ed0a0e0020ca5b5780bed4e4759ba8f6edaa6d33c6434
+DIST nemo-4.0.6.tar.gz 1449313 BLAKE2B 0d80e23a503c34e52f126635a7b3df54f7f0d336a637f14e11ac8e1d252a4b7bd43173c362ea0f24602fc4eceb71c97d651ddec2f2922d70c32518fbc8d15424 SHA512 87006f345317b37093daed1081880a4c28eb84438b9c43f9b62211824306074969e5e21df57cfc5fa163d66d16bcf7ba6c26674e27353cfd8a91cf2bfe82099f
+EBUILD nemo-3.6.4.ebuild 2084 BLAKE2B bd1ced9533fa6c2f65e4c4cc09a2cd0b25a46beb1a30c1ffa96ed8fa4a199ba6d15176fa0ad99051b6c1c836c67ac9495df0564a8b7d1cc97fb89351d3f5fc09 SHA512 1108f55d96be0a639eac59a83acc89a14c26cce5bd02bff37df8747f96034db565177d01bc135a653b4bad0d32543b046a80250f1b2d25c383a608073b1d97ed
+EBUILD nemo-3.8.5-r1.ebuild 1970 BLAKE2B d8f77a2586b83d373594ecc0c9e6fc88ed14d10b07768b9de7a7b465ed0de229f8fd1f63e8d0b19a3447fd8857f4c4cf7149384321216d2e036c2213ac5032c1 SHA512 08296f07274babe27df20e978a9241ce2041c735fe997aef0993a35e371d42b3053087a1505a0f84b2e0d9f4c8c1a8cbc61767fc66eda2cf85bf79c50cb7f53e
+EBUILD nemo-3.8.6.ebuild 1970 BLAKE2B d8f77a2586b83d373594ecc0c9e6fc88ed14d10b07768b9de7a7b465ed0de229f8fd1f63e8d0b19a3447fd8857f4c4cf7149384321216d2e036c2213ac5032c1 SHA512 08296f07274babe27df20e978a9241ce2041c735fe997aef0993a35e371d42b3053087a1505a0f84b2e0d9f4c8c1a8cbc61767fc66eda2cf85bf79c50cb7f53e
+EBUILD nemo-4.0.2.ebuild 1970 BLAKE2B b4833fea21f5a166e2f24c658d356d2a87780f1302faa24821a7237bae1bee0a6f5e463a38a307cb37dc4580e9d04e6b8a872627a2ece623450120d6638ab5ad SHA512 f83144c5d6ccca761064f21b82ae2b60a2934926552e5f9c0a73e01433400cd925dac241b2b69fb3768e74ed1a1ce91008ea313847f8e15b9b1bcf986ee09681
+EBUILD nemo-4.0.6.ebuild 2057 BLAKE2B 20401b16500cf3395554b847e5374226e64a342d6e72bff5dda51913882f17f0c965ce5678bca753c886a2aae7ea9bd82388402fe128beb7e0c842c525d850e0 SHA512 92777c6ee8139efe815336f58b6cf4a161c1c34c7d04b6f2154b422b4d5f3fb02c8bd579e95ee1a64010f4355b0c32db9d6517f783f820dc23de179d4788068a
 MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/files/tracker-2.patch b/gnome-extra/nemo/files/tracker-2.patch
new file mode 100644
index 000000000000..22b7c121a787
--- /dev/null
+++ b/gnome-extra/nemo/files/tracker-2.patch
@@ -0,0 +1,27 @@
+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/nemo-3.6.4.ebuild b/gnome-extra/nemo/nemo-3.6.4.ebuild
index d840df8f6897..bba409dbc557 100644
--- a/gnome-extra/nemo/nemo-3.6.4.ebuild
+++ b/gnome-extra/nemo/nemo-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:= )
+	tracker? ( >=app-misc/tracker-0.12:0/100 )
 	xmp? ( >=media-libs/exempi-2.2.0:= )
 	sys-libs/libselinux
 "
diff --git a/gnome-extra/nemo/nemo-3.8.5-r1.ebuild b/gnome-extra/nemo/nemo-3.8.5-r1.ebuild
index d22c0fb12ac9..c4ae41b45371 100644
--- a/gnome-extra/nemo/nemo-3.8.5-r1.ebuild
+++ b/gnome-extra/nemo/nemo-3.8.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:= )
+	tracker? ( >=app-misc/tracker-0.12:0/100 )
 	xmp? ( >=media-libs/exempi-2.2.0:= )
 	selinux? ( sys-libs/libselinux )
 "
diff --git a/gnome-extra/nemo/nemo-3.8.6.ebuild b/gnome-extra/nemo/nemo-3.8.6.ebuild
index a974edbd04c9..c4ae41b45371 100644
--- a/gnome-extra/nemo/nemo-3.8.6.ebuild
+++ b/gnome-extra/nemo/nemo-3.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:= )
+	tracker? ( >=app-misc/tracker-0.12:0/100 )
 	xmp? ( >=media-libs/exempi-2.2.0:= )
 	selinux? ( sys-libs/libselinux )
 "
diff --git a/gnome-extra/nemo/nemo-4.0.2.ebuild b/gnome-extra/nemo/nemo-4.0.2.ebuild
index d956a188f799..84fe05b0dad9 100644
--- a/gnome-extra/nemo/nemo-4.0.2.ebuild
+++ b/gnome-extra/nemo/nemo-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:= )
+	tracker? ( >=app-misc/tracker-0.12:0/100 )
 	xmp? ( >=media-libs/exempi-2.2.0:= )
 	selinux? ( sys-libs/libselinux )
 "
diff --git a/gnome-extra/nemo/nemo-4.0.6.ebuild b/gnome-extra/nemo/nemo-4.0.6.ebuild
new file mode 100644
index 000000000000..80cd39e0275d
--- /dev/null
+++ b/gnome-extra/nemo/nemo-4.0.6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit meson eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+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_prepare() {
+	gnome2_src_prepare
+}
+
+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
+}