diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-11-24 03:06:30 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-11-24 03:06:30 +0000 |
| commit | 53894b7d79df4c2bc6f7c37f1c12e0c28983710c (patch) | |
| tree | 9e46606b617cfc089984af68dd74a41fa85b568f | |
| parent | 2021-11-24 02:51:37 UTC (diff) | |
| parent | net-analyzer/wireshark: drop 3.6.0 keywords for now (breaks libvirt?) (diff) | |
| download | gentoo-53894b7d79df4c2bc6f7c37f1c12e0c28983710c.tar.gz gentoo-53894b7d79df4c2bc6f7c37f1c12e0c28983710c.tar.bz2 gentoo-53894b7d79df4c2bc6f7c37f1c12e0c28983710c.zip | |
Merge updates from master
| -rw-r--r-- | net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 11 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-9999.ebuild | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild index a850f1953b70..87ec81e02281 100644 --- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild @@ -18,7 +18,8 @@ else SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" S="${WORKDIR}/${P/_/}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" + # Seems to break libvirt? + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" fi LICENSE="GPL-2" @@ -213,6 +214,12 @@ src_install() { # FAQ is not required as is installed from help/faq.txt dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins ws_diag_control.h ws_symbol_export.h \ + "${BUILD_DIR}"/config.h + # If trying to remove this, try build e.g. libvirt first! # At last check, Fedora is still doing this too. local dir dirs=( @@ -221,9 +228,9 @@ src_install() { epan/dfilter epan/dissectors epan/ftypes - epan/wmem wiretap wsutil + wsutil/wmem ) for dir in "${dirs[@]}" ; do diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index a850f1953b70..87ec81e02281 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -18,7 +18,8 @@ else SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" S="${WORKDIR}/${P/_/}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" + # Seems to break libvirt? + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" fi LICENSE="GPL-2" @@ -213,6 +214,12 @@ src_install() { # FAQ is not required as is installed from help/faq.txt dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins ws_diag_control.h ws_symbol_export.h \ + "${BUILD_DIR}"/config.h + # If trying to remove this, try build e.g. libvirt first! # At last check, Fedora is still doing this too. local dir dirs=( @@ -221,9 +228,9 @@ src_install() { epan/dfilter epan/dissectors epan/ftypes - epan/wmem wiretap wsutil + wsutil/wmem ) for dir in "${dirs[@]}" ; do |