summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-05-21 07:55:41 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-05-21 07:55:41 +0000
commit11adebbb94908fa3864993de4ab292c24b0b8331 (patch)
tree5a0dfc8a632ca4d8266a64cf6e159d9be24dcf8d /sys-fs
parentmarked x86 per bug 416655 (diff)
downloadgentoo-2-11adebbb94908fa3864993de4ab292c24b0b8331.tar.gz
gentoo-2-11adebbb94908fa3864993de4ab292c24b0b8331.tar.bz2
gentoo-2-11adebbb94908fa3864993de4ab292c24b0b8331.zip
Fix sys-fs/udev dependency within || ( ) block from -171-r5 to -171-r6 wrt #416653, Comment #3 by Mariusz Pękala
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/cryptsetup/ChangeLog7
-rw-r--r--sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild4
-rw-r--r--sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index ed3575d6ccf6..3e2cec0b088f 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/cryptsetup
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.135 2012/05/11 09:29:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.136 2012/05/21 07:55:41 ssuominen Exp $
+
+ 21 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+ cryptsetup-1.2.0-r1.ebuild, cryptsetup-1.4.1.ebuild:
+ Fix sys-fs/udev dependency within || ( ) block from -171-r5 to -171-r6 wrt
+ #416653, Comment #3 by Mariusz Pękala
11 May 2012; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.4.2.ebuild:
Always depend on library packages as we install a shared lib as pointed out by
diff --git a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
index 9418ac35ade3..fd8a26f4ed7a 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-2012 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.10 2012/03/20 17:36:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.11 2012/05/21 07:55:41 ssuominen Exp $
EAPI="2"
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
|| ( >=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 )
- || ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r5 )
+ || ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r6 )
)"
pkg_setup() {
diff --git a/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild
index 91e9c6e3c85c..5792d2988744 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.4.1.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/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild,v 1.9 2012/05/11 08:31:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild,v 1.10 2012/05/21 07:55:41 ssuominen Exp $
EAPI="2"
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
|| ( >=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 )
- || ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r5 )
+ || ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r6 )
)"
pkg_setup() {