gentoo (leap year) resync : 29.02.2020

13 files changed, 334 insertions, 10 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 40a5e2668e19..3c3ea3ee66a1 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 d5d4fea1db65..037bb339f2a3 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,3 +1,6 @@
+AUX 3.32.2-vala-compat.patch 1011 BLAKE2B 99861d3c6c7ae2c35c118676d6805c09ce6475256eea2a90770e0681d01f2cb33351b24854de341752f3e2e4986c1e43dfb7685dbf081ccf2d06193eb03ee7f2 SHA512 c4ebcfdc838ca088fbab980f745c404264927d274f50d4d135d170ebeedcd4c2dc8eb2345d0ba140e4e474a87083dd283e0734c672cc43a70cbe03292b1dc7e9
 DIST gnome-boxes-3.30.3.tar.xz 1198224 BLAKE2B 1c65d3f051d32dc85284da4d392e3ec418edf028b61f1166173ac6ced3e6cba687b297ea135a4e54058c561eb5fe69d767e9ee698fb6b16f6bd4cd09b00d5c3a SHA512 fc8a06bb8c71356d50002468f7722aee14abe8432ccce319ada3032746b53eb2f679a93f991c04ae34832a315fc95d561ffc169c4560a23573c046705b5446b4
-EBUILD gnome-boxes-3.30.3.ebuild 3827 BLAKE2B 0d7dbaaf166c058562124cbf0c7a3b8de22053c0b98a00ba3b31601abbd3c432e66bfa776e49fcfb64e5944aa58bb5a2326349e7612c613eaca62f2320fc2cfb SHA512 63a0fa999ae77081d409a72cc23f73e4589f753f0fe8aa51b81534731216c8dc474e8a1efcd24411bc9d57134dc6f11aac8b9458e03dce05eaef7380b4283f6e
+DIST gnome-boxes-3.32.2.tar.xz 1178340 BLAKE2B 9c345e69cc53b3b06b609c3ddfb0f3e1cb54aaffb9ebad4deafd0414913e6d5bc4faecce6e9714a448da7c6094b27d97f039bb8db512973ffd665a5190ff6561 SHA512 f3208f5185ad65750b2f745e8170aaff6a097aa9d706e5abc74259c0940da8fafb046b55dfcc144e8c64782942dfebb711622b552f6daa2dc45ad863d480855f
+EBUILD gnome-boxes-3.30.3.ebuild 3919 BLAKE2B 40592b490c835d18da742e89ac44941f1f13beefe01cfec8e4b7727208122a8b6cb5d8be8a90fe49280c75ac76b057d3cf3767f8c37b5c982d7c7a7f43dded6b SHA512 e4d3cf2519a0f542a97786154fa802a7aca0cdb5f35f30f04d98293128f625a3cdb13e68f7971668ce23aa18db8a5e55f6505dd0b00c7ec2af000a4fceca61b2
+EBUILD gnome-boxes-3.32.2.ebuild 4057 BLAKE2B c9bd3b0df53c691eecce0fbe2e504ff23382c00af0d4b6b14b1fdd9b9599e5e707c8c8a78bb22deeb0f335b62086da3fa7b6b24709c2de8e1a241168522c4f85 SHA512 dbc8a3818fd736413f722affe7216b7df540288a606b2e84b2ed479a2fcbad5b565b89a56cfaec8aa2db3bd477a7e61783a3fec03c66befab49bd83bc5f6de99
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/files/3.32.2-vala-compat.patch b/gnome-extra/gnome-boxes/files/3.32.2-vala-compat.patch
new file mode 100644
index 000000000000..548064be909c
--- /dev/null
+++ b/gnome-extra/gnome-boxes/files/3.32.2-vala-compat.patch
@@ -0,0 +1,28 @@
+From 8aaf59870b9972f228e073a674b254b1e4cda2de Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Mon, 28 Oct 2019 10:36:20 -0500
+Subject: [PATCH] app-window: Fix build with vala master
+
+Cherry-picked from a1522749a9651915132fc1171d31a1c22df423ab
+
+See #431
+---
+ src/app-window.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/app-window.vala b/src/app-window.vala
+index 8a1ebb6a..82a9f834 100644
+--- a/src/app-window.vala
++++ b/src/app-window.vala
+@@ -438,7 +438,7 @@ public bool on_key_pressed (Widget widget, Gdk.EventKey event) {
+ 
+             return true;
+         } else if (event.keyval == Gdk.Key.A &&
+-                   (event.state & default_modifiers) == Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK) {
++                   (event.state & default_modifiers) == (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK)) {
+             foreach_view ((view) => { view.unselect_all (); });
+ 
+             return true;
+-- 
+2.20.1
+
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild
index 9a76000ee4dc..5ea890daa907 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 VALA_USE_DEPEND="vapigen"
 VALA_MIN_API_VERSION="0.36"
 # 0.46 has problems with spice-client-glib-2.0.vapi exposing a bad constructor
-VALA_MAX_API_VERSION="0.44"
+# 0.40 and 0.44 have problems with gdk modifier types, for which we have patch in 3.32 bump
+VALA_MAX_API_VERSION="0.36"
 
 inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
 
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.32.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.32.2.ebuild
new file mode 100644
index 000000000000..b29f17ed72dc
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.32.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2+ CC-BY-2.0"
+SLOT="0"
+
+IUSE="rdp"
+KEYWORDS="~amd64"
+
+# FIXME: ovirt is not available in tree; though it seems the gnome-boxes ovirt broker is too buggy atm anyways (would need rest[vala] as well)
+# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
+# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
+# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
+# gtk-vnc raised due to missing vala bindings in earlier ebuilds
+DEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.22.20:3
+	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
+	>=sys-libs/libosinfo-1.4.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.44:2.4
+	virtual/libusb:1
+	>=app-emulation/libvirt-glib-2.0.0
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
+	app-misc/tracker:0/2.0
+	>=x11-libs/vte-0.40.2:2.91
+	net-libs/webkit-gtk:4
+
+	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/libgudev-165:=
+	rdp? ( net-misc/freerdp:= )
+" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
+# These are called via exec():
+# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
+# virtual/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
+# sys-apps/policycoreutils restorecon is used for checking selinux context
+# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
+# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
+# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
+RDEPEND="${DEPEND}
+	>=app-misc/tracker-miners-2[iso]
+	app-emulation/spice[smartcard]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	sys-fs/mtools
+	virtual/cdrtools
+	sys-auth/polkit
+"
+# gtk-frdp generates gir and needs gtk+ introspection for it
+# This is only needed for creating the .vapi file, but gnome-boxes needs it
+BDEPEND="
+	$(vala_depend)
+	net-libs/gtk-vnc[vala]
+	sys-libs/libosinfo[vala]
+	app-crypt/libsecret[vala]
+	net-libs/libsoup:2.4[vala]
+	app-emulation/libvirt-glib[vala]
+	net-misc/spice-gtk[vala]
+	x11-libs/vte:2.91[vala]
+	dev-libs/appstream-glib
+	rdp? ( x11-libs/gtk+:3[introspection] )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-vala-compat.patch
+)
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
+		fi
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddistributor_name=Gentoo
+		-Ddistributor_version=${PVR}
+		-Dovirt=false
+		$(meson_use rdp)
+		-Dinstalled_tests=false
+		-Dflatpak=false
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index 29242c4793f6..651eb8f73fbd 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-logs-3.30.0.tar.xz 1289980 BLAKE2B 51c99c335b72039eab96feae8acff55f17c65b44959ce7b0f6a310a71dc4d372fd7e225a73650896a7177650ca77df6cf340a91cdbbff0cd18dfc1b2fd658d1b SHA512 940aa6883538aad28ce86e313425e28f2633d68f55dc3b17260bd81f6232799b29234d9a26dfd0cd26af0d0debf0cb832e76b5b8743d95b8e32514ac5fe6ece0
+DIST gnome-logs-3.32.1.tar.xz 459524 BLAKE2B c3330257df4e6baddb7cfe6053787d2084ea50ca36b2d792c940be997a07b198a3b1277ab5e0d9ccaa272ffead8df05d27cf7f9cd637f882ba0fd23b0b199a91 SHA512 bb2bec86c68ed9850bae99420d5ca7855ae557acb5712ec17c67c071faf98b84e8562d27acf09c7feb08a62eb1570d0c72d28a1415924304b2ade36692428da7
 EBUILD gnome-logs-3.30.0.ebuild 898 BLAKE2B fee69afffd4975c489be85e502aead7e803c98a5288d485e9e86b7bf67bd91671a0a53d0474fbae8de14f462f207b5bae401575ab857b5ad3946f624cd706ede SHA512 5a9752c433b7a8f7a13f59e75a441bded180b8c43d641a5f4384604a2376cce58cbaff272aa88652858119622c0857c5fdcd3aac671554f3543546031c182dc4
