Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/openssl: openssl-0.9.8y-r1.ebuild openssl-1.0.1g-r1.ebuild openssl-1.0.2_beta1-r3.ebuild ChangeLog
Date: Fri, 30 May 2014 20:54:15
Message-Id: 20140530205408.A4FC32004E@flycatcher.gentoo.org
1 mgorny 14/05/30 20:54:08
2
3 Modified: openssl-0.9.8y-r1.ebuild openssl-1.0.1g-r1.ebuild
4 openssl-1.0.2_beta1-r3.ebuild ChangeLog
5 Log:
6 Enable multilib krb5 support.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
9
10 Revision Changes Path
11 1.2 dev-libs/openssl/openssl-0.9.8y-r1.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8y-r1.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8y-r1.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8y-r1.ebuild?r1=1.1&r2=1.2
16
17 Index: openssl-0.9.8y-r1.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8y-r1.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- openssl-0.9.8y-r1.ebuild 23 May 2014 23:13:54 -0000 1.1
24 +++ openssl-0.9.8y-r1.ebuild 30 May 2014 20:54:08 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8y-r1.ebuild,v 1.1 2014/05/23 23:13:54 jcallen Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8y-r1.ebuild,v 1.2 2014/05/30 20:54:08 mgorny Exp $
30
31 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
32
33 @@ -19,7 +19,7 @@
34
35 RDEPEND="gmp? ( dev-libs/gmp[${MULTILIB_USEDEP}] )
36 zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
37 - kerberos? ( app-crypt/mit-krb5 )
38 + kerberos? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
39 abi_x86_32? (
40 !<=app-emulation/emul-linux-x86-baselibs-20140508-r4
41 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
42 @@ -87,7 +87,6 @@
43 # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
44
45 use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
46 - multilib_native_use_ssl() { multilib_native_usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
47 echoit() { echo "$@" ; "$@" ; }
48
49 local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
50 @@ -108,7 +107,7 @@
51 $(use_ssl !bindist rc5) \
52 enable-tlsext \
53 $(use_ssl gmp gmp -lgmp) \
54 - $(multilib_native_use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
55 + $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
56 $(use_ssl zlib) \
57 --prefix=/usr \
58 --openssldir=/etc/ssl \
59
60
61
62 1.4 dev-libs/openssl/openssl-1.0.1g-r1.ebuild
63
64 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.1g-r1.ebuild?rev=1.4&view=markup
65 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.1g-r1.ebuild?rev=1.4&content-type=text/plain
66 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.1g-r1.ebuild?r1=1.3&r2=1.4
67
68 Index: openssl-1.0.1g-r1.ebuild
69 ===================================================================
70 RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1g-r1.ebuild,v
71 retrieving revision 1.3
72 retrieving revision 1.4
73 diff -u -r1.3 -r1.4
74 --- openssl-1.0.1g-r1.ebuild 20 May 2014 06:41:24 -0000 1.3
75 +++ openssl-1.0.1g-r1.ebuild 30 May 2014 20:54:08 -0000 1.4
76 @@ -1,6 +1,6 @@
77 # Copyright 1999-2014 Gentoo Foundation
78 # Distributed under the terms of the GNU General Public License v2
79 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1g-r1.ebuild,v 1.3 2014/05/20 06:41:24 mgorny Exp $
80 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1g-r1.ebuild,v 1.4 2014/05/30 20:54:08 mgorny Exp $
81
82 EAPI="4"
83
84 @@ -22,7 +22,7 @@
85 # the future.
86 RDEPEND="gmp? ( dev-libs/gmp[static-libs(+)?,${MULTILIB_USEDEP}] )
87 zlib? ( sys-libs/zlib[static-libs(+)?,${MULTILIB_USEDEP}] )
88 - kerberos? ( app-crypt/mit-krb5 )
89 + kerberos? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
90 abi_x86_32? (
91 !<=app-emulation/emul-linux-x86-baselibs-20140406-r3
92 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
93 @@ -112,7 +112,6 @@
94 # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
95
96 use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
97 - multilib_native_use_ssl() { multilib_native_usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
98 echoit() { echo "$@" ; "$@" ; }
99
100 local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
101 @@ -145,7 +144,7 @@
102 $(use_ssl !bindist rc5) \
103 enable-tlsext \
104 $(use_ssl gmp gmp -lgmp) \
105 - $(multilib_native_use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
106 + $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
107 $(use_ssl rfc3779) \
108 $(use_ssl tls-heartbeat heartbeats) \
109 $(use_ssl zlib) \
110
111
112
113 1.4 dev-libs/openssl/openssl-1.0.2_beta1-r3.ebuild
114
115 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.2_beta1-r3.ebuild?rev=1.4&view=markup
116 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.2_beta1-r3.ebuild?rev=1.4&content-type=text/plain
117 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.2_beta1-r3.ebuild?r1=1.3&r2=1.4
118
119 Index: openssl-1.0.2_beta1-r3.ebuild
120 ===================================================================
121 RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2_beta1-r3.ebuild,v
122 retrieving revision 1.3
123 retrieving revision 1.4
124 diff -u -r1.3 -r1.4
125 --- openssl-1.0.2_beta1-r3.ebuild 20 May 2014 06:41:24 -0000 1.3
126 +++ openssl-1.0.2_beta1-r3.ebuild 30 May 2014 20:54:08 -0000 1.4
127 @@ -1,6 +1,6 @@
128 # Copyright 1999-2014 Gentoo Foundation
129 # Distributed under the terms of the GNU General Public License v2
130 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2_beta1-r3.ebuild,v 1.3 2014/05/20 06:41:24 mgorny Exp $
131 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2_beta1-r3.ebuild,v 1.4 2014/05/30 20:54:08 mgorny Exp $
132
133 EAPI="4"
134
135 @@ -24,7 +24,7 @@
136 # the future.
137 RDEPEND="gmp? ( dev-libs/gmp[static-libs(+)?,${MULTILIB_USEDEP}] )
138 zlib? ( sys-libs/zlib[static-libs(+)?,${MULTILIB_USEDEP}] )
139 - kerberos? ( app-crypt/mit-krb5 )
140 + kerberos? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
141 abi_x86_32? (
142 !<=app-emulation/emul-linux-x86-baselibs-20140508
143 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
144 @@ -119,7 +119,6 @@
145 # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
146
147 use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
148 - multilib_native_use_ssl() { multilib_native_usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
149 echoit() { echo "$@" ; "$@" ; }
150
151 local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
152 @@ -152,7 +151,7 @@
153 $(use_ssl !bindist rc5) \
154 enable-tlsext \
155 $(use_ssl gmp gmp -lgmp) \
156 - $(multilib_native_use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
157 + $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
158 $(use_ssl rfc3779) \
159 $(use_ssl tls-heartbeat heartbeats) \
160 $(use_ssl zlib) \
161
162
163
164 1.540 dev-libs/openssl/ChangeLog
165
166 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.540&view=markup
167 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.540&content-type=text/plain
168 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.539&r2=1.540
169
170 Index: ChangeLog
171 ===================================================================
172 RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v
173 retrieving revision 1.539
174 retrieving revision 1.540
175 diff -u -r1.539 -r1.540
176 --- ChangeLog 23 May 2014 23:13:54 -0000 1.539
177 +++ ChangeLog 30 May 2014 20:54:08 -0000 1.540
178 @@ -1,6 +1,10 @@
179 # ChangeLog for dev-libs/openssl
180 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
181 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.539 2014/05/23 23:13:54 jcallen Exp $
182 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.540 2014/05/30 20:54:08 mgorny Exp $
183 +
184 + 30 May 2014; Michał Górny <mgorny@g.o> openssl-0.9.8y-r1.ebuild,
185 + openssl-1.0.1g-r1.ebuild, openssl-1.0.2_beta1-r3.ebuild:
186 + Enable multilib krb5 support.
187
188 *openssl-0.9.8y-r1 (23 May 2014)