gentoo resync : 03.11.2019

6 files changed, 160 insertions, 187 deletions

diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index f0d295f2e103..63fd50671b3c 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,10 +1,10 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
 AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d1321f35c74072c3e0c51a115f7d40039b7c6dd484cf3beec90c8950df5fbb42575ab62e3c309da3405b5217864b746b SHA512 f879a3f26be439a68e1f40e32e654eea301efc9f5494039b7166673337688f0832e180ab77863cde55627ee033572caf04d5bb08816d4272382d9dccf43ef7f1
 AUX spice-gtk-0.35-libressl.patch 2025 BLAKE2B f1123494cfa4f2cf3d168ae1f2a1277b77dd2afc9a0c4911a65941977f8bac30b30de1d03575fcaf483cd5f9cc8f4ff150a40b6f1bfb8b19da18d2027fc1f04f SHA512 b7717296b66a32f3dd3458de27059c82fd826479143b0261819d0abad5f496cedaca61da42706808b686e1b55bb8c7613187c0b103ccbc9566abb3385c7a36de
+AUX spice-gtk-0.37-adjust-to-window-scaling.patch 5257 BLAKE2B a60692c0e08cfed4933cdfe15378c428d4bd006b6f91412f5071519d9027efe95b94ecd3baf4ebabd7143d358433cccc7335ea41a9a5fb9ed280e63664c04d01 SHA512 13afe7b894954d25635c2fc146b6386eb3973c151363067ec0762f95a349bf6d2d26005521214db07fd2a69ce9e994c9d25b92d0b80882c015b8313bb2016328
 DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729
 DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029
