From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-838829-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 04EA613888F
for <garchives@archives.gentoo.org>; Wed, 7 Oct 2015 05:42:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F0598E07D5;
Wed, 7 Oct 2015 05:42:26 +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 A13ECE07D5
for <gentoo-commits@lists.gentoo.org>; Wed, 7 Oct 2015 05:42:26 +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 60EB334085B
for <gentoo-commits@lists.gentoo.org>; Wed, 7 Oct 2015 05:42:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 986625A7
for <gentoo-commits@lists.gentoo.org>; Wed, 7 Oct 2015 05:42:23 +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: <1444196526.4e516d316bfa68c96cba91aa0dac30f354343a8c.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-1.12.7.ebuild net-analyzer/wireshark/wireshark-1.99.9.ebuild 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: 4e516d316bfa68c96cba91aa0dac30f354343a8c
X-VCS-Branch: master
Date: Wed, 7 Oct 2015 05:42:23 +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: 4baa679e-7127-4062-9282-a2b53bb5cd65
X-Archives-Hash: c1735f65d4646d4c7dc52519860375a9
commit: 4e516d316bfa68c96cba91aa0dac30f354343a8c
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 7 05:39:33 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct 7 05:42:06 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e516d31
net-analyzer/wireshark: Install a desktop file with USE=qt5 (bug #562022 by Paolo Pedroni).
Package-Manager: portage-2.2.22
net-analyzer/wireshark/wireshark-1.12.7.ebuild | 2 +-
net-analyzer/wireshark/wireshark-1.99.9.ebuild | 2 +-
net-analyzer/wireshark/wireshark-99999999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index 47ff12c..e227f75 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -234,7 +234,7 @@ src_install() {
domenu wireshark.desktop
fi
- if use qt4; then
+ if use qt4 || use qt5; then
sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
domenu wireshark-qt.desktop
fi
diff --git a/net-analyzer/wireshark/wireshark-1.99.9.ebuild b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
index 1479231..591f9fe 100644
--- a/net-analyzer/wireshark/wireshark-1.99.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
@@ -240,7 +240,7 @@ src_install() {
domenu wireshark.desktop
fi
- if use qt4; then
+ if use qt4 || use qt5; then
sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
domenu wireshark-qt.desktop
fi
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 02e46af..bd4b947 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -243,7 +243,7 @@ src_install() {
domenu wireshark.desktop
fi
- if use qt4; then
+ if use qt4 || use qt5; then
sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
domenu wireshark-qt.desktop
fi