Make Xsession executable. Refactor session-wrapper script

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

4 files changed, 37 insertions, 24 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 2864bc4fe196..3dbae7a51b6a 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.21 2011/11/05 19:38:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.22 2011/11/05 23:51:20 hwoarang Exp $
+
+*lightdm-1.0.6-r2 (05 Nov 2011)
+
+  05 Nov 2011; Markos Chandras <hwoarang@gentoo.org> +lightdm-1.0.6-r2.ebuild,
+  -lightdm-1.0.6-r1.ebuild, files/session-wrapper-lightdm.patch:
+  Make Xsession executable. Refactor session-wrapper script
 
   05 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> lightdm-1.0.6-r1.ebuild:
   Missing introspection.m4 for eautoreconf with USE="-introspection" wrt
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 9eb7f94e3780..d7a0536c4394 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,23 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX Xsession 1641 RMD160 fec5ca0ab491c2d23a631d7bab4bfa634788841d SHA1 7261a104c145025c63f8febfcecc189badfd3e86 SHA256 fb38b265420e55b2fd96f003ab00ad2a2d2cd1902984c84239c8ca84eb9b66a9
 AUX lightdm 209 RMD160 376933fdcdbc9a3196a1eb741f152cac7447c7b3 SHA1 4903519bee34d24c89e42de9e6a4199ff8e8396e SHA256 ccbc64732dce394e0d238e4c095bdbcab23b4adfdbcf213a763e26d96476d208
-AUX session-wrapper-lightdm.patch 344 RMD160 1630a3f971b81eb2433feba9e0f70ab923da1cdc SHA1 670c4f2b84e5a56ac8cbbf6a61b0701e3c1f8123 SHA256 59e64e288315268714504c52f32561d23a675347f02e23dc28c3740caabb3a8b
+AUX session-wrapper-lightdm.patch 419 RMD160 899fd1b62b77ff1d3dcd46c35092486391f8bc2b SHA1 a609ddf728296ed8c139e2750ad3557e2a8bfec0 SHA256 de5504221cd31c6d25ccbb21f4559780564ce908e2306238d92dd4ac481e687a
 DIST introspection-20110205.m4.tar.bz2 1220 RMD160 c520adf7edf0e56012138208b45bed9df2a3e62f SHA1 092adcee1acce39e89069db0f3e8b4cb7ad89dea SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2
 DIST lightdm-1.0.6.tar.gz 648433 RMD160 798fc0a3277e07e50a7c22b961027972f03d695c SHA1 5e9ab2fd7353cf17f06e11b581fdd3f1c21586a7 SHA256 745f2ffe58f90ffb318527d20520e1e8f04a36dfa2ac9cc00140857ef57284ae
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
-EBUILD lightdm-1.0.6-r1.ebuild 3351 RMD160 990aaee240b82704f49ed8dfcc836d0dca5de33c SHA1 b6db844f529161a2c24646a8ffda5c3e0c36baa4 SHA256 9457294dd7a25bb2ceba165ac5a9cb99c3b3a017827dda3bf3a6bd5486bd8cdd
-MISC ChangeLog 2944 RMD160 cfaa4e8aea9d800e361eed32d6180e549d4e1206 SHA1 dad6d3443db455304f7d61a7eb94dd9a6aaf6588 SHA256 110633786882408584fc17994b98624d3d0f5e72bead82e866fec8d94f87c493
+EBUILD lightdm-1.0.6-r2.ebuild 3380 RMD160 7feaa3efc2a47e4126a51fa1bf58b45c8d988b77 SHA1 e2faca1aac49e90401a218b6e92ad5f2e54f6062 SHA256 e868ac6e176732a4afbcf8713b6c92e4e31832dfeeea7922ea9c0ce0ffc09167
+MISC ChangeLog 3181 RMD160 e8522db39c1b0c3b7b885e0660e08d16c148a756 SHA1 3269e23167721822feb0b2ada651daa73a22de57 SHA256 ac5c69661651acf19ccb5e9e80d0805ea9a1605d444696e5d97918d9f328e062
 MISC metadata.xml 476 RMD160 ffe13acf80a13cf4793170da46aac1087ab9e753 SHA1 6de246984b16415d8e1fe8cab2478ce5b1da4c31 SHA256 a3a8bd4e87cb4735bcc99606498b27552517c024d0ac85b05a7aec35c6c2983d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOtZCHAAoJEEdUh39IaPFNleYH/AjrQ2X4ah/Aq3wIqTWlhS+Z
