summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-01-15 23:44:17 +0000
committerMike Frysinger <vapier@gentoo.org>2011-01-15 23:44:17 +0000
commitc4944fed02d05f300ecd753a180b3da99c668b55 (patch)
tree79128130a9d1625fb7961633fd6c040d83157a36 /sys-fs/cryptsetup
parentVersion bump. (diff)
downloadhistorical-c4944fed02d05f300ecd753a180b3da99c668b55.tar.gz
historical-c4944fed02d05f300ecd753a180b3da99c668b55.tar.bz2
historical-c4944fed02d05f300ecd753a180b3da99c668b55.zip
Require libgpg-error[static-libs] when USE=static #351810 by Peter Volkov.
Package-Manager: portage-2.2.0_alpha13/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 4586ee0e10d8..22b4cff7ecd0 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.108 2011/01/12 23:36:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.109 2011/01/15 23:44:17 vapier Exp $
+
+ 15 Jan 2011; Mike Frysinger <vapier@gentoo.org>
+ cryptsetup-1.2.0-r1.ebuild:
+ Require libgpg-error[static-libs] when USE=static #351810 by Peter Volkov.
*cryptsetup-1.1.3-r3 (12 Jan 2011)
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 5e9cd258e818..bfc08a4fa604 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 3149 RMD160 cc0f623d0e0e9f8a0f03790410374950ce4d1e87 SHA1 c640988703966d2d406abb4cfa53f8d630894d43 SHA256 ab314f0503db7d5b34a3f6c7b6836c2d3d94e7afbae2aaa23a8947f8e9d741fd
-EBUILD cryptsetup-1.2.0-r1.ebuild 3323 RMD160 f60b7fdda559e38d9971dd51c4b4a93ae47a78a9 SHA1 fe508623919bacbbd95b6eaf5b28e2470c145113 SHA256 0c2b473e5bd5834d0baa8f8e96d21486e042cce2c8a258be985f76943e4df5aa
-MISC ChangeLog 15799 RMD160 8140ada2a6f07fe610c6c6c85fc960f179dc31ed SHA1 45cc5f421135301b38c3ea46e33725452da94f34 SHA256 8daaaa190ceffae1830230d4aba23b6e51454eb592c19e82c54dd70796c7213d
+EBUILD cryptsetup-1.2.0-r1.ebuild 3438 RMD160 a3ac59cc4944e1c44e3ba7ce585295951deaef53 SHA1 114e54a62bbfcc1afa67687b938fd5a294418619 SHA256 597b8f0aacf67f50ef61b5d6cf2e4c4574df3094244a43bcad757ee4cd78e595
+MISC ChangeLog 15957 RMD160 23beb10e7392341145bdfccf50486dd7e10650de SHA1 4fd5c2c91ab2ee250359630392b7eb499f743d65 SHA256 8854bba57023fbe33a0955d9890af734815e9a449625c69c554ef72958464210
MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iF4EAREIAAYFAk0uOyAACgkQaC/OocHi7JbDigEAnnRU0sv2TomqOC9jOQlnyBp5
-+/VeBuCdiMHNh7DZ1cUA/jwCNzZR23d/sCIg4oOjN+w6kZhrACbSqnn02k9HLyBE
-=zkzs
+iF4EAREIAAYFAk0yMXQACgkQaC/OocHi7JaeFwEAjb1zXGTLGW08TM6WXsH9kMRQ
+IY1ubB/2LvuC8X9lcAoA/3zvajGjJuaXPbGeYPmwH8qLgNdruZ1aDuA8aSxHL27y
+=aFUo
-----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 289cfa7f4b5b..3c3e2add3304 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.3 2011/01/08 00:52:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.4 2011/01/15 23:44:17 vapier Exp $
EAPI="2"
@@ -18,14 +18,16 @@ IUSE="+static nls selinux"
S=${WORKDIR}/${MY_P}
-DEPEND=">=sys-fs/lvm2-2.02.64
+RDEPEND=">=sys-fs/lvm2-2.02.64
>=dev-libs/libgcrypt-1.1.42
- >=dev-libs/libgpg-error-1.0-r1
+ !static? ( dev-libs/libgpg-error )
>=dev-libs/popt-1.7
>=sys-fs/udev-124
|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
selinux? ( sys-libs/libselinux )
!sys-fs/cryptsetup-luks"
+DEPEND="${RDEPEND}
+ static? ( || ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 ) )"
pkg_setup() {
local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"