Apply pkglibexec patch. Thanks to Alphat-PC <AlphatPC@gmail.com>. Bug #397399

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

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 08a8ad617d8c61030ab6708b48310be0ff459c88..0864142d8a8194ce3e6e3ade96ceac0f4bd76aa5 100644 (file)
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.23 2011/11/19 20:27:34 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.24 2012/01/13 23:23:48 hwoarang Exp $
+
+  13 Jan 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/lightdm-1.0.6-pkglibexec.patch, lightdm-1.0.6-r3.ebuild:
+  Apply pkglibexec patch. Thanks to Alphat-PC <AlphatPC@gmail.com>. Bug #397399
 
 *lightdm-1.0.6-r3 (19 Nov 2011)
 

diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 281a3126e7252c96819e870080b40c5e096c8c51..262bee46a4dad807f78338f28e00112417023a10 100644 (file)
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -3,29 +3,30 @@ Hash: SHA512
 
 AUX Xsession 1641 RMD160 fec5ca0ab491c2d23a631d7bab4bfa634788841d SHA1 7261a104c145025c63f8febfcecc189badfd3e86 SHA256 fb38b265420e55b2fd96f003ab00ad2a2d2cd1902984c84239c8ca84eb9b66a9
 AUX lightdm 209 RMD160 376933fdcdbc9a3196a1eb741f152cac7447c7b3 SHA1 4903519bee34d24c89e42de9e6a4199ff8e8396e SHA256 ccbc64732dce394e0d238e4c095bdbcab23b4adfdbcf213a763e26d96476d208
+AUX lightdm-1.0.6-pkglibexec.patch 757 RMD160 ac773aa01efd79af1bba9b1c5467493653a11164 SHA1 870dd5ba429c844a1323ca862bb1bf350105a051 SHA256 c00d7c1c3463a96ed69da7159f8c410ff55cebe10c78554dea9d5bad56c41a55
 AUX lightdm-autologin 369 RMD160 2adb17241b378ad4ca10e6241cb21b5a679c0973 SHA1 8372a199f5e00fb0d9d2630d0ced060f190d2af2 SHA256 e964a100e72a8eccea4ed8e1558ae70cbe5b7cbea67415651d0c0bdcea2d06c8
 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-r2.ebuild 3380 RMD160 7feaa3efc2a47e4126a51fa1bf58b45c8d988b77 SHA1 e2faca1aac49e90401a218b6e92ad5f2e54f6062 SHA256 e868ac6e176732a4afbcf8713b6c92e4e31832dfeeea7922ea9c0ce0ffc09167
-EBUILD lightdm-1.0.6-r3.ebuild 3418 RMD160 1104d2c6695b835aee2adfe46339668901ed7560 SHA1 6459ef7d0b6a7d876c0ca988c94bf9bdf5d31fe7 SHA256 9f67139bf736a97fe66a198aa4b15bb379064dd51a147beb0b933e0c9ce7370e
-MISC ChangeLog 3413 RMD160 9455122a617c5ea3d65bb0653b0b8e4c3cb73c3e SHA1 627b8e16ffe888ad4c97ee3dcdc428279383c727 SHA256 7de0d8f1f4c2a5158fcd7a029c0281e9faebf9dcba587b22a275016d827ac27f
+EBUILD lightdm-1.0.6-r3.ebuild 3461 RMD160 c95b4f837217de7fb68ed702dcba87e3b1f7f0ef SHA1 95184adc3266ee079d5505ef6c33f926ffc638ca SHA256 10cc3129d35b0a281cf0128ba056eaccae36da47657ebf7192270f951240812f
+MISC ChangeLog 3613 RMD160 a63a14c9aa09e2e32070dc5ccb5c55131f675df4 SHA1 9807feae0de30cdb53494b41ef8b76184d233d02 SHA256 4937336fa485eec071ed2ee6225b1ca86bb2a44876ba1a8ae115a1cfca5686af
 MISC metadata.xml 476 RMD160 ffe13acf80a13cf4793170da46aac1087ab9e753 SHA1 6de246984b16415d8e1fe8cab2478ce5b1da4c31 SHA256 a3a8bd4e87cb4735bcc99606498b27552517c024d0ac85b05a7aec35c6c2983d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOyBE5AAoJEPqDWhW0r/LC2EoQAL7ndo2CKW7bhDpS2KGnb5mN
