summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-04-25 00:34:24 +0000
committerMike Frysinger <vapier@gentoo.org>2015-04-25 00:34:24 +0000
commit148736bf3f20e146589231cff91dcbcec0da0552 (patch)
tree5a417891054cc79d8b089e02ff95b98e0bc4a2b0 /net-misc
parentUpdate patches against latest git. (diff)
downloadgentoo-2-148736bf3f20e146589231cff91dcbcec0da0552.tar.gz
gentoo-2-148736bf3f20e146589231cff91dcbcec0da0552.tar.bz2
gentoo-2-148736bf3f20e146589231cff91dcbcec0da0552.zip
Require gnutls be built w/USE=openssl #546116 by Patrick Lauer.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/iputils/ChangeLog6
-rw-r--r--net-misc/iputils/iputils-20121221-r1.ebuild7
-rw-r--r--net-misc/iputils/iputils-99999999.ebuild7
3 files changed, 15 insertions, 5 deletions
diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index 94f78e86ec58..fbb7aa5bf91a 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/iputils
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.139 2015/04/25 00:09:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.140 2015/04/25 00:34:24 vapier Exp $
+
+ 25 Apr 2015; Mike Frysinger <vapier@gentoo.org> iputils-20121221-r1.ebuild,
+ iputils-99999999.ebuild:
+ Require gnutls be built w/USE=openssl #546116 by Patrick Lauer.
25 Apr 2015; Mike Frysinger <vapier@gentoo.org>
+files/iputils-99999999-openssl.patch,
diff --git a/net-misc/iputils/iputils-20121221-r1.ebuild b/net-misc/iputils/iputils-20121221-r1.ebuild
index 9f0bfcb39251..04fc99b4c97f 100644
--- a/net-misc/iputils/iputils-20121221-r1.ebuild
+++ b/net-misc/iputils/iputils-20121221-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.16 2015/04/04 22:31:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.17 2015/04/25 00:34:24 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
@@ -29,7 +29,10 @@ IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
idn? ( net-dns/libidn[static-libs(+)] )
ipv6? ( ssl? (
- gnutls? ( net-libs/gnutls[static-libs(+)] )
+ gnutls? (
+ net-libs/gnutls[openssl(+)]
+ net-libs/gnutls[static-libs(+)]
+ )
!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
) )"
RDEPEND="!net-misc/rarpd
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index d1ad9aac938b..8d8a6ef48425 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.14 2015/04/25 00:09:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.15 2015/04/25 00:34:24 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
@@ -29,7 +29,10 @@ IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
idn? ( net-dns/libidn[static-libs(+)] )
ipv6? ( ssl? (
- gnutls? ( net-libs/gnutls[static-libs(+)] )
+ gnutls? (
+ net-libs/gnutls[openssl(+)]
+ net-libs/gnutls[static-libs(+)]
+ )
!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
) )"
RDEPEND="!net-misc/rarpd