summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-09-07 04:02:54 +0000
committerMike Frysinger <vapier@gentoo.org>2011-09-07 04:02:54 +0000
commitd9326b612f344e9d2ab0dfd03f850bc1fefcc6f2 (patch)
tree51ac6260bd1c2a8aba58fb1bf876a029f0a60de7 /sys-fs/cryptsetup
parentClear DISTRO env var #381311 by Nick Bowler. (diff)
downloadhistorical-d9326b612f344e9d2ab0dfd03f850bc1fefcc6f2.tar.gz
historical-d9326b612f344e9d2ab0dfd03f850bc1fefcc6f2.tar.bz2
historical-d9326b612f344e9d2ab0dfd03f850bc1fefcc6f2.zip
Pull in util-linux for uuid and require static/static-libs properly #381197 by Vasileios Lourdas, and drop older deps that are no longer in the tree.
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/cryptsetup')
-rw-r--r--sys-fs/cryptsetup/ChangeLog6
-rw-r--r--sys-fs/cryptsetup/Manifest10
-rw-r--r--sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild8
3 files changed, 15 insertions, 9 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index f60c90f1a4f3..ca3ebdb0b9c8 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.116 2011/08/07 23:41:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.117 2011/09/07 04:02:54 vapier Exp $
+
+ 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
+ by Vasileios Lourdas, and drop older deps that are no longer in the tree.
07 Aug 2011; Mike Frysinger <vapier@gentoo.org>
files/1.1.3-dm-crypt-start.sh:
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 2086539402d1..f87ff9b03265 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -17,13 +17,13 @@ DIST cryptsetup-1.2.0.tar.bz2 523859 RMD160 8f1ce6d72a056e9c98996be85041569e96ab
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 3364 RMD160 a4e497ae62cc974350460446b173fb3d092afc28 SHA1 e640b856ab39e456ed194da62fe0cf0dc11d76ab SHA256 54733ac01c0e2ec02c02ec6f13e50a24452cf1d7c93135a5bf8141129687ab52
-EBUILD cryptsetup-1.2.0-r1.ebuild 3551 RMD160 3504879074c3bcb321366d1d5364feba5e60fe21 SHA1 06d2b1fd114ea580fbe43338fdd98f3fd4020a08 SHA256 b0f240059a16b29b2f134159e4fce3265074d44ddaf9f041c2b54bef771c8bf3
-MISC ChangeLog 16976 RMD160 b4216acaa00cc2f2ea82cf950c6153cb36f07dca SHA1 4e433b277a9908d795e9e7069dff0dba6e2292a2 SHA256 f456e09123ad94cb333a50169896560ed14ee7c0e2431e4a6bbc0e90900b6ea5
+EBUILD cryptsetup-1.2.0-r1.ebuild 3589 RMD160 9398f608585f2f3e0c657b09f7058588d35f78d4 SHA1 0caa958c0988e773e45924aa16debd7c684a392d SHA256 7c07352f9bea874cee0d5b2b7768be66e939ecada2cdf0249706b74597b65fe2
+MISC ChangeLog 17209 RMD160 2bf6f1c1679f372f7ff0214c46ad9007959a4abc SHA1 d0b1691e1ba10575757f274332758c85788c1d62 SHA256 7b6bb24e250cec75e72ebd36a21e25c89cd1f8a27e68bf5a71eb93fdd393f413
MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk4/IooACgkQaC/OocHi7JZ/rgD9HTDMrCNoTeorMqhOONzRg3SF
-k5eU09lQM/+uNRgGZDQA/3q19w3cdQUoMN7VGRvrEbPNSCWcp8FPTVd0UA1obv0d
-=im4W
+iF4EAREIAAYFAk5m7PoACgkQaC/OocHi7JYVkQD/cffy/juqgZkvRAxtt30hcewQ
+aMQXX4hu+IxsMnoBSt4A/1Q0z4aSuxNGVX+5nXPsa3piweUh+JZlV1mXSgMTCfBF
+=dneD
-----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 44be3f83267a..a29a8f6a0275 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.7 2011/03/17 16:32:10 ssuominen Exp $
+# $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 $
EAPI="2"
@@ -23,6 +23,7 @@ RDEPEND=">=sys-fs/lvm2-2.02.64
!static? (
dev-libs/libgpg-error
>=dev-libs/popt-1.7
+ >=sys-apps/util-linux-2.17.2
)
>=sys-fs/udev-124
|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
@@ -30,8 +31,9 @@ RDEPEND=">=sys-fs/lvm2-2.02.64
!sys-fs/cryptsetup-luks"
DEPEND="${RDEPEND}
static? (
- || ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 )
- || ( >=dev-libs/popt-1.16-r1[static-libs] <dev-libs/popt-1.16-r1 )
+ >=dev-libs/libgpg-error-1.10[static-libs]
+ >=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]
)"