From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 E0135138334 for ; Tue, 24 Jul 2018 08:57:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1056E0880; Tue, 24 Jul 2018 08:57:16 +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 9E186E0880 for ; Tue, 24 Jul 2018 08:57:16 +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 3CA5F33BE07 for ; Tue, 24 Jul 2018 08:57:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D49035C for ; Tue, 24 Jul 2018 08:57:13 +0000 (UTC) From: "Jeroen Roovers" 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" Message-ID: <1532422630.e8fe71341eb7f6a169d62dcad74a7650423eef24.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/Manifest net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch net-analyzer/wireshark/wireshark-2.6.1.ebuild X-VCS-Directories: net-analyzer/wireshark/ net-analyzer/wireshark/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: e8fe71341eb7f6a169d62dcad74a7650423eef24 X-VCS-Branch: master Date: Tue, 24 Jul 2018 08:57:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8655db45-9610-40ff-b5a6-9dfb346e0230 X-Archives-Hash: 2f6db90d56a3e1205bd53ba38feeb2ed commit: e8fe71341eb7f6a169d62dcad74a7650423eef24 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Jul 24 08:56:23 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Tue Jul 24 08:57:10 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8fe7134 net-analyzer/wireshark: Old. Package-Manager: Portage-2.3.43, Repoman-2.3.10 net-analyzer/wireshark/Manifest | 1 - .../wireshark/files/wireshark-2.6.0-qtsvg.patch | 29 --- .../wireshark/files/wireshark-2.6.1-Qt-5.11.patch | 54 ----- net-analyzer/wireshark/wireshark-2.6.1.ebuild | 243 --------------------- 4 files changed, 327 deletions(-) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index f21c28363cc..251aec24554 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,3 +1,2 @@ DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3 -DIST wireshark-2.6.1.tar.xz 28386244 BLAKE2B fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486 SHA512 e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444 DIST wireshark-2.6.2.tar.xz 28392140 BLAKE2B 08fb59061f618494ee07ca19cd97ab2ebe7c483419c1932e185dd42a0fe2b6d0070834ae5b7aaea4981f6fbc4baeaadb7c9eee8bf32b823af77e753c468257ce SHA512 e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2 diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch deleted file mode 100644 index 63327727590..00000000000 --- a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -926,14 +926,12 @@ - Qt5LinguistTools - Qt5Multimedia - Qt5PrintSupport -- Qt5Svg - Qt5Widgets - ) - set(Qt5Core_OPTIONS REQUIRED) - set(Qt5LinguistTools_OPTIONS REQUIRED) - set(Qt5Multimedia_OPTIONS REQUIRED) - set(Qt5PrintSupport_OPTIONS REQUIRED) -- set(Qt5Svg_OPTIONS REQUIRED) - set(Qt5Widgets_OPTIONS REQUIRED) - if (APPLE) - set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras) -@@ -1229,11 +1227,6 @@ - # That's the name autofoo uses - set(QT_MULTIMEDIA_LIB 1) - endif() -- if(Qt5Svg_FOUND) -- set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES}) -- # That's the name autofoo uses -- set(QT_SVG_LIB 1) -- endif() - if(Qt5MacExtras_FOUND) - set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES}) - # That's the name autofoo uses diff --git a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch b/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch deleted file mode 100644 index c8d8bb9ce9c..00000000000 --- a/net-analyzer/wireshark/files/wireshark-2.6.1-Qt-5.11.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b8e8aa87f43c12ad564426b3359f593305cd45a1 Mon Sep 17 00:00:00 2001 -From: Roland Knall -Date: Wed, 25 Apr 2018 10:28:30 +0200 -Subject: [PATCH] Qt: Fix various missing header includes - -Qt 5.11 seems to have changed the include dependencies, so adding those, that are missing - -Change-Id: I2b0482f7554467d6981be65bfd3fea1a3e118976 -Reviewed-on: https://code.wireshark.org/review/27145 -Petri-Dish: Roland Knall -Tested-by: Petri Dish Buildbot -Reviewed-by: Roland Knall ---- - ui/qt/packet_format_group_box.cpp | 1 + - ui/qt/time_shift_dialog.cpp | 1 + - ui/qt/wireless_frame.cpp | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp -index a80a71aaaddfce2798ececcbb27a4d9e75382c1b..3c0fff28aa4cd91d344f2e70db1e66123bc17f41 100644 ---- a/ui/qt/packet_format_group_box.cpp -+++ b/ui/qt/packet_format_group_box.cpp -@@ -10,6 +10,7 @@ - #include - - #include -+#include - - PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) : - QGroupBox(parent), -diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp -index 93882c09a377a5630e8bb09b4e80d7f6a84f7293..8460db2e966a0f572478de7430b8b63f4473dd16 100644 ---- a/ui/qt/time_shift_dialog.cpp -+++ b/ui/qt/time_shift_dialog.cpp -@@ -14,6 +14,7 @@ - #include - #include - -+#include - - TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) : - QDialog(parent), -diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp -index bd9076abcf4a5d7b6fd73d2bc0b63b4fff8c256a..46fb2dd2f3054f66380239106fb2e27058196447 100644 ---- a/ui/qt/wireless_frame.cpp -+++ b/ui/qt/wireless_frame.cpp -@@ -23,6 +23,7 @@ - #include - - #include -+#include - - // To do: - // - Disable or hide invalid channel types. diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild deleted file mode 100644 index 9e43a2a0eac..00000000000 --- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm hppa ia64 ~ppc64 x86" -IUSE=" - adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc - +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink - nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux - +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump - zlib -" - -S=${WORKDIR}/${P/_/} - -CDEPEND=" - >=dev-libs/glib-2.14:2 - dev-libs/libgcrypt:0 - netlink? ( dev-libs/libnl:3 ) - adns? ( >=net-dns/c-ares-1.5 ) - bcg729? ( media-libs/bcg729 ) - filecaps? ( sys-libs/libcap ) - gtk? ( - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/pango - x11-misc/xdg-utils - ) - kerberos? ( virtual/krb5 ) - sshdump? ( >=net-libs/libssh-0.6 ) - ciscodump? ( >=net-libs/libssh-0.6 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - maxminddb? ( dev-libs/libmaxminddb ) - nghttp2? ( net-libs/nghttp2 ) - pcap? ( net-libs/libpcap ) - portaudio? ( media-libs/portaudio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - >=media-libs/speex-1.2.0 - media-libs/speexdsp - x11-misc/xdg-utils - ) - sbc? ( media-libs/sbc ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy ) - spandsp? ( media-libs/spandsp ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - dev-lang/perl - !