commit: 7219fcbf921dc107ae1694495cc9267289308e52
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 19 12:07:20 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 12:07:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7219fcbf
net-analyzer/wireshark: Drop 8 year old !=sys-libs/zlib-1.2.4 workaround.
Package-Manager: Portage-2.3.43, Repoman-2.3.10
net-analyzer/wireshark/wireshark-2.4.5.ebuild | 2 +-
net-analyzer/wireshark/wireshark-2.6.1.ebuild | 2 +-
net-analyzer/wireshark/wireshark-2.6.2.ebuild | 2 +-
net-analyzer/wireshark/wireshark-99999999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index bd015bae18a..49ec9932a08 100644
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
@@ -61,7 +61,7 @@ CDEPEND="
snappy? ( app-arch/snappy )
spandsp? ( media-libs/spandsp )
ssl? ( net-libs/gnutls:= )
- zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+ zlib? ( sys-libs/zlib )
"
# We need perl for `pod2html`. The rest of the perl stuff is to block older
# and broken installs. #455122
diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
index efde4f468e8..9e43a2a0eac 100644
--- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
@@ -59,7 +59,7 @@ CDEPEND="
snappy? ( app-arch/snappy )
spandsp? ( media-libs/spandsp )
ssl? ( net-libs/gnutls:= )
- zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+ zlib? ( sys-libs/zlib )
"
# We need perl for `pod2html`. The rest of the perl stuff is to block older
# and broken installs. #455122
diff --git a/net-analyzer/wireshark/wireshark-2.6.2.ebuild
b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
index a2a55523293..2677cc78823 100644
--- a/net-analyzer/wireshark/wireshark-2.6.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
@@ -59,7 +59,7 @@ CDEPEND="
snappy? ( app-arch/snappy )
spandsp? ( media-libs/spandsp )
ssl? ( net-libs/gnutls:= )
- zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+ zlib? ( sys-libs/zlib )
"
# We need perl for `pod2html`. The rest of the perl stuff is to block older
# and broken installs. #455122
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild
b/net-analyzer/wireshark/wireshark-99999999.ebuild
index d1a9875cba3..820661327c1 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -52,7 +52,7 @@ CDEPEND="
snappy? ( app-arch/snappy )
spandsp? ( media-libs/spandsp )
ssl? ( net-libs/gnutls:= )
- zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+ zlib? ( sys-libs/zlib )
"
# We need perl for `pod2html`. The rest of the perl stuff is to block older
# and broken installs. #455122