vapier      14/04/29 19:22:34

  Modified:             iputils-99999999.ebuild iputils-20121221-r1.ebuild
                        ChangeLog
  Log:
  Put USE=gnutls behind USE=ssl since only one of openssl/gnutls can be used at 
a time #509100 by David Heidelberger.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
D2E96200)

Revision  Changes    Path
1.13                 net-misc/iputils/iputils-99999999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild?r1=1.12&r2=1.13

Index: iputils-99999999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- iputils-99999999.ebuild     18 Jan 2014 05:37:45 -0000      1.12
+++ iputils-99999999.ebuild     29 Apr 2014 19:22:34 -0000      1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 
1.12 2014/01/18 05:37:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 
1.13 2014/04/29 19:22:34 vapier Exp $
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
@@ -28,10 +28,10 @@
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
        idn? ( net-dns/libidn[static-libs(+)] )
-       ipv6? (
+       ipv6? ( ssl? (
                gnutls? ( net-libs/gnutls[static-libs(+)] )
-               ssl? ( dev-libs/openssl:0[static-libs(+)] )
-       )"
+               !gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+       ) )"
 RDEPEND="!net-misc/rarpd
        !static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}



1.6                  net-misc/iputils/iputils-20121221-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild?rev=1.6&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild?rev=1.6&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild?r1=1.5&r2=1.6

Index: iputils-20121221-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iputils-20121221-r1.ebuild  18 Jan 2014 05:37:45 -0000      1.5
+++ iputils-20121221-r1.ebuild  29 Apr 2014 19:22:34 -0000      1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.5 
2014/01/18 05:37:45 vapier Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.6 
2014/04/29 19:22:34 vapier Exp $
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
@@ -28,10 +28,10 @@
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
        idn? ( net-dns/libidn[static-libs(+)] )
-       ipv6? (
+       ipv6? ( ssl? (
                gnutls? ( net-libs/gnutls[static-libs(+)] )
-               ssl? ( dev-libs/openssl:0[static-libs(+)] )
-       )"
+               !gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+       ) )"
 RDEPEND="!net-misc/rarpd
        !static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}



1.126                net-misc/iputils/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/ChangeLog?rev=1.126&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/ChangeLog?rev=1.126&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iputils/ChangeLog?r1=1.125&r2=1.126

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- ChangeLog   18 Jan 2014 05:37:45 -0000      1.125
+++ ChangeLog   29 Apr 2014 19:22:34 -0000      1.126
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/iputils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.125 
2014/01/18 05:37:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.126 
2014/04/29 19:22:34 vapier Exp $
+
+  29 Apr 2014; Mike Frysinger <[email protected]> iputils-20121221-r1.ebuild,
+  iputils-99999999.ebuild:
+  Put USE=gnutls behind USE=ssl since only one of openssl/gnutls can be used at
+  a time #509100 by David Heidelberger.
 
   18 Jan 2014; Mike Frysinger <[email protected]> iputils-20121221-r1.ebuild,
   iputils-20121221.ebuild, iputils-99999999.ebuild:




Reply via email to