Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-99999999.ebuild
Date: Mon, 01 Jun 2015 05:46:35
Message-Id: 20150601054630.644DCA19@oystercatcher.gentoo.org
1 jer 15/06/01 05:46:30
2
3 Modified: ChangeLog wireshark-99999999.ebuild
4 Log:
5 Set RCC per Qt branch, too (maybe bug #549880).
6
7 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.721 net-analyzer/wireshark/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.721&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.721&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.720&r2=1.721
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
19 retrieving revision 1.720
20 retrieving revision 1.721
21 diff -u -r1.720 -r1.721
22 --- ChangeLog 1 Jun 2015 04:20:10 -0000 1.720
23 +++ ChangeLog 1 Jun 2015 05:46:30 -0000 1.721
24 @@ -1,6 +1,9 @@
25 # ChangeLog for net-analyzer/wireshark
26 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.720 2015/06/01 04:20:10 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.721 2015/06/01 05:46:30 jer Exp $
29 +
30 + 01 Jun 2015; Jeroen Roovers <jer@g.o> wireshark-99999999.ebuild:
31 + Set RCC per Qt branch, too (maybe bug #549880).
32
33 01 Jun 2015; Jeroen Roovers <jer@g.o> wireshark-1.12.5.ebuild:
34 Set RCC per Qt branch, too (maybe bug #549880).
35
36
37
38 1.14 net-analyzer/wireshark/wireshark-99999999.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.14&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.14&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?r1=1.13&r2=1.14
43
44 Index: wireshark-99999999.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v
47 retrieving revision 1.13
48 retrieving revision 1.14
49 diff -u -r1.13 -r1.14
50 --- wireshark-99999999.ebuild 14 May 2015 07:51:39 -0000 1.13
51 +++ wireshark-99999999.ebuild 1 Jun 2015 05:46:30 -0000 1.14
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2015 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.13 2015/05/14 07:51:39 jer Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.14 2015/06/01 05:46:30 jer Exp $
57
58 EAPI=5
59 inherit autotools eutils fcaps git-r3 multilib qmake-utils qt4-r2 user
60 @@ -97,7 +97,6 @@
61 epatch \
62 "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
63 "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
64 - "${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \
65 "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
66 "${FILESDIR}"/${PN}-99999999-pkgconfig.patch
67
68 @@ -159,8 +158,10 @@
69 $(use_with pcap) \
70 $(use_with portaudio) \
71 $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
72 + $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
73 $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
74 $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
75 + $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
76 $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
77 $(use_with sbc) \
78 $(use_with smi libsmi) \