gentoo resync : 24.03.2019

6 files changed, 23 insertions, 6 deletions

diff --git a/profiles/targets/desktop/gnome/make.defaults b/profiles/targets/desktop/gnome/make.defaults
index fdeb486548d4..e32bb8b830e5 100644
--- a/profiles/targets/desktop/gnome/make.defaults
+++ b/profiles/targets/desktop/gnome/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-USE="colord eds evo gnome gnome-keyring gnome-online-accounts gstreamer introspection libsecret nautilus pulseaudio tracker"
+USE="colord -consolekit eds elogind evo gnome gnome-keyring gnome-online-accounts gstreamer introspection libsecret nautilus networkmanager pulseaudio tracker"
diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
index 6ad779174603..70a21e468c55 100644
--- a/profiles/targets/desktop/gnome/package.use
+++ b/profiles/targets/desktop/gnome/package.use
@@ -1,11 +1,16 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Needed by mutter defaults, bug #547300
+# Needed by gnome-photos
+media-libs/gegl jpeg2k raw
+
+# Needed by a global USE=wayland right now; some REQUIRED_USE may be outdated and need review
+>=media-libs/cogl-1.18.2-r1 gles2
 >=media-libs/clutter-1.20 egl
 media-libs/cogl kms
+
+# Needed by mutter defaults and USE=wayland, bug #547300
 >=media-libs/mesa-10.3 gbm gles2
->=media-libs/cogl-1.18.2-r1 gles2
 
 # For eautoreconf in =app-crypt/seahorse-3.10.2-r1
 app-crypt/gcr vala
@@ -39,9 +44,6 @@ net-libs/libproxy python
 # For net-misc/vinagre-3.4 and gnome-boxes
 net-misc/spice-gtk gtk3
 
-# for gnome-extra/gnome-user-share
-www-servers/apache apache2_modules_dav apache2_modules_dav_fs apache2_modules_authn_file apache2_modules_auth_digest apache2_modules_authz_groupfile
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (19 Feb 2015)
 # Set reasonable default toolkit for gnome users to prevent emerge error
 # when USE=tools
diff --git a/profiles/targets/desktop/gnome/systemd/eapi b/profiles/targets/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/targets/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/targets/desktop/gnome/systemd/package.use b/profiles/targets/desktop/gnome/systemd/package.use
new file mode 100644
index 000000000000..6d583e8165df
--- /dev/null
+++ b/profiles/targets/desktop/gnome/systemd/package.use
@@ -0,0 +1,8 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# On systemd profiles we can default enable gnome-user-share as it always has been
+gnome-base/gnome-extra-apps share
+
+# for gnome-extra/gnome-user-share
+www-servers/apache apache2_modules_dav apache2_modules_dav_fs apache2_modules_authn_file apache2_modules_auth_digest apache2_modules_authz_groupfile
diff --git a/profiles/targets/desktop/gnome/systemd/parent b/profiles/targets/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..ead73795d6d7
--- /dev/null
+++ b/profiles/targets/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../systemd
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 4b1b1a923c3b..18f4dbc4b291 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Lars Wendler <polynomial-c@gentoo.org> (20 Mar 2019)
+# Enable client by default. Usually desktop users need the client.
+net-fs/samba client
+
 # Andreas Sturmlechner <asturm@gentoo.org> (09 Jun 2018)
 # Required by app-office/libreoffice
 dev-libs/xmlsec nss