Gentoo Archives: gentoo-commits

From: "Peter Weller (welp)" <welp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gdm: ChangeLog gdm-2.20.5.ebuild
Date: Mon, 21 Apr 2008 17:06:01
Message-Id: E1JnzSo-00024z-IJ@stork.gentoo.org
1 welp 08/04/21 17:05:58
2
3 Modified: ChangeLog gdm-2.20.5.ebuild
4 Log:
5 keyring to gnome-keyring
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.269 gnome-base/gdm/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.269&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.269&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/ChangeLog?r1=1.268&r2=1.269
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v
18 retrieving revision 1.268
19 retrieving revision 1.269
20 diff -u -r1.268 -r1.269
21 --- ChangeLog 20 Apr 2008 20:36:07 -0000 1.268
22 +++ ChangeLog 21 Apr 2008 17:05:57 -0000 1.269
23 @@ -1,6 +1,9 @@
24 # ChangeLog for gnome-base/gdm
25 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.268 2008/04/20 20:36:07 eva Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.269 2008/04/21 17:05:57 welp Exp $
28 +
29 + 21 Apr 2008; <welp@g.o> gdm-2.20.5.ebuild:
30 + keyring to gnome-keyring
31
32 *gdm-2.20.5 (20 Apr 2008)
33
34
35
36
37 1.2 gnome-base/gdm/gdm-2.20.5.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/gdm-2.20.5.ebuild?rev=1.2&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/gdm-2.20.5.ebuild?rev=1.2&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/gdm-2.20.5.ebuild?r1=1.1&r2=1.2
42
43 Index: gdm-2.20.5.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.5.ebuild,v
46 retrieving revision 1.1
47 retrieving revision 1.2
48 diff -u -r1.1 -r1.2
49 --- gdm-2.20.5.ebuild 20 Apr 2008 20:36:07 -0000 1.1
50 +++ gdm-2.20.5.ebuild 21 Apr 2008 17:05:58 -0000 1.2
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2008 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.5.ebuild,v 1.1 2008/04/20 20:36:07 eva Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.5.ebuild,v 1.2 2008/04/21 17:05:58 welp Exp $
56
57 inherit autotools eutils pam gnome2
58
59 @@ -12,7 +12,7 @@
60 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86 ~x86-fbsd"
61
62 IUSE_LIBC="elibc_glibc"
63 -IUSE="accessibility afs branding dmx ipv6 keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
64 +IUSE="accessibility afs branding dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
65
66 # Name of the tarball with gentoo specific files
67 GDM_EXTRA="${PN}-2.20.5-gentoo-files"
68 @@ -42,7 +42,7 @@
69 accessibility? ( x11-libs/libXevie )
70 afs? ( net-fs/openafs sys-libs/lwp )
71 dmx? ( x11-libs/libdmx )
72 - keyring? ( >=gnome-base/gnome-keyring-2.22 )
73 + gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
74 pam? (
75 virtual/pam
76 >=sys-auth/pambase-20080318
77 @@ -83,15 +83,15 @@
78 G2CONF="${G2CONF} --with-dmx=no"
79 fi
80
81 - if use keyring && ! built_with_use gnome-base/gnome-keyring pam; then
82 + if use gnome-keyring && ! built_with_use gnome-base/gnome-keyring pam; then
83 eerror "You need to build gnome-base/gnome-keyring with USE=\"pam\""
84 - eerror "for USE=\"keyring\" to have any effect on this package."
85 + eerror "for USE=\"gnome-keyring\" to have any effect on this package."
86 fi
87
88 if use pam; then
89 G2CONF="${G2CONF} --enable-authentication-scheme=pam"
90
91 - if use keyring && ! built_with_use sys-auth/pambase gnome; then
92 + if use gnome-keyring && ! built_with_use sys-auth/pambase gnome; then
93 eerror "You need USE=\"gnome\" in sys-auth/pambase for proper keyring"
94 eerror "unlocking at login time. It will not work properly otherwise."
95 fi
96 @@ -153,7 +153,7 @@
97 rm -rf "${D}/etc/pam.d"
98
99 if use pam ; then
100 - use keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
101 + use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
102
103 dopamd "${gentoodir}"/pam.d/*
104 dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
105 @@ -188,7 +188,7 @@
106
107 elog "See README.install for more information about the change."
108
109 - if use keyring; then
110 + if use gnome-keyring; then
111 elog "For autologin to unlock your keyring, you need to set an empty"
112 elog "password on your keyring. Use app-crypt/seahorse for that."
113 fi
114
115
116
117 --
118 gentoo-commits@l.g.o mailing list