jer 15/06/24 05:31:48 Modified: wireshark-99999999.ebuild ChangeLog wireshark-1.99.7.ebuild wireshark-1.12.6.ebuild Log: Emit PIC when USE=qt5 (bug #552440 by octoploid). (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.15 net-analyzer/wireshark/wireshark-99999999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?r1=1.14&r2=1.15 Index: wireshark-99999999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- wireshark-99999999.ebuild 1 Jun 2015 05:46:30 -0000 1.14 +++ wireshark-99999999.ebuild 24 Jun 2015 05:31:48 -0000 1.15 @@ -1,9 +1,9 @@ # 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.14 2015/06/01 05:46:30 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.15 2015/06/24 05:31:48 jer Exp $ EAPI=5 -inherit autotools eutils fcaps git-r3 multilib qmake-utils qt4-r2 user +inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils qt4-r2 user DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="http://www.wireshark.org/" @@ -129,7 +129,11 @@ fi use qt4 && export QT_MIN_VERSION=4.6.0 - use qt5 && export QT_MIN_VERSION=5.3.0 + + if use qt5; then + export QT_MIN_VERSION=5.3.0 + append-cxxflags -fPIC -DPIC + fi # Hack around inability to disable doxygen/fop doc generation use doc || export ac_cv_prog_HAVE_DOXYGEN=false 1.730 net-analyzer/wireshark/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.730&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.730&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.729&r2=1.730 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v retrieving revision 1.729 retrieving revision 1.730 diff -u -r1.729 -r1.730 --- ChangeLog 21 Jun 2015 06:16:25 -0000 1.729 +++ ChangeLog 24 Jun 2015 05:31:48 -0000 1.730 @@ -1,6 +1,10 @@ # 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.729 2015/06/21 06:16:25 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.730 2015/06/24 05:31:48 jer Exp $ + + 24 Jun 2015; Jeroen Roovers <j...@gentoo.org> wireshark-1.12.6.ebuild, + wireshark-1.99.7.ebuild, wireshark-99999999.ebuild: + Emit PIC when USE=qt5 (bug #552440 by octoploid). 21 Jun 2015; Mikle Kolyada <zlog...@gentoo.org> wireshark-1.12.6.ebuild: x86 stable wrt bug #552434 1.2 net-analyzer/wireshark/wireshark-1.99.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.7.ebuild?r1=1.1&r2=1.2 Index: wireshark-1.99.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wireshark-1.99.7.ebuild 19 Jun 2015 12:39:14 -0000 1.1 +++ wireshark-1.99.7.ebuild 24 Jun 2015 05:31:48 -0000 1.2 @@ -1,9 +1,9 @@ # 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.99.7.ebuild,v 1.1 2015/06/19 12:39:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.7.ebuild,v 1.2 2015/06/24 05:31:48 jer Exp $ EAPI=5 -inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user +inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="http://www.wireshark.org/" @@ -130,7 +130,11 @@ fi use qt4 && export QT_MIN_VERSION=4.6.0 - use qt5 && export QT_MIN_VERSION=5.3.0 + + if use qt5;then + export QT_MIN_VERSION=5.3.0 + append-cxxflags -fPIC -DPIC + fi # Hack around inability to disable doxygen/fop doc generation use doc || export ac_cv_prog_HAVE_DOXYGEN=false 1.6 net-analyzer/wireshark/wireshark-1.12.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild?r1=1.5&r2=1.6 Index: wireshark-1.12.6.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wireshark-1.12.6.ebuild 21 Jun 2015 06:16:25 -0000 1.5 +++ wireshark-1.12.6.ebuild 24 Jun 2015 05:31:48 -0000 1.6 @@ -1,9 +1,9 @@ # 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.6.ebuild,v 1.5 2015/06/21 06:16:25 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild,v 1.6 2015/06/24 05:31:48 jer Exp $ EAPI=5 -inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user +inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user DESCRIPTION="A network protocol analyzer formerly known as ethereal" HOMEPAGE="http://www.wireshark.org/" @@ -127,7 +127,11 @@ fi use qt4 && export QT_MIN_VERSION=4.6.0 - use qt5 && export QT_MIN_VERSION=5.3.0 + + if use qt5; then + export QT_MIN_VERSION=5.3.0 + append-cxxflags -fPIC -DPIC + fi # Hack around inability to disable doxygen/fop doc generation use doc || export ac_cv_prog_HAVE_DOXYGEN=false