jer 15/04/20 04:41:52 Modified: ChangeLog wireshark-99999999.ebuild Log: Fix qt4/5 configure logic. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.711 net-analyzer/wireshark/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.711&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.711&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.710&r2=1.711 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v retrieving revision 1.710 retrieving revision 1.711 diff -u -r1.710 -r1.711 --- ChangeLog 13 Apr 2015 17:29:19 -0000 1.710 +++ ChangeLog 20 Apr 2015 04:41:52 -0000 1.711 @@ -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.710 2015/04/13 17:29:19 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.711 2015/04/20 04:41:52 jer Exp $ + + 20 Apr 2015; Jeroen Roovers <[email protected]> wireshark-99999999.ebuild: + Fix qt4/5 configure logic. 13 Apr 2015; Jeroen Roovers <[email protected]> wireshark-1.12.4.ebuild, -files/wireshark-1.12.4-pkgconfig.patch, 1.12 net-analyzer/wireshark/wireshark-99999999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?r1=1.11&r2=1.12 Index: wireshark-99999999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- wireshark-99999999.ebuild 13 Apr 2015 05:00:01 -0000 1.11 +++ wireshark-99999999.ebuild 20 Apr 2015 04:41:52 -0000 1.12 @@ -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.11 2015/04/13 05:00:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.12 2015/04/20 04:41:52 jer Exp $ EAPI=5 inherit autotools eutils fcaps git-r3 multilib qmake-utils qt4-r2 user @@ -99,7 +99,6 @@ "${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}-1.99.0-qt5.patch \ "${FILESDIR}"/${PN}-99999999-pkgconfig.patch epatch_user @@ -137,6 +136,14 @@ use doc || export ac_cv_prog_HAVE_DOXYGEN=false use doc-pdf || export ac_cv_prog_HAVE_FOP=false + if use qt4; then + myconf+=" --with-qt=4" + elif use qt5; then + myconf+=" --with-qt=5" + else + myconf+=" --with-qt=no" + fi + # dumpcap requires libcap # --disable-profile-build bugs #215806, #292991, #479602 econf \ @@ -151,8 +158,6 @@ $(use_with pcap dumpcap-group wireshark) \ $(use_with pcap) \ $(use_with portaudio) \ - $(use_with qt4) \ - $(use_with qt5) \ $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \ $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
