diff options
| author |   Johannes Huber <johu@gentoo.org> | 2015-01-28 23:06:23 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2015-01-28 23:06:23 +0000 |
| commit | 375e8d15cb9f4c0eacb24c77291781cf19af3595 (patch) | |
| tree | 0ba1c63e6eeb180adcf29c252d85f8d0fab817c9 /dev-libs/qoauth | |
| parent | Switch to CPU_FLAGS_X86. (diff) | |
| download | gentoo-2-375e8d15cb9f4c0eacb24c77291781cf19af3595.tar.gz gentoo-2-375e8d15cb9f4c0eacb24c77291781cf19af3595.tar.bz2 gentoo-2-375e8d15cb9f4c0eacb24c77291781cf19af3595.zip | |
Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'dev-libs/qoauth')
| -rw-r--r-- | dev-libs/qoauth/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/qoauth/qoauth-1.0.1.ebuild | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/dev-libs/qoauth/ChangeLog b/dev-libs/qoauth/ChangeLog index a13c398b3bb9..9c5d208b0b31 100644 --- a/dev-libs/qoauth/ChangeLog +++ b/dev-libs/qoauth/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/qoauth -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/ChangeLog,v 1.21 2013/04/02 20:56:16 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/ChangeLog,v 1.22 2015/01/28 23:06:23 johu Exp $ + + 28 Jan 2015; Johannes Huber <johu@gentoo.org> qoauth-1.0.1.ebuild: + Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. 02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> qoauth-1.0.1.ebuild: Stable for ppc64, wrt bug #462890 diff --git a/dev-libs/qoauth/qoauth-1.0.1.ebuild b/dev-libs/qoauth/qoauth-1.0.1.ebuild index 88555e5baed9..3f5a8c0fe664 100644 --- a/dev-libs/qoauth/qoauth-1.0.1.ebuild +++ b/dev-libs/qoauth/qoauth-1.0.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/qoauth-1.0.1.ebuild,v 1.12 2013/04/02 20:56:16 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/qoauth-1.0.1.ebuild,v 1.13 2015/01/28 23:06:23 johu Exp $ EAPI=4 @@ -15,13 +15,13 @@ SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" IUSE="debug doc static-libs test" -COMMON_DEPEND="app-crypt/qca:2[debug?]" +COMMON_DEPEND="app-crypt/qca:2[debug?,qt4(+)]" DEPEND="${COMMON_DEPEND} doc? ( app-doc/doxygen ) test? ( dev-qt/qttest:4 ) " RDEPEND="${COMMON_DEPEND} - app-crypt/qca-ossl:2[debug?] + || ( app-crypt/qca-ossl:2[debug?] app-crypt/qca:2[debug?,openssl] ) " S=${WORKDIR}/${P}-src |