diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-01-28 07:57:33 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-28 07:57:33 +0000 |
| commit | 206143599e37b29b1fd48e8757467a45b5909f52 (patch) | |
| tree | 7984545826e04178b80fa1a2065020234cc10dbd /x11-apps/xdm | |
| parent | Add missing test dependency on open4, bug 391073. (diff) | |
| download | historical-206143599e37b29b1fd48e8757467a45b5909f52.tar.gz historical-206143599e37b29b1fd48e8757467a45b5909f52.tar.bz2 historical-206143599e37b29b1fd48e8757467a45b5909f52.zip | |
Explicitely block =sys-auth/pambase-20101024-r1 to ensure the "nox11" argument is restored to pam_ck_connector.so which would otherwise conflict with the native ConsoleKit support.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'x11-apps/xdm')
| -rw-r--r-- | x11-apps/xdm/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-apps/xdm/Manifest | 18 | ||||
| -rw-r--r-- | x11-apps/xdm/xdm-1.1.11-r1.ebuild | 3 |
3 files changed, 17 insertions, 11 deletions
diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog index 89563e9d82a6..30a8715b96ea 100644 --- a/x11-apps/xdm/ChangeLog +++ b/x11-apps/xdm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-apps/xdm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.132 2012/01/28 07:52:04 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.133 2012/01/28 07:57:33 ssuominen Exp $ + + 28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> xdm-1.1.11-r1.ebuild: + Explicitely block =sys-auth/pambase-20101024-r1 to ensure the "nox11" + argument is restored to pam_ck_connector.so which would otherwise conflict + with the native ConsoleKit support. *xdm-1.1.11-r1 (28 Jan 2012) diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest index 45d4fb819aa9..a21f3f4a3a7e 100644 --- a/x11-apps/xdm/Manifest +++ b/x11-apps/xdm/Manifest @@ -10,18 +10,18 @@ DIST xdm-1.1.10.tar.bz2 423578 RMD160 c5f6b3bba2d1294b560ad50e2eaaa90097c62dee S DIST xdm-1.1.11.tar.bz2 446612 RMD160 574b5bda0b46a43d0df474279d03e49fa93c9a92 SHA1 8195a8e17d71d18cb89813d04b69a3750e9e818e SHA256 d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47 EBUILD xdm-1.1.10-r1.ebuild 1313 RMD160 7b176ae8c7935b7e493a933d2eaba6d5233be93d SHA1 6fc96802ba63ca46d55915e412144f1e712b0350 SHA256 6bdc61bd529aac883efdf966a3be23741ccd3779a2761f1924a159a078baef8a EBUILD xdm-1.1.10-r2.ebuild 1970 RMD160 f1bc2940fee345629f57af97157e407ddf9e20c3 SHA1 754f7e84c71676ed67ae94353d33df9aea612334 SHA256 63a143577df305b64fa981eb16dc18298611376a19e311d1dc072bf7c7d4695b -EBUILD xdm-1.1.11-r1.ebuild 1799 RMD160 b97fbd2e09e6e6390e46b21c7bc3847120265438 SHA1 d8cca7e1a5a0ea6ee8a5dd5251016b5505b26c6c SHA256 1873beb144d6ddfa24825632b22b5185fc310975cdcdf9d503dceb4859cdee4b +EBUILD xdm-1.1.11-r1.ebuild 1831 RMD160 03d941a4b67a5c51ad3f3dd90ab2deca7f720bc3 SHA1 2cc06c6c451ae4bc61d2a3bc9360b124dec7429e SHA256 ab8ee5e5d21493ee757da30b6436a505676d097be39cbec8aeeeab199b3e5772 EBUILD xdm-1.1.11.ebuild 1810 RMD160 c2886d6a30cf909d501ec0618285538e12e51fe8 SHA1 f2ad58492dfbd0c50f5ba939d8f1311d805d613f SHA256 a5c00bc52f6afbf08a3b41f22993737fabaaf6d0cc24862cfe665eec55fece76 -MISC ChangeLog 19182 RMD160 5d52116cf480346c63a8ecf300ba71ed4dd649fe SHA1 6fedcec806b3bbd7bc0e58539c05c58a677506a1 SHA256 c4b53b18cdc07d015b08c77f4ae2ccc5b40ce9afaf5441de00cf2b7eceb4f314 +MISC ChangeLog 19446 RMD160 38c95aec0b4873b988c3c1025ed3fc55674ec4b4 SHA1 1571fc0d131a1172e483977beecdbdf21994ee5e SHA256 3c925282b154bcb02cf645868332f8942f44eb5f99cf8ceb8ecd3508bfbe73c1 MISC metadata.xml 263 RMD160 9ff3bbaed628e48ed00387ddb9990a91a434584e SHA1 4c3a3264e51fb691f208420459fa19f1b235ca8a SHA256 b5893b2e9cadfba8dcee59fe1044e4131621077472177850c1b6ae1d8eef2b4e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJPI6idAAoJEEdUh39IaPFNr5oH/ikwsrxxGIg24+waQZw2Fqd1 -FAoYFdHX4RcP48T8gLVcysgKeNNbmIgjbE/4v+TctvEq1X94I0kajQcC6xOiuniC -2Fy2odHz1PzLBX0TPnS+QrElFp1zUP/NQmoisKs2F7W5Ub/s7Zb9hU+dkkoNgbye -ZT9v2+loL7OnZoS9nwXQfm3KtO/1esSLvqZILGk8xv2rgmocnKUzNbfj5WBJtA+z -PQyZhZwt5Lvo7jD5AxYU3gJsxVFqPfQd/6hJ2ER7TJ9FTQm4QGus4wITnK48DRSo -T6qR8lZd6N4aHzi/uMtfp6wVl3Z8Tf8UwDrYUAL8FIS7Gyk1Bx7AUKd1hZyR4VU= -=qwV1 +iQEcBAEBAgAGBQJPI6nnAAoJEEdUh39IaPFNIh0H/iE5XEAjVoqG6jBZ93kJ+O6V +B7g6xIIOYbiKOr8NzUSxOIDT4jYgmuApKbZzXa0tdpX7NNHJN2SUeC/9Aqi/hZjw +nK+Qbr6X8ZhRsH5Ki/+LtriFyEJdjSuXw1eT4PEdOmzkfMr9kaP/80kIpdHewGPX +ydnNO++p1YiVxxAm88TJiCzYFPZH+0eMouuqhoC4Ubsn6GRUKYrpFY6KYSHLs+iB +jKBpwbIW0rEifi4pBK6wwWTVCMX+8AExA+B+1JUP096OEEaFGD80S6zxTk2a8tD+ +jeOzHpCYKTB7KREIQvBTVzI+oa6nY3BMTN0zdIPtuqFlOWGKDUcimadILTDS3v4= +=ds+M -----END PGP SIGNATURE----- diff --git a/x11-apps/xdm/xdm-1.1.11-r1.ebuild b/x11-apps/xdm/xdm-1.1.11-r1.ebuild index c1c4109d259a..ff0d7d731fbe 100644 --- a/x11-apps/xdm/xdm-1.1.11-r1.ebuild +++ b/x11-apps/xdm/xdm-1.1.11-r1.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-apps/xdm/xdm-1.1.11-r1.ebuild,v 1.1 2012/01/28 07:52:04 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r1.ebuild,v 1.2 2012/01/28 07:57:33 ssuominen Exp $ EAPI=4 @@ -28,6 +28,7 @@ RDEPEND="x11-apps/xrdb consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam )" DEPEND="${RDEPEND} + !=sys-auth/pambase-20101024-r1 x11-proto/xineramaproto x11-proto/xproto" |