diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-03-05 05:21:04 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-03-05 05:21:04 +0000 |
| commit | e42df09b82fc2dbb045c81300ae57ffc49ccdf37 (patch) | |
| tree | f6b2c84cfc0df5fa8a073e7918b505b4d1ae1ddf /app-crypt | |
| parent | simplify SLOT logic (diff) | |
| download | gentoo-2-e42df09b82fc2dbb045c81300ae57ffc49ccdf37.tar.gz gentoo-2-e42df09b82fc2dbb045c81300ae57ffc49ccdf37.tar.bz2 gentoo-2-e42df09b82fc2dbb045c81300ae57ffc49ccdf37.zip | |
Allow older zlib versions without the static-libs use flag to statisfy the dependency as well.
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/gnupg/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/gnupg/gnupg-2.0.18.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog index 8f838016392e..3b80d1c6992d 100644 --- a/app-crypt/gnupg/ChangeLog +++ b/app-crypt/gnupg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/gnupg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.424 2012/03/05 04:31:00 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.425 2012/03/05 05:21:04 radhermit Exp $ + + 05 Mar 2012; Tim Harder <radhermit@gentoo.org> gnupg-2.0.18.ebuild: + Allow older zlib versions without the static-libs use flag to statisfy the + dependency as well. 05 Mar 2012; Tim Harder <radhermit@gentoo.org> gnupg-2.0.18.ebuild: Add more dependencies required for static build (fixes bugs #395669 and diff --git a/app-crypt/gnupg/gnupg-2.0.18.ebuild b/app-crypt/gnupg/gnupg-2.0.18.ebuild index db87b4561dc5..32643fbeb4da 100644 --- a/app-crypt/gnupg/gnupg-2.0.18.ebuild +++ b/app-crypt/gnupg/gnupg-2.0.18.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/app-crypt/gnupg/gnupg-2.0.18.ebuild,v 1.5 2012/03/05 04:31:00 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.18.ebuild,v 1.6 2012/03/05 05:21:04 radhermit Exp $ EAPI="4" @@ -40,7 +40,7 @@ DEPEND="${COMMON_DEPEND_LIBS} >=dev-libs/libgpg-error-1.7[static-libs] >=dev-libs/libksba-1.0.7[static-libs] >=dev-libs/pth-1.3.7[static-libs] - sys-libs/zlib[static-libs] + || ( sys-libs/zlib[static-libs] <sys-libs/zlib-1.2.5.1-r2 ) ) nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo )" |