[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     abc127741683281c159a3ca869baabc0d5207dec
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  6 12:40:19 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Sep  6 12:40:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abc12774

net-analyzer/wireshark: Fix USE=-editcap

Fixes: https://bugs.gentoo.org/665250
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../wireshark/files/wireshark-2.6.3-docbook.patch      | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch
index 38d223491a6..9e5e8810991 100644
--- a/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch
+++ b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch
@@ -25,7 +25,7 @@
 +foreach(th_build ${WSUG_TOOLS_COMMANDS})
 +if (TARGET ${th_build})
 +	list(APPEND WSUG_TOOLS_HELP_COMMANDS ${th_build})
-+endif(BUILD_${th_build})
++endif(TARGET ${th_build})
 +endforeach()
  
  # We want the wsug_* targets to depend on the tools help files.
@@ -38,3 +38,19 @@
  	list(APPEND WSUG_TOOLS_HELP_FILES ${th_file})
  	add_custom_command(
  		OUTPUT ${th_file}
+@@ -103,6 +105,7 @@
+ # Extra command output
+ # Note that these won't work on Windows unless we make -F and -T write
+ # to stdout and return 0 or wrap the commands similar to hhc.exe.
++if (TARGET editcap)
+ set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/editcap-F.txt)
+ list(APPEND WSUG_TOOLS_HELP_FILES ${th_file})
+ add_custom_command(
+@@ -117,6 +120,7 @@
+ 	COMMAND $<TARGET_FILE:editcap> -T > ${th_file}
+ 	DEPENDS $<TARGET_FILE:editcap>
+ )
++endif(TARGET editcap)
+ 
+ add_custom_target(update_tools_help
+ 	DEPENDS ${WSUG_TOOLS_HELP_FILES}