-fmE53Po77VPFJB9r/TiIP/87GETBBv1j75Rct5jV+joORYJKjeblcrlGILl9LmV0
-Omg046ik9nWJqwQGWsWvZ70epWLetJKhRC36k3w4/ruGJTS4UeZubHvTZl/2UvJF
-7WzJ8iovXVxah0Rilq7ZY6AzLYOMslbYjiPedEqbvbNXLsJnhfTPrfTRLtn3xVWk
-vXeLyZ12tpUqUf/uurovVNrBhVd9bDklBItQasmunILb8VkNxjXxUI7bZB4AncpM
-azi1EGvrchVILxRd98y2NoQbz064cFmo+NdQ4Ui/3QVF8CSzDoS3IErISOq7I95H
-AqbMamewA4SSSt5oiA3brEuxul9fNmIXy7L/APbM7JXcS69WWx8HsuFTR03/qSOW
-CejFK3VjsNbrcZV5J+UguL+Tti1ufCKjW4UV609dngLYJxUMXruxQXqW/SQlA9cV
-W9kVAvnoQ4VaJDZXq3cw0bJfy52gqz1pMBwwN0AN/tNxuS310NHDAUat5O0cCFru
-XMSwlAJD/evbvvN+qolhD5HM1yYRsDyqfk4K5davyZAO8YCdcGJv8LyX5wIC7nd4
-37ggVdU72pDhxgMVzblAFWmm7v9gtWa8RWbHtWy2ZWdQgRNSYqOYNxMhJFSUuKup
-fqy2jQu7N5Ra/IyBARXR
-=XZyj
+iQIcBAEBCgAGBQJPEL0HAAoJEPqDWhW0r/LC1VMP/Al+HYj8tMUkO8sqtie/126n
+VNZlDOkGMTvYUpdsnATha2pW9I5LLzibkx0uYPKbE+aKNFd7L9C8w0aLSFAShJ9l
+oMrGvBeK3+Ke06IhOjUyc/JPfrlGU7ekFKQ544PFkg20VAJ9uzPeVAB5i+2bb537
+UgHgWVYsKD1s877rlSXQo2LEaji3OyOJklcTW1YUZQebib6T0npWs548FrLHaIvH
+5ibKatJNltjK1DHV58JeANzSaiH0RqV7ATd05/LU4UsHMrAb+fQuo1dRZ6kHUPK4
+FJyb4ckDpYaveFZtFp0ULNC8LCvbBm81JxJwwNc+Dbj3/ZBzWbmtJnjQKb37JFzV
+VEkGzoQKLpQJyJRvv7jT/AxaW1MeM+eiM52Q/9AsVWXTCfJWyR3T3qtRcWJNxven
+UiYGReNE5YohOH9wqKk+dLtddLH9EpKZx4YCi0TwTTW6ByLSH2cD3/cQaSKTxLGD
+swQdzm332SUAhgSSLW7VV0dnKQJTO1x3UuzMAmykRXgLIbSWYOMS9MBvggjsu73y
+kDhbfxVJmYhgraCGxgjmm2yRfHRrJx5FzKP2HIwE5q6lz6NaXwkxVbfAwuVgnJeM
+6Ni5ysPu9cfSvA49wC3HhXbVLsNscT7DtDHjvO+UQXsqionzjazpzh22tue+gwlQ
+Z1hWhR7Xslsx/IE8cc04
+=AvmC
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch b/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch
new file mode 100644 (file)
index 0000000..ef208a7
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch
@@ -0,0 +1,25 @@
+Install dir:
+    /usr/libexec/lightdm-guest-session-wrapper
+    /usr/libexec/lightdm-set-defaults
+    /usr/libexec/lightdm/gdmflexiserver
+
+Due to the following change, pkglibexec_SCRIPTS is invalid:
+    http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
+
+---
+ utils/Makefile.am |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+index 41df48b..ee527cf 100644
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
+@@ -1,6 +1,7 @@
+ bin_PROGRAMS = dm-tool
+ libexec_PROGRAMS = lightdm-set-defaults
+-dist_pkglibexec_SCRIPTS = gdmflexiserver
++ldmlibexecdir = $(libexecdir)/@PACKAGE@
++dist_ldmlibexec_SCRIPTS = gdmflexiserver
+ 
+ dm_tool_SOURCES = \
+       dm-tool.c

diff --git a/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild b/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild
index b90f2ca76a59547826d515d4de65cc55b1045764..46a46b55b5e5e3f3358c529eb889e7bdaf87b544 100644 (file)
--- a/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild
+++ b/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.0.6-r3.ebuild,v 1.1 2011/11/19 20:27:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild,v 1.2 2012/01/13 23:23:48 hwoarang Exp $
 
 EAPI=4
 inherit autotools eutils pam
@@ -42,7 +42,7 @@ src_prepare() {
        sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
        sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
        epatch "${FILESDIR}"/session-wrapper-${PN}.patch
-
+       epatch "${FILESDIR}"/${P}-pkglibexec.patch
        if has_version dev-libs/gobject-introspection; then
                eautoreconf
        else