jer 15/06/01 05:46:30 Modified: ChangeLog wireshark-99999999.ebuild Log: Set RCC per Qt branch, too (maybe bug #549880). (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.721 net-analyzer/wireshark/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.721&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.721&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.720&r2=1.721 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v retrieving revision 1.720 retrieving revision 1.721 diff -u -r1.720 -r1.721 --- ChangeLog 1 Jun 2015 04:20:10 -0000 1.720 +++ ChangeLog 1 Jun 2015 05:46:30 -0000 1.721 @@ -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.720 2015/06/01 04:20:10 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.721 2015/06/01 05:46:30 jer Exp $ + + 01 Jun 2015; Jeroen Roovers <[email protected]> wireshark-99999999.ebuild: + Set RCC per Qt branch, too (maybe bug #549880). 01 Jun 2015; Jeroen Roovers <[email protected]> wireshark-1.12.5.ebuild: Set RCC per Qt branch, too (maybe bug #549880). 1.14 net-analyzer/wireshark/wireshark-99999999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?r1=1.13&r2=1.14 Index: wireshark-99999999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wireshark-99999999.ebuild 14 May 2015 07:51:39 -0000 1.13 +++ wireshark-99999999.ebuild 1 Jun 2015 05:46:30 -0000 1.14 @@ -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-99999999.ebuild,v 1.13 2015/05/14 07:51:39 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.14 2015/06/01 05:46:30 jer Exp $ EAPI=5 inherit autotools eutils fcaps git-r3 multilib qmake-utils qt4-r2 user @@ -97,7 +97,6 @@ epatch \ "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \ "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \ - "${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \ "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \ "${FILESDIR}"/${PN}-99999999-pkgconfig.patch @@ -159,8 +158,10 @@ $(use_with pcap) \ $(use_with portaudio) \ $(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) \