+EBUILD gnome-logs-3.32.1.ebuild 899 BLAKE2B 1ef591cf196c29bb4969e844df740b49b88a3bee02de8cbc0d8b991c8f3ecbd4e3cbaaf5d8c8f11e39e77ae01c546d2b581ab1078f8db00f7c3bd9221c027f78 SHA512 3a7fb30629439f9f6586ab3648cec06db687fa5900c86b0bbf3c53e4c92da256d037c7eb1d32207d515656fc7998b8a8b56c89027d419c03b9301bb297e4f9f3
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.32.1.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.32.1.ebuild
new file mode 100644
index 000000000000..e5c5db386565
--- /dev/null
+++ b/gnome-extra/gnome-logs/gnome-logs-3.32.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Log messages and event viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	gnome-base/gsettings-desktop-schemas
+	>=dev-libs/glib-2.43.90:2
+	>=x11-libs/gtk+-3.22:3
+	sys-apps/systemd:=
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		-Dman=true
+	)
+	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
+}
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 1caa38f8b75a..b5f319fe16be 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-power-manager-3.30.0.tar.xz 380820 BLAKE2B 9d39df24854f649ab3b40fcf454c7be73d93e3e99050b93ec5dfb86760e27055f856918e5fb7d7b53472a4062cf9b2039a519130bb5d887126a69326d9392737 SHA512 ed0e2a20bd8979fd9064cea9f4485da832eb44a2c727e39cde5ca9f9e2eb75a37e3d1b5a2181d9c666c19b1b300cbc62cd5f9e2c3f36ee4a4dfc3e1537a10329
 DIST gnome-power-manager-3.32.0.tar.xz 379136 BLAKE2B 3f9b385c37fcf1de3741781627d275057f67d489ed4b372f6f68495a707d9e67b78be9f186922a99a606a80008addd570943800ddb2ddd17d2071161b7276c49 SHA512 0ea11085dd015e30c1bdc6913000b63eabf7df76720f2d51d63b075f3b7bd2a610aaa484c53a4092d78d3c484ed8c4e81ec66603bdc6c132b0316113ec6a24a0
 EBUILD gnome-power-manager-3.30.0.ebuild 1094 BLAKE2B dc026aee1e73ff75549bf0f4dff27303ff4e11f039f65684b9cb812b8f04d0e7db920b0507872924b714152855cfdff3ef5e1b34bb6246608e82893a85626ffa SHA512 99d2492bda2450d55244196fcc63eaf814cb110eac13f1bffb058860ce481e2d0fc7daf5fd5be4f200acb115466c6ef0770c4101ce904ad8603609efe14795b7
