From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1037347-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 784F7138334
	for <garchives@archives.gentoo.org>; Thu, 19 Jul 2018 12:07:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1CE06E08ED;
	Thu, 19 Jul 2018 12:07:54 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id C7AD4E08CE
	for <gentoo-commits@lists.gentoo.org>; Thu, 19 Jul 2018 12:07:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A071B335CCC
	for <gentoo-commits@lists.gentoo.org>; Thu, 19 Jul 2018 12:07:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id B794137C
	for <gentoo-commits@lists.gentoo.org>; Thu, 19 Jul 2018 12:07:49 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1532002067.7219fcbf921dc107ae1694495cc9267289308e52.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/wireshark/wireshark-2.4.5.ebuild net-analyzer/wireshark/wireshark-2.6.1.ebuild net-analyzer/wireshark/wireshark-2.6.2.ebuild net-analyzer/wireshark/wireshark-99999999.ebuild
X-VCS-Directories: net-analyzer/wireshark/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 7219fcbf921dc107ae1694495cc9267289308e52
X-VCS-Branch: master
Date: Thu, 19 Jul 2018 12:07:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 26214511-9e9e-471c-bc41-76107a8714aa
X-Archives-Hash: 101c5d4e8b154170acd835f8600152c1

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