diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-08-26 14:46:27 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-08-26 14:46:27 +0000 |
| commit | 96ace494db168ee216d49fe92e35dfbdf0c59846 (patch) | |
| tree | 9281c8a7a0bf832690e158c14fdeb26ac6b406ca /sys-fs | |
| parent | bumped EAPI to 5 to help with dev-lang/perl upgrade (diff) | |
| download | gentoo-2-96ace494db168ee216d49fe92e35dfbdf0c59846.tar.gz gentoo-2-96ace494db168ee216d49fe92e35dfbdf0c59846.tar.bz2 gentoo-2-96ace494db168ee216d49fe92e35dfbdf0c59846.zip | |
Backport block to stabletarget
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index e463ce6d12ab..00eb2a0465d7 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.175 2014/08/26 14:43:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.176 2014/08/26 14:46:27 ssuominen Exp $ 26 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> +files/dmcrypt-1.0.6.confd, -cryptsetup-1.0.6-r2.ebuild, @@ -13,8 +13,9 @@ old 26 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> cryptsetup-1.6.2.ebuild, - cryptsetup-1.6.6.ebuild: - Block use of USE gcrypt with USE static wrt #496612 + cryptsetup-1.6.5.ebuild, cryptsetup-1.6.6.ebuild: + Block use of USE gcrypt with USE static in stable, next stable and latest wrt + #496612 20 Aug 2014; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.6.6.ebuild: Add epatch_user #520276 by Nikoli. diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild index 9093cd46b6e6..5674479ab7b1 100644 --- a/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild,v 1.3 2014/08/19 17:10:23 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild,v 1.4 2014/08/26 14:46:27 ssuominen Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) @@ -20,7 +20,8 @@ CRYPTO_BACKENDS="+gcrypt kernel nettle openssl" # and it's missing ripemd160 support so it can't provide full backward compatibility IUSE="${CRYPTO_BACKENDS} nls python reencrypt static static-libs udev urandom" REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) - python? ( ${PYTHON_REQUIRED_USE} )" + python? ( ${PYTHON_REQUIRED_USE} ) + static? ( !gcrypt )" #496612 LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] |