1 |
ssuominen 12/01/28 07:57:33 |
2 |
|
3 |
Modified: ChangeLog xdm-1.1.11-r1.ebuild |
4 |
Log: |
5 |
Explicitely block =sys-auth/pambase-20101024-r1 to ensure the "nox11" argument is restored to pam_ck_connector.so which would otherwise conflict with the native ConsoleKit support. |
6 |
|
7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.133 x11-apps/xdm/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/ChangeLog?rev=1.133&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/ChangeLog?rev=1.133&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/ChangeLog?r1=1.132&r2=1.133 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v |
19 |
retrieving revision 1.132 |
20 |
retrieving revision 1.133 |
21 |
diff -u -r1.132 -r1.133 |
22 |
--- ChangeLog 28 Jan 2012 07:52:04 -0000 1.132 |
23 |
+++ ChangeLog 28 Jan 2012 07:57:33 -0000 1.133 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for x11-apps/xdm |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.132 2012/01/28 07:52:04 ssuominen Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.133 2012/01/28 07:57:33 ssuominen Exp $ |
29 |
+ |
30 |
+ 28 Jan 2012; Samuli Suominen <ssuominen@g.o> xdm-1.1.11-r1.ebuild: |
31 |
+ Explicitely block =sys-auth/pambase-20101024-r1 to ensure the "nox11" |
32 |
+ argument is restored to pam_ck_connector.so which would otherwise conflict |
33 |
+ with the native ConsoleKit support. |
34 |
|
35 |
*xdm-1.1.11-r1 (28 Jan 2012) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.2 x11-apps/xdm/xdm-1.1.11-r1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r1.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r1.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r1.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: xdm-1.1.11-r1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r1.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- xdm-1.1.11-r1.ebuild 28 Jan 2012 07:52:04 -0000 1.1 |
53 |
+++ xdm-1.1.11-r1.ebuild 28 Jan 2012 07:57:33 -0000 1.2 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2012 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r1.ebuild,v 1.1 2012/01/28 07:52:04 ssuominen Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r1.ebuild,v 1.2 2012/01/28 07:57:33 ssuominen Exp $ |
59 |
|
60 |
EAPI=4 |
61 |
|
62 |
@@ -28,6 +28,7 @@ |
63 |
consolekit? ( sys-auth/consolekit ) |
64 |
pam? ( virtual/pam )" |
65 |
DEPEND="${RDEPEND} |
66 |
+ !=sys-auth/pambase-20101024-r1 |
67 |
x11-proto/xineramaproto |
68 |
x11-proto/xproto" |