From 69727570d677e87bdd408c90a30c40e3ffb5e10f Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 18 Mar 2019 21:46:49 +0100 Subject: net-analyzer/wireshark: Old Package-Manager: Portage-2.3.62, Repoman-2.3.12 Bug: https://bugs.gentoo.org/show_bug.cgi?id=679004 Signed-off-by: Jeroen Roovers --- net-analyzer/wireshark/Manifest | 2 - .../files/wireshark-2.6.0-androiddump-wsutil.patch | 26 --- .../wireshark/files/wireshark-2.6.3-docbook.patch | 56 ----- net-analyzer/wireshark/wireshark-2.6.3.ebuild | 243 --------------------- net-analyzer/wireshark/wireshark-2.6.6.ebuild | 240 -------------------- 5 files changed, 567 deletions(-) delete mode 100644 net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch delete mode 100644 net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch delete mode 100644 net-analyzer/wireshark/wireshark-2.6.3.ebuild delete mode 100644 net-analyzer/wireshark/wireshark-2.6.6.ebuild diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index c4ba02e145bf..65dd7ac03bfb 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,4 +1,2 @@ -DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80 -DIST wireshark-2.6.6.tar.xz 28407404 BLAKE2B 5135789d345b675814a6394d5ba1469585b9eab917885730125b8a007aecd9cb48a510fc9e7479148cadf625807bac9017b854797e4bb2e562d7dc7f76140826 SHA512 b781c3b34dc76a3d8e60dc2b9b4e46a11994440b8df7b56134521ea9a77b27b0719a600db60d7f3d65f15972a5db2a7e85a8bf60d7217fce498fb5668de8fe56 DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677 DIST wireshark-3.0.0.tar.xz 30953760 BLAKE2B ee866966000cf902da6f330eb8a4b281d34a3ca88e9d92a7de1069172c8aeb86f9222e1467c5d3722ee055baf88d8ba0eb6fe27084d0b35f9639bdb9741d25e1 SHA512 917708b5edc25609536c7bd7cf4ae32a901fd99118302138dc0bf6f1ad092a8e5069a917cc8cf6cb77190f54e50623a4eba1ee10ffc225ee3051b50cf02a0963 diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch deleted file mode 100644 index e28465e814a5..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.6.0-androiddump-wsutil.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2841,6 +2841,7 @@ - if(HAVE_LIBPCAP) - set(androiddump_LIBS - ui -+ wsutil - ${GLIB2_LIBRARIES} - ${PCAP_LIBRARIES} - ) -@@ -2851,6 +2852,7 @@ - set(androiddump_LIBS - ui - wiretap -+ wsutil - ${GLIB2_LIBRARIES} - ${ZLIB_LIBRARIES} - ${CMAKE_DL_LIBS} -@@ -2862,7 +2864,6 @@ - ) - - add_executable(androiddump WIN32 ${androiddump_FILES}) -- # XXX Shouldn't we add wsutil to androiddump_LIBS instead? - set_extcap_executable_properties(androiddump) - target_link_libraries(androiddump ${androiddump_LIBS}) - install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR}) diff --git a/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch deleted file mode 100644 index 9e5e8810991e..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/docbook/CMakeLists.txt -+++ b/docbook/CMakeLists.txt -@@ -61,21 +61,22 @@ - common_graphics/warning.svg - ) - --set(WSUG_TOOLS_HELP_COMMANDS -+set(WSUG_TOOLS_COMMANDS - capinfos -+ dumpcap - editcap - mergecap -+ rawshark - reordercap - text2pcap - tshark - ) - --if (PCAP_FOUND) -- list(APPEND WSUG_TOOLS_HELP_COMMANDS -- dumpcap -- rawshark -- ) --endif(PCAP_FOUND) -+foreach(th_build ${WSUG_TOOLS_COMMANDS}) -+if (TARGET ${th_build}) -+ list(APPEND WSUG_TOOLS_HELP_COMMANDS ${th_build}) -+endif(TARGET ${th_build}) -+endforeach() - - # We want the wsug_* targets to depend on the tools help files. - # We want update_tools_help to be an independent target. -@@ -92,6 +93,7 @@ - - foreach(th_command ${WSUG_TOOLS_HELP_COMMANDS}) - set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/${th_command}-h.txt) -+ add_dependencies(th_file th_command) - list(APPEND WSUG_TOOLS_HELP_FILES ${th_file}) - add_custom_command( - OUTPUT ${th_file} -@@ -103,6 +105,7 @@ - # Extra command output - # Note that these won't work on Windows unless we make -F and -T write - # to stdout and return 0 or wrap the commands similar to hhc.exe. -+if (TARGET editcap) - set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/editcap-F.txt) - list(APPEND WSUG_TOOLS_HELP_FILES ${th_file}) - add_custom_command( -@@ -117,6 +120,7 @@ - COMMAND $ -T > ${th_file} - DEPENDS $ - ) -+endif(TARGET editcap) - - add_custom_target(update_tools_help - DEPENDS ${WSUG_TOOLS_HELP_FILES} diff --git a/net-analyzer/wireshark/wireshark-2.6.3.ebuild b/net-analyzer/wireshark/wireshark-2.6.3.ebuild deleted file mode 100644 index 6043c647518e..000000000000 --- a/net-analyzer/wireshark/wireshark-2.6.3.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 - !