| 1 |
yngwin 12/06/21 07:37:15 |
| 2 |
|
| 3 |
Modified: lightdm-1.2.2-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Re-tidy. Restore glib slot. Drop unnecessary gobject-introspection minimal version (there is nothing lower in tree). Restore useful comments. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 x11-misc/lightdm/lightdm-1.2.2-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: lightdm-1.2.2-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- lightdm-1.2.2-r2.ebuild 20 Jun 2012 04:58:41 -0000 1.1 |
| 23 |
+++ lightdm-1.2.2-r2.ebuild 21 Jun 2012 07:37:15 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v 1.1 2012/06/20 04:58:41 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v 1.2 2012/06/21 07:37:15 yngwin Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
inherit autotools eutils pam |
| 32 |
@@ -15,18 +15,16 @@ |
| 33 |
KEYWORDS="~amd64 ~x86" |
| 34 |
IUSE="+introspection qt4" |
| 35 |
|
| 36 |
-COMMON_DEPEND=">=dev-libs/glib-2 |
| 37 |
+COMMON_DEPEND="dev-libs/glib:2 |
| 38 |
dev-libs/libxml2 |
| 39 |
sys-apps/accountsservice |
| 40 |
virtual/pam |
| 41 |
x11-libs/libX11 |
| 42 |
>=x11-libs/libxklavier-5 |
| 43 |
- introspection? ( >=dev-libs/gobject-introspection-1 ) |
| 44 |
- qt4? ( |
| 45 |
- x11-libs/qt-core:4 |
| 46 |
+ introspection? ( dev-libs/gobject-introspection ) |
| 47 |
+ qt4? ( x11-libs/qt-core:4 |
| 48 |
x11-libs/qt-dbus:4 |
| 49 |
- x11-libs/qt-gui:4 |
| 50 |
- )" |
| 51 |
+ x11-libs/qt-gui:4 )" |
| 52 |
RDEPEND="${COMMON_DEPEND} |
| 53 |
>=sys-auth/pambase-20101024-r2" |
| 54 |
DEPEND="${COMMON_DEPEND} |
| 55 |
@@ -36,7 +34,7 @@ |
| 56 |
sys-devel/gettext |
| 57 |
virtual/pkgconfig" |
| 58 |
|
| 59 |
-DOCS="NEWS" |
| 60 |
+DOCS=( NEWS ) |
| 61 |
|
| 62 |
src_prepare() { |
| 63 |
sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 |
| 64 |
@@ -54,18 +52,18 @@ |
| 65 |
} |
| 66 |
|
| 67 |
src_configure() { |
| 68 |
+ # Set default values if global vars unset |
| 69 |
local _greeter _session _user |
| 70 |
_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} |
| 71 |
_session=${LIGHTDM_SESSION:=gnome} |
| 72 |
_user=${LIGHTDM_USER:=root} |
| 73 |
- |
| 74 |
+ # Let user know how lightdm is configured |
| 75 |
einfo "Gentoo configuration" |
| 76 |
einfo "Default greeter: ${_greeter}" |
| 77 |
einfo "Default session: ${_session}" |
| 78 |
einfo "Greeter user: ${_user}" |
| 79 |
|
| 80 |
- econf \ |
| 81 |
- --localstatedir=/var \ |
| 82 |
+ econf --localstatedir=/var \ |
| 83 |
--disable-static \ |
| 84 |
$(use_enable introspection) \ |
| 85 |
$(use_enable qt4 liblightdm-qt) \ |
| 86 |
@@ -78,15 +76,17 @@ |
| 87 |
src_install() { |
| 88 |
default |
| 89 |
|
| 90 |
+ # Install missing files |
| 91 |
insinto /etc/${PN} |
| 92 |
doins data/{${PN},users,keys}.conf |
| 93 |
- |
| 94 |
doins "${FILESDIR}"/Xsession |
| 95 |
fperms +x /etc/${PN}/Xsession |
| 96 |
|
| 97 |
+ # Remove unnecessary files |
| 98 |
prune_libtool_files --all |
| 99 |
rm -rf "${ED}"/etc/init |
| 100 |
|
| 101 |
+ # Install proper pam files |
| 102 |
pamd_mimic system-local-login ${PN} auth account session |
| 103 |
pamd_mimic system-local-login ${PN}-autologin auth account session |
| 104 |
} |
| 105 |
|
| 106 |
|
| 107 |
|
| 108 |
1.43 x11-misc/lightdm/ChangeLog |
| 109 |
|
| 110 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?rev=1.43&view=markup |
| 111 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?rev=1.43&content-type=text/plain |
| 112 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?r1=1.42&r2=1.43 |
| 113 |
|
| 114 |
Index: ChangeLog |
| 115 |
=================================================================== |
| 116 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v |
| 117 |
retrieving revision 1.42 |
| 118 |
retrieving revision 1.43 |
| 119 |
diff -u -r1.42 -r1.43 |
| 120 |
--- ChangeLog 20 Jun 2012 04:58:41 -0000 1.42 |
| 121 |
+++ ChangeLog 21 Jun 2012 07:37:15 -0000 1.43 |
| 122 |
@@ -1,6 +1,10 @@ |
| 123 |
# ChangeLog for x11-misc/lightdm |
| 124 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 125 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.42 2012/06/20 04:58:41 ssuominen Exp $ |
| 126 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.43 2012/06/21 07:37:15 yngwin Exp $ |
| 127 |
+ |
| 128 |
+ 21 Jun 2012; Ben de Groot <yngwin@g.o> lightdm-1.2.2-r2.ebuild: |
| 129 |
+ Re-tidy. Restore glib slot. Drop unnecessary gobject-introspection minimal |
| 130 |
+ version (there is nothing lower in tree). Restore useful comments. |
| 131 |
|
| 132 |
*lightdm-1.2.2-r2 (20 Jun 2012) |
Archives