diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2013-09-02 08:33:12 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2013-09-02 08:33:12 +0000 |
| commit | 5ede29888b803d2b0d7fa530123626e41e1668d3 (patch) | |
| tree | f925f161f60bd777b9784924398bf4c2dd7e2a0c /x11-misc | |
| parent | Stable for x86, wrt bug #482886 (diff) | |
| download | gentoo-2-5ede29888b803d2b0d7fa530123626e41e1668d3.tar.gz gentoo-2-5ede29888b803d2b0d7fa530123626e41e1668d3.tar.bz2 gentoo-2-5ede29888b803d2b0d7fa530123626e41e1668d3.zip | |
Make PAM and xlockrc support mutually exclusive as defined in configure file, wrt bug #255229
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xlockmore/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xlockmore/xlockmore-5.43.ebuild | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog index a655283a46d7..25355ea298a0 100644 --- a/x11-misc/xlockmore/ChangeLog +++ b/x11-misc/xlockmore/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xlockmore # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.137 2013/08/20 14:42:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.138 2013/09/02 08:33:12 pinkbyte Exp $ + + 02 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> xlockmore-5.43.ebuild: + Make PAM and xlockrc support mutually exclusive as defined in configure file, + wrt bug #255229 20 Aug 2013; Jeroen Roovers <jer@gentoo.org> -xlockmore-5.41.ebuild: Old. diff --git a/x11-misc/xlockmore/xlockmore-5.43.ebuild b/x11-misc/xlockmore/xlockmore-5.43.ebuild index 7ff2d2c2d718..8d598541ba01 100644 --- a/x11-misc/xlockmore/xlockmore-5.43.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.43.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.43.ebuild,v 1.8 2013/07/21 17:55:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.43.ebuild,v 1.9 2013/09/02 08:33:12 pinkbyte Exp $ EAPI=4 inherit autotools eutils flag-o-matic pam @@ -16,6 +16,8 @@ IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc REQUIRED_USE=" || ( crypt pam ) + pam? ( !xlockrc ) + xlockrc? ( !pam ) " RDEPEND=" gtk? ( x11-libs/gtk+:2 ) |