-EBUILD gnome-power-manager-3.32.0.ebuild 1096 BLAKE2B a393d9460613b5bd75a580cea4e1a3c8c2cd1dd10a5943a5446c3bb6459b8aad0567a02b513151eeba1259815cc27b4874644359e8e4d548a93e0fb8692a6566 SHA512 c035f9faa3e5330b107da9999a50e6525622d2474ec941c50fcae6c1e1a1fa3c0e2c427c3620894f4819878f4022a2b2c1bc5f3d84b1a6ccfc08bbe3916cd624
+EBUILD gnome-power-manager-3.32.0.ebuild 1098 BLAKE2B b5b5299a35359cfd2b35253f59bc6def491e1abe4ec5047b6a2b92cf327a8986e9c9d6dd458cc1f31b42cd816e3425ea5e20cb8a7799ae5d8116ad0638e12f11 SHA512 7996569a9dd26826ff5523537a19bffa82cbafa72c5dffecad2d0e6dbab57c6d4f60d5cbaa006d0ad6f08fc55a51941980fed090a232de6076c1cb952c2f5ca6
 MISC metadata.xml 600 BLAKE2B 31046c118a172aa788bcafc57e5a2615d22a9ddbcd56886607a6b07a496adb950f3e05067470ea3b85298acf9ee045fba5fa315e9fe7eb7e72dc3fc9511f5dd3 SHA512 05290535ed07687c59013dbf7b3e527063a48f99da84fc6603ee48b4548d08e0ffe4a2f5836a100786f0ed87bdc43a68cca707c5f5f0c36a8126f53822561ef2
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
index 245404a12318..459646ac6915 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
@@ -17,7 +17,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.45.8:2
 	>=x11-libs/gtk+-3.3.8:3
 	>=x11-libs/cairo-1
