From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 81298138334 for ; Sun, 2 Sep 2018 17:58:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E36DE07B3; Sun, 2 Sep 2018 17:58:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 0337CE07B3 for ; Sun, 2 Sep 2018 17:58:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 ADD0A335C8D for ; Sun, 2 Sep 2018 17:58:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC76D398 for ; Sun, 2 Sep 2018 17:58:10 +0000 (UTC) From: "Jeroen Roovers" 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" Message-ID: <1535911083.1f2c951b114a1bf4c382dbe7b0055886c19ab5c1.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch net-analyzer/wireshark/wireshark-2.6.3.ebuild X-VCS-Directories: net-analyzer/wireshark/ net-analyzer/wireshark/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 1f2c951b114a1bf4c382dbe7b0055886c19ab5c1 X-VCS-Branch: master Date: Sun, 2 Sep 2018 17:58:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 240c051c-4bd6-4203-a98c-21fa3607ddc6 X-Archives-Hash: 6bbb8d3a4e0a3eacde53951b53434b59 commit: 1f2c951b114a1bf4c382dbe7b0055886c19ab5c1 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Sep 2 17:56:44 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Sep 2 17:58:03 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2c951b net-analyzer/wireshark: Hopefully fix docbook/ Bug: https://bugs.gentoo.org/665080 Package-Manager: Portage-2.3.48, Repoman-2.3.10 .../wireshark/files/wireshark-2.6.3-docbook.patch | 40 ++++++++++++++++++++++ net-analyzer/wireshark/wireshark-2.6.3.ebuild | 1 + 2 files changed, 41 insertions(+) diff --git a/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch new file mode 100644 index 00000000000..38d223491a6 --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch @@ -0,0 +1,40 @@ +--- a/docbook/CMakeLists.txt ++++ b/docbook/CMakeLists.txt +@@ -61,21 +61,22 @@ + common_graphics/warning.svg + ) + +-set(WSUG_TOOLS_HELP_COMMANDS ++set(WSUG_TOOLS_COMMANDS + capinfos ++ dumpcap + editcap + mergecap ++ rawshark + reordercap + text2pcap + tshark + ) + +-if (PCAP_FOUND) +- list(APPEND WSUG_TOOLS_HELP_COMMANDS +- dumpcap +- rawshark +- ) +-endif(PCAP_FOUND) ++foreach(th_build ${WSUG_TOOLS_COMMANDS}) ++if (TARGET ${th_build}) ++ list(APPEND WSUG_TOOLS_HELP_COMMANDS ${th_build}) ++endif(BUILD_${th_build}) ++endforeach() + + # We want the wsug_* targets to depend on the tools help files. + # We want update_tools_help to be an independent target. +@@ -92,6 +93,7 @@ + + foreach(th_command ${WSUG_TOOLS_HELP_COMMANDS}) + set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/${th_command}-h.txt) ++ add_dependencies(th_file th_command) + list(APPEND WSUG_TOOLS_HELP_FILES ${th_file}) + add_custom_command( + OUTPUT ${th_file} diff --git a/net-analyzer/wireshark/wireshark-2.6.3.ebuild b/net-analyzer/wireshark/wireshark-2.6.3.ebuild index b76d96cd942..abfa5bc13ee 100644 --- a/net-analyzer/wireshark/wireshark-2.6.3.ebuild +++ b/net-analyzer/wireshark/wireshark-2.6.3.ebuild @@ -91,6 +91,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch "${FILESDIR}"/${PN}-2.6.0-redhat.patch "${FILESDIR}"/${PN}-2.6.2-qtsvg.patch + "${FILESDIR}"/${PN}-2.6.3-docbook.patch "${FILESDIR}"/${PN}-99999999-androiddump.patch )