commit: f048bbf2244226deeaf2acafd4eb829de3c515c9
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 5 16:58:37 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 17:01:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f048bbf2
net-analyzer/wireshark: 8=>{cmake-utils,}.eclass
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/wireshark/wireshark-3.2.0.ebuild | 8 ++++----
net-analyzer/wireshark/wireshark-99999999.ebuild | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-3.2.0.ebuild
b/net-analyzer/wireshark/wireshark-3.2.0.ebuild
index e01ec82368e..931de56a7b3 100644
--- a/net-analyzer/wireshark/wireshark-3.2.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils
cmake-utils
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils
cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/";
@@ -168,15 +168,15 @@ src_configure() {
-DENABLE_ZLIB=$(usex zlib)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_test() {
- cmake-utils_src_test
+ cmake_src_test
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# FAQ is not required as is installed from help/faq.txt
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild
b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 877a35cd055..a228b3f00e2 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user
xdg-utils cmake-utils
+inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user
xdg-utils cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/";
@@ -168,15 +168,15 @@ src_configure() {
-DENABLE_ZLIB=$(usex zlib)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_test() {
- cmake-utils_src_test
+ cmake_src_test
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# FAQ is not required as is installed from help/faq.txt
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
