1 |
vapier 14/04/29 19:22:34 |
2 |
|
3 |
Modified: iputils-99999999.ebuild iputils-20121221-r1.ebuild |
4 |
ChangeLog |
5 |
Log: |
6 |
Put USE=gnutls behind USE=ssl since only one of openssl/gnutls can be used at a time #509100 by David Heidelberger. |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
9 |
|
10 |
Revision Changes Path |
11 |
1.13 net-misc/iputils/iputils-99999999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild?rev=1.13&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild?rev=1.13&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild?r1=1.12&r2=1.13 |
16 |
|
17 |
Index: iputils-99999999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v |
20 |
retrieving revision 1.12 |
21 |
retrieving revision 1.13 |
22 |
diff -u -r1.12 -r1.13 |
23 |
--- iputils-99999999.ebuild 18 Jan 2014 05:37:45 -0000 1.12 |
24 |
+++ iputils-99999999.ebuild 29 Apr 2014 19:22:34 -0000 1.13 |
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/net-misc/iputils/iputils-99999999.ebuild,v 1.12 2014/01/18 05:37:45 vapier Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.13 2014/04/29 19:22:34 vapier Exp $ |
30 |
|
31 |
# For released versions, we precompile the man/html pages and store |
32 |
# them in a tarball on our mirrors. This avoids ugly issues while |
33 |
@@ -28,10 +28,10 @@ |
34 |
|
35 |
LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) |
36 |
idn? ( net-dns/libidn[static-libs(+)] ) |
37 |
- ipv6? ( |
38 |
+ ipv6? ( ssl? ( |
39 |
gnutls? ( net-libs/gnutls[static-libs(+)] ) |
40 |
- ssl? ( dev-libs/openssl:0[static-libs(+)] ) |
41 |
- )" |
42 |
+ !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) |
43 |
+ ) )" |
44 |
RDEPEND="!net-misc/rarpd |
45 |
!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" |
46 |
DEPEND="${RDEPEND} |
47 |
|
48 |
|
49 |
|
50 |
1.6 net-misc/iputils/iputils-20121221-r1.ebuild |
51 |
|
52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild?rev=1.6&view=markup |
53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild?rev=1.6&content-type=text/plain |
54 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild?r1=1.5&r2=1.6 |
55 |
|
56 |
Index: iputils-20121221-r1.ebuild |
57 |
=================================================================== |
58 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v |
59 |
retrieving revision 1.5 |
60 |
retrieving revision 1.6 |
61 |
diff -u -r1.5 -r1.6 |
62 |
--- iputils-20121221-r1.ebuild 18 Jan 2014 05:37:45 -0000 1.5 |
63 |
+++ iputils-20121221-r1.ebuild 29 Apr 2014 19:22:34 -0000 1.6 |
64 |
@@ -1,6 +1,6 @@ |
65 |
# Copyright 1999-2014 Gentoo Foundation |
66 |
# Distributed under the terms of the GNU General Public License v2 |
67 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.5 2014/01/18 05:37:45 vapier Exp $ |
68 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.6 2014/04/29 19:22:34 vapier Exp $ |
69 |
|
70 |
# For released versions, we precompile the man/html pages and store |
71 |
# them in a tarball on our mirrors. This avoids ugly issues while |
72 |
@@ -28,10 +28,10 @@ |
73 |
|
74 |
LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) |
75 |
idn? ( net-dns/libidn[static-libs(+)] ) |
76 |
- ipv6? ( |
77 |
+ ipv6? ( ssl? ( |
78 |
gnutls? ( net-libs/gnutls[static-libs(+)] ) |
79 |
- ssl? ( dev-libs/openssl:0[static-libs(+)] ) |
80 |
- )" |
81 |
+ !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) |
82 |
+ ) )" |
83 |
RDEPEND="!net-misc/rarpd |
84 |
!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" |
85 |
DEPEND="${RDEPEND} |
86 |
|
87 |
|
88 |
|
89 |
1.126 net-misc/iputils/ChangeLog |
90 |
|
91 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/ChangeLog?rev=1.126&view=markup |
92 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/ChangeLog?rev=1.126&content-type=text/plain |
93 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/ChangeLog?r1=1.125&r2=1.126 |
94 |
|
95 |
Index: ChangeLog |
96 |
=================================================================== |
97 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v |
98 |
retrieving revision 1.125 |
99 |
retrieving revision 1.126 |
100 |
diff -u -r1.125 -r1.126 |
101 |
--- ChangeLog 18 Jan 2014 05:37:45 -0000 1.125 |
102 |
+++ ChangeLog 29 Apr 2014 19:22:34 -0000 1.126 |
103 |
@@ -1,6 +1,11 @@ |
104 |
# ChangeLog for net-misc/iputils |
105 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
106 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.125 2014/01/18 05:37:45 vapier Exp $ |
107 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.126 2014/04/29 19:22:34 vapier Exp $ |
108 |
+ |
109 |
+ 29 Apr 2014; Mike Frysinger <vapier@g.o> iputils-20121221-r1.ebuild, |
110 |
+ iputils-99999999.ebuild: |
111 |
+ Put USE=gnutls behind USE=ssl since only one of openssl/gnutls can be used at |
112 |
+ a time #509100 by David Heidelberger. |
113 |
|
114 |
18 Jan 2014; Mike Frysinger <vapier@g.o> iputils-20121221-r1.ebuild, |
115 |
iputils-20121221.ebuild, iputils-99999999.ebuild: |