Simplify deps a little more, and require static-libs with lvm2 #383417 by Bernd Lomme...

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

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index ca3ebdb0b9c8265b997c0cf207f3697062a1eddb..9cde2fdd06f3b76d6ce374edd3943b0a3903ada0 100644 (file)
--- 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/Manifest b/sys-fs/cryptsetup/Manifest
index f87ff9b032658e2b79133e58e263470b4752e0ed..aaa1a79a32e23d808d37ef9de34ad0ee44c76df6 100644 (file)
--- 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 3589 RMD160 9398f608585f2f3e0c657b09f7058588d35f78d4 SHA1 0caa958c0988e773e45924aa16debd7c684a392d SHA256 7c07352f9bea874cee0d5b2b7768be66e939ecada2cdf0249706b74597b65fe2
-MISC ChangeLog 17209 RMD160 2bf6f1c1679f372f7ff0214c46ad9007959a4abc SHA1 d0b1691e1ba10575757f274332758c85788c1d62 SHA256 7b6bb24e250cec75e72ebd36a21e25c89cd1f8a27e68bf5a71eb93fdd393f413
+EBUILD cryptsetup-1.2.0-r1.ebuild 3628 RMD160 98044dce88847e72e1778482bef3ddcc600bae52 SHA1 60a007d06de6b05f78f03b9a4488ca9b463aa446 SHA256 0dff751d075bb47c26c9dd3426f86da7e8e717b08a5daa7dfd05affc509e0b6e
+MISC ChangeLog 17385 RMD160 bd00202024361bfc9eac4c2a6e727340cdb8677e SHA1 7f159c930f07eb34636dd67b4af78740c83b5c2a SHA256 d5265945a7cf3a42db8e229882f46fe10ac0811ebaa59ebb194bbad790b567c8
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5m7PoACgkQaC/OocHi7JYVkQD/cffy/juqgZkvRAxtt30hcewQ
-aMQXX4hu+IxsMnoBSt4A/1Q0z4aSuxNGVX+5nXPsa3piweUh+JZlV1mXSgMTCfBF
-=dneD
+iF4EAREIAAYFAk52nAIACgkQaC/OocHi7Jb9NQEAl5/i/VZRMNSfuxNWMq/W4pbN
+XTvrQ86nhw1paKL6FooA+wRDFoMC0uPSjcAjnsd+TWRHRcKPT0ZsGMe/M75+3/Qi
+=Ft4/
 -----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 a29a8f6a0275e17d3d534b92bd66988c1d84bb8e..3f8d56c687d7afc186a19d7ae4ab98952e20ca79 100644 (file)
--- 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() {