gentoo resync : 16.02.1018

21 files changed, 386 insertions, 217 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 9cbdb6324e8a..846ee31dcb6d 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 22f6c84329ab..3d3215fc18fb 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-boxes-3.24.1.tar.xz 1710348 BLAKE2B ce90cc1a6baefa45c1a553b059f4fa7ac5c9a6fbd7a2d71377a9c6f38fddb7ac5a110f38d0a65b45cf2ba948ebee6026cc22b5f93a2ba521c9db6cb20bd3dc37 SHA512 a687dd65af91d717862bba0a81d715b64de1092cbb5ffd8a756fe80988c84110127f186007e8cf4011bf23cc0ec0adb346ead72ef47c655f85a7fcb9ed3ec393
 DIST gnome-boxes-3.26.4.tar.xz 1893760 BLAKE2B 91d01f33b2fb03150c0abd75cb58a9a9ecd8deeb14d32502f5766e06c93b4d236f971417e0a26c44e1250afa069966b607912f2dde92fc5058e598eb029ff03b SHA512 f92f09ea6f61d418253b3b4388bc7aac321cbbba853908b3a8e4faca0e04287cc7c3387eefdd2e150bc9dace8ef5ebbbab3dc3b38b26e0e2d010272703fbf6a3
 EBUILD gnome-boxes-3.24.1-r1.ebuild 2647 BLAKE2B 9190558020d64cec5c8e2cb568d081c4f975b50ac0f20ae31263bf113067573597c117f816d1dfaea5042451849e04ad4fbdc628761d267dc4a1b0ec6d22d82e SHA512 12a9920bf3e5f2cd1b6fb4809dea9649d193cd6e2dbcbcf94bfa35f0d325ae6e163ab1a53298d80d37e4eb0f62f6ae6ca5363ca548dc6e962215746063142008
-EBUILD gnome-boxes-3.26.4.ebuild 2708 BLAKE2B 9902c217d7c7a237cb7b7d319efdd785240a099e9833e1d8427eb1b82b445d98a128280c5a5c677a5442da980fd843cc2cd3213d9034f949e9607520d3b394de SHA512 d69ac06aec92bbd29d68e72963ecde6809cf4e74620984a56c8e30727dbfca000977d0c5e93213f14d81dbd9a1b83507d9f51576a9d90862160c82f55b6a9b4e
+EBUILD gnome-boxes-3.26.4.ebuild 2698 BLAKE2B ebb6e0248247e5f7e49b22facb3298d321d1b0c8142001209f8692a9c69506fa6352a60ad8dceb0d21234ccf938f3a2ab4a7015bccb65b4f00220702370a2027 SHA512 ca797c1ced8a55227a7b69e542037f6cbad38be5e6140a0ccd3160e1a857f60a5935056b7a24e667239f0dbfe050919f89fc1c5c07bfb9e137529b6d34f817de
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild
index bfb069b4f2d6..1ec866f6c6ef 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild
@@ -25,7 +25,6 @@ KEYWORDS="~amd64"
 #        vala deps like live ebuild has.
 # FIXME: qemu probably needs to depend on spice[smartcard]
 #        directly with USE=spice
-# tracker-2 is supported, but we don't have the USE=iso replacement in main tree yet to depend on
 RDEPEND="
 	>=app-arch/libarchive-3:=
 	>=dev-libs/glib-2.52:2
@@ -42,7 +41,7 @@ RDEPEND="
 	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
 	virtual/libusb:1
 
-	app-misc/tracker:0/100[iso]
+	app-misc/tracker:=
 
 	>=net-libs/libsoup-2.44:2.4
 
