diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-09-19 01:33:47 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-09-19 01:33:47 +0000 |
| commit | dc22966dc9a162c8caf8ddfd55b4cf2a2eff16b5 (patch) | |
| tree | c920c41dc656f19789c36150e98d71fcbdbac42f /sys-fs | |
| parent | Version bump. Bug #376371 (diff) | |
| download | gentoo-2-dc22966dc9a162c8caf8ddfd55b4cf2a2eff16b5.tar.gz gentoo-2-dc22966dc9a162c8caf8ddfd55b4cf2a2eff16b5.tar.bz2 gentoo-2-dc22966dc9a162c8caf8ddfd55b4cf2a2eff16b5.zip | |
Simplify deps a little more, and require static-libs with lvm2 #383417 by Bernd Lommerzheim.
(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index ca3ebdb0b9c8..9cde2fdd06f3 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.117 2011/09/07 04:02:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.118 2011/09/19 01:33:47 vapier Exp $ + + 19 Sep 2011; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.2.0-r1.ebuild: + Simplify deps a little more, and require static-libs with lvm2 #383417 by + Bernd Lommerzheim. 07 Sep 2011; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.2.0-r1.ebuild: Pull in util-linux for uuid and require static/static-libs properly #381197 diff --git a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild index a29a8f6a0275..3f8d56c687d7 100644 --- a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.8 2011/09/07 04:02:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.9 2011/09/19 01:33:47 vapier Exp $ EAPI="2" @@ -14,19 +14,20 @@ SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="+static nls selinux" +IUSE="nls selinux +static" S=${WORKDIR}/${MY_P} -RDEPEND=">=sys-fs/lvm2-2.02.64 - >=dev-libs/libgcrypt-1.1.42 +RDEPEND=" !static? ( + >=dev-libs/libgcrypt-1.1.42 dev-libs/libgpg-error >=dev-libs/popt-1.7 >=sys-apps/util-linux-2.17.2 + >=sys-fs/lvm2-2.02.64 ) >=sys-fs/udev-124 - || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) + >=sys-libs/e2fsprogs-libs-1.41 selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks" DEPEND="${RDEPEND} @@ -35,6 +36,7 @@ DEPEND="${RDEPEND} >=dev-libs/popt-1.16-r1[static-libs] || ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 ) dev-libs/libgcrypt[static-libs] + || ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 ) )" pkg_setup() { |