| 1 |
zerochaos 12/08/31 16:45:21 |
| 2 |
|
| 3 |
Modified: wireshark-1.8.2-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
remove requirement for required use |
| 6 |
|
| 7 |
(Portage version: 2.1.11.12/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: wireshark-1.8.2-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- wireshark-1.8.2-r1.ebuild 31 Aug 2012 16:34:43 -0000 1.4 |
| 23 |
+++ wireshark-1.8.2-r1.ebuild 31 Aug 2012 16:45:21 -0000 1.5 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild,v 1.4 2012/08/31 16:34:43 jer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r1.ebuild,v 1.5 2012/08/31 16:45:21 zerochaos Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
PYTHON_DEPEND="python? 2" |
| 32 |
@@ -18,8 +18,6 @@ |
| 33 |
adns doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile |
| 34 |
+pcap portaudio python +caps selinux smi ssl zlib |
| 35 |
" |
| 36 |
-REQUIRED_USE="libadns? ( adns )" |
| 37 |
- |
| 38 |
RDEPEND=">=dev-libs/glib-2.14:2 |
| 39 |
zlib? ( sys-libs/zlib |
| 40 |
!=sys-libs/zlib-1.2.4 ) |
| 41 |
@@ -36,8 +34,8 @@ |
| 42 |
portaudio? ( media-libs/portaudio ) |
| 43 |
adns? ( |
| 44 |
!libadns? ( >=net-dns/c-ares-1.5 ) |
| 45 |
- libadns? ( net-libs/adns ) |
| 46 |
) |
| 47 |
+ libadns? ( net-libs/adns ) |
| 48 |
geoip? ( dev-libs/geoip ) |
| 49 |
lua? ( >=dev-lang/lua-5.1 ) |
| 50 |
selinux? ( sec-policy/selinux-wireshark )" |
| 51 |
@@ -135,6 +133,10 @@ |
| 52 |
else |
| 53 |
myconf+=" --without-adns --with-c-ares" |
| 54 |
fi |
| 55 |
+ else |
| 56 |
+ if use libadns; then |
| 57 |
+ myconf+=" --with-adns --without-c-ares" |
| 58 |
+ fi |
| 59 |
fi |
| 60 |
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass |
| 61 |
# --with-ssl to ./configure. (Mimics code from acinclude.m4). |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.388 net-analyzer/wireshark/ChangeLog |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.388&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.388&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.387&r2=1.388 |
| 70 |
|
| 71 |
Index: ChangeLog |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
| 74 |
retrieving revision 1.387 |
| 75 |
retrieving revision 1.388 |
| 76 |
diff -u -r1.387 -r1.388 |
| 77 |
--- ChangeLog 31 Aug 2012 16:34:43 -0000 1.387 |
| 78 |
+++ ChangeLog 31 Aug 2012 16:45:21 -0000 1.388 |
| 79 |
@@ -1,6 +1,9 @@ |
| 80 |
# ChangeLog for net-analyzer/wireshark |
| 81 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.387 2012/08/31 16:34:43 jer Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.388 2012/08/31 16:45:21 zerochaos Exp $ |
| 84 |
+ |
| 85 |
+ 31 Aug 2012; Rick Farina <zerochaos@g.o> wireshark-1.8.2-r1.ebuild: |
| 86 |
+ remove requirement for required use |
| 87 |
|
| 88 |
31 Aug 2012; Jeroen Roovers <jer@g.o> wireshark-1.6.10-r1.ebuild, |
| 89 |
wireshark-1.8.2-r1.ebuild: |
Archives