@@ -58,6 +57,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 # eautoreconf needs yelp-tools
+RDEPEND="${RDEPEND}
+	|| (
+		>=app-misc/tracker-1[iso(-)]
+		>=app-misc/tracker-miners-2[iso]
+	)
+"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules.
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index c0d0556f6c32..2a719a2534ed 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-documents-3.24.3.tar.xz 2313680 BLAKE2B 920e18b0ca43cfa95945268613f15f2f417de74c8992aefe414205d3463c0cdaac81fcabb9453ac93a76ae7b221da73379d86902b483fe2f3d12063ac27acdf7 SHA512 c5b59ba4a2eb83d7c61e6e50f6af2d0b310c7b9709ea7c8a02da707cc7e335589e4bef7b6f6618bbcca729fdaed531647f7f839aa3538830a226b837d0f0118a
-EBUILD gnome-documents-3.24.3.ebuild 1245 BLAKE2B 33bc45540e828e4045b47930b3e4627fd40aa0e15de115b3b8516c93ca8a76941bf62089a434b824da3788e3098660ca937e1c00dc1b68c790dd8796b2a6dd18 SHA512 acd279ff281474d3654f2f49f9783a84226971caacdeae4b21b5dadd6e47520dd69fffc383d3259d401c96542e2eb1f45b3e325c60174eff447c375ea1707dda
+DIST gnome-documents-3.26.3.tar.xz 2453132 BLAKE2B e430c5f4dc68578d5fa14a87b0544f20ed6a3f90351abe3fc1505addd65b41affe46981d5035b70fb750a16193eddbfbf205040d3a96e633e8e78ff98e340156 SHA512 d37f763817f617163d1cb85fa8b4d06048a099494e129effdd8e4db7b62178925c6b238150d145565017ce9cf0e2af9acc47623493d4e2df353bab669b076fb6
+EBUILD gnome-documents-3.24.3.ebuild 1270 BLAKE2B 458af5908908ac8ebc890177d329e864c7f7bea69998935ca002027ae6930630748cf517842c0328ddf8f928b4c87dea579fcad4e18e7bb2bb59c66d7943db0d SHA512 09f5b6249d95a7a150a66ebc56b6b34d47b291eec62ef0cc190631303e507e3d71af3ddf1eec149bd05837f402214436ca77621dd488d29927cec38450c9eb24
+EBUILD gnome-documents-3.26.3.ebuild 1317 BLAKE2B bedc89a0a2c0704cf30ea8721fad3426cfe3ad4ae45fe15249fe82516e056b074e09066c9a9bb5d7dceb8bcb7cfd39d6433b8a769f59237064af8e60d9a214be SHA512 6839fc2170e810a7775e412ac1ce2012121a83e489f8fad1475a6414b9aa50e6dffd4d1bd6a48860dc1b44080e74410162d01d8a4c6ec5a7930e0ba8c7c1a517
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
index 0d0f874803cf..7c9f445132fe 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.24.3.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
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-3.22.10:3[introspection]
 	>=net-libs/libsoup-2.41.3:2.4
 	gnome-base/gnome-desktop:3=[introspection]
-	>=app-misc/tracker-1:=[miner-fs]
+	>=app-misc/tracker-1:0/100[miner-fs]
 	>=x11-libs/cairo-1.14
 	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
 	x11-libs/gdk-pixbuf:2[introspection]
@@ -30,6 +30,7 @@ COMMON_DEPEND="
 	x11-libs/pango[introspection]
 	>=net-libs/libzapojit-0.0.2[introspection]
 	>=app-text/libgepub-0.4[introspection]
