[gentoo-commits] repo/gentoo:master commit in: gnome-base/gdm/

[Mart Raudsepp]

commit:     10113e35e8dd748c59069b2b39b55be43917b9a0
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 08:25:06 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 08:51:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10113e35

gnome-base/gdm-3.24.2: Sync in changes done over time in the 3.22 series

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 gnome-base/gdm/gdm-3.24.2.ebuild | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/gnome-base/gdm/gdm-3.24.2.ebuild b/gnome-base/gdm/gdm-3.24.2.ebuild
index ec6a3c0e22b..3ce0f556026 100644
--- a/gnome-base/gdm/gdm-3.24.2.ebuild
+++ b/gnome-base/gdm/gdm-3.24.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="
        GPL-2+
-       branding? ( CC-Sampling-Plus-1.0 )
+       branding? ( CC-BY-SA-4.0 )
 "
 
 SLOT="0"
@@ -48,10 +48,10 @@ COMMON_DEPEND="
        x11-libs/libXdmcp
        x11-libs/libXext
        x11-libs/libXft
-       >=x11-misc/xdg-utils-1.0.2-r3
        x11-libs/libxcb
-       virtual/pam
+       >=x11-misc/xdg-utils-1.0.2-r3
 
+       virtual/pam
        >=sys-apps/systemd-186:0=[pam]
 
        sys-auth/pambase[systemd]
@@ -148,6 +148,7 @@ src_configure() {
 
        gnome2_src_configure \
                --enable-gdm-xsession \
+               --enable-user-display-server \
                --with-run-dir=/run/gdm \
                --localstatedir="${EPREFIX}"/var \
                --disable-static \
@@ -208,9 +209,4 @@ pkg_postinst() {
        eend ${ret}
 
        readme.gentoo_print_elog
-
-       if ! version_is_at_least 3.16.0 ${REPLACING_VERSIONS}; then
-               ewarn "GDM will now use a new TTY per logged user as explained 
at:"
-               ewarn 
"https://wiki.gentoo.org/wiki/Project:GNOME/GNOME3-Troubleshooting#GDM_.3E.3D_3.16_opens_one_graphical_session_per_user";
-       fi
 }