-	>=sys-power/upower-0.99:=
+	>=sys-power/upower-0.99.8:=
 "
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/adwaita-icon-theme
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index d1821227937a..caad0b7f4859 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-software-3.30.6.tar.xz 5217384 BLAKE2B 6a9478aa7752ea62c391545b5f84191a22c839802bd1ac2118696b9dd954a19003477a688d9f36868a617dbf3dd186fc36a054ce0eac8ba8c7a5eee834732ce4 SHA512 dd98e9e61469fc5566ab569f09bdc06ccb5812a236e305185b911c70364e2983f257e939aed0bb61778163084fb5628d63ff6bd5f056d4a7626a2e771ad6426a
+DIST gnome-software-3.32.4.tar.xz 4852860 BLAKE2B 334eaeccbcd897720e11f0b7b9d4cd9f88c848e536c11e74217074044cfc40ea41fe452b68b6c45787a8369b49268dd704a2efeaf6378e35d3a878ec24f6907e SHA512 81a32477fe755f57465cfbc3d1c88a2f460d6a21222fd73aced06c92b409023a1ace002c338e713135658896c2c14a7ff8508eeefbc5f648e66d8c8777dee881
 EBUILD gnome-software-3.30.6.ebuild 2531 BLAKE2B dbbf3176ecaed83bb3310531ed437afe91793c1ccbd1b788ac9ff05af8fb5342d0c147b0eeca9e94cd3e8637df8aac12324ced104c2c5416680bd8960cb6ca3b SHA512 53a36a9d2dcf7f75d73f56eeb75d6a6fe785984f3dbbc0df87ea965f53ba30c04b1a8839a77ab455649930834507dd04ef31d63f92d0963dfa91f50c8b797855
+EBUILD gnome-software-3.32.4.ebuild 2511 BLAKE2B 287cc883208934666ec0f2205d9152a76483cce475b622ed5f705aa654e230c3c8ae74c792e0d568d0a07397b8c7964da35c4ad54ef93498e34188e27c0555ed SHA512 b473dde75bb656b29e97874e9d6704505d6149e689aaf260b4af295fd931f9060871645c5fda38d396870355b50c15b343d255b0ca4a7eeae5175389cfe1bde8
 MISC metadata.xml 443 BLAKE2B 5f060a298a752150f4b06545c328985c5e55a6e32afb45382b419e33beb27c7ac965d59465dc02e23e4214fd9b995b44894a666b2b4ff55bbca469d3992d12f8 SHA512 aff64504d9b2df32113844e86e05c393314ba247ae0742bbd140b2212771d8a3c76856c79426aca11908a8a8f5e881f6ad8a9a4d298d11fc4f9990bd1fe454f7
