diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-02-22 18:41:23 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-02-22 18:41:23 +0000 |
| commit | d3c7e9661a3041fcc300db221b30937591db3f71 (patch) | |
| tree | 82758e287f11312a60d21a883fbbd69999dde14c /sys-auth | |
| parent | Add missing dependencies for USE=doc, bug 540966. (diff) | |
| download | gentoo-2-d3c7e9661a3041fcc300db221b30937591db3f71.tar.gz gentoo-2-d3c7e9661a3041fcc300db221b30937591db3f71.tar.bz2 gentoo-2-d3c7e9661a3041fcc300db221b30937591db3f71.zip | |
Update dependency on QCA plugins to use USE flags on app-crypt/qca:2 unconditionally, to provide a single sane path for dependency resolution. Bug #541066.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sys-auth')
| -rw-r--r-- | sys-auth/fingerprint-gui/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild | 5 | ||||
| -rw-r--r-- | sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/sys-auth/fingerprint-gui/ChangeLog b/sys-auth/fingerprint-gui/ChangeLog index e89cb981913d..3d98e27d5055 100644 --- a/sys-auth/fingerprint-gui/ChangeLog +++ b/sys-auth/fingerprint-gui/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-auth/fingerprint-gui # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog,v 1.9 2015/01/29 01:47:10 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/ChangeLog,v 1.10 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny <mgorny@gentoo.org> fingerprint-gui-1.05-r1.ebuild, + fingerprint-gui-1.05.ebuild: + Update dependency on QCA plugins to use USE flags on app-crypt/qca:2 + unconditionally, to provide a single sane path for dependency resolution. Bug + #541066. 29 Jan 2015; Johannes Huber <johu@gentoo.org> fingerprint-gui-1.05-r1.ebuild, fingerprint-gui-1.05.ebuild: diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild index 6a6ae677017a..d1bb7b660a4b 100644 --- a/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild +++ b/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild,v 1.2 2015/01/29 01:47:10 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -15,8 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+upekbsapi" -DEPEND="app-crypt/qca:2[qt4(+)] - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) +DEPEND="app-crypt/qca:2[openssl,qt4(+)] sys-auth/libfprint sys-auth/polkit-qt sys-libs/pam diff --git a/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild b/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild index 92f55e7948ca..c6805e5ad71d 100644 --- a/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild +++ b/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild,v 1.2 2015/01/29 01:47:10 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $ EAPI=4 @@ -15,8 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+upekbsapi" -DEPEND="app-crypt/qca:2[qt4(+)] - || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) +DEPEND="app-crypt/qca:2[openssl,qt4(+)] sys-auth/libfprint sys-auth/polkit-qt sys-libs/pam |