From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1045493-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 6717E138334
	for <garchives@archives.gentoo.org>; Thu,  6 Sep 2018 12:40:49 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 473B8E07B3;
	Thu,  6 Sep 2018 12:40:48 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 1C38EE07B3
	for <gentoo-commits@lists.gentoo.org>; Thu,  6 Sep 2018 12:40:47 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 71DE9335CC7
	for <gentoo-commits@lists.gentoo.org>; Thu,  6 Sep 2018 12:40:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 75FF33C0
	for <gentoo-commits@lists.gentoo.org>; Thu,  6 Sep 2018 12:40:43 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1536237636.abc127741683281c159a3ca869baabc0d5207dec.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch
X-VCS-Directories: net-analyzer/wireshark/files/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: abc127741683281c159a3ca869baabc0d5207dec
X-VCS-Branch: master
Date: Thu,  6 Sep 2018 12:40:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 24acc375-da35-4de7-8934-b0c4dfb505a1
X-Archives-Hash: 644429b0909cb2ab8d8a542b483df124

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}