Re-tidy. Restore glib slot. Drop unnecessary gobject-introspection minimal version (there is nothing lower in tree). Restore useful comments.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 19 insertions, 29 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 0d1e0ab48667..a3dbacf73e57 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -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 <yngwin@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)
 
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index dfea9610ed0d..b125183ab3ec 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Xsession 1641 RMD160 fec5ca0ab491c2d23a631d7bab4bfa634788841d SHA1 7261a104c145025c63f8febfcecc189badfd3e86 SHA256 fb38b265420e55b2fd96f003ab00ad2a2d2cd1902984c84239c8ca84eb9b66a9
 AUX lightdm 257 RMD160 85f6b3f74ce06fdd8ee9a5c550ec6c9a1cb75345 SHA1 1b93afa7fa26d5b7ad0292c49be274aa7b2ab932 SHA256 c43240d1fbdb76d219d11ffbb8ad406bcbd7c78c8eba9c03c0feb353b6671c27
 AUX lightdm-1.0.6-pkglibexec.patch 757 RMD160 ac773aa01efd79af1bba9b1c5467493653a11164 SHA1 870dd5ba429c844a1323ca862bb1bf350105a051 SHA256 c00d7c1c3463a96ed69da7159f8c410ff55cebe10c78554dea9d5bad56c41a55
@@ -13,18 +10,7 @@ DIST lightdm-1.2.2.tar.gz 642334 RMD160 bfd65206d389bc29e9b5a60e91044fa19c703115
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
 EBUILD lightdm-1.0.11.ebuild 3637 RMD160 ea1ef882661e1d53e631207dedfd9517c013b7fe SHA1 762931d6fc84ff0ad7e8cf21d7639fe7d2de709d SHA256 03064e876254588c136599d334f79f91be48ccbff3b710255afb1a5f3fa087eb
 EBUILD lightdm-1.2.2-r1.ebuild 2982 RMD160 4770d6200c6faa81b68f0127b0e568d6b605c795 SHA1 72c16a6e0953ccdcf1fd00cc3f65816e2cdd15cc SHA256 2f9a9f00f07879c54948b1917aca104e9ca353d02ac3c60d1926adad7004d9f3
-EBUILD lightdm-1.2.2-r2.ebuild 2962 RMD160 4e9d1e27912af7ef9c06a2a70a5a6cfbccb1c770 SHA1 70f3169f6a60f18abc90a13d05471f8f39cae6b1 SHA256 efb8e4de7a6f6322c129282f59f41a671e08adeea3da7c2fb3a234fac6a4a17b
+EBUILD lightdm-1.2.2-r2.ebuild 3112 RMD160 096058ab62677dca7fd4684525d13e1306b68c29 SHA1 c09f174e78620e88da9612fda084b8b2a4fd2140 SHA256 13fd3bdf34a5c14424ff2de0acc696f69df1926fed6bdf6a02771eb9fb9904a2
 EBUILD lightdm-1.2.2.ebuild 2751 RMD160 8b64cf6c134421447bd1a7ac45f62c45479c2007 SHA1 837564b400183024bbf5d184fd9d20e122089b9c SHA256 3ee3832e3d74657978db01be096072511d09415e2dd1b1b8d591a0a38638497e
-MISC ChangeLog 7109 RMD160 5179415bccbf63a8a88e27df6f40f145ffbd37f7 SHA1 4f80bbb58f2fe5d61a102335a40e153c652a7659 SHA256 7a2b1f98583424ddfd64f78767054e98b40b244ac3dbe8d39381a6163dca2a6d
+MISC ChangeLog 7326 RMD160 33b3674fd30eacded88359183bbebede440380af SHA1 8be0b77529bf3950830e162a271474e366ee185e SHA256 3aa03ff67f1c17ac7e3544eaba2af34d7eb93291518f91e63a9e8541f462f7d2
 MISC metadata.xml 565 RMD160 1f9bedfcdaeebb452bfd81e1e6ac52910381841e SHA1 2407aa8809f8da8403a865614dd2daacc53c6c42 SHA256 f229bd86fcc0af59f4d1d68e2f57d56ddda188940ec4b6a01ac26816b3d98fcd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBAgAGBQJP4VdtAAoJEEdUh39IaPFNmP0IAKO6bPegeF2LKJTnjWYX5DCx
-eAXJd0JfF8E6CEzJf/WC00uq/Pe3QCK31XPMEKPwZ49Hg8NFl01LCR69rKTX+RLd
-T4dQDpKSHknyZgNw6PBhTaBVmWUws50M6Eyrx6Vyy6I70073xNtfVZSmSYcE6pfG
-bcDUWE4P5rw6bMT4U80Ook9UT9bKfEA6VHLL6UHDv0PODhaYPI4yHwOI05fqRkOh
-NA7rFkKjZocshTk2OebTM2s+ik2UI5G8dzLM+PZ/cmRyo7fx4uOQej4jJa7lPGwf
-PJ3VcS1PeMXmrKHAQyT+OvMz1/1QWxEKxErQOXZXg92xz3inAxQ7NfdMqIgNnvM=
-=luO2
------END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild b/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild
index c82ebc2c7efb..96ed3129d1b0 100644
--- a/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild
+++ b/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild
@@ -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 @@ SLOT="0"
 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 @@ DEPEND="${COMMON_DEPEND}
 	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_prepare() {
 }
 
 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_configure() {
 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
 }