| 1 |
pva 10/04/22 06:06:27 |
| 2 |
|
| 3 |
Modified: ChangeLog wireshark-1.2.7.ebuild |
| 4 |
Log: |
| 5 |
zlib USE flag back as it should be fixed now, bug #311241. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.220 net-analyzer/wireshark/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.220&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.220&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.219&r2=1.220 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
| 18 |
retrieving revision 1.219 |
| 19 |
retrieving revision 1.220 |
| 20 |
diff -u -r1.219 -r1.220 |
| 21 |
--- ChangeLog 1 Apr 2010 07:21:16 -0000 1.219 |
| 22 |
+++ ChangeLog 22 Apr 2010 06:06:27 -0000 1.220 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for net-analyzer/wireshark |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.219 2010/04/01 07:21:16 pva Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.220 2010/04/22 06:06:27 pva Exp $ |
| 28 |
+ |
| 29 |
+ 22 Apr 2010; Peter Volkov <pva@g.o> wireshark-1.2.7.ebuild: |
| 30 |
+ zlib USE flag back as it should be fixed now, bug #311241. |
| 31 |
|
| 32 |
*wireshark-1.2.7 (01 Apr 2010) |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.2 net-analyzer/wireshark/wireshark-1.2.7.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.7.ebuild?rev=1.2&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.7.ebuild?rev=1.2&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.7.ebuild?r1=1.1&r2=1.2 |
| 42 |
|
| 43 |
Index: wireshark-1.2.7.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.7.ebuild,v |
| 46 |
retrieving revision 1.1 |
| 47 |
retrieving revision 1.2 |
| 48 |
diff -u -r1.1 -r1.2 |
| 49 |
--- wireshark-1.2.7.ebuild 1 Apr 2010 07:21:16 -0000 1.1 |
| 50 |
+++ wireshark-1.2.7.ebuild 22 Apr 2010 06:06:27 -0000 1.2 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2010 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.7.ebuild,v 1.1 2010/04/01 07:21:16 pva Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.7.ebuild,v 1.2 2010/04/22 06:06:27 pva Exp $ |
| 56 |
|
| 57 |
EAPI=2 |
| 58 |
inherit autotools libtool flag-o-matic eutils toolchain-funcs |
| 59 |
@@ -17,9 +17,11 @@ |
| 60 |
LICENSE="GPL-2" |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 63 |
-IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip kerberos threads profile smi +pcap pcre +caps selinux" |
| 64 |
+IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux" |
| 65 |
|
| 66 |
RDEPEND=">=dev-libs/glib-2.4.0:2 |
| 67 |
+ zlib? ( sys-libs/zlib |
| 68 |
+ !=sys-libs/zlib-1.2.4 ) |
| 69 |
smi? ( net-libs/libsmi ) |
| 70 |
gtk? ( >=x11-libs/gtk+-2.4.0:2 |
| 71 |
x11-libs/pango |
| 72 |
@@ -51,7 +53,6 @@ |
| 73 |
|
| 74 |
# Add group for users allowed to sniff. |
| 75 |
enewgroup wireshark |
| 76 |
- ewarn "zlib support was disabled due to bug #311241." |
| 77 |
} |
| 78 |
|
| 79 |
src_prepare() { |
| 80 |
@@ -112,7 +113,7 @@ |
| 81 |
$(use_with kerberos krb5) \ |
| 82 |
$(use_with smi libsmi) \ |
| 83 |
$(use_with pcap) \ |
| 84 |
- --without-zlib \ |
| 85 |
+ $(use_with zlib) \ |
| 86 |
$(use_with pcre) \ |
| 87 |
$(use_with geoip) \ |
| 88 |
$(use_with portaudio) \ |
Archives