+	<app-text/libgepub-0.5
 "
 RDEPEND="${COMMON_DEPEND}
 	net-misc/gnome-online-miners
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.26.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.26.3.ebuild
new file mode 100644
index 000000000000..5200a6d762eb
--- /dev/null
+++ b/gnome-extra/gnome-documents/gnome-documents-3.26.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A document manager application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+# cairo-1.14 for cairo_surface_set_device_scale check and usage
+COMMON_DEPEND="
+	>=app-text/evince-3.13.3[introspection]
+	>=net-libs/webkit-gtk-2.6:4[introspection]
+	>=dev-libs/gjs-1.48.0
+	>=dev-libs/glib-2.39.3:2
+	>=dev-libs/gobject-introspection-1.31.6:=
+	>=x11-libs/gtk+-3.22.15:3[introspection]
+	>=net-libs/libsoup-2.41.3:2.4
+	gnome-base/gnome-desktop:3=[introspection]
+	>=app-misc/tracker-2:=
+	>=x11-libs/cairo-1.14
+	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=net-libs/gnome-online-accounts-3.2.0[introspection]
+	x11-libs/pango[introspection]
+	>=net-libs/libzapojit-0.0.2[introspection]
+	>=app-text/libgepub-0.5[introspection]
+	<app-text/libgepub-0.6
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-misc/tracker-miners-2
+	net-misc/gnome-online-miners
+	sys-apps/dbus
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf requires yelp-tools and autoconf-archive
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 99a9b294cd92..7915b020bfd0 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -6,5 +6,6 @@ AUX libgda-5.2.4-vala-check.patch 920 BLAKE2B 97ec35e7f3bceaa05ffb31dbb1bc895240
 DIST libgda-5.2.4.tar.xz 12320228 BLAKE2B 567b82934e9fe05abdd7405f17c3e8db1a335698236aed069c66037bb387f34adfc41eae7663d8cedb1ba97d2b54afda15280d745c574e5b28cb1856ff8376b1 SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc
 DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e SHA512 6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece
 EBUILD libgda-5.2.4-r2.ebuild 4949 BLAKE2B 554ec6cc79bb402d73d9cc86c59a16f49d235388abd83ab085a77f75dd4f6ca9b99461220e24436059a5e0add9bdca99a9ba37c407229ee6baf43c47780cde30 SHA512 c59cbf63e1f5f8256a2b54bf3b31eebab3ae05fc90e24f7519ec9e3dc76c3380779a23c0c3501a2f2880b7972528f0948d49d53738976043a6b6754a07a6c184
-EBUILD libgda-5.2.8.ebuild 5064 BLAKE2B 49382d9e5de106d987193134ea65aaa03cb9b6fae17d1b85be929111d8066e9249cbf0e4bbebcac125f3903f4e938c9f34e4234024cf8981ad4475f1e158fb81 SHA512 0424e4bccac3f59bfbef3953cac7240954987fb99c53dc8fe991b06e16fc10805c29ed215ba702ec70d59c7c4dd63b7631502ef6f41f41f8b5488f56f17e8543
+EBUILD libgda-5.2.4-r3.ebuild 4963 BLAKE2B dbbc3c6d0b3b711d6f5e60c5a08f37927712074a6661151f2334b0f608d428f1453fff11294e2745d917c6f3be7d0cea631bc0a2f7980c2bc915a26ae0cee6fc SHA512 5fb2610e1645a6f7179fa900349f03fb4bbed2144c7c6a1250b9970f2f4e0d1de432ec73973321489d12b43068669a7a3ddf45f38cbbaba8af25dfcad9f97329
+EBUILD libgda-5.2.8-r1.ebuild 5076 BLAKE2B b68c1ec7999643711241bb045343cd5dbfc3a473fb7904f632ea7ccfb1a703ab1b569e084e95ed2de744fc19b672a1fc251a23e946468245cc44725d8eff5f1f SHA512 6057b4628285f3ac518a25641b47f211b06c6c3ec797a245ca417631cbb43dbb3f2975bb6f198c3596172640817d0c06dd769e1319ea047c59ee6ea9a4fb1df4
 MISC metadata.xml 759 BLAKE2B ce4b021f5697460110c6d976231579b4299875991f28fad526ce29b83da1db248d0be46eb83e1f2704c3aa997b1a7f4546f901410ee1751dbd2d03718fc2e935 SHA512 aa0bce4d0262948dc57ce220d453a92dd957db925dc381a362055e5a5d09479cf3954e1bc19966cca21ab0e4d9e41f8611242bcf9f3fe1051388c5a8094c851e