-EBUILD spice-gtk-0.35-r1.ebuild 3644 BLAKE2B d9af139bcc0ebf73761baf6ca0e7576b79d0684bad33ca49b48ceca06f4ae895f8d9fd737f575f241f90fc988e57d84f78f0c0795aa7532649c6d88a7f9afdb0 SHA512 139c7e72429d06b82272141430927bb6d163d64a6b9011f094cad504733dd3fdb3f8b9899fab41514e5ceedcf11b29dddad6882d9069af4a850fb8eae78c2195
-EBUILD spice-gtk-0.35.ebuild 3606 BLAKE2B e9847a0cdf2093241e8e54bfb4d56d9617c8f812abfbe3461fab52a2a3ad4440c781ab221c236eac52ea51bbb3cd3f0ce059abd81b42a218f259c0bde17ac085 SHA512 260bef70ecbea74788de9cb7730ede3e345407c382ca57fb428d2b548ccd7ede67fe948b4cc61a70055edd6c184d5cd5b37b9e144a97f35484d77f30710ba3bd
-EBUILD spice-gtk-0.37-r2.ebuild 3672 BLAKE2B 60e5a10d61c571185ce7abb56b9d8e6449338f87d09604c7ee8485360ed5945c02a02003797ae3edb1e7ca5edec35f0c4d3e6c7159232b6b3a96edd930806b53 SHA512 ce882723b5a1f445fca3332a54225b24d362a27dea6554153c5a96c19b807f945ed87f8952c1ba8956bc3b5b8675cd606ee10c5e979921475c357568b6534954
-EBUILD spice-gtk-9999.ebuild 3637 BLAKE2B 6a95666f309c1d29779b33a225d8a429caf6954f6a4ba5ee993ea7e0db539b6341d2e3d85f66ae5d4fe2e05a7b61a69e80a578ff2ea8de1c8de3ca44f1529de9 SHA512 39f419bc6188c40e25332111ae4953f3eeccfbb6880fd7b22d20be90ce534f9267e6e6f094e36e8cb76d3677cccbea50895f53039acd46b934d24dd3b2e3c9c2
+EBUILD spice-gtk-0.35.ebuild 3607 BLAKE2B 85b9ecbdd8cf0f7fd919325142c7bef634fcdc6985a18738f032bc5671fb4f57d79eeb20792cdc908ccc6ec82844250bc0031bc4b399dee822a480ab94c0842d SHA512 c0a4ed0daac8b060615f7edbcbf1518dbc38a895c48b4192e1a7f4acb1feed31b7179f5636d95cc63a1dd5f7872ab44db9e27512e1036a303f41f3fc610d0b0d
+EBUILD spice-gtk-0.37-r2.ebuild 3739 BLAKE2B df139b67cd3c1038e07662b9afcf8c4bdd4a79fad2d624366287563ee695df045c2cf5aeefd575af45bc703491e491887945ea225995d18deb012e2a3ba416f0 SHA512 71688a1d0c8de4e360a67c91ef1f313ba05515393354f32980084f2438cebdec410c4e0ec060128549b7eeba38d1c80dbcadf41cb18d7cb0115d470f525bbd81
+EBUILD spice-gtk-9999.ebuild 3394 BLAKE2B 2014ce9d0d762a51286f1f0b6cf7802606dad6dba0c2fe7e83ffd005828c81a0f09287de4561f51ea897195ed2261b5bba354d938b0d3ff518ef725d681e7759 SHA512 f9c4cd502006ce73f3129d32907e3e52ff2a217f497021ce398f49a6e2c422e2ae6de61acc70c250778a2a6fcfc09baed4f9577f9cb65aeefa7d713bbf5e7a85
 MISC metadata.xml 1072 BLAKE2B 0dec19853765b4a606a94fb31df1e6d569bc0131a7e2a9a28d822218b7f11d0d039d27d9bf4cdc43e073ed2ea433f1af7971a48a0529cd46b10f45f7b5ec1ff7 SHA512 8f94f0d99d6bfefba369f974d0b8358f86f5e3910279e5ab8ccb08b5ffb428f911ae64bb8904415e330c543609ee46c2dbd68f34912b50aca3929016fcac26de
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch b/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch
new file mode 100644
index 000000000000..504cb7c4848b
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch
@@ -0,0 +1,132 @@
+From 262c84081fbd3cfc3d92e6ae9a60a780549d6c2f Mon Sep 17 00:00:00 2001
+From: Snir Sheriber <ssheribe@redhat.com>
+Date: Thu, 28 Feb 2019 11:44:34 +0200
+Subject: [PATCH] Adjust to window scaling
+
+When GDK_SCALE is != 1 and egl is used, the image presented does not
+fit to the window (scale of 2 is often used with hidpi monitors).
+Usually this is not a problem since all components are adjusted by
+gdk/gtk but with egl, pixel-based data is not being scaled. In this
+case window's scale value can be used in order to determine whether
+to use a pixel resource with higher resolution data.
+
+In order to reproduce the problem set spice with virgl/Intel-vGPU
+and run spice-gtk with GDK_SCALE=2
+
+This issue was also reported at freedesktop gitlab repo:
+https://gitlab.freedesktop.org/spice/spice-gtk/issues/99
+
+Signed-off-by: Snir Sheriber <ssheribe@redhat.com>
+Acked-by: Victor Toso <victortoso@redhat.com>
+---
+ src/spice-widget-egl.c |  7 ++++---
+ src/spice-widget.c     | 27 +++++++++++++++++++--------
+ 2 files changed, 23 insertions(+), 11 deletions(-)
+
+diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
+index 43fccd7..7bae4e5 100644
+--- a/src/spice-widget-egl.c
++++ b/src/spice-widget-egl.c
+@@ -360,9 +360,9 @@ gboolean spice_egl_realize_display(SpiceDisplay *display, GdkWindow *win, GError
+     DISPLAY_DEBUG(display, "egl realize");
+     if (!spice_widget_init_egl_win(display, win, err))
+         return FALSE;
+-
+-    spice_egl_resize_display(display, gdk_window_get_width(win),
+-                             gdk_window_get_height(win));
++    gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
++    spice_egl_resize_display(display, gdk_window_get_width(win) * scale_factor,
++                             gdk_window_get_height(win) * scale_factor);
+ 
+     return TRUE;
+ }
+@@ -426,6 +426,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
+ #endif
+ }
+ 
++/* w and h should be adjusted to gdk scaling */
+ G_GNUC_INTERNAL
+ void spice_egl_resize_display(SpiceDisplay *display, int w, int h)
+ {
+diff --git a/src/spice-widget.c b/src/spice-widget.c
+index 1f2a154..a9ba1f1 100644
+--- a/src/spice-widget.c
++++ b/src/spice-widget.c
+@@ -1382,7 +1382,8 @@ static void set_egl_enabled(SpiceDisplay *display, bool enabled)
+     }
+ 
+     if (enabled && d->egl.context_ready) {
+-        spice_egl_resize_display(display, d->ww, d->wh);
++        gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
++        spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor);
+     }
+ 
+     d->egl.enabled = enabled;
+@@ -1978,11 +1979,14 @@ static void transform_input(SpiceDisplay *display,
+     SpiceDisplayPrivate *d = display->priv;
+     int display_x, display_y, display_w, display_h;
+     double is;
++    gint scale_factor = 1;
+ 
+     spice_display_get_scaling(display, NULL,
+                               &display_x, &display_y,
+                               &display_w, &display_h);
+-
++    if (egl_enabled(d)) {
++        scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
++    }
+     /* For input we need a different scaling factor in order to
+        be able to reach the full width of a display. For instance, consider
+        a display of 100 pixels showing in a window 10 pixels wide. The normal
+@@ -1998,7 +2002,7 @@ static void transform_input(SpiceDisplay *display,
+        coordinates in the inverse direction (window -> display) as the fb size
+        (display -> window).
+     */
+-    is = (double)(d->area.width-1) / (double)(display_w-1);
++    is = ((double)(d->area.width-1) / (double)(display_w-1)) * scale_factor;
+ 
+     window_x -= display_x;
+     window_y -= display_y;
+@@ -2183,8 +2187,10 @@ static void size_allocate(GtkWidget *widget, GtkAllocation *conf, gpointer data)
+         d->wh = conf->height;
+         recalc_geometry(widget);
+ #if HAVE_EGL
+-        if (egl_enabled(d))
+-            spice_egl_resize_display(display, conf->width, conf->height);
++        if (egl_enabled(d)) {
++            gint scale_factor = gtk_widget_get_scale_factor(widget);
++            spice_egl_resize_display(display, conf->width * scale_factor, conf->height * scale_factor);
++        }
+ #endif
+     }
+ 
+@@ -2942,10 +2948,14 @@ void spice_display_get_scaling(SpiceDisplay *display,
+     int ww, wh;
+     int x, y, w, h;
+     double s;
++    gint scale_factor = 1;
+ 
+     if (gtk_widget_get_realized (GTK_WIDGET(display))) {
+-        ww = gtk_widget_get_allocated_width(GTK_WIDGET(display));
+-        wh = gtk_widget_get_allocated_height(GTK_WIDGET(display));
++        if (egl_enabled(d)) {
++            scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
++        }
++        ww = gtk_widget_get_allocated_width(GTK_WIDGET(display)) * scale_factor;
++        wh = gtk_widget_get_allocated_height(GTK_WIDGET(display)) * scale_factor;
+     } else {
+         ww = fbw;
+         wh = fbh;
+@@ -3091,7 +3101,8 @@ void spice_display_widget_gl_scanout(SpiceDisplay *display)
+             g_clear_error(&err);
+         }
+ 
+-        spice_egl_resize_display(display, d->ww, d->wh);
++        gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
++        spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor);
+     }
+ #endif
+ 
+-- 
+2.21.0
+
diff --git a/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
deleted file mode 100644
index 2bf65fbe5552..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils xdg-utils vala readme.gentoo-r1
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	gstvideo? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	gstaudio? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	>=x11-libs/pixman-0.17.7
-	media-libs/opus
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
-	>=dev-libs/glib-2.46:2
-	>=x11-libs/cairo-1.2
-	virtual/jpeg:0=
-	sys-libs/zlib
-	introspection? ( dev-libs/gobject-introspection )
-	lz4? ( app-arch/lz4 )
-	sasl? ( dev-libs/cyrus-sasl )
-	smartcard? ( app-emulation/qemu[smartcard] )
-	usbredir? (
-		sys-apps/hwids
-		>=sys-apps/usbredir-0.4.2
-		virtual/libusb:1
-		virtual/libgudev:=
-		policykit? (
-			sys-apps/acl
-			>=sys-auth/polkit-0.110-r1
-			!~sys-auth/polkit-0.111 )
-		)
-	webdav? (
-		net-libs/phodav:2.0
-		>=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.12.14
-	dev-perl/Text-CSV
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.34-openssl11.patch
-	"${FILESDIR}"/${P}-libressl.patch
-)
-
-src_prepare() {
-	# bug 558558
-	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-
-	default
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #581836
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	# Clean up environment, bug #586642
-	xdg_environment_reset
-
-	local myconf
-	myconf="
-		$(use_enable static-libs static)
-		$(use_enable introspection)
-		$(use_with sasl)
-		$(use_enable smartcard)
-		$(use_enable usbredir)
-		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
-		$(use_with usbredir usb-acl-helper-dir /usr/libexec)
-		$(use_with gtk3 gtk 3.0)
-		$(use_enable policykit polkit)
-		$(use_enable pulseaudio pulse)
-		$(use_enable gstaudio)
-		$(use_enable gstvideo)
-		$(use_enable mjpeg builtin-mjpeg)
-		$(use_enable vala)
-		$(use_enable webdav)
-		$(use_enable dbus)
-		--disable-celt051
-		--disable-gtk-doc
-		--disable-maintainer-mode
-		--disable-werror
-		--enable-pie"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #581836
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	# Remove .la files if they're not needed
-	use static-libs || prune_libtool_files
-
-	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.35.ebuild b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
index d6e46f5386d3..07b64a227a3c 100644
--- a/net-misc/spice-gtk/spice-gtk-0.35.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
@@ -48,10 +48,10 @@ RDEPEND="
 	sasl? ( dev-libs/cyrus-sasl )
 	smartcard? ( app-emulation/qemu[smartcard] )
 	usbredir? (
+		dev-libs/libgudev:=
 		sys-apps/hwids
 		>=sys-apps/usbredir-0.4.2
 		virtual/libusb:1
-		virtual/libgudev:=
 		policykit? (
 			sys-apps/acl
 			>=sys-auth/polkit-0.110-r1
diff --git a/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
index 146bbc7608c1..cb24fbda3a85 100644
--- a/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-libs/json-glib:0=
 	media-libs/gst-plugins-base:1.0
 	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
+	media-libs/gstreamer:1.0[introspection?]
 	media-libs/opus
 	sys-libs/zlib
 	virtual/jpeg:0=
@@ -74,6 +74,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
+	"${FILESDIR}"/${P}-adjust-to-window-scaling.patch
 )
 
 src_prepare() {
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index c4e0bd6c740b..96f51b0281d4 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -3,12 +3,10 @@
 
 EAPI=7
 
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools desktop eutils git-r3 readme.gentoo-r1 vala xdg-utils
+inherit desktop eutils git-r3 meson readme.gentoo-r1 vala xdg-utils
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
 HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
@@ -17,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
 KEYWORDS=""
-IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
+IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav libressl"
 
 # TODO:
 # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
@@ -27,7 +25,7 @@ RDEPEND="
 	dev-libs/json-glib:0=
 	media-libs/gst-plugins-base:1.0
 	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
+	media-libs/gstreamer:1.0[introspection?]
 	media-libs/opus
 	sys-libs/zlib
 	virtual/jpeg:0=
@@ -80,8 +78,6 @@ src_prepare() {
 
 	default
 
-	eautoreconf
-
 	use vala && vala_src_prepare
 }
 
@@ -94,28 +90,22 @@ src_configure() {
 	# Clean up environment, bug #586642
 	xdg_environment_reset
 
-	local myconf
-	myconf="
-		$(use_with gtk3 gtk 3.0)
-		$(use_enable introspection)
-		$(use_enable mjpeg builtin-mjpeg)
-		$(use_enable policykit polkit)
-		$(use_enable pulseaudio pulse)
-		$(use_with sasl)
-		$(use_enable smartcard)
-		$(use_enable static-libs static)
-		$(use_enable usbredir)
-		$(use_with usbredir usb-acl-helper-dir /usr/libexec)
-		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
-		$(use_enable vala)
-		$(use_enable webdav)
-		--disable-celt051
-		--disable-gtk-doc
-		--disable-maintainer-mode
-		--disable-werror
-		--enable-pie"
-
-	econf ${myconf}
+	local emesonargs=(
+		$(meson_feature gtk3 gtk)
+		$(meson_feature introspection)
+		$(meson_use mjpeg builtin-mjpeg)
+		$(meson_feature policykit polkit)
+		$(meson_feature pulseaudio pulse)
+		$(meson_feature sasl)
+		$(meson_feature smartcard)
+		$(meson_feature usbredir)
+		$(usex usbredir -Dusb-acl-helper-dir=/usr/libexec)
+		$(usex usbredir -Dusb-ids-path=/usr/share/misc/usb.ids)
+		$(meson_feature vala vapi)
+		$(meson_feature webdav)
+	)
+
+	meson_src_configure
 }
 
 src_compile() {
@@ -124,14 +114,11 @@ src_compile() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
 	addpredict /dev
 
-	default
+	meson_src_compile
 }
 
 src_install() {
-	default
-
-	# Remove .la files if they're not needed
-	use static-libs || find "${D}" -name '*.la' -delete || die
+	meson_src_install
 
 	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
 	readme.gentoo_create_doc