Fix sys-fs/udev dependency within || ( ) block from -171-r5 to -171-r6 wrt #416653, Comment #3 by Mariusz Pękala

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 20 insertions, 21 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/Manifest b/sys-fs/cryptsetup/Manifest
index 4abc2eb67beb..2a52f90f7b4e 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -21,26 +21,20 @@ DIST cryptsetup-1.4.2.tar.bz2 787016 RMD160 abb8daee54b76f752ce36274954333217d57
 EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2a53197 SHA1 8cbe4f6a69a72faf4916f1992a4ee3febd04114e SHA256 cad92c053518bb11a2acd9e806e471117c462187c8a02f5258e933e093ab2a66
 EBUILD cryptsetup-1.1.2.ebuild 3382 RMD160 c737fb8fb63a11c15c1af86db25fafc8a32e152a SHA1 4cc2311e92c429d519d99c126434b4e2ca6375cf SHA256 6445f68c8a2f1497a771cc07466f0ee6a0b23cdeb257c7db2899a1f7b247d452
 EBUILD cryptsetup-1.1.3-r3.ebuild 3467 RMD160 5a95d64bff7d3dafe21ea0176456abea73319b51 SHA1 e60b7e828697ff8ec380f9b84e716e166a553ba5 SHA256 f8785d631199f73b31abeebc9a5dd335a07c124f1688557953b89be462d7b48e
-EBUILD cryptsetup-1.2.0-r1.ebuild 3693 RMD160 c03f9fad5e18fb9ae52dadba7427ba8e1eb08ac4 SHA1 684ae967abbf890fc1c61c44f7ae7b4e37955b5e SHA256 a579ec17a8d09d5ed5a3d1d79b8cedf499783fcbfcb0d1cb179c1e991eb12360
+EBUILD cryptsetup-1.2.0-r1.ebuild 3693 RMD160 09c6f0cf937a9925ffb3a776ed8b09c6597393c0 SHA1 d676cc89c392f07391591ed3409174cfa22bff4f SHA256 e204e7fd16b9994433743c692e395cb496f9e269a984eb31ec21e5512400144a
 EBUILD cryptsetup-1.4.1-r1.ebuild 3301 RMD160 647490023744eec3086844ce585c7015ab10c53c SHA1 ff88da1634eb173e96a835444a5557b40ddb665d SHA256 4542b703622c0852a152f806251728019847b14ec59c99f9407898fcdf6158c7
-EBUILD cryptsetup-1.4.1.ebuild 3394 RMD160 7f934640d0b47ca697a20de781718e3ca67b4628 SHA1 9c72ae3ad0788f22b2cb41c601c3f45e58b0d46b SHA256 bd70f5ec5f0bb7c2dfa36a966160a2d8595cb8539e7c8f5305fe2e1028a28ac3
+EBUILD cryptsetup-1.4.1.ebuild 3398 RMD160 9d2c90a15f7de156b6a38b335ab5c12536fee432 SHA1 afc25ae4418b5facae74e6b1344f9b3874f0af3d SHA256 5a4347c8df3a7405a429cb8e23bdfcdb07e956907a58461a41efd01c6c78bd79
 EBUILD cryptsetup-1.4.2.ebuild 3532 RMD160 60ad24966e74e5d67378f7fcb2381630fcf656d8 SHA1 a6a063d3ed90e0159c4ee2a83c854d8d54fd1100 SHA256 043819d32f27ca340847ae144ceda51d084b4f3e2c0f5b10999c31220d8c8108
-MISC ChangeLog 20287 RMD160 d65b817d34dfea004710bdf19490e19ea11a269e SHA1 64a42c24546673d4246cbab3b63eb6ef058b9241 SHA256 4b63ca9ebdfba7c1e0e77c5acad6ca35219ce14709fc8006eda8a5af445cac32
+MISC ChangeLog 20518 RMD160 19f286cbcef4c23d14b9bb6597f8890d9880e353 SHA1 694d7d0b3c216b22bca88efe588fdbe6522c9882 SHA256 a7118aacec3687e8261faf0a8fa5ec9907731db69ad6ca9e5de5990679547efc
 MISC metadata.xml 319 RMD160 12a57320613564de0b0f076f47915481b15b4e1a SHA1 e0a65649b5aabd5079bf6b67058c5afef11a556b SHA256 9f83a3638c5c1aaac590711dd3ac6b1a7fbea92b3f32be918cc6207689772705
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPrNwbAAoJELEHsLL7fEFWzRUQAIxSHPmx00sckTl1q00GUSDa
-gze3646GxyyGtI7Zcyi8OtJovHyKsfxsHRNL3cE0fLkPVFNN9WiHoeLhvs8XBdms
-2VocaYY5N3Y9vplYcekrob/fnR0L+A09jb1U9ezLquefq48TKRPDmAcB+Venln94
-V7gzM+BW9TFCkk4sXYY+U3jEXeGD2OxuvPt4yjnMHjqQIt70cy00fp19jIRghrP3
-PP5KOFxDo8uXXzO83wBSZcg/qnLSeD2uUFSpgI17zpfbfjeLEvzXnYxqL/zFJ8wZ
-x4HSH05YLwCyU3Z+p4uoszWoteAA5QsijfDa8udwRozjLp1KGaClzgPWC3gTDg4o
-urNgcZEu9yJVNo5DuZhCR0CYdwSZgfzju585tKknNnIk5SZ3zgH11ivza1xg0tPG
-x7jw4lYtPTwIfAFCYrJiZF5VqHjEwOC9L+ju0yKOPy4hvTD68aWNvk04kxBlQhTL
-zvtm5JGDbu75lsXTgRD23/lVrfs9r5gjD/1YtoLhiRSALYvbDx/AU00dD9CkQzDk
-NJMVTjjjn187H68eE96wfJOKqJ+COazNvMFcLoWf1o0Q/pUsptuQUFfz300RqtmV
-1rMybu5JC1GouPbZ1etKLQ4//XRLoSVDU4UBF5tFkoKZBPHjsEcwj63Ir18OlEVC
-1Zcaq21OMt0at7C/YyIM
-=AyPD
+iQEcBAEBAgAGBQJPufRKAAoJEEdUh39IaPFNWsEH/2Wi/chkkKej6S63SKuLyQ0d
+H4jErAfEpLVXIGovRaeJ5ZJeWVJCh42Tzwqda8NES6rULhoJsc4u6xyB1OXr2WR9
+NAVT8p9XUQ3UETmGFr9y95V6APd5RZXH9MuEXtrucxhRijp17RG1AToAzLxp7Otg
+HcLEvuTkiaMBSRnve3SwlqI8hn/gxE8vK8hDcF411I9PjEt0atC1dUpOwRK+CRtP
+hgg0GWiI4TNLW5Kbj1MeYhP8+jSO5wJ8xrD73jwTQUfJZ9VpxjOuTcwCV3/RoLJA
+VUkXcC7H1tJmOqZwTk/8QeyWcyPNNDfO7fHvVM9qHJi/CGav+ME3kGUVaSrsPNA=
+=mtdp
 -----END PGP SIGNATURE-----
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() {