Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
Date: Wed, 24 Nov 2021 02:38:37
Message-Id: 1637721444.25ab9cdb6716966705de45e0a44610f6685fa90d.sam@gentoo
1 commit: 25ab9cdb6716966705de45e0a44610f6685fa90d
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 24 02:37:24 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 24 02:37:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ab9cdb
7
8 net-analyzer/wireshark: restore non-obsolete others headers
9
10 I'd mistakenly thought this lot were obsolete but it seems not.
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 ...ireshark-3.6.0.ebuild => wireshark-3.6.0-r1.ebuild} | 18 ++++++++++++++++++
15 net-analyzer/wireshark/wireshark-9999.ebuild | 18 ++++++++++++++++++
16 2 files changed, 36 insertions(+)
17
18 diff --git a/net-analyzer/wireshark/wireshark-3.6.0.ebuild b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
19 similarity index 95%
20 rename from net-analyzer/wireshark/wireshark-3.6.0.ebuild
21 rename to net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
22 index 07df8f9a5dfd..a850f1953b70 100644
23 --- a/net-analyzer/wireshark/wireshark-3.6.0.ebuild
24 +++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
25 @@ -213,6 +213,24 @@ src_install() {
26 # FAQ is not required as is installed from help/faq.txt
27 dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
28
29 + # If trying to remove this, try build e.g. libvirt first!
30 + # At last check, Fedora is still doing this too.
31 + local dir dirs=(
32 + epan
33 + epan/crypt
34 + epan/dfilter
35 + epan/dissectors
36 + epan/ftypes
37 + epan/wmem
38 + wiretap
39 + wsutil
40 + )
41 +
42 + for dir in "${dirs[@]}" ; do
43 + insinto /usr/include/wireshark/${dir}
44 + doins ${dir}/*.h
45 + done
46 +
47 if use qt5; then
48 local s
49 for s in 16 32 48 64 128 256 512 1024; do
50
51 diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
52 index 07df8f9a5dfd..a850f1953b70 100644
53 --- a/net-analyzer/wireshark/wireshark-9999.ebuild
54 +++ b/net-analyzer/wireshark/wireshark-9999.ebuild
55 @@ -213,6 +213,24 @@ src_install() {
56 # FAQ is not required as is installed from help/faq.txt
57 dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
58
59 + # If trying to remove this, try build e.g. libvirt first!
60 + # At last check, Fedora is still doing this too.
61 + local dir dirs=(
62 + epan
63 + epan/crypt
64 + epan/dfilter
65 + epan/dissectors
66 + epan/ftypes
67 + epan/wmem
68 + wiretap
69 + wsutil
70 + )
71 +
72 + for dir in "${dirs[@]}" ; do
73 + insinto /usr/include/wireshark/${dir}
74 + doins ${dir}/*.h
75 + done
76 +
77 if use qt5; then
78 local s
79 for s in 16 32 48 64 128 256 512 1024; do