diff --git a/gnome-extra/gnome-software/gnome-software-3.32.4.ebuild b/gnome-extra/gnome-software/gnome-software-3.32.4.ebuild
new file mode 100644
index 000000000000..41a258a51acc
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-3.32.4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="Gnome install & update software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Software"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+firmware gnome gtk-doc packagekit spell test udev"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/appstream-glib-0.7.14:0
+	>=x11-libs/gdk-pixbuf-2.32.0:2
+	>=dev-libs/libxmlb-0.1.7
+	>=dev-libs/glib-2.56:2
+	net-libs/gnome-online-accounts:=
+	>=x11-libs/gtk+-3.22.4:3
+	>=dev-libs/json-glib-1.2.0
+	>=net-libs/libsoup-2.52.0:2.4
+	gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= )
+	spell? ( app-text/gspell:= )
+	sys-auth/polkit
+	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
+	firmware? ( >=sys-apps/fwupd-1.0.3 )
+	udev? ( dev-libs/libgudev )
+	>=gnome-base/gsettings-desktop-schemas-3.11.5
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+# test? ( dev-util/valgrind )
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
+	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
+	# TODO: Investigate; seems to work outside ebuild .. test/emerge
+	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		$(meson_use spell gspell)
+		$(meson_use gnome gnome_desktop) # Investigate purpose, in relation to shell_extensions too (is it ok to be same USE?)
+		-Dman=true
+		$(meson_use packagekit)
+		# -Dpackagekit_autoremove
+		-Dpolkit=true
+		$(meson_use firmware fwupd)
+		-Dflatpak=false
+		-Drpm_ostree=false
+		$(meson_use gnome shell_extensions) # Maybe gnome-shell USE?
+		-Dodrs=false
+		-Dwebapps=true
+		$(meson_use udev gudev)
+		-Dsnap=false
+		-Dexternal_appstream=false
+		-Dvalgrind=false
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson test -v -C "${BUILD_DIR}"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index 019460fb9427..f92fa476959b 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,4 +1,4 @@
 AUX nautilus-dropbox-0.7.0-system-rst2man.patch 463 BLAKE2B fdb1996d7144cd9c6943111cf1a4abd9a55f9a594131985c1f0c40eec7c203b2d2839fdf2e673480bb329735dce27e31cbcdee8bdd2c019df678620d374095aa SHA512 5a34c3e6ff51a1a14eac11e0619a81afeec05979944d128ed37076cadb9a79edd839918ee289c409c537be73a913ee3bc58f19cc2227cda8762328e2f0fbd7eb
 DIST nautilus-dropbox-1.6.2.tar.bz2 354408 BLAKE2B 7a3d1cee88dc595fc43f92d84328cf112755d2aa98a99e84e24d132b6167fb5378cc4e9914c31510d38deadc952caed1debdea7ae07dcd0a7b58e72790af428a SHA512 696808a7e5a1d8bbe06903b5ab075e0aa32d0b35c44363d7874fcdd48d339650bdf80190e37cba5782b31565ca9b233573a3d2ee74866add169ff5ea1d0b62d3
-EBUILD nautilus-dropbox-1.6.2.ebuild 2145 BLAKE2B 5073b2aeb1adaf28f185a4f1b3ac6be6d80d24aec701dc05b5435f757d1e695947130e39927d2bc5bfeeb9fa2710adfe272fd8854224998fbda26871c359bdf3 SHA512 b23269bb118f4029f242a2437fd5c8ea3f1d6db5cde512a668e0871216353c079e824d9a924e7c7a8de8c12f42c76963115bedab36aeb19a1a640015cf107a77
+EBUILD nautilus-dropbox-1.6.2.ebuild 2139 BLAKE2B 7b061bb4b6fa19284064f1a6bd2f18744ab54456fb2a744d3ca30e941dbe38c466af17ea1d70f259d9c661a289179995911c433df711b6ccf1c09ce886736882 SHA512 11fe5db76463c33572a66fc3755863c21fd44da7726b51775b3e2bbc64e6791f6a67876af31ff41fe5952462e205453cd77a1d123f2af6d10645afa9fa7a07fa
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
index ba29db204a63..049f64ac504d 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 
 CONFIG_CHECK="~INOTIFY_USER"
 
-pkg_setup () {
+pkg_setup() {
 	check_extra_config
 	enewgroup dropbox
 
@@ -61,7 +61,7 @@ src_prepare() {
 	AT_NOELIBTOOLIZE=yes eautoreconf
 }
 
-src_install () {
+src_install() {
 	gnome2_src_install
 
 	local extensiondir="$(pkg-config --variable=extensiondir libnautilus-extension)"
@@ -78,7 +78,7 @@ src_install () {
 	python_replicate_script "${ED}"/usr/bin/dropbox
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	gnome2_pkg_postinst
 	readme.gentoo_print_elog
 }