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 80154138247 for ; Sat, 11 Oct 2014 23:11:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46715E0C74; Sat, 11 Oct 2014 23:11:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F7AAE0C74 for ; Sat, 11 Oct 2014 23:11:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EFFB33403B8 for ; Sat, 11 Oct 2014 23:11:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7718E799B for ; Sat, 11 Oct 2014 23:11:28 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1413068916.bf21e33e467cda6ed231b8a35f16a7232b7324b8.eva@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.12.1.ebuild gnome-base/gdm/gdm-3.14.0.ebuild gnome-base/gdm/gdm-9999.ebuild X-VCS-Directories: gnome-base/gdm/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: bf21e33e467cda6ed231b8a35f16a7232b7324b8 X-VCS-Branch: master Date: Sat, 11 Oct 2014 23:11:28 +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: dcebf662-5a6f-4483-866b-2c00cc3ac3c1 X-Archives-Hash: c21163b6976a878501196ba7659c4391 commit: bf21e33e467cda6ed231b8a35f16a7232b7324b8 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Oct 11 23:08:36 2014 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Oct 11 23:08:36 2014 +0000 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-9999.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-9999.ebuild b/gnome-base/gdm/gdm-9999.ebuild index e2c6848..a96d603 100644 --- a/gnome-base/gdm/gdm-9999.ebuild +++ b/gnome-base/gdm/gdm-9999.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} = 9999 ]]; 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 ${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 }