From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 391A613888F for ; Thu, 15 Oct 2015 10:31:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26050E080A; Thu, 15 Oct 2015 10:31:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA2B4E080A for ; Thu, 15 Oct 2015 10:31:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6587E340B28 for ; Thu, 15 Oct 2015 10:31:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28E06B81 for ; Thu, 15 Oct 2015 10:31:51 +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: <1444905095.b68773a2ffd43500f54bd8f00d33e94cba5679c6.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/wireshark-99999999.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: b68773a2ffd43500f54bd8f00d33e94cba5679c6 X-VCS-Branch: master Date: Thu, 15 Oct 2015 10:31:51 +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: 22411d26-5271-4c3e-971d-7aa1e2f84590 X-Archives-Hash: 452e2c0a69dc1221594793e294d94fc8 commit: b68773a2ffd43500f54bd8f00d33e94cba5679c6 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Oct 15 10:31:35 2015 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Oct 15 10:31:35 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b68773a2 net-analyzer/wireshark: Port applicable 2.0.0_rc1 changes to live ebuild Package-Manager: portage-2.2.23 net-analyzer/wireshark/wireshark-99999999.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 6c12e53..c17f5f2 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -99,7 +99,6 @@ src_prepare() { "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \ "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \ "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \ - "${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \ "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch epatch_user @@ -197,7 +196,7 @@ src_install() { dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}} if use doc-pdf; then insinto /usr/share/doc/${PF}/pdf/ - doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf + doins docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf fi fi