| 1 |
commit: bbd323c44e6eb0de78cbed3106cf0adb7fdeaecd |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 26 21:37:20 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 26 21:37:51 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd323c4 |
| 7 |
|
| 8 |
net-analyzer/wireshark: fix paths in live ebuild |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/835860 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
net-analyzer/wireshark/wireshark-3.6.3.ebuild | 12 ++---------- |
| 14 |
net-analyzer/wireshark/wireshark-9999.ebuild | 19 +++++-------------- |
| 15 |
2 files changed, 7 insertions(+), 24 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/wireshark/wireshark-3.6.3.ebuild b/net-analyzer/wireshark/wireshark-3.6.3.ebuild |
| 18 |
index 7d40549271cb..76a4a4ef4420 100644 |
| 19 |
--- a/net-analyzer/wireshark/wireshark-3.6.3.ebuild |
| 20 |
+++ b/net-analyzer/wireshark/wireshark-3.6.3.ebuild |
| 21 |
@@ -6,7 +6,7 @@ EAPI=8 |
| 22 |
LUA_COMPAT=( lua5-{1..2} ) |
| 23 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 24 |
|
| 25 |
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake |
| 26 |
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake |
| 27 |
|
| 28 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
| 29 |
HOMEPAGE="https://www.wireshark.org/" |
| 30 |
@@ -248,9 +248,7 @@ src_install() { |
| 31 |
} |
| 32 |
|
| 33 |
pkg_postinst() { |
| 34 |
- xdg_desktop_database_update |
| 35 |
- xdg_icon_cache_update |
| 36 |
- xdg_mimeinfo_database_update |
| 37 |
+ xdg_pkg_postinst |
| 38 |
|
| 39 |
# Add group for users allowed to sniff. |
| 40 |
chgrp pcap "${EROOT}"/usr/bin/dumpcap |
| 41 |
@@ -265,9 +263,3 @@ pkg_postinst() { |
| 42 |
ewarn "add yourself to the pcap group. This security measure ensures" |
| 43 |
ewarn "that only trusted users are allowed to sniff your traffic." |
| 44 |
} |
| 45 |
- |
| 46 |
-pkg_postrm() { |
| 47 |
- xdg_desktop_database_update |
| 48 |
- xdg_icon_cache_update |
| 49 |
- xdg_mimeinfo_database_update |
| 50 |
-} |
| 51 |
|
| 52 |
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild |
| 53 |
index 7d40549271cb..3c9c26865ea3 100644 |
| 54 |
--- a/net-analyzer/wireshark/wireshark-9999.ebuild |
| 55 |
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild |
| 56 |
@@ -6,7 +6,7 @@ EAPI=8 |
| 57 |
LUA_COMPAT=( lua5-{1..2} ) |
| 58 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 59 |
|
| 60 |
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake |
| 61 |
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake |
| 62 |
|
| 63 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
| 64 |
HOMEPAGE="https://www.wireshark.org/" |
| 65 |
@@ -207,8 +207,7 @@ src_install() { |
| 66 |
|
| 67 |
# install headers |
| 68 |
insinto /usr/include/wireshark |
| 69 |
- doins ws_diag_control.h ws_symbol_export.h \ |
| 70 |
- "${BUILD_DIR}"/config.h |
| 71 |
+ doins "${BUILD_DIR}"/config.h |
| 72 |
|
| 73 |
# If trying to remove this, try build e.g. libvirt first! |
| 74 |
# At last check, Fedora is still doing this too. |
| 75 |
@@ -233,12 +232,12 @@ src_install() { |
| 76 |
|
| 77 |
for s in 16 32 48 64 128 256 512 1024 ; do |
| 78 |
insinto /usr/share/icons/hicolor/${s}x${s}/apps |
| 79 |
- newins image/wsicon${s}.png wireshark.png |
| 80 |
+ newins resources/icons/wsicon${s}.png wireshark.png |
| 81 |
done |
| 82 |
|
| 83 |
for s in 16 24 32 48 64 128 256 ; do |
| 84 |
insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes |
| 85 |
- newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png |
| 86 |
+ newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png |
| 87 |
done |
| 88 |
fi |
| 89 |
|
| 90 |
@@ -248,9 +247,7 @@ src_install() { |
| 91 |
} |
| 92 |
|
| 93 |
pkg_postinst() { |
| 94 |
- xdg_desktop_database_update |
| 95 |
- xdg_icon_cache_update |
| 96 |
- xdg_mimeinfo_database_update |
| 97 |
+ xdg_pkg_postinst |
| 98 |
|
| 99 |
# Add group for users allowed to sniff. |
| 100 |
chgrp pcap "${EROOT}"/usr/bin/dumpcap |
| 101 |
@@ -265,9 +262,3 @@ pkg_postinst() { |
| 102 |
ewarn "add yourself to the pcap group. This security measure ensures" |
| 103 |
ewarn "that only trusted users are allowed to sniff your traffic." |
| 104 |
} |
| 105 |
- |
| 106 |
-pkg_postrm() { |
| 107 |
- xdg_desktop_database_update |
| 108 |
- xdg_icon_cache_update |
| 109 |
- xdg_mimeinfo_database_update |
| 110 |
-} |
Archives