diff --git a/gnome-extra/libgda/libgda-5.2.4-r3.ebuild b/gnome-extra/libgda/libgda-5.2.4-r3.ebuild
new file mode 100644
index 000000000000..17ea3fb66a19
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.4-r3.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+REQUIRED_USE="
+	reports? ( ${PYTHON_REQUIRED_USE} )
+	canvas? ( gtk )
+	graphviz? ( gtk )
+	sourceview? ( gtk )
+	vala? ( introspection )
+"
+# firebird license is not GPL compatible
+
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2
+	dev-libs/libxslt
+	sys-libs/readline:0=
+	sys-libs/ncurses:0=
+	berkdb? ( sys-libs/db:* )
+	firebird? ( dev-db/firebird )
+	gnome-keyring? ( app-crypt/libsecret )
+	gtk? (
+		>=x11-libs/gtk+-3.0.0:3
+		canvas? ( x11-libs/goocanvas:2.0= )
+		sourceview? ( x11-libs/gtksourceview:3.0 )
+		graphviz? ( media-gfx/graphviz )
+	)
+	http? ( >=net-libs/libsoup-2.24:2.4 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	json? ( dev-libs/json-glib )
+	ldap? ( net-nds/openldap:= )
+	mdb? ( >app-office/mdbtools-0.5:= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:= )
+	reports? (
+		${PYTHON_DEPS}
+		dev-java/fop
+		dev-python/reportlab )
+	ssl? ( <dev-libs/openssl-1.1:0= )
+	>=dev-db/sqlite-3.6.22:3=
+	vala? ( dev-libs/libgee:0.8 )
+"
+
+# java dep shouldn't rely on slots, bug #450004
+DEPEND="${RDEPEND}
+	>=app-text/gnome-doc-utils-0.9
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )
+	vala? ( $(vala_depend) )
+"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+	test
+	firebird? ( bindist )
+"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix compilation with -Werror=format-security (from 'master')
+	eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
+
+	# Support JRE 1.8 (from Fedora)
+	eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
+
+	# Fix vala test,
+	# https://bugzilla.gnome.org/show_bug.cgi?id=761424
+	eapply "${FILESDIR}"/${PN}-5.2.4-vala-check.patch
+
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	use reports ||
+		sed -e '/SUBDIRS =/ s/trml2html//' \
+			-e '/SUBDIRS =/ s/trml2pdf//' \
+			-i libgda-report/RML/Makefile.{am,in} || die
+
+	# Prevent file collisions with libgda:4
+	eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+	eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+	# Move files with mv (since epatch can't handle rename diffs) and
+	# update pre-generated gtk-doc files (for non-git versions of libgda)
+	local f
+	for f in tools/browser/doc/gda-browser* ; do
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in tools/browser/doc/html/gda-browser.devhelp* ; do
+		sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
+			-i ${f} || die "sed ${f} failed"
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in control-center/data/*_gda-control-center.png ; do
+		mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
+			die "mv ${f} failed"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+	java-pkg-opt-2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local myconf=( )
+	if use introspection ; then
+		myconf+=( $(use_enable gtk gdaui-gi) )
+	else
+		myconf+=( --disable-gdaui-gi )
+	fi
+	if use vala ; then
+		myconf+=( $(use_enable gtk gdaui-vala) )
+	else
+		myconf+=( --disable-gdaui-vala )
+	fi
+
+	gnome2_src_configure \
+		--with-help \
+		--disable-default-binary \
+		--disable-static \
+		--enable-system-sqlite \
+		$(use_with berkdb bdb /usr) \
+		$(use_with canvas goocanvas) \
+		$(use_enable debug) \
+		$(use_with firebird firebird /usr) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with graphviz) \
+		$(use_with gtk ui) \
+		$(use_with http libsoup) \
+		$(use_enable introspection) \
+		$(use_enable introspection gda-gi) \
+		"$(use_with java java $JAVA_HOME)" \
+		$(use_enable json) \
+		$(use_with ldap) \
+		$(use_with mdb mdb /usr) \
+		$(use_with mysql mysql /usr) \
+		$(use_with oci8 oracle) \
+		$(use_with postgres postgres /usr) \
+		$(use_enable ssl crypto) \
+		$(use_with sourceview gtksourceview) \
+		$(use_enable vala) \
+		$(use_enable vala vala-extensions) \
+		${myconf[@]}
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	java-pkg-opt-2_pkg_preinst
+}
+
+src_install() {
+	gnome2_src_install
+	if use reports; then
+		for t in trml2{html,pdf}; do
+			python_scriptinto /usr/share/libgda-5.0/gda_${t}
+			python_doscript libgda-report/RML/${t}/${t}.py
+		done
+	fi
+}
diff --git a/gnome-extra/libgda/libgda-5.2.8.ebuild b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild
index 6570bb39df71..afb0f66db4ce 100644
--- a/gnome-extra/libgda/libgda-5.2.8.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.8-r1.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
@@ -47,7 +47,7 @@ RDEPEND="
 	json? ( dev-libs/json-glib )
 	ldap? ( net-nds/openldap:= )
 	mdb? ( >app-office/mdbtools-0.5:= )
-	mysql? ( virtual/mysql:= )
+	mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:= )
 	reports? (
 		${PYTHON_DEPS}
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
+}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 5738d8a44545..e777c7624709 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,7 +1,5 @@
-AUX nm-applet-1.8.10-cert-chooser.patch 1421 BLAKE2B 6c867f5cca1c3b67a27cdfc9a80da728be65f80a8619dcfa0d53f910884e56d7cc1e6c2aa4a2661079d29f3abd49257a0720d59c09d0ba8024e140dc086ce033 SHA512 79ac1445ee0885b63092f28d2fbfd74b6b926696d44ee0ff47d079adc293301c05b8984ad812c66d4b7cab34c32902faed467fee1a2f14af66d2c43914858ed6
-AUX nm-applet-1.8.10-vpn-crash.patch 4613 BLAKE2B 44dbc67736d2025f177de3c29961234c8f8f1f0002bd7a4275cdd2631e5a3961f011c73c9c1a9ee77b2471945d5ce83c5120b2b26e8395f5666338e64b067359 SHA512 e2a9bc66b13f84270ac9735315d197c1ab264c99e5941218df310ebaa40900490661dec5f5972734e75c89b6db27530fd6ef02ad91a61a20c0eb388cff0b42aa
-DIST network-manager-applet-1.8.10.tar.xz 1479032 BLAKE2B 482c7a644edaf4f19ed02ca3f29ffbbcf11c01b1c9572affa430a7edb8314d1381ca6738d998e91537903f6eceea0cff1b82b88e7acd1e9b5665c566271cdf3c SHA512 319a280ad56efe8d1b31db7879aebd6242f2e67453287476d397835069f5f5c6ce7884c84d65e0177a94a554b8f1a6e1d353ab33f8ddfc63269d8133b76b1372
 DIST network-manager-applet-1.8.18.tar.xz 1550448 BLAKE2B 93e0075b87c13f81d3551a62da2cfc8fa41f478043c1d19540aaa6fa3ae149ce1f08d931a8141473bb759e09fbb231bd29e9d1aec8f97fa670c059b83489d48e SHA512 4871d95f3260beb8c3207e5ec8e25437b3d01758afc3bfe7d877774b21a05f4523449ee32e4cff27c082fefef88fed01db718d2227d6896c3c9b85d09cee927b
-EBUILD nm-applet-1.8.10-r1.ebuild 1782 BLAKE2B d4f25b89b7005270718ac2c0ede3ee063a33f8b434b6033826b5ffe793d7be4d409c0227ccefe84f6479545c636799f22e775ba3f7b8b84cbc71fb80d986e91f SHA512 03855f3ffcf930d139197f33cf2a646dc17071d2634a65021949c2e4845e5244364672b235de56a09828ef162cd1320976481df3e7026cfc802535b1646a966d
-EBUILD nm-applet-1.8.18.ebuild 1626 BLAKE2B 330bd42d3950feb6e2937bd483fe25d169fb32b8050bb80e21caf03323815eb27108b9765255f99d50ed4260cbe5a356c4efd84adfef07657400b846fe31b2ba SHA512 33d9cae3c3f5ba3161648c5dad974366f9f5c2590677dc58a8b8c5f8621d102b3ba1be6e414897264eefb84b35e8a3a9635836cfeeed956717d8a5b8c275e528
+DIST network-manager-applet-1.8.20.tar.xz 1551392 BLAKE2B 91258012715f226467126e4eefdfcd6ebde36958be80ae5e264dbf5168e0b772ce04404030d3f7dac9a6f72088918a2c5160aba694b6b7f7d4d6289b716b76f1 SHA512 5020aefe1803ad3b59562478e793737b52a3e5fd294470cfb430c73937cdbc0be6ecba5f3f8e8dbcc5bb5ac293df2866ecc919dd5019a3e681a434078d235a41
+EBUILD nm-applet-1.8.18.ebuild 1633 BLAKE2B ba80b0cac495071fd961509af7c15ba7dfa3eab07663dd634282d13361972ffa3a7e103fd86116d16d5fb2ac43f72b827e6db301002537bb88493a752d0e4e56 SHA512 809d8e54ebcebcea0927d8f246c296fb4533d8553c7b133a95d557d054462ac18a4c5a45f63f33076ac41d9b5f75d1f7d9c0823d380116b2a998f9b093f225eb
+EBUILD nm-applet-1.8.20.ebuild 1654 BLAKE2B e5c25bc5c9f390c8fe6b7edea11097621e5548d191b49a20cae17192edcc174459d4ddb6faf6df91d95122a5edb98c81fd42273253aa6873522b5a59c7735417 SHA512 da8d7c1ff8c3d3f3e6e3121d169ead87d12da1ca510b698aac0a2dce27124750306b1c182a8ee878eeda912d7778fdd0f47c46237e11f33a43f55257bfe4d082
 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch
deleted file mode 100644
index 9aad2396953e..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4d2523b482ab78134dafc02c9b99bd15f1a9174a Mon Sep 17 00:00:00 2001
-From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
-Date: Sun, 14 Jan 2018 23:28:15 +0100
-Subject: [PATCH 1/1] libnma/cert-chooser: handle case of no avalable modules
-
-Cause: Apparently it's perfectly okay if the list of modules is empty
-(e.g., NULL).  However, the code assume that this indicates an error,
-tries to print the NULL error, and crashes.
-
-[lkundrak@v3.sk: cosmetic changes]
-
-https://bugzilla.gnome.org/show_bug.cgi?id=785674
-(cherry picked from commit a37483c1a364ef3cc1cfa29e7ad51ca108d75674)
----
- src/libnma/nma-cert-chooser-button.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libnma/nma-cert-chooser-button.c b/src/libnma/nma-cert-chooser-button.c
-index c7089390..00651765 100644
---- a/src/libnma/nma-cert-chooser-button.c
-+++ b/src/libnma/nma-cert-chooser-button.c
-@@ -93,10 +93,10 @@ modules_initialized (GObject *object, GAsyncResult *res, gpointer user_data)
- 	gchar *label;
- 
- 	modules = gck_modules_initialize_registered_finish (res, &error);
--	if (!modules) {
-+	if (error) {
- 		/* The Front Fell Off. */
--		g_critical ("Error getting registered modules: %s", error->message);
--		g_error_free (error);
-+		g_warning ("Error getting registered modules: %s", error->message);
-+		g_clear_error (&error);
- 	}
- 
- 	model = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (self)));
--- 
-2.14.3
-
diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch
deleted file mode 100644
index 8f217af2dac6..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 46f99b295e59f44dfde50ec90e7c09627d32431e Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Wed, 20 Dec 2017 13:23:12 +0100
-Subject: [PATCH 1/2] shared/compat: fix memory handling of
- nm_setting_vpn_get_*_keys
-
-The compat implementations return a (transfer none) strv instead of a
-(transfer container) one. This has caused double frees in nm-applet:
-https://bugs.archlinux.org/task/56772
-
-Don't copy the keys and don't free the container later.
-
-[thaller@redhat.com: patch adjusted to avoid compiler warning]
-
-Patch imported from NetworkManager commit 8ac8c01162235c2c198bfaf25fb7d1a57a595ce5.
-
-Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
-(cherry picked from commit 0c90e08f77b71d2bda699cf032fceec0122bbf82)
----
- shared/nm-utils/nm-compat.c | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
-index 22ab675d..47035e62 100644
---- a/shared/nm-utils/nm-compat.c
-+++ b/shared/nm-utils/nm-compat.c
-@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data)
- {
- 	GPtrArray *a = user_data;
- 
--	g_ptr_array_add (a, g_strdup (key));
-+	g_ptr_array_add (a, (gpointer) key);
- }
- 
- static const char **
-@@ -55,14 +55,6 @@ _get_keys (NMSettingVpn *setting,
- 		g_ptr_array_sort (a, nm_strcmp_p);
- 		g_ptr_array_add (a, NULL);
- 		keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
--
--		/* we need to cache the keys *somewhere*. */
--		g_object_set_qdata_full (G_OBJECT (setting),
--		                         is_secrets
--		                         ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
--		                         : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
--		                         keys,
--		                         (GDestroyNotify) g_strfreev);
- 	}
- 
- 	NM_SET_OUT (out_length, len);
--- 
-2.14.3
-
-
-From 0d13a8b4064c83146714ecee86b69042aca35f9e Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Thu, 21 Dec 2017 20:36:48 +0100
-Subject: [PATCH 2/2] shared/compat: fix memory handling of
- nm_setting_vpn_get_*_keys()
-
-The previous fix was bad because the keys do not come from NMSettingVpn's hash
-table but are copies that are freed by nm_setting_vpn_foreach_* before
-it returns.
-
-[thaller@redhat.com: import shared code from NetworkManager, merging
-three patches together.]
-
-Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
-Fixes: 0c90e08f77b71d2bda699cf032fceec0122bbf82
-
-https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00069.html
-https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00070.html
-(cherry picked from commit a52ccb2fe170558fc0aab4dd1d15ba8808b10951)
----
- shared/nm-utils/nm-compat.c | 29 ++++++++++++++++++++++-------
- 1 file changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
-index 47035e62..90328c06 100644
---- a/shared/nm-utils/nm-compat.c
-+++ b/shared/nm-utils/nm-compat.c
-@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data)
- {
- 	GPtrArray *a = user_data;
- 
--	g_ptr_array_add (a, (gpointer) key);
-+	g_ptr_array_add (a, g_strdup (key));
- }
- 
- static const char **
-@@ -40,22 +40,37 @@ _get_keys (NMSettingVpn *setting,
- {
- 	guint len;
- 	const char **keys = NULL;
--	gs_unref_ptrarray GPtrArray *a = NULL;
-+	GPtrArray *a;
- 
- 	nm_assert (NM_IS_SETTING_VPN (setting));
- 
--	a = g_ptr_array_new ();
-+	if (is_secrets)
-+		len = nm_setting_vpn_get_num_secrets (setting);
-+	else
-+		len = nm_setting_vpn_get_num_data_items (setting);
-+
-+	a = g_ptr_array_sized_new (len + 1);
-+
- 	if (is_secrets)
- 		nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a);
- 	else
- 		nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a);
--	len = a->len;
- 
--	if (a->len) {
-+	len = a->len;
-+	if (len) {
- 		g_ptr_array_sort (a, nm_strcmp_p);
- 		g_ptr_array_add (a, NULL);
--		keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
--	}
-+		keys = g_memdup (a->pdata, a->len * sizeof (gpointer));
-+
-+		/* we need to cache the keys *somewhere*. */
-+		g_object_set_qdata_full (G_OBJECT (setting),
-+		                         is_secrets
-+		                         ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
-+		                         : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
-+		                         g_ptr_array_free (a, FALSE),
-+		                         (GDestroyNotify) g_strfreev);
-+	} else
-+		g_ptr_array_free (a, TRUE);
- 
- 	NM_SET_OUT (out_length, len);
- 	return keys;
--- 
-2.14.3
-
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.18.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.18.ebuild
index 2a27396ee54d..6caa158b082b 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.18.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.18.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
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-crypt/libsecret-0.18
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild
index 7ce48b41917b..601b8b123ea7 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.20.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
@@ -12,8 +12,8 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=app-crypt/libsecret-0.18
@@ -28,6 +28,9 @@ RDEPEND="
 	>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
 	net-misc/mobile-broadband-provider-info
 
+	ayatana? (
+		dev-libs/libappindicator:3
+		>=dev-libs/libdbusmenu-16.04.0 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 	virtual/freedesktop-icon-theme
 	virtual/libgudev:=
@@ -44,19 +47,10 @@ DEPEND="${RDEPEND}
 
 PDEPEND="virtual/notification-daemon" #546134
 
-PATCHES=(
-	# shared/compat: fix memory handling of nm_setting_vpn_get_*_keys
-	# (from 'master')
-	"${FILESDIR}"/${P}-vpn-crash.patch
-
-	# libnma/cert-chooser: handle case of no avalable modules (from
-	# 'master')
-	"${FILESDIR}"/${P}-cert-chooser.patch
-)
-
 src_configure() {
 	local myconf=(
-		--without-appindicator
+		--with-appindicator=$(usex ayatana ubuntu no)
+		--with-libnm-gtk
 		--disable-lto
 		--disable-ld-gc
 		--disable-more-warnings