-zWEP++VSpMMNNpK1Ft8l/zKngpE+AmQPnYvMHtSrNlkT07EMId2OsxBwtxiCFTUS
-WVSFK92G1tZW0HJeZtBrb4hiDI7Vb8OZT6S5SDUseHtyMxVhJ885Ct3cGcXmfizS
-1NL0CnPJrNjVCB5v8N9qqBSKcFcSQEBvsVLDqTjiKLrgF6mHMK/XNVIuCVCvIAgu
-Fc71ks3SagQkQUe0TyByOykNUVpzTjcDPMZy2Eqc0Nx4olDWhjegHZO5MW8Eamq5
-wlVy0CWfNQamD+rUU3mYxCJRAgsJOVkeH2Y3LK9C3VIMVPIIuBg3CO1ULbGZb6A=
-=5e0E
+iQIcBAEBCgAGBQJOtcv+AAoJEPqDWhW0r/LCWLEP/RpeVs5SDj0Pb4HUys51rGBY
+AsEQM8R4yMf8NM8IlqCIvpkn5aXOVwr8Eo8xaTuVWFS7uEahbR+rPOtNqPAofjeA
+qRsX6QFjl/Gx7YRVJy1jZbfKq+f+RVqb3KSYV7HRdkVPFM3I7NXT1srEUNl7srI+
+AubnbRXJmyr1ptUA7vLnhsYKIeXWzPtcJEGV3ZtbecZpRdYika1hC5pNAzqzdf8G
+WnoSHQ6lMyRMuaq3ZomBTDByP25jgnOLKiihMoLnXEJ1/B3uSIq1CEG1xy5OB7Ol
+xB1NxR878J2yP241iQ1BCWunKyBbrno/StCpLpBwXZ1Gt3CTTWbNYTTzDzwoQJki
+v8c+KQLkDAO8ytiv327ORhpxroGMTAOvDAPKdC/ldzamoKYOyRXiUTaAtpMJhj12
+tozKrprncg0KAq2yZxzRKx2WcDO0oE/xDhjvK58psfxe3msiCaHKlwbo0AnreYnH
+PTb7KtM5byN7wPwjNPm35pBnGEc4TY63CTCbqNzOhqD4cSz8nD0q33K1ZdYewDQu
+ZAJvKnu7jPwIbTjKrqjtEI+YLNmSQso7F5ePTpCwIO11UbhZDDFBt5Tgs2xYYP2j
+5j/8BgwFWvHArURXEzErxaZGGBoNUWMKpXQ/nhxISmAld8SneiR+NQDbh6V53Zc6
+OA9dCbmKXU1CYJ5B+Toq
+=C1Gw
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm/files/session-wrapper-lightdm.patch b/x11-misc/lightdm/files/session-wrapper-lightdm.patch
index f8ffc702c6e3..9f41816a9f5f 100644
--- a/x11-misc/lightdm/files/session-wrapper-lightdm.patch
+++ b/x11-misc/lightdm/files/session-wrapper-lightdm.patch
@@ -1,12 +1,13 @@
-Index: data/lightdm.conf
+Index: lightdm-1.0.6/data/lightdm.conf
 ===================================================================
---- data.orig/lightdm.conf
-+++ data/lightdm.conf
-@@ -25,6 +25,7 @@
- #cache-directory=/var/cache/lightdm
- #xsessions-directory=/usr/share/xsessions
- #xgreeters-directory=/usr/share/xgreeters
+--- lightdm-1.0.6.orig/data/lightdm.conf
++++ lightdm-1.0.6/data/lightdm.conf
+@@ -65,7 +65,7 @@
+ #user-session=default
+ #allow-guest=true
+ #guest-session=UNIMPLEMENTED
+-#session-wrapper=lightdm-session
 +session-wrapper=/etc/lightdm/Xsession
- 
- #
- # Seat defaults
+ #display-setup-script=
+ #greeter-setup-script=
+ #session-setup-script=
diff --git a/x11-misc/lightdm/lightdm-1.0.6-r1.ebuild b/x11-misc/lightdm/lightdm-1.0.6-r2.ebuild
index dc4ade084285..04c8a7c7248e 100644
--- a/x11-misc/lightdm/lightdm-1.0.6-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.0.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.6-r1.ebuild,v 1.4 2011/11/05 19:38:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.6-r2.ebuild,v 1.1 2011/11/05 23:51:20 hwoarang Exp $
 
 EAPI=4
 inherit autotools eutils pam
@@ -85,7 +85,7 @@ src_install() {
 	insinto /etc/${PN}/
 	doins "${S}"/data/{users,keys}.conf
 	doins "${FILESDIR}"/Xsession
-
+	fperms +x /etc/${PN}/Xsession
 	# remove .la files
 	find "${ED}" -name "*.la" -exec rm -rf {} +
 	rm -Rf "${ED}"/etc/init || die