public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-1.10.1-r1.ebuild
@ 2013-08-03 16:17 Jeroen Roovers (jer)
  0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2013-08-03 16:17 UTC (permalink / raw
  To: gentoo-commits

jer         13/08/03 16:17:19

  Modified:             ChangeLog wireshark-1.10.1-r1.ebuild
  Log:
  Remove USE=profile since it merely injects C*FLAGS+=-pg (bug #479602).
  
  (Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.533                net-analyzer/wireshark/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.533&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.533&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.532&r2=1.533

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -r1.532 -r1.533
--- ChangeLog	3 Aug 2013 13:37:11 -0000	1.532
+++ ChangeLog	3 Aug 2013 16:17:19 -0000	1.533
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.532 2013/08/03 13:37:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.533 2013/08/03 16:17:19 jer Exp $
+
+  03 Aug 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.10.1-r1.ebuild,
+  metadata.xml:
+  Remove USE=profile since it merely injects C*FLAGS+=-pg (bug #479602).
 
 *wireshark-1.10.1-r1 (03 Aug 2013)
 



1.2                  net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild?r1=1.1&r2=1.2

Index: wireshark-1.10.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wireshark-1.10.1-r1.ebuild	3 Aug 2013 13:37:11 -0000	1.1
+++ wireshark-1.10.1-r1.ebuild	3 Aug 2013 16:17:19 -0000	1.2
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v 1.1 2013/08/03 13:37:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v 1.2 2013/08/03 16:17:19 jer Exp $
 
 EAPI=5
-inherit autotools eutils fcaps flag-o-matic user
+inherit autotools eutils fcaps user
 
 [[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
@@ -15,7 +15,7 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns +caps crypt doc doc-pdf geoip +gtk2 gtk3 ipv6 kerberos libadns lua
-	+netlink +pcap portaudio profile qt4 selinux smi ssl zlib
+	+netlink +pcap portaudio qt4 selinux smi ssl zlib
 "
 REQUIRED_USE="
 	^^ ( gtk2 gtk3 qt4 )
@@ -94,13 +94,6 @@
 src_configure() {
 	local myconf
 
-	# profile and pie are incompatible #215806, #292991
-	if use profile; then
-		ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
-		ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101."
-		append-flags $(test-flags-CC -nopie)
-	fi
-
 	if use adns; then
 		if use libadns; then
 			myconf+=( "--with-adns --without-c-ares" )
@@ -140,11 +133,11 @@
 	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
 
 	# dumpcap requires libcap, setuid-install requires dumpcap
+	# --disable-profile-build bugs #215806, #292991, #479602
 	econf \
 		$(use pcap && use_enable !caps setuid-install) \
 		$(use pcap && use_enable caps setcap-install) \
 		$(use_enable ipv6) \
-		$(use_enable profile profile-build) \
 		$(use_with caps libcap) \
 		$(use_with crypt gcrypt) \
 		$(use_with geoip) \
@@ -160,6 +153,7 @@
 		$(use_with zlib) \
 		$(usex gtk3 --with-gtk3=yes --with-gtk3=no) \
 		--disable-extra-gcc-checks \
+		--disable-profile-build \
 		--disable-usr-local \
 		--sysconfdir="${EPREFIX}"/etc/wireshark \
 		${myconf[@]}





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-1.10.1-r1.ebuild
@ 2013-08-04 11:59 Sergey Popov (pinkbyte)
  0 siblings, 0 replies; 3+ messages in thread
From: Sergey Popov (pinkbyte) @ 2013-08-04 11:59 UTC (permalink / raw
  To: gentoo-commits

pinkbyte    13/08/04 11:59:38

  Modified:             ChangeLog wireshark-1.10.1-r1.ebuild
  Log:
  Restore ability to build wireshark GUI-less, wrt bug #479692. Thanks to Tobias Klausmann for discovering this issue
  
  (Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

Revision  Changes    Path
1.534                net-analyzer/wireshark/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.534&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.534&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.533&r2=1.534

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -r1.533 -r1.534
--- ChangeLog	3 Aug 2013 16:17:19 -0000	1.533
+++ ChangeLog	4 Aug 2013 11:59:38 -0000	1.534
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.533 2013/08/03 16:17:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.534 2013/08/04 11:59:38 pinkbyte Exp $
+
+  04 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> wireshark-1.10.1-r1.ebuild:
+  Restore ability to build wireshark GUI-less, wrt bug #479692. Thanks to
+  Tobias Klausmann for discovering this issue
 
   03 Aug 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.10.1-r1.ebuild,
   metadata.xml:



1.3                  net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild?r1=1.2&r2=1.3

Index: wireshark-1.10.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wireshark-1.10.1-r1.ebuild	3 Aug 2013 16:17:19 -0000	1.2
+++ wireshark-1.10.1-r1.ebuild	4 Aug 2013 11:59:38 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v 1.2 2013/08/03 16:17:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v 1.3 2013/08/04 11:59:38 pinkbyte Exp $
 
 EAPI=5
 inherit autotools eutils fcaps user
@@ -18,7 +18,7 @@
 	+netlink +pcap portaudio qt4 selinux smi ssl zlib
 "
 REQUIRED_USE="
-	^^ ( gtk2 gtk3 qt4 )
+	?? ( gtk2 gtk3 qt4 )
 	ssl? ( crypt )
 "
 





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-1.10.1-r1.ebuild
@ 2013-08-14 15:42 Jeroen Roovers (jer)
  0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2013-08-14 15:42 UTC (permalink / raw
  To: gentoo-commits

jer         13/08/14 15:42:23

  Modified:             ChangeLog wireshark-1.10.1-r1.ebuild
  Log:
  Perhaps fix bug #479624.
  
  (Portage version: 2.2.0/cvs/Linux i686, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.536                net-analyzer/wireshark/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.536&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.536&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.535&r2=1.536

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -r1.535 -r1.536
--- ChangeLog	4 Aug 2013 13:28:08 -0000	1.535
+++ ChangeLog	14 Aug 2013 15:42:23 -0000	1.536
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.535 2013/08/04 13:28:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.536 2013/08/14 15:42:23 jer Exp $
+
+  14 Aug 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.10.1-r1.ebuild,
+  +files/wireshark-1.10.1-oldlibs.patch:
+  Perhaps fix bug #479624.
 
   04 Aug 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.10.1.ebuild,
   wireshark-1.10.1-r1.ebuild:



1.5                  net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild?r1=1.4&r2=1.5

Index: wireshark-1.10.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wireshark-1.10.1-r1.ebuild	4 Aug 2013 13:28:08 -0000	1.4
+++ wireshark-1.10.1-r1.ebuild	14 Aug 2013 15:42:23 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v 1.4 2013/08/04 13:28:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v 1.5 2013/08/14 15:42:23 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps user
@@ -86,7 +86,8 @@
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.10.1-pod.patch
+		"${FILESDIR}"/${PN}-1.10.1-pod.patch \
+		"${FILESDIR}"/${PN}-1.10.1-oldlibs.patch
 
 	eautoreconf
 }





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-08-14 15:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-14 15:42 [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-1.10.1-r1.ebuild Jeroen Roovers (jer)
  -- strict thread matches above, loose matches on Subject: below --
2013-08-04 11:59 Sergey Popov (pinkbyte)
2013-08-03 16:17 Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox