From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 021B259CA5 for ; Fri, 25 Mar 2016 00:56:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4972321C014; Fri, 25 Mar 2016 00:56:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3409121C03A for ; Fri, 25 Mar 2016 00:56:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C77E340D74 for ; Fri, 25 Mar 2016 00:56:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED83586E for ; Fri, 25 Mar 2016 00:56:15 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1458867346.ad2634f4d8c0f63a91f9adef9c4bde2c222d7ae7.tranquility@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gdm/gdm-3.20.0.ebuild gnome-base/gdm/gdm-9999.ebuild gnome-base/gdm/metadata.xml X-VCS-Directories: gnome-base/gdm/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: ad2634f4d8c0f63a91f9adef9c4bde2c222d7ae7 X-VCS-Branch: master Date: Fri, 25 Mar 2016 00:56:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 345f476c-9973-4cb5-88ab-3ab68c262c62 X-Archives-Hash: fb828b34d0d544739289ecb777b5ce7f commit: ad2634f4d8c0f63a91f9adef9c4bde2c222d7ae7 Author: Ole Reifschneider gentoo org> AuthorDate: Sun Mar 20 18:09:53 2016 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Fri Mar 25 00:55:46 2016 +0000 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-9999.ebuild => gdm-3.20.0.ebuild} | 68 ++++++++-------------- gnome-base/gdm/gdm-9999.ebuild | 59 ++++++++----------- gnome-base/gdm/metadata.xml | 7 +-- 3 files changed, 51 insertions(+), 83 deletions(-) diff --git a/gnome-base/gdm/gdm-9999.ebuild b/gnome-base/gdm/gdm-3.20.0.ebuild similarity index 81% copy from gnome-base/gdm/gdm-9999.ebuild copy to gnome-base/gdm/gdm-3.20.0.ebuild index 49b3223..3ecef06 100644 --- a/gnome-base/gdm/gdm-9999.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} = 9999 ]]; 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} = 9999 ]]; 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} = 9999 ]]; 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} != 9999 ]]; then - eautoreconf - fi + eautoreconf gnome2_src_prepare } src_configure() { - local myconf="" - - [[ ${PV} != 9999 ]] && 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() { --enable-authentication-scheme=pam \ --with-default-pam-config=exherbo \ --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ - --with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \ --without-xevie \ + --enable-systemd-journal \ $(use_with audit libaudit) \ $(use_enable ipv6) \ $(use_with plymouth) \ $(use_with selinux) \ - $(use_with systemd) \ - $(use_with !systemd console-kit) \ - $(use_enable systemd systemd-journal) \ $(systemd_with_unitdir) \ $(use_with tcpd tcp-wrappers) \ $(use_enable wayland wayland-support) \ @@ -203,9 +180,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 @@ -235,4 +212,9 @@ 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 } diff --git a/gnome-base/gdm/gdm-9999.ebuild b/gnome-base/gdm/gdm-9999.ebuild index 49b3223..a1690e5 100644 --- a/gnome-base/gdm/gdm-9999.ebuild +++ b/gnome-base/gdm/gdm-9999.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,7 +6,7 @@ EAPI="5" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" -inherit autotools eutils gnome2 pam readme.gentoo systemd user +inherit autotools eutils gnome2 pam readme.gentoo systemd user versionator if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -24,8 +24,9 @@ LICENSE=" " SLOT="0" -IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama" -REQUIRED_USE="wayland? ( systemd )" + +IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" + if [[ ${PV} = 9999 ]]; then KEYWORDS="" else @@ -38,7 +39,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 +60,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 +95,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 +103,6 @@ DEPEND="${COMMON_DEPEND} xinerama? ( x11-proto/xineramaproto ) " -if [[ ${PV} = 9999 ]]; 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 +133,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 +142,13 @@ src_prepare() { # Show logo when branding is enabled use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch" - if [[ ${PV} != 9999 ]]; then - eautoreconf - fi + eautoreconf gnome2_src_prepare } src_configure() { - local myconf="" - - [[ ${PV} != 9999 ]] && 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 +159,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 +167,12 @@ 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 \ --without-xevie \ + --enable-systemd-journal \ $(use_with audit libaudit) \ $(use_enable ipv6) \ $(use_with plymouth) \ $(use_with selinux) \ - $(use_with systemd) \ - $(use_with !systemd console-kit) \ - $(use_enable systemd systemd-journal) \ $(systemd_with_unitdir) \ $(use_with tcpd tcp-wrappers) \ $(use_enable wayland wayland-support) \ @@ -203,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 @@ -235,4 +219,9 @@ 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 } diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml index 98d052e..547e121 100644 --- a/gnome-base/gdm/metadata.xml +++ b/gnome-base/gdm/metadata.xml @@ -9,10 +9,7 @@ Enable support for sys-process/audit Enables experimental fingerprint authentication using sys-auth/fprintd - Enable support for smooth transition from + Enable support for smooth transition from sys-boot/plymouth - Enables experimental smartcard authentication - Use sys-apps/systemd for session - tracking - +