net-analyzer/wireshark: IUSE=nghttp2 => IUSE=http2

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 1dfc66edc73a01e989da8dff0e1a25f2c9396d4a..651879bc6f825e237f9719463d6be5e02d83f01c 100644 (file)
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -38,12 +38,12 @@ be exported to XML, PostScript®, CSV, or plain text.
 <flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag>
 <flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
 <flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
+<flag name="http2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
 <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
 <flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag>
 <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
 <flag name="minizip">Build with zip file compression support</flag>
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
-<flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
 <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
 <flag name="plugin-ifdemo">Install plugin interface demo</flag>
 <flag name="plugins">Install plugins</flag>

diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
index 25bf89b8cfe8402b8ba79d4f0a5979665f111e49..0fcd75a867a01627385d5f43a9e88eeb2de1a160 100644 (file)
--- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc64 x86"
 IUSE="
        adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
-       +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-       nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+       +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+       +netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
        smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
        +udpdump zlib
 "
@@ -29,13 +29,13 @@ CDEPEND="
        bcg729? ( media-libs/bcg729 )
        ciscodump? ( >=net-libs/libssh-0.6 )
        filecaps? ( sys-libs/libcap )
+       http2? ( net-libs/nghttp2 )
        kerberos? ( virtual/krb5 )
        libxml2? ( dev-libs/libxml2 )
        lua? ( >=dev-lang/lua-5.1:* )
        lz4? ( app-arch/lz4 )
        maxminddb? ( dev-libs/libmaxminddb )
        netlink? ( dev-libs/libnl:3 )
-       nghttp2? ( net-libs/nghttp2 )
        pcap? ( net-libs/libpcap )
        qt5? (
                dev-qt/qtcore:5
@@ -157,7 +157,7 @@ src_configure() {
                -DENABLE_LUA=$(usex lua)
                -DENABLE_LZ4=$(usex lz4)
                -DENABLE_NETLINK=$(usex netlink)
-               -DENABLE_NGHTTP2=$(usex nghttp2)
+               -DENABLE_NGHTTP2=$(usex http2)
                -DENABLE_PCAP=$(usex pcap)
                -DENABLE_SBC=$(usex sbc)
                -DENABLE_SMI=$(usex smi)

diff --git a/net-analyzer/wireshark/wireshark-3.0.4.ebuild b/net-analyzer/wireshark/wireshark-3.0.4.ebuild
index a2a6a43079c7d785be12594839d5c8e0cf25c80d..61e8bd7a288c1eb346507f274d388b834b78eff2 100644 (file)
--- a/net-analyzer/wireshark/wireshark-3.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.4.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 x86"
 IUSE="
        adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
-       +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-       nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+       +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+       +netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
        smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
        +udpdump zlib
 "
@@ -29,13 +29,13 @@ CDEPEND="
        bcg729? ( media-libs/bcg729 )
        ciscodump? ( >=net-libs/libssh-0.6 )
        filecaps? ( sys-libs/libcap )
+       http2? ( net-libs/nghttp2 )
        kerberos? ( virtual/krb5 )
        libxml2? ( dev-libs/libxml2 )
        lua? ( >=dev-lang/lua-5.1:* )
        lz4? ( app-arch/lz4 )
        maxminddb? ( dev-libs/libmaxminddb )
        netlink? ( dev-libs/libnl:3 )
-       nghttp2? ( net-libs/nghttp2 )
        pcap? ( net-libs/libpcap )
        qt5? (
                dev-qt/qtcore:5
@@ -157,7 +157,7 @@ src_configure() {
                -DENABLE_LUA=$(usex lua)
                -DENABLE_LZ4=$(usex lz4)
                -DENABLE_NETLINK=$(usex netlink)
-               -DENABLE_NGHTTP2=$(usex nghttp2)
+               -DENABLE_NGHTTP2=$(usex http2)
                -DENABLE_PCAP=$(usex pcap)
                -DENABLE_SBC=$(usex sbc)
                -DENABLE_SMI=$(usex smi)

diff --git a/net-analyzer/wireshark/wireshark-3.0.5.ebuild b/net-analyzer/wireshark/wireshark-3.0.5.ebuild
index e33cf0877e634b2eab217a120946ff6386816454..f4fbb9dc3bcdf479a4c73f78aa8cc828fa7cc365 100644 (file)
--- a/net-analyzer/wireshark/wireshark-3.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.5.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
        adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
-       +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-       nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+       +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+       +netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
        smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
        +udpdump zlib
 "
@@ -29,13 +29,13 @@ CDEPEND="
        bcg729? ( media-libs/bcg729 )
        ciscodump? ( >=net-libs/libssh-0.6 )
        filecaps? ( sys-libs/libcap )
+       http2? ( net-libs/nghttp2 )
        kerberos? ( virtual/krb5 )
        libxml2? ( dev-libs/libxml2 )
        lua? ( >=dev-lang/lua-5.1:* )
        lz4? ( app-arch/lz4 )
        maxminddb? ( dev-libs/libmaxminddb )
        netlink? ( dev-libs/libnl:3 )
-       nghttp2? ( net-libs/nghttp2 )
        pcap? ( net-libs/libpcap )
        qt5? (
                dev-qt/qtcore:5
@@ -157,7 +157,7 @@ src_configure() {
                -DENABLE_LUA=$(usex lua)
                -DENABLE_LZ4=$(usex lz4)
                -DENABLE_NETLINK=$(usex netlink)
-               -DENABLE_NGHTTP2=$(usex nghttp2)
+               -DENABLE_NGHTTP2=$(usex http2)
                -DENABLE_PCAP=$(usex pcap)
                -DENABLE_SBC=$(usex sbc)
                -DENABLE_SMI=$(usex smi)

diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
index e19be1f83c4d6bf8b1ec1d541315f3959f723579..4d9324a7a9b863a5c2c2b6407d9f45f299d12e5b 100644 (file)
--- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
        adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
-       dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
-       +minizip +netlink nghttp2 +plugins plugin-ifdemo +pcap +qt5 +randpkt
+       dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb
+       +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
        +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
        sdjournal +text2pcap tfshark +tshark +udpdump zlib
 "
@@ -29,6 +29,7 @@ CDEPEND="
        brotli? ( app-arch/brotli )
        ciscodump? ( >=net-libs/libssh-0.6 )
        filecaps? ( sys-libs/libcap )
+       http2? ( net-libs/nghttp2 )
        kerberos? ( virtual/krb5 )
        libxml2? ( dev-libs/libxml2 )
        lua? ( >=dev-lang/lua-5.1:* )
@@ -36,7 +37,6 @@ CDEPEND="
        maxminddb? ( dev-libs/libmaxminddb )
        minizip? ( sys-libs/zlib[minizip] )
        netlink? ( dev-libs/libnl:3 )
-       nghttp2? ( net-libs/nghttp2 )
        pcap? ( net-libs/libpcap )
        qt5? (
                dev-qt/qtcore:5
@@ -160,7 +160,7 @@ src_configure() {
                -DENABLE_LZ4=$(usex lz4)
                -DENABLE_MINIZIP=$(usex minizip)
                -DENABLE_NETLINK=$(usex netlink)
-               -DENABLE_NGHTTP2=$(usex nghttp2)
+               -DENABLE_NGHTTP2=$(usex http2)
                -DENABLE_PCAP=$(usex pcap)
                -DENABLE_PLUGINS=$(usex plugins)
                -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 5fb0f3785286732125235bd4aff80a21bf5990c4..7ecaa00c8eecb91aedeea7d7624f681e670a9cea 100644 (file)
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
        adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
-       dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
-       +minizip +netlink nghttp2 +plugins plugin-ifdemo +pcap +qt5 +randpkt
+       dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb
+       +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
        +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
        sdjournal +text2pcap tfshark +tshark +udpdump zlib
 "
@@ -29,6 +29,7 @@ CDEPEND="
        brotli? ( app-arch/brotli )
        ciscodump? ( >=net-libs/libssh-0.6 )
        filecaps? ( sys-libs/libcap )
+       http2? ( net-libs/nghttp2 )
        kerberos? ( virtual/krb5 )
        libxml2? ( dev-libs/libxml2 )
        lua? ( >=dev-lang/lua-5.1:* )
@@ -36,7 +37,6 @@ CDEPEND="
        maxminddb? ( dev-libs/libmaxminddb )
        minizip? ( sys-libs/zlib[minizip] )
        netlink? ( dev-libs/libnl:3 )
-       nghttp2? ( net-libs/nghttp2 )
        pcap? ( net-libs/libpcap )
        qt5? (
                dev-qt/qtcore:5
@@ -160,7 +160,7 @@ src_configure() {
                -DENABLE_LZ4=$(usex lz4)
                -DENABLE_MINIZIP=$(usex minizip)
                -DENABLE_NETLINK=$(usex netlink)
-               -DENABLE_NGHTTP2=$(usex nghttp2)
+               -DENABLE_NGHTTP2=$(usex http2)
                -DENABLE_PCAP=$(usex pcap)
                -DENABLE_PLUGINS=$(usex plugins)
                -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)