On 06/21/2012 10:37 AM, Ben de Groot (yngwin) wrote:
yngwin 12/06/21 07:37:15
Modified: lightdm-1.2.2-r2.ebuild ChangeLog
Log:
Re-tidy. Restore glib slot. Drop unnecessary gobject-introspection minimal
version (there is nothing lower in tree). Restore useful comments.
There is no glib3 and all the commands are self-explanatory. And users
might still have older gobject-introspection installed, with nothing
forcing the upgrade now.
I consider this a regression (in every regard) and will just do the same
changes again with the next fixes
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Revision Changes Path
1.2 x11-misc/lightdm/lightdm-1.2.2-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild?rev=1.2&view=markup
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
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild?r1=1.1&r2=1.2
Index: lightdm-1.2.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lightdm-1.2.2-r2.ebuild 20 Jun 2012 04:58:41 -0000 1.1
+++ lightdm-1.2.2-r2.ebuild 21 Jun 2012 07:37:15 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=4
inherit autotools eutils pam
@@ -15,18 +15,16 @@
KEYWORDS="~amd64 ~x86"
IUSE="+introspection qt4"
-COMMON_DEPEND=">=dev-libs/glib-2
+COMMON_DEPEND="dev-libs/glib:2
dev-libs/libxml2
sys-apps/accountsservice
virtual/pam
x11-libs/libX11
>=x11-libs/libxklavier-5
- introspection? ( >=dev-libs/gobject-introspection-1 )
- qt4? (
- x11-libs/qt-core:4
+ introspection? ( dev-libs/gobject-introspection )
+ qt4? ( x11-libs/qt-core:4
x11-libs/qt-dbus:4
- x11-libs/qt-gui:4
- )"
+ x11-libs/qt-gui:4 )"
RDEPEND="${COMMON_DEPEND}
>=sys-auth/pambase-20101024-r2"
DEPEND="${COMMON_DEPEND}
@@ -36,7 +34,7 @@
sys-devel/gettext
virtual/pkgconfig"
-DOCS="NEWS"
+DOCS=( NEWS )
src_prepare() {
sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
@@ -54,18 +52,18 @@
}
src_configure() {
+ # Set default values if global vars unset
local _greeter _session _user
_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
_session=${LIGHTDM_SESSION:=gnome}
_user=${LIGHTDM_USER:=root}
-
+ # Let user know how lightdm is configured
einfo "Gentoo configuration"
einfo "Default greeter: ${_greeter}"
einfo "Default session: ${_session}"
einfo "Greeter user: ${_user}"
- econf \
- --localstatedir=/var \
+ econf --localstatedir=/var \
--disable-static \
$(use_enable introspection) \
$(use_enable qt4 liblightdm-qt) \
@@ -78,15 +76,17 @@
src_install() {
default
+ # Install missing files
insinto /etc/${PN}
doins data/{${PN},users,keys}.conf
-
doins "${FILESDIR}"/Xsession
fperms +x /etc/${PN}/Xsession
+ # Remove unnecessary files
prune_libtool_files --all
rm -rf "${ED}"/etc/init
+ # Install proper pam files
pamd_mimic system-local-login ${PN} auth account session
pamd_mimic system-local-login ${PN}-autologin auth account session
}
1.43 x11-misc/lightdm/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?rev=1.43&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?rev=1.43&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?r1=1.42&r2=1.43
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog 20 Jun 2012 04:58:41 -0000 1.42
+++ ChangeLog 21 Jun 2012 07:37:15 -0000 1.43
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/lightdm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.42
2012/06/20 04:58:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.43
2012/06/21 07:37:15 yngwin Exp $
+
+ 21 Jun 2012; Ben de Groot <yng...@gentoo.org> lightdm-1.2.2-r2.ebuild:
+ Re-tidy. Restore glib slot. Drop unnecessary gobject-introspection minimal
+ version (there is nothing lower in tree). Restore useful comments.
*lightdm-1.2.2-r2 (20 Jun 2012)
