1 |
vapier 11/01/17 19:51:48 |
2 |
|
3 |
Modified: ChangeLog cryptsetup-1.2.0-r1.ebuild |
4 |
cryptsetup-1.1.3-r3.ebuild |
5 |
Log: |
6 |
Require new dev-libs/libgcrypt[static-libs] too #351810. |
7 |
|
8 |
(Portage version: 2.2.0_alpha13/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.110 sys-fs/cryptsetup/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?rev=1.110&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?rev=1.110&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?r1=1.109&r2=1.110 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v |
20 |
retrieving revision 1.109 |
21 |
retrieving revision 1.110 |
22 |
diff -u -r1.109 -r1.110 |
23 |
--- ChangeLog 15 Jan 2011 23:44:17 -0000 1.109 |
24 |
+++ ChangeLog 17 Jan 2011 19:51:48 -0000 1.110 |
25 |
@@ -1,6 +1,10 @@ |
26 |
# ChangeLog for sys-fs/cryptsetup |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.109 2011/01/15 23:44:17 vapier Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.110 2011/01/17 19:51:48 vapier Exp $ |
30 |
+ |
31 |
+ 17 Jan 2011; Mike Frysinger <vapier@g.o> |
32 |
+ cryptsetup-1.1.3-r3.ebuild, cryptsetup-1.2.0-r1.ebuild: |
33 |
+ Require new dev-libs/libgcrypt[static-libs] too #351810. |
34 |
|
35 |
15 Jan 2011; Mike Frysinger <vapier@g.o> |
36 |
cryptsetup-1.2.0-r1.ebuild: |
37 |
|
38 |
|
39 |
|
40 |
1.5 sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild?rev=1.5&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild?rev=1.5&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild?r1=1.4&r2=1.5 |
45 |
|
46 |
Index: cryptsetup-1.2.0-r1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v |
49 |
retrieving revision 1.4 |
50 |
retrieving revision 1.5 |
51 |
diff -u -r1.4 -r1.5 |
52 |
--- cryptsetup-1.2.0-r1.ebuild 15 Jan 2011 23:44:17 -0000 1.4 |
53 |
+++ cryptsetup-1.2.0-r1.ebuild 17 Jan 2011 19:51:48 -0000 1.5 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2011 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $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 $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.5 2011/01/17 19:51:48 vapier Exp $ |
59 |
|
60 |
EAPI="2" |
61 |
|
62 |
@@ -27,7 +27,10 @@ |
63 |
selinux? ( sys-libs/libselinux ) |
64 |
!sys-fs/cryptsetup-luks" |
65 |
DEPEND="${RDEPEND} |
66 |
- static? ( || ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 ) )" |
67 |
+ static? ( |
68 |
+ || ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 ) |
69 |
+ dev-libs/libgcrypt[static-libs] |
70 |
+ )" |
71 |
|
72 |
pkg_setup() { |
73 |
local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC" |
74 |
|
75 |
|
76 |
|
77 |
1.2 sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild |
78 |
|
79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild?rev=1.2&view=markup |
80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild?rev=1.2&content-type=text/plain |
81 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild?r1=1.1&r2=1.2 |
82 |
|
83 |
Index: cryptsetup-1.1.3-r3.ebuild |
84 |
=================================================================== |
85 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild,v |
86 |
retrieving revision 1.1 |
87 |
retrieving revision 1.2 |
88 |
diff -u -r1.1 -r1.2 |
89 |
--- cryptsetup-1.1.3-r3.ebuild 12 Jan 2011 23:36:42 -0000 1.1 |
90 |
+++ cryptsetup-1.1.3-r3.ebuild 17 Jan 2011 19:51:48 -0000 1.2 |
91 |
@@ -1,6 +1,6 @@ |
92 |
# Copyright 1999-2011 Gentoo Foundation |
93 |
# Distributed under the terms of the GNU General Public License v2 |
94 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild,v 1.1 2011/01/12 23:36:42 vapier Exp $ |
95 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild,v 1.2 2011/01/17 19:51:48 vapier Exp $ |
96 |
|
97 |
EAPI="2" |
98 |
|
99 |
@@ -18,7 +18,7 @@ |
100 |
|
101 |
S=${WORKDIR}/${MY_P} |
102 |
|
103 |
-DEPEND=">=sys-fs/lvm2-2.02.64 |
104 |
+RDEPEND=">=sys-fs/lvm2-2.02.64 |
105 |
>=dev-libs/libgcrypt-1.1.42 |
106 |
>=dev-libs/libgpg-error-1.0-r1 |
107 |
>=dev-libs/popt-1.7 |
108 |
@@ -26,6 +26,11 @@ |
109 |
|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) |
110 |
selinux? ( sys-libs/libselinux ) |
111 |
!sys-fs/cryptsetup-luks" |
112 |
+DEPEND="${RDEPEND} |
113 |
+ !dynamic? ( |
114 |
+ || ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 ) |
115 |
+ dev-libs/libgcrypt[static-libs] |
116 |
+ )" |
117 |
|
118 |
pkg_setup() { |
119 |
local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC" |