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 9C73A139085 for ; Wed, 21 Dec 2016 08:49:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E692EE0EAB; Wed, 21 Dec 2016 08:49:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADC95E0EAB for ; Wed, 21 Dec 2016 08:49:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44A86340EDA for ; Wed, 21 Dec 2016 08:49:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22AC11AE8 for ; Wed, 21 Dec 2016 08:49:24 +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: <1482310135.5aea03e28794e737e82fd9a9a884f05e31843e21.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/Manifest net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch net-analyzer/wireshark/wireshark-2.0.6.ebuild X-VCS-Directories: net-analyzer/wireshark/files/ net-analyzer/wireshark/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 5aea03e28794e737e82fd9a9a884f05e31843e21 X-VCS-Branch: master Date: Wed, 21 Dec 2016 08:49:24 +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: f3c76e6a-aac7-493f-8acb-5f5a81ea0cf5 X-Archives-Hash: abadd238bec1a702382767f40751ce67 commit: 5aea03e28794e737e82fd9a9a884f05e31843e21 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Dec 21 08:48:55 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed Dec 21 08:48:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aea03e2 net-analyzer/wireshark: Old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-analyzer/wireshark/Manifest | 1 - .../wireshark/files/wireshark-1.11.0-oldlibs.patch | 20 -- .../wireshark/files/wireshark-1.6.13-ldflags.patch | 14 -- .../files/wireshark-2.0.0-androiddump-pcap.patch | 10 - .../wireshark/files/wireshark-2.1.0-sse4_2.patch | 20 -- .../files/wireshark-99999999-pkgconfig.patch | 62 ----- net-analyzer/wireshark/wireshark-2.0.6.ebuild | 266 --------------------- 7 files changed, 393 deletions(-) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 62af4df..7ec75cf 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,3 +1,2 @@ -DIST wireshark-2.0.6.tar.bz2 31213641 SHA256 70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db SHA512 2e4c9b76e365c6a2952b6a949173982286783884a60faaffb78a0364f606cb43811313ee31ada4c437cf831440253038d47976e5a1d73c3b1a85645691b1e5d9 WHIRLPOOL aa6570e5250c27ee3ac1ac9ea834102e0136f1482f702845b03aa4ab83fbcec64f8454fc9e9f6f92298e06208293c49a030f37d9dd6b569c3ed7c211e22eb5f5 DIST wireshark-2.2.2.tar.bz2 32230208 SHA256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 SHA512 7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0 WHIRLPOOL 52e81a2529a49f0f206e96c48e67fd235a6a3e7ab654cdf44107b90af269863b4c10f34ed4473966082bc025102eed18d690613fbdd2231fc7d177f5e77030a3 DIST wireshark-2.2.3.tar.bz2 32315857 SHA256 97bac89e88892054a5848a9f7e0c36aa399a2008900829b078e29cab0ddd593b SHA512 a067cc5e4683a70deb301b50d57e5543f265b4fd9eef6a55a9c31e078da0d03aa89322012b9b8b7689af1720e36fe3a17a20689d657c7dca5aa7aa7f51d0701c WHIRLPOOL d11f66fa5cf2cb777bcf3f178da83e9cbddf8ab84aba75239a3669bf5563b108840ef8154014077d414c55129caa7d2ed7c702dea71b72f753099399c99fa7f5 diff --git a/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch b/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch deleted file mode 100644 index 24b5c7d..00000000 --- a/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/epan/Makefile.am -+++ b/epan/Makefile.am -@@ -137,6 +137,7 @@ - # Add the object files for missing routines, if any. - # - libwireshark_la_LIBADD = \ -+ ${top_builddir}/wiretap/libwiretap.la ${top_builddir}/wsutil/libwsutil.la \ - libwireshark_generated.la \ - libwireshark_asmopt.la crypt/libairpdcap.la \ - ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ -@@ -144,8 +145,7 @@ - wmem/libwmem.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ - @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ - @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \ -- ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \ -- ${top_builddir}/wsutil/libwsutil.la -lm -+ @GLIB_LIBS@ -lm - - libwireshark_la_DEPENDENCIES = \ - libwireshark_generated.la \ diff --git a/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch b/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch deleted file mode 100644 index 94554fd..00000000 --- a/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -61,9 +61,9 @@ - # "-R" here. - # - AC_DEFUN([AC_WIRESHARK_ADD_DASH_L], --[$1="$$1 -L$2" --case "$host_os" in -+[case "$host_os" in - solaris*) -+ $1="$$1 -L$2" - $1="$$1 -R$2" - ;; - esac diff --git a/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch b/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch deleted file mode 100644 index 639e299..00000000 --- a/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -549,6 +549,7 @@ - wiretap/libwiretap.la \ - wsutil/libwsutil.la \ - @GLIB_LIBS@ \ -+ @PCAP_LIBS@ \ - @SOCKET_LIBS@ - - androiddump_CFLAGS = $(AM_CLEAN_CFLAGS) diff --git a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch deleted file mode 100644 index 1f80be9..00000000 --- a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1101,6 +1101,7 @@ - AC_SUBST(PIE_CFLAGS) - AC_SUBST(PIE_LDFLAGS) - -+AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[ - WS_CHECKED_CFLAGS_before_simd="$WS_CHECKED_CFLAGS" - AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C) - if test "x$can_add_to_cflags" = "xyes" -@@ -1132,6 +1133,9 @@ - ac_sse4_2_flag=-xarch=sse4_2 - fi - fi -+],[ -+AC_MSG_RESULT(no) -+]) - - # - # All AC_WIRESHARK_COMPILER_FLAGS_CHECK are done, do not call it again! diff --git a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch b/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch deleted file mode 100644 index 51f3c8f..00000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -242,7 +242,7 @@ - # This is referenced via AC_REQUIRE([PKG_PROG_PKG_CONFIG] in some macros - # like PKG_CHECK_MODULES. If the first call to such a macro is under an - # "if" statement, it's safer to call PKG_PROG_PKG_CONFIG directly, see --# the comments in acolocal.m4 -+# the comments in aclocal.m4 - # - # We want version 0.7 or better. (XXX - explain why. Is that just - # because our Qt tests were originally based on AM_PATH_GTK, and *it* -@@ -1910,6 +1910,19 @@ - AC_SUBST(plugins_dir) - - # -+# Find out where to store wireshark.pc and what should be in it -+# -+ -+PKG_INSTALLDIR -+ -+AC_SUBST(CMAKE_INSTALL_PREFIX,[$prefix]) -+AC_SUBST(CMAKE_INSTALL_LIBDIR,[`basename $libdir`]) -+PLUGIN_INSTALL_DIR="\${libdir}/$PACKAGE_NAME/$PACKAGE_VERSION/$plugins_dir" -+AC_SUBST(PLUGIN_INSTALL_DIR) -+PROJECT_VERSION="$PACKAGE_VERSION" -+AC_SUBST(PROJECT_VERSION) -+ -+# - # If we have , check whether we have dladdr. - # - if test "$ac_cv_header_dlfcn_h" = "yes" -@@ -3080,10 +3093,15 @@ - sinclude(asn1/Custom.m4) dnl - ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl - -+# -+# Configuration output -+# -+ - AC_CONFIG_HEADERS(config.h) - AC_OUTPUT( - Makefile - doxygen.cfg -+ wireshark.pc - asn1/Makefile - _CUSTOM_ASN1_AC_OUTPUT_ - asn1/acp133/Makefile ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,6 +56,12 @@ - smi_modules ipmap.html pdml2html.xsl - - # -+# Install a pkgconfig file -+# -+ -+pkgconfig_DATA = wireshark.pc -+ -+# - # Install global profiles in the "profiles" subdirectory - # - profilesdir = $(pkgdatadir) diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild deleted file mode 100644 index 4e96b75..00000000 --- a/net-analyzer/wireshark/wireshark-2.0.6.ebuild +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="http://www.wireshark.org/" -SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE=" - adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua - +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark - cpu_flags_x86_sse4_2 ssl zlib -" -REQUIRED_USE=" - ssl? ( crypt ) - ?? ( qt4 qt5 ) -" - -S=${WORKDIR}/${P/_/} - -GTK_COMMON_DEPEND=" - x11-libs/gdk-pixbuf - x11-libs/pango - x11-misc/xdg-utils -" -CDEPEND=" - >=dev-libs/glib-2.14:2 - netlink? ( dev-libs/libnl:3 ) - adns? ( >=net-dns/c-ares-1.5 ) - crypt? ( dev-libs/libgcrypt:0 ) - caps? ( sys-libs/libcap ) - geoip? ( dev-libs/geoip ) - gtk3? ( - ${GTK_COMMON_DEPEND} - x11-libs/gtk+:3 - ) - kerberos? ( virtual/krb5 ) - lua? ( >=dev-lang/lua-5.1:* ) - pcap? ( net-libs/libpcap ) - portaudio? ( media-libs/portaudio ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4[accessibility] - x11-misc/xdg-utils - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-misc/xdg-utils - ) - sbc? ( media-libs/sbc ) - smi? ( net-libs/libsmi ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - dev-lang/perl - !