[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/

[Julian Ospald]

commit:     91547e769e88e9b79e30eaf6d90ab10d53170178
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 08:53:48 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 08:53:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91547e76

net-analyzer/tcpdump: add libressl support

 .../{tcpdump-9999.ebuild => tcpdump-4.7.4-r1.ebuild}       | 14 +++++++++-----
 net-analyzer/tcpdump/tcpdump-9999.ebuild                   |  7 +++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild 
b/net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild
similarity index 80%
copy from net-analyzer/tcpdump/tcpdump-9999.ebuild
copy to net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild
index 17b9895..003ab7b 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild
@@ -3,22 +3,26 @@
 # $Id$
 
 EAPI=5
-inherit eutils flag-o-matic git-r3 toolchain-funcs user
+inherit flag-o-matic toolchain-funcs user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 HOMEPAGE="http://www.tcpdump.org/";
-EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump";
+SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+               http://www.jp.tcpdump.org/release/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="+drop-root smi ssl ipv6 samba suid test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+drop-root libressl smi ssl ipv6 samba suid test"
 
 RDEPEND="
        drop-root? ( sys-libs/libcap-ng )
        net-libs/libpcap
        smi? ( net-libs/libsmi )
-       ssl? ( >=dev-libs/openssl-0.9.6m )
+       ssl? (
+               !libressl? ( >=dev-libs/openssl-0.9.6m:0 )
+               libressl? ( dev-libs/libressl )
+       )
 "
 DEPEND="
        ${RDEPEND}

diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild 
b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 17b9895..7ca9116 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -12,13 +12,16 @@ EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump";
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="+drop-root smi ssl ipv6 samba suid test"
+IUSE="+drop-root libressl smi ssl ipv6 samba suid test"
 
 RDEPEND="
        drop-root? ( sys-libs/libcap-ng )
        net-libs/libpcap
        smi? ( net-libs/libsmi )
-       ssl? ( >=dev-libs/openssl-0.9.6m )
+       ssl? (
+               !libressl? ( >=dev-libs/openssl-0.9.6m:0 )
+               libressl? ( dev-libs/libressl )
+       )
 "
 DEPEND="
        ${RDEPEND}