[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/files/, gnome-base/gdm/
commit: 7d8dc86e28c18d907412f3400e9172a868b76322 Author: Mart Raudsepp gentoo org> AuthorDate: Thu Sep 27 22:58:10 2018 + Commit: Mart Raudsepp gentoo org> CommitDate: Thu Sep 27 22:58:10 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7d8dc86e gnome-base/gdm: remove old security vulnerable, use ::gentoo revbump Main tree version has patches to fix CVE-2018-14424, which were missed here during sync with main tree (presumably it was thought 3.26 already had the patches, but it doesn't). gnome-base/gdm/files/49-keychain-r1| 9 - gnome-base/gdm/files/50-ssh-agent-r1 | 10 -- .../gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch | 32 .../gdm/files/gdm-3.8.4-fingerprint-auth.patch | 29 --- gnome-base/gdm/files/gdm-3.8.4-logo.patch | 25 --- gnome-base/gdm/gdm-3.26.2.1.ebuild | 198 - gnome-base/gdm/metadata.xml| 14 -- 7 files changed, 317 deletions(-) diff --git a/gnome-base/gdm/files/49-keychain-r1 b/gnome-base/gdm/files/49-keychain-r1 deleted file mode 100644 index 51a1ca87.. --- a/gnome-base/gdm/files/49-keychain-r1 +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# source keychain variables - -keychain="`which keychain 2>/dev/null`" -if [ -n "$keychain" ] && [ -x "$keychain" ] && [ -f "$HOME/.bash_profile" ] -then - . "${HOME}/.bash_profile" -fi diff --git a/gnome-base/gdm/files/50-ssh-agent-r1 b/gnome-base/gdm/files/50-ssh-agent-r1 deleted file mode 100644 index 4d94fb04.. --- a/gnome-base/gdm/files/50-ssh-agent-r1 +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# add ssh-agent if found - -sshagent="`which ssh-agent 2>/dev/null`" -if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then - command="$sshagent -- $command" -elif [ -z "$sshagent" ] ; then - echo "$0: ssh-agent not found!" -fi diff --git a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch deleted file mode 100644 index bfd8398a.. --- a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c0581264d5e2b412aa27dc30623512b461024e4f Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Tue, 2 Nov 2010 23:19:31 +0100 -Subject: [PATCH 2/4] ssh-agent handling must be done at xinitrc.d - -Gentoo bug: #220603 - data/Xsession.in | 8 - 1 file changed, 8 deletions(-) - -diff --git a/data/Xsession.in b/data/Xsession.in -index 201be92..88f1fd9 100755 a/data/Xsession.in -+++ b/data/Xsession.in -@@ -191,14 +191,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then - done - fi - --# add ssh-agent if found --sshagent="`gdmwhich ssh-agent`" --if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then --command="$sshagent -- $command" --elif [ -z "$sshagent" ] ; then --echo "$0: ssh-agent not found!" --fi -- - echo "$0: Setup done, will execute: $command" - - eval exec $command --- -1.8.5.1 - diff --git a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch deleted file mode 100644 index cd19077a.. --- a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 75fe02c2b383b27b202940bdedd7d8d2c64169fb Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Tue, 30 Jul 2013 22:56:30 -0400 -Subject: [PATCH 3/4] Gentoo does not have a fingerprint-auth pam stack - - data/pam-exherbo/gdm-fingerprint.pam | 7 ++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/data/pam-exherbo/gdm-fingerprint.pam b/data/pam-exherbo/gdm-fingerprint.pam -index 41639ec..d9633fb 100644 a/data/pam-exherbo/gdm-fingerprint.pam -+++ b/data/pam-exherbo/gdm-fingerprint.pam -@@ -1,6 +1,11 @@ - account include system-login - --auth substack fingerprint-auth -+auth optional pam_env.so -+auth required pam_tally2.so onerr=succeed -+auth required pam_shells.so -+auth required pam_nologin.so -+auth required pam_fprintd.so -+auth required pam_permit.so - auth optional pam_gnome_keyring.so - - password required pam_deny.so --- -1.8.5.1 - diff --git a/gnome-base/gdm/files/gdm-3.8.4-logo.patch b/gnome-base/gdm/files/gdm-3.8.4-logo.patch deleted file mode 100644 index 151d4bc7.. --- a/gnome-base/gdm/files/gdm-3.8.4-logo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bcc651df77a429a6bf9b13892f71fedb1b87a069 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 11 Dec 2013 22:46:58 +0100 -Subject: [PATCH 4/4] Apply Gentoo branding - - data/org.gnome.login-screen.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/org.gnome.login-screen.gschema.xml.in b/data/org.gnome.login-screen.gschema.xml.in -index 03da374..5e81bc0 100644 a/data/org.gnome.login-screen.gschema.xml.in -+++ b/data/org.gnome.login-
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
commit: 68e73f2651513b49c361cc73b374e3a4a456dbba Author: Mart Raudsepp gentoo org> AuthorDate: Thu Sep 27 22:57:43 2018 + Commit: Mart Raudsepp gentoo org> CommitDate: Thu Sep 27 22:57:43 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=68e73f26 gnome-base/gdm: remove live ebuild, too outdated Signed-off-by: Mart Raudsepp gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 gnome-base/gdm/gdm-.ebuild | 224 - 1 file changed, 224 deletions(-) diff --git a/gnome-base/gdm/gdm-.ebuild b/gnome-base/gdm/gdm-.ebuild deleted file mode 100644 index 0ac9e91a.. --- a/gnome-base/gdm/gdm-.ebuild +++ /dev/null @@ -1,224 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 pam readme.gentoo systemd user versionator -if [[ ${PV} = ]]; then - inherit gnome2-live -fi - -DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/Projects/GDM"; - -SRC_URI="${SRC_URI} - branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) -" - -LICENSE=" - GPL-2+ - branding? ( CC-Sampling-Plus-1.0 ) -" - -SLOT="0" - -IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" - -if [[ ${PV} = ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" -fi - -# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 -# nspr used by smartcard extension -# dconf, dbus and g-s-d are needed at install time for dconf update -# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.36:2[dbus] - >=x11-libs/gtk+-2.91.1:3 - >=gnome-base/dconf-0.20 - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - >=media-libs/fontconfig-2.5.0 - >=media-libs/libcanberra-0.4[gtk3] - sys-apps/dbus - >=sys-apps/accountsservice-0.6.12 - - x11-apps/sessreg - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - >=x11-misc/xdg-utils-1.0.2-r3 - - virtual/pam - - >=sys-apps/systemd-186:0=[pam] - - sys-auth/pambase[systemd] - - audit? ( sys-process/audit ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - plymouth? ( sys-boot/plymouth ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -# gnome-session-3.6 needed to avoid freezing with orca -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-session-3.6 - >=gnome-base/gnome-shell-3.1.90 - gnome-extra/polkit-gnome:0 - x11-apps/xhost - x11-themes/gnome-icon-theme-symbolic - - accessibility? ( - >=app-accessibility/orca-3.10 - gnome-extra/mousetweaks ) - fprint? ( - sys-auth/fprintd - sys-auth/pam_fprint ) - - !gnome-extra/fast-user-switch-applet -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - >=dev-util/intltool-0.40.0 - dev-util/itstool - virtual/pkgconfig - x11-base/xorg-proto - test? ( >=dev-libs/check-0.9.4 ) -" - -DOC_CONTENTS=" - To make GDM start at boot, run:\n - # systemctl enable gdm.service\n - \n - For passwordless login to unlock your keyring, you need to install - sys-auth/pambase with USE=gnome-keyring and set an empty password - on your keyring. Use app-crypt/seahorse for that.\n - \n - You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 - for smartcard support -" - -pkg_setup() { - enewgroup gdm - enewgroup video # Just in case it hasn't been created yet - enewuser gdm -1 -1 /var/lib/gdm gdm,video - - # For compatibility with certain versions of nvidia-drivers, etc., need to - # ensure that gdm user is in the video group - if ! egetent group video | grep -q gdm; then - # FIXME XXX: is this at all portable, ldap-safe, etc.? - # XXX: egetent does not have a 1-argument form, so we can't use it to - # get the list of gdm's groups - local g=$(groups gdm) - elog "Adding user gdm to video group" - usermod -G video,${g// /,} gdm || die "Adding user gdm
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
commit: e1f3bb715e54229ee0e35ed61559621e5c1e6c61 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Sep 10 13:06:14 2018 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Mon Sep 10 14:02:12 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e1f3bb71 gnome-base/gdm: synchronize with gentoo repository Package-Manager: Portage-2.3.49, Repoman-2.3.10 Manifest-Sign-Key: 0x5A56C8CD0C13248A gnome-base/gdm/gdm-3.26.2.1.ebuild | 15 +-- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/gnome-base/gdm/gdm-3.26.2.1.ebuild b/gnome-base/gdm/gdm-3.26.2.1.ebuild index ac51df37..8f528e56 100644 --- a/gnome-base/gdm/gdm-3.26.2.1.ebuild +++ b/gnome-base/gdm/gdm-3.26.2.1.ebuild @@ -4,7 +4,7 @@ EAPI=6 GNOME2_LA_PUNT="yes" -inherit eutils gnome2 pam readme.gentoo-r1 systemd user versionator +inherit eutils gnome2 pam readme.gentoo-r1 systemd user DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" HOMEPAGE="https://wiki.gnome.org/Projects/GDM"; @@ -192,20 +192,7 @@ src_install() { } pkg_postinst() { - local d ret - gnome2_pkg_postinst - - # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm - ret=0 - ebegin "Fixing "${EROOT}"var/lib/gdm ownership" - chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1 - for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do - [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1 - done - eend ${ret} - systemd_reenable gdm.service - readme.gentoo_print_elog }
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
commit: e166fc9a24465271cab43d0500f9d59aa3fe7852 Author: Sobhan Mohammadpour gentoo org> AuthorDate: Fri Feb 23 11:29:12 2018 + Commit: Sobhan Mohammadpour gentoo org> CommitDate: Fri Feb 23 11:29:12 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e166fc9a gnome-base/gdm: bump Package-Manager: Portage-2.3.24, Repoman-2.3.6 Manifest-Sign-Key: 0x7DF238CF0AA182E1 gnome-base/gdm/{gdm-3.26.2.ebuild => gdm-3.26.2.1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gnome-base/gdm/gdm-3.26.2.ebuild b/gnome-base/gdm/gdm-3.26.2.1.ebuild similarity index 100% rename from gnome-base/gdm/gdm-3.26.2.ebuild rename to gnome-base/gdm/gdm-3.26.2.1.ebuild
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
commit: a8ce4cc744fa0e10b79a6a42d5ce81dd7f92adc4 Author: Sobhan Mohammadpour gentoo org> AuthorDate: Tue Feb 6 16:00:42 2018 + Commit: Sobhan Mohammadpour gentoo org> CommitDate: Tue Feb 6 16:00:42 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a8ce4cc7 gnome-base/gdm: bump Package-Manager: Portage-2.3.23, Repoman-2.3.6 Manifest-Sign-Key: 0x7DF238CF0AA182E1 gnome-base/gdm/gdm-3.26.2.ebuild | 213 +++ 1 file changed, 213 insertions(+) diff --git a/gnome-base/gdm/gdm-3.26.2.ebuild b/gnome-base/gdm/gdm-3.26.2.ebuild new file mode 100644 index ..56cf0c6a --- /dev/null +++ b/gnome-base/gdm/gdm-3.26.2.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 pam readme.gentoo-r1 systemd user versionator + +DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" +HOMEPAGE="https://wiki.gnome.org/Projects/GDM"; + +SRC_URI="${SRC_URI} + branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) +" + +LICENSE=" + GPL-2+ + branding? ( CC-BY-SA-4.0 ) +" + +SLOT="0" + +IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +# nspr used by smartcard extension +# dconf, dbus and g-s-d are needed at install time for dconf update +# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.36:2[dbus] + >=x11-libs/gtk+-2.91.1:3 + >=gnome-base/dconf-0.20 + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + >=media-libs/fontconfig-2.5.0:1.0 + >=media-libs/libcanberra-0.4[gtk3] + sys-apps/dbus + >=sys-apps/accountsservice-0.6.35 + + x11-apps/sessreg + x11-base/xorg-server + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXft + x11-libs/libxcb + >=x11-misc/xdg-utils-1.0.2-r3 + + virtual/pam + >=sys-apps/systemd-186:0=[pam] + + sys-auth/pambase[systemd] + + audit? ( sys-process/audit ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + plymouth? ( sys-boot/plymouth ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) +" +# XXX: These deps are from session and desktop files in data/ directory +# fprintd is used via dbus by gdm-fingerprint-extension +# gnome-session-3.6 needed to avoid freezing with orca +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-session-3.6 + >=gnome-base/gnome-shell-3.1.90 + x11-apps/xhost + + accessibility? ( + >=app-accessibility/orca-3.10 + gnome-extra/mousetweaks ) + fprint? ( + sys-auth/fprintd + sys-auth/pam_fprint ) + + !gnome-extra/fast-user-switch-applet +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + >=dev-util/intltool-0.40.0 + dev-util/itstool + virtual/pkgconfig + x11-proto/inputproto + x11-proto/randrproto + test? ( >=dev-libs/check-0.9.4 ) + xinerama? ( x11-proto/xineramaproto ) +" + +DOC_CONTENTS=" + To make GDM start at boot, run:\n + # systemctl enable gdm.service\n + \n + For passwordless login to unlock your keyring, you need to install + sys-auth/pambase with USE=gnome-keyring and set an empty password + on your keyring. Use app-crypt/seahorse for that.\n + \n + You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 + for smartcard support +" + +pkg_setup() { + enewgroup gdm + enewgroup video # Just in case it hasn't been created yet + enewuser gdm -1 -1 /var/lib/gdm gdm,video + + # For compatibility with certain versions of nvidia-drivers, etc., need to + # ensure that gdm user is in the video group + if ! egetent group video | grep -q gdm; then + # FIXME XXX: is this at all portable, ldap-safe, etc.? + # XXX: egetent does not have a 1-argument form, so we can't use it to + # get the list of gdm's groups + local g=$(groups gdm) + elog "Adding user gdm to video group" + usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" + fi +} + +src_prepare() { + # ssh-agent handling must be done at xinitrc.d, bug #220603 + eapply "${FILESDIR}/${PN}-2.32.0
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/files/, gnome-base/gdm/
commit: 1b003d0629813dc80a2c386a5899e8a0a574d4ad Author: Dennis Lamm gentoo org> AuthorDate: Fri Jan 12 12:05:22 2018 + Commit: Dennis Lamm gentoo org> CommitDate: Fri Jan 12 12:05:22 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=1b003d06 gnome-base/gdm: drop old Package-Manager: Portage-2.3.13, Repoman-2.3.3 .../gdm/files/gdm-3.2.1.1-custom-session.patch | 51 - gnome-base/gdm/gdm-3.20.1.ebuild | 220 - gnome-base/gdm/gdm-.ebuild | 3 +- gnome-base/gdm/metadata.xml| 5 +- 4 files changed, 3 insertions(+), 276 deletions(-) diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch b/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch deleted file mode 100644 index c27f8fd3.. --- a/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e61ece2b42b270dd3f68718fef291be7b7f44aa6 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Tue, 2 Nov 2010 23:19:07 +0100 -Subject: [PATCH 1/4] make custom session work - -Gentoo bug: #216984 - -fix custom sessions not doing sourcing in the proper order. - data/Xsession.in | 18 +- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/data/Xsession.in b/data/Xsession.in -index 118518c..201be92 100755 a/data/Xsession.in -+++ b/data/Xsession.in -@@ -155,15 +155,6 @@ fi - - xhost +si:localuser:`id -un` || : - --# run all system xinitrc shell scripts. --if [ -d /etc/X11/xinit/xinitrc.d ]; then --for i in /etc/X11/xinit/xinitrc.d/* ; do --if [ -x "$i" -a ! -d "$i" ]; then -- . "$i" --fi --done --fi -- - if [ "x$command" = "xcustom" ] ; then - if [ -x "$HOME/.xsession" ]; then - command="$HOME/.xsession" -@@ -191,6 +182,15 @@ if [ "x$command" = "xdefault" ] ; then - fi - fi - -+# run all system xinitrc shell scripts. -+if [ -d /etc/X11/xinit/xinitrc.d ]; then -+for i in /etc/X11/xinit/xinitrc.d/* ; do -+if [ -x "$i" -a ! -d "$i" ]; then -+ . "$i" -+fi -+done -+fi -+ - # add ssh-agent if found - sshagent="`gdmwhich ssh-agent`" - if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then --- -1.8.5.1 - diff --git a/gnome-base/gdm/gdm-3.20.1.ebuild b/gnome-base/gdm/gdm-3.20.1.ebuild deleted file mode 100644 index 3ecef062.. --- a/gnome-base/gdm/gdm-3.20.1.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 pam readme.gentoo systemd user versionator - -DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/Projects/GDM"; - -SRC_URI="${SRC_URI} - branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) -" - -LICENSE=" - GPL-2+ - branding? ( CC-Sampling-Plus-1.0 ) -" - -SLOT="0" - -IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" - -# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 -# nspr used by smartcard extension -# dconf, dbus and g-s-d are needed at install time for dconf update -# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.36:2[dbus] - >=x11-libs/gtk+-2.91.1:3 - >=gnome-base/dconf-0.20 - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - >=media-libs/fontconfig-2.5.0 - >=media-libs/libcanberra-0.4[gtk3] - sys-apps/dbus - >=sys-apps/accountsservice-0.6.12 - - x11-apps/sessreg - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - >=x11-misc/xdg-utils-1.0.2-r3 - - virtual/pam - - >=sys-apps/systemd-186:0=[pam] - - sys-auth/pambase[systemd] - - audit? ( sys-process/audit ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - plymouth? ( sys-boot/plymouth ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -# gnome-session-3.6 needed to avoid freezing with orca -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-session-3.6 - >=gnome-base/gnome-shell-3.1.90 - gnome-extra/polkit-gnome:0 - x11-apps/xhost - x11-themes/gnome-icon-theme-symbolic - - a
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
commit: 9d31fc0eb80c9fb9c59bca480b2ec187538792b7 Author: Rémi Cardona gentoo org> AuthorDate: Wed Apr 20 06:23:49 2016 + Commit: Remi Cardona gentoo org> CommitDate: Wed Apr 20 06:23:49 2016 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9d31fc0e gnome-base/gdm: bump to 3.20.1 Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0xE0663D48103108F8 gnome-base/gdm/{gdm-3.20.0.ebuild => gdm-3.20.1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gnome-base/gdm/gdm-3.20.0.ebuild b/gnome-base/gdm/gdm-3.20.1.ebuild similarity index 100% rename from gnome-base/gdm/gdm-3.20.0.ebuild rename to gnome-base/gdm/gdm-3.20.1.ebuild
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
commit: ad2634f4d8c0f63a91f9adef9c4bde2c222d7ae7 Author: Ole Reifschneider gentoo org> AuthorDate: Sun Mar 20 18:09:53 2016 + Commit: Ole Reifschneider gentoo org> CommitDate: Fri Mar 25 00:55:46 2016 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ad2634f4 gnome-base/gdm: Bump version to 3.20.0 Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0xE9E568677E8B4D42 .../gdm/{gdm-.ebuild => gdm-3.20.0.ebuild} | 68 -- gnome-base/gdm/gdm-.ebuild | 59 --- gnome-base/gdm/metadata.xml| 7 +-- 3 files changed, 51 insertions(+), 83 deletions(-) diff --git a/gnome-base/gdm/gdm-.ebuild b/gnome-base/gdm/gdm-3.20.0.ebuild similarity index 81% copy from gnome-base/gdm/gdm-.ebuild copy to gnome-base/gdm/gdm-3.20.0.ebuild index 49b3223..3ecef06 100644 --- a/gnome-base/gdm/gdm-.ebuild +++ b/gnome-base/gdm/gdm-3.20.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,10 +6,7 @@ EAPI="5" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" -inherit autotools eutils gnome2 pam readme.gentoo systemd user -if [[ ${PV} = ]]; then - inherit gnome2-live -fi +inherit autotools eutils gnome2 pam readme.gentoo systemd user versionator DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" HOMEPAGE="https://wiki.gnome.org/Projects/GDM"; @@ -24,13 +21,10 @@ LICENSE=" " SLOT="0" -IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama" -REQUIRED_USE="wayland? ( systemd )" -if [[ ${PV} = ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" -fi + +IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 # nspr used by smartcard extension @@ -38,7 +32,7 @@ fi # We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 COMMON_DEPEND=" app-text/iso-codes - >=dev-libs/glib-2.36:2 + >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 @@ -59,16 +53,13 @@ COMMON_DEPEND=" >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam - systemd? ( >=sys-apps/systemd-186:0=[pam] ) - !systemd? ( - >=x11-base/xorg-server-1.14.3-r1 - >=sys-auth/consolekit-0.4.5_p20120320-r2 - !=sys-apps/systemd-186:0=[pam] + + sys-auth/pambase[systemd] audit? ( sys-process/audit ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) @@ -97,6 +88,7 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 + dev-util/itstool virtual/pkgconfig x11-proto/inputproto x11-proto/randrproto @@ -104,11 +96,6 @@ DEPEND="${COMMON_DEPEND} xinerama? ( x11-proto/xineramaproto ) " -if [[ ${PV} = ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools" -fi - DOC_CONTENTS=" To make GDM start at boot, run:\n # systemctl enable gdm.service\n @@ -139,9 +126,6 @@ pkg_setup() { } src_prepare() { - # make custom session work, bug #216984, upstream bug #737578 - epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch" - # ssh-agent handling must be done at xinitrc.d, bug #220603 epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" @@ -151,18 +135,13 @@ src_prepare() { # Show logo when branding is enabled use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch" - if [[ ${PV} != ]]; then - eautoreconf - fi + eautoreconf gnome2_src_prepare } src_configure() { - local myconf="" - - [[ ${PV} != ]] && myconf="ITSTOOL=$(type -P true)" - + local myconf # PAM is the only auth scheme supported # even though configure lists shadow and crypt # they don't have any corresponding code. @@ -173,6 +152,7 @@ src_configure() { ! use plymouth && myconf="${myconf} --with-initial-vt=7" gnome2_src_configure \ + --enable-gdm-xsession \ --with-run-dir=/run/gdm \ --localstatedir="${EPREFIX}"/var \ --disable-static \ @@ -180,15 +160,12 @@ src_configure() { --enabl
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
commit: 61974c0a1865ffa70577527bbf115c345de3d817 Author: Ole Reifschneider gentoo org> AuthorDate: Sun Apr 19 12:47:32 2015 + Commit: Ole Reifschneider gentoo org> CommitDate: Sun Apr 19 12:47:32 2015 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=61974c0a Bump gnome-base/gdm version to 3.16.1.1 Package-Manager: portage-2.2.14 Manifest-Sign-Key: 7E8B4D42 .../gdm/{gdm-.ebuild => gdm-3.16.1.1.ebuild} | 37 ++ gnome-base/gdm/gdm-.ebuild | 5 +-- 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/gnome-base/gdm/gdm-.ebuild b/gnome-base/gdm/gdm-3.16.1.1.ebuild similarity index 91% copy from gnome-base/gdm/gdm-.ebuild copy to gnome-base/gdm/gdm-3.16.1.1.ebuild index a96d603..3ae0f58 100644 --- a/gnome-base/gdm/gdm-.ebuild +++ b/gnome-base/gdm/gdm-3.16.1.1.ebuild @@ -1,15 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.14.1-r1.ebuild,v 1.3 2015/03/15 13:22:01 pacho Exp $ EAPI="5" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" inherit autotools eutils gnome2 pam readme.gentoo systemd user -if [[ ${PV} = ]]; then - inherit gnome2-live -fi DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" HOMEPAGE="https://wiki.gnome.org/Projects/GDM"; @@ -26,12 +23,7 @@ LICENSE=" SLOT="0" IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama" REQUIRED_USE="wayland? ( systemd )" -if [[ ${PV} = ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" -fi - +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 # nspr used by smartcard extension @@ -57,7 +49,6 @@ COMMON_DEPEND=" x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft - x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam @@ -88,7 +79,6 @@ RDEPEND="${COMMON_DEPEND} accessibility? ( >=app-accessibility/orca-3.10 - app-accessibility/caribou gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd @@ -107,11 +97,6 @@ DEPEND="${COMMON_DEPEND} xinerama? ( x11-proto/xineramaproto ) " -if [[ ${PV} = ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools" -fi - DOC_CONTENTS=" To make GDM start at boot, run:\n # systemctl enable gdm.service\n @@ -154,18 +139,13 @@ src_prepare() { # Show logo when branding is enabled use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch" - if [[ ${PV} != ]]; then - eautoreconf - fi + eautoreconf gnome2_src_prepare } src_configure() { - local myconf="" - - [[ ${PV} != ]] && myconf="ITSTOOL=$(type -P true)" - + local myconf # PAM is the only auth scheme supported # even though configure lists shadow and crypt # they don't have any corresponding code. @@ -196,6 +176,7 @@ src_configure() { $(use_with tcpd tcp-wrappers) \ $(use_enable wayland wayland-support) \ $(use_with xinerama) \ + ITSTOOL=$(type -P true) \ ${myconf} } @@ -206,9 +187,9 @@ src_install() { rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die fi - insinto /etc/X11/xinit/xinitrc.d - newins "${FILESDIR}/49-keychain-r1" 49-keychain - newins "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}/49-keychain-r1" 49-keychain + newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent # gdm user's home directory keepdir /var/lib/gdm diff --git a/gnome-base/gdm/gdm-.ebuild b/gnome-base/gdm/gdm-.ebuild index a96d603..a39e31a 100644 --- a/gnome-base/gdm/gdm-.ebuild +++ b/gnome-base/gdm/gdm-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -32,7 +32,6 @@ else KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" fi - # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 # nspr used by smartcard extension # dconf, dbus and g-s-d are needed at install time for dconf update @@ -57,7 +56,6 @@ COMMON_DEPEND=" x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft - x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam @@ -88,7 +86,6 @@ RDEPEND="${COMMON_DEPEND} access
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
commit: f39cc301c303af711acb8e2fc31522fd1b4fbcfc Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Dec 22 23:05:02 2014 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Mon Dec 22 23:05:02 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f39cc301 gnome-base/gdm: moved to gentoo-x86 --- gnome-base/gdm/gdm-3.14.1.ebuild | 224 --- 1 file changed, 224 deletions(-) diff --git a/gnome-base/gdm/gdm-3.14.1.ebuild b/gnome-base/gdm/gdm-3.14.1.ebuild deleted file mode 100644 index 2d332dd..000 --- a/gnome-base/gdm/gdm-3.14.1.ebuild +++ /dev/null @@ -1,224 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 pam readme.gentoo systemd user - -DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/Projects/GDM"; - -SRC_URI="${SRC_URI} - branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) -" - -LICENSE=" - GPL-2+ - branding? ( CC-Sampling-Plus-1.0 ) -" - -SLOT="0" -IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama" -REQUIRED_USE="wayland? ( systemd )" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" - -# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 -# nspr used by smartcard extension -# dconf, dbus and g-s-d are needed at install time for dconf update -# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.36:2 - >=x11-libs/gtk+-2.91.1:3 - >=gnome-base/dconf-0.20 - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - >=media-libs/fontconfig-2.5.0 - >=media-libs/libcanberra-0.4[gtk3] - sys-apps/dbus - >=sys-apps/accountsservice-0.6.12 - - x11-apps/sessreg - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libXrandr - >=x11-misc/xdg-utils-1.0.2-r3 - - virtual/pam - systemd? ( >=sys-apps/systemd-186:0=[pam] ) - !systemd? ( - >=x11-base/xorg-server-1.14.3-r1 - >=sys-auth/consolekit-0.4.5_p20120320-r2 - !=dev-libs/gobject-introspection-0.9.12 ) - plymouth? ( sys-boot/plymouth ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -# gnome-session-3.6 needed to avoid freezing with orca -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-session-3.6 - >=gnome-base/gnome-shell-3.1.90 - gnome-extra/polkit-gnome:0 - x11-apps/xhost - x11-themes/gnome-icon-theme-symbolic - - accessibility? ( - >=app-accessibility/orca-3.10 - app-accessibility/caribou - gnome-extra/mousetweaks ) - fprint? ( - sys-auth/fprintd - sys-auth/pam_fprint ) - - !gnome-extra/fast-user-switch-applet -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - >=dev-util/intltool-0.40.0 - virtual/pkgconfig - x11-proto/inputproto - x11-proto/randrproto - test? ( >=dev-libs/check-0.9.4 ) - xinerama? ( x11-proto/xineramaproto ) -" - -DOC_CONTENTS=" - To make GDM start at boot, run:\n - # systemctl enable gdm.service\n - \n - For passwordless login to unlock your keyring, you need to install - sys-auth/pambase with USE=gnome-keyring and set an empty password - on your keyring. Use app-crypt/seahorse for that.\n - \n - You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 - for smartcard support -" - -pkg_setup() { - enewgroup gdm - enewgroup video # Just in case it hasn't been created yet - enewuser gdm -1 -1 /var/lib/gdm gdm,video - - # For compatibility with certain versions of nvidia-drivers, etc., need to - # ensure that gdm user is in the video group - if ! egetent group video | grep -q gdm; then - # FIXME XXX: is this at all portable, ldap-safe, etc.? - # XXX: egetent does not have a 1-argument form, so we can't use it to - # get the list of gdm's groups - local g=$(groups gdm) - elog "Adding user gdm to video group" - usermod -G video,${g// /,} gdm || die "Add
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
commit: 2f5972ac262434750b85b33cf518b4336bacbd21 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Wed Oct 15 22:13:14 2014 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Wed Oct 15 22:13:14 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2f5972ac gnome-base/gdm: 3.14.0 → 3.14.1 --- gnome-base/gdm/{gdm-3.14.0.ebuild => gdm-3.14.1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gnome-base/gdm/gdm-3.14.0.ebuild b/gnome-base/gdm/gdm-3.14.1.ebuild similarity index 100% rename from gnome-base/gdm/gdm-3.14.0.ebuild rename to gnome-base/gdm/gdm-3.14.1.ebuild
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
commit: bf21e33e467cda6ed231b8a35f16a7232b7324b8 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Oct 11 23:08:36 2014 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Oct 11 23:08:36 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bf21e33e gnome-base/gdm: 3.12.1-r1 → 3.14.0 --- gnome-base/gdm/{gdm-3.12.1.ebuild => gdm-3.14.0.ebuild} | 16 gnome-base/gdm/gdm-.ebuild | 16 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/gnome-base/gdm/gdm-3.12.1.ebuild b/gnome-base/gdm/gdm-3.14.0.ebuild similarity index 94% rename from gnome-base/gdm/gdm-3.12.1.ebuild rename to gnome-base/gdm/gdm-3.14.0.ebuild index 9f584ac..2d332dd 100644 --- a/gnome-base/gdm/gdm-3.12.1.ebuild +++ b/gnome-base/gdm/gdm-3.14.0.ebuild @@ -3,12 +3,13 @@ # $Header: $ EAPI="5" +GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" inherit autotools eutils gnome2 pam readme.gentoo systemd user DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/GDM"; +HOMEPAGE="https://wiki.gnome.org/Projects/GDM"; SRC_URI="${SRC_URI} branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) @@ -89,6 +90,7 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 virtual/pkgconfig x11-proto/inputproto @@ -127,7 +129,7 @@ pkg_setup() { } src_prepare() { - # make custom session work, bug #216984 + # make custom session work, bug #216984, upstream bug #737578 epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch" # ssh-agent handling must be done at xinitrc.d, bug #220603 @@ -164,7 +166,6 @@ src_configure() { --with-default-pam-config=exherbo \ --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ --with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \ - --with-initial-vt=7 \ --without-xevie \ $(use_with audit libaudit) \ $(use_enable ipv6) \ @@ -192,9 +193,6 @@ src_install() { newins "${FILESDIR}/49-keychain-r1" 49-keychain newins "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent - # log, etc. - keepdir /var/log/gdm - # gdm user's home directory keepdir /var/lib/gdm fowners gdm:gdm /var/lib/gdm @@ -223,10 +221,4 @@ pkg_postinst() { eend ${ret} readme.gentoo_print_elog - - if [[ -f "/etc/X11/gdm/gdm.conf" ]]; then - elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" - elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" - mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 - fi } diff --git a/gnome-base/gdm/gdm-.ebuild b/gnome-base/gdm/gdm-.ebuild index e2c6848..a96d603 100644 --- a/gnome-base/gdm/gdm-.ebuild +++ b/gnome-base/gdm/gdm-.ebuild @@ -3,6 +3,7 @@ # $Header: $ EAPI="5" +GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" inherit autotools eutils gnome2 pam readme.gentoo systemd user @@ -11,7 +12,7 @@ if [[ ${PV} = ]]; then fi DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/GDM"; +HOMEPAGE="https://wiki.gnome.org/Projects/GDM"; SRC_URI="${SRC_URI} branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) @@ -97,6 +98,7 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 virtual/pkgconfig x11-proto/inputproto @@ -140,7 +142,7 @@ pkg_setup() { } src_prepare() { - # make custom session work, bug #216984 + # make custom session work, bug #216984, upstream bug #737578 epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch" # ssh-agent handling must be done at xinitrc.d, bug #220603 @@ -182,7 +184,6 @@ src_configure() { --with-default-pam-config=exherbo \ --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ --with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \ - --with-initial-vt=7 \ --without-xevie \ $(use_with audit libaudit) \ $(use_enable ipv6) \ @@ -209,9 +210,6 @@ src_install() { newins "${FILESDIR}/49-keychain-r1" 49-keychain newins "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent - # log, etc. - keepdir /var/log/gdm - # gdm user's home directory keepdir /var/lib/gdm fowners gdm:gdm /var/lib/gdm @@ -240,10 +238,4 @@ pkg_postinst() { eend
[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
commit: bd06987debab6cb6e0f8816d550a2c49bbdd118b Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Apr 22 21:31:39 2014 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Tue Apr 22 21:31:39 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bd06987d gnome-base/gdm: 3.12.0 → 3.12.1 --- gnome-base/gdm/{gdm-3.12.0.ebuild => gdm-3.12.1.ebuild} | 0 gnome-base/gdm/gdm-.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-base/gdm/gdm-3.12.0.ebuild b/gnome-base/gdm/gdm-3.12.1.ebuild similarity index 100% rename from gnome-base/gdm/gdm-3.12.0.ebuild rename to gnome-base/gdm/gdm-3.12.1.ebuild diff --git a/gnome-base/gdm/gdm-.ebuild b/gnome-base/gdm/gdm-.ebuild index 389eeff..e2c6848 100644 --- a/gnome-base/gdm/gdm-.ebuild +++ b/gnome-base/gdm/gdm-.ebuild @@ -181,7 +181,7 @@ src_configure() { --enable-authentication-scheme=pam \ --with-default-pam-config=exherbo \ --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ - --with-consolekit-directory=${EPREFIX}/usr/lib/ConsoleKit \ + --with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \ --with-initial-vt=7 \ --without-xevie \ $(use_with audit libaudit) \