summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-03-20 21:28:58 +0000
committerPacho Ramos <pacho@gentoo.org>2014-03-20 21:28:58 +0000
commit5681ae74fbfcf24f75157ab4898f7bfaf97ebb32 (patch)
tree6b240fc7132dd4000b3d661b7fc016082b81fe2e /gnome-base/gdm
parentMark arm64/m68k/s390/sh stable. (diff)
downloadgentoo-2-5681ae74fbfcf24f75157ab4898f7bfaf97ebb32.tar.gz
gentoo-2-5681ae74fbfcf24f75157ab4898f7bfaf97ebb32.tar.bz2
gentoo-2-5681ae74fbfcf24f75157ab4898f7bfaf97ebb32.zip
--with-initial-vt=7 conflicts with plymouth, bug #453392 by Jan Vesely
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-base/gdm')
-rw-r--r--gnome-base/gdm/ChangeLog5
-rw-r--r--gnome-base/gdm/gdm-3.10.0.1-r1.ebuild9
2 files changed, 11 insertions, 3 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index b794307fea96..b72aa3cb1bca 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-base/gdm
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.396 2014/03/19 22:30:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.397 2014/03/20 21:28:58 pacho Exp $
+
+ 20 Mar 2014; Pacho Ramos <pacho@gentoo.org> gdm-3.10.0.1-r1.ebuild:
+ --with-initial-vt=7 conflicts with plymouth, bug #453392 by Jan Vesely
*gdm-3.10.0.1-r1 (19 Mar 2014)
diff --git a/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild b/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild
index f947032fbd6b..c1ced6f21735 100644
--- a/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild,v 1.1 2014/03/19 22:30:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild,v 1.2 2014/03/20 21:28:58 pacho Exp $
EAPI="5"
GNOME2_LA_PUNT="yes"
@@ -149,12 +149,16 @@ src_prepare() {
}
src_configure() {
+ local myconf
# PAM is the only auth scheme supported
# even though configure lists shadow and crypt
# they don't have any corresponding code.
# --with-at-spi-registryd-directory= needs to be passed explicitly because
# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
# Xevie is obsolete, bug #482304
+ # --with-initial-vt=7 conflicts with plymouth, bug #453392
+ ! use plymouth && myconf="${myconf} --with-initial-vt=7"
+
gnome2_src_configure \
--with-run-dir=/run/gdm \
--localstatedir="${EPREFIX}"/var \
@@ -176,7 +180,8 @@ src_configure() {
$(systemd_with_unitdir) \
$(use_with tcpd tcp-wrappers) \
$(use_with xinerama) \
- ITSTOOL=$(type -P true)
+ ITSTOOL=$(type -P true) \
+ ${myconf}
}
src_install() {