1 |
ssuominen 12/04/03 04:56:34 |
2 |
|
3 |
Modified: ChangeLog libimobiledevice-1.1.2.ebuild |
4 |
Log: |
5 |
Convert USE="ssl" to IMOBILEDEVICE_BACKEND USE_EXPAND to clarify it's exactly-one-of from gnutls or openssl. |
6 |
|
7 |
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.25 app-pda/libimobiledevice/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libimobiledevice/ChangeLog?rev=1.25&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libimobiledevice/ChangeLog?rev=1.25&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libimobiledevice/ChangeLog?r1=1.24&r2=1.25 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v |
19 |
retrieving revision 1.24 |
20 |
retrieving revision 1.25 |
21 |
diff -u -r1.24 -r1.25 |
22 |
--- ChangeLog 3 Apr 2012 04:35:14 -0000 1.24 |
23 |
+++ ChangeLog 3 Apr 2012 04:56:34 -0000 1.25 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for app-pda/libimobiledevice |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.24 2012/04/03 04:35:14 ssuominen Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.25 2012/04/03 04:56:34 ssuominen Exp $ |
29 |
+ |
30 |
+ 03 Apr 2012; Samuli Suominen <ssuominen@g.o> |
31 |
+ libimobiledevice-1.1.2.ebuild: |
32 |
+ Convert USE="ssl" to IMOBILEDEVICE_BACKEND USE_EXPAND to clarify it's |
33 |
+ exactly-one-of from gnutls or openssl. |
34 |
|
35 |
03 Apr 2012; Samuli Suominen <ssuominen@g.o> |
36 |
libimobiledevice-1.1.1.ebuild: |
37 |
|
38 |
|
39 |
|
40 |
1.3 app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild?rev=1.3&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild?rev=1.3&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild?r1=1.2&r2=1.3 |
45 |
|
46 |
Index: libimobiledevice-1.1.2.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild,v |
49 |
retrieving revision 1.2 |
50 |
retrieving revision 1.3 |
51 |
diff -u -r1.2 -r1.3 |
52 |
--- libimobiledevice-1.1.2.ebuild 31 Mar 2012 15:39:16 -0000 1.2 |
53 |
+++ libimobiledevice-1.1.2.ebuild 3 Apr 2012 04:56:34 -0000 1.3 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2012 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild,v 1.2 2012/03/31 15:39:16 ssuominen Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild,v 1.3 2012/04/03 04:56:34 ssuominen Exp $ |
59 |
|
60 |
EAPI=4 |
61 |
|
62 |
@@ -15,12 +15,12 @@ |
63 |
LICENSE="GPL-2 LGPL-2.1" |
64 |
SLOT="0" |
65 |
KEYWORDS="~amd64 ~ppc64 ~x86" |
66 |
-IUSE="python ssl static-libs" |
67 |
+IUSE="imobiledevice_backend_gnutls +imobiledevice_backend_openssl python static-libs" |
68 |
|
69 |
RDEPEND=">=app-pda/libplist-1.8-r1[python?] |
70 |
>=app-pda/usbmuxd-0.1.4 |
71 |
- ssl? ( dev-libs/openssl:0 ) |
72 |
- !ssl? ( |
73 |
+ imobiledevice_backend_openssl? ( dev-libs/openssl:0 ) |
74 |
+ imobiledevice_backend_gnutls? ( |
75 |
dev-libs/libgcrypt |
76 |
>=dev-libs/libtasn1-1.1 |
77 |
>=net-libs/gnutls-2.2.0 |
78 |
@@ -29,6 +29,8 @@ |
79 |
dev-util/pkgconfig |
80 |
python? ( >=dev-python/cython-0.13 )" |
81 |
|
82 |
+REQUIRED_USE="^^ ( imobiledevice_backend_openssl imobiledevice_backend_gnutls )" |
83 |
+ |
84 |
DOCS=( AUTHORS NEWS README ) |
85 |
|
86 |
pkg_setup() { |
87 |
@@ -45,7 +47,7 @@ |
88 |
src_configure() { |
89 |
local myconf |
90 |
use python || myconf+=' --without-cython' |
91 |
- use ssl || myconf+=' --disable-openssl' |
92 |
+ use imobiledevice_backend_openssl || myconf+=' --disable-openssl' |
93 |
|
94 |
econf \ |
95 |
$(use_enable static-libs static) \ |