summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-06-01 04:20:10 +0000
committerJeroen Roovers <jer@gentoo.org>2015-06-01 04:20:10 +0000
commitc4944df20c72aad48d839444fec6b9ef47fe7af8 (patch)
tree1ea676d8ae74e82449baa5b2b55a0b4e512060f8 /net-analyzer/wireshark
parentBump (diff)
downloadgentoo-2-c4944df20c72aad48d839444fec6b9ef47fe7af8.tar.gz
gentoo-2-c4944df20c72aad48d839444fec6b9ef47fe7af8.tar.bz2
gentoo-2-c4944df20c72aad48d839444fec6b9ef47fe7af8.zip
Set RCC per Qt branch, too (maybe bug #549880).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r--net-analyzer/wireshark/ChangeLog5
-rw-r--r--net-analyzer/wireshark/wireshark-1.12.5.ebuild4
2 files changed, 7 insertions, 2 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index bb020f9604e9..76921131207b 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/wireshark
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.719 2015/05/31 18:09:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.720 2015/06/01 04:20:10 jer Exp $
+
+ 01 Jun 2015; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.5.ebuild:
+ Set RCC per Qt branch, too (maybe bug #549880).
*wireshark-1.99.6 (31 May 2015)
diff --git a/net-analyzer/wireshark/wireshark-1.12.5.ebuild b/net-analyzer/wireshark/wireshark-1.12.5.ebuild
index 7ed5a894e4d4..fdbfea570fb8 100644
--- a/net-analyzer/wireshark/wireshark-1.12.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.5.ebuild,v 1.7 2015/05/16 09:23:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.5.ebuild,v 1.8 2015/06/01 04:20:10 jer Exp $
EAPI=5
inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
@@ -150,8 +150,10 @@ src_configure() {
$(use_with qt4) \
$(use_with qt5) \
$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+ $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+ $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
$(use_with sbc) \
$(use_with smi libsmi) \