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 6E4B9138334 for ; Thu, 28 Jun 2018 14:43:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63843E0831; Thu, 28 Jun 2018 14:43:18 +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 36E49E0831 for ; Thu, 28 Jun 2018 14:43:18 +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 CA290335C76 for ; Thu, 28 Jun 2018 14:43:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5E64348 for ; Thu, 28 Jun 2018 14:43:14 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1530196985.93e113d4477dccfc195947272eeb76cc6e9d42ef.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/wireshark-2.6.1.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 93e113d4477dccfc195947272eeb76cc6e9d42ef X-VCS-Branch: master Date: Thu, 28 Jun 2018 14:43:14 +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: 0a967277-c855-430a-832e-ce4acab95cd4 X-Archives-Hash: 6bfb5c467cda46ca1622bd57195cc272 commit: 93e113d4477dccfc195947272eeb76cc6e9d42ef Author: Michał Górny gentoo org> AuthorDate: Wed Jun 13 06:51:23 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Thu Jun 28 14:43:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e113d4 net-analyzer/wireshark: Fix install to avoid calling doins per-file Call doins per-directory rather than per-file. doins accept multiple arguments, so it's entirely silly to iterate and call it separately for each file; not to mention that thanks to new Python implementation in Portage it is veeeeery slow. This patch reduces install time by around 10 minutes. Closes: https://bugs.gentoo.org/656834 net-analyzer/wireshark/wireshark-2.6.1.ebuild | 41 +++++++++++---------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild index b9152684e6e..efde4f468e8 100644 --- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild +++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild @@ -176,31 +176,24 @@ src_install() { dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* # install headers - local wsheader - for wsheader in \ - epan/*.h \ - epan/crypt/*.h \ - epan/dfilter/*.h \ - epan/dissectors/*.h \ - epan/ftypes/*.h \ - epan/wmem/*.h \ - wiretap/*.h \ - ws_diag_control.h \ - ws_symbol_export.h \ - wsutil/*.h - do - echo "Installing ${wsheader}" - insinto /usr/include/wireshark/$( dirname ${wsheader} ) - doins ${wsheader} - done - - for wsheader in \ - ../${P}_build/config.h \ - ../${P}_build/version.h + insinto /usr/include/wireshark + doins ws_diag_control.h ws_symbol_export.h \ + "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h + + local dir dirs=( + epan + epan/crypt + epan/dfilter + epan/dissectors + epan/ftypes + epan/wmem + wiretap + wsutil + ) + for dir in "${dirs[@]}" do - echo "Installing ${wsheader}" - insinto /usr/include/wireshark - doins ${wsheader} + insinto /usr/include/wireshark/${dir} + doins ${dir}/*.h done #with the above this really shouldn't be needed, but things may be looking