| 1 |
zerochaos 12/08/31 16:50:26 |
| 2 |
|
| 3 |
Modified: metadata.xml wireshark-1.6.10-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
complete changes to remove REQUIRED_USE and update metadata use flag desc |
| 6 |
|
| 7 |
(Portage version: 2.1.11.12/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.12 net-analyzer/wireshark/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/metadata.xml?rev=1.12&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/metadata.xml?rev=1.12&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/metadata.xml?r1=1.11&r2=1.12 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/metadata.xml,v |
| 19 |
retrieving revision 1.11 |
| 20 |
retrieving revision 1.12 |
| 21 |
diff -u -r1.11 -r1.12 |
| 22 |
--- metadata.xml 31 Aug 2012 16:29:11 -0000 1.11 |
| 23 |
+++ metadata.xml 31 Aug 2012 16:50:26 -0000 1.12 |
| 24 |
@@ -34,8 +34,8 @@ |
| 25 |
plain text |
| 26 |
</longdescription> |
| 27 |
<use> |
| 28 |
+<flag name='adns'>Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag> |
| 29 |
<flag name='ares'>Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag> |
| 30 |
-<flag name='adns'>Add support for asynchronous DNS</flag> |
| 31 |
<flag name='doc-pdf'>Build documentation in pdf format (US and a4 paper sizes)</flag> |
| 32 |
<flag name='gcrypt'>Use GNU crypto library (<pkg>dev-libs/libgcrypt</pkg>) to decrypt ipsec traffic</flag> |
| 33 |
<flag name='libadns'>Use <pkg>net-lib/adns</pkg> (DEPRECATED) instead of <pkg>net-dns/c-ares</pkg> to resolve DNS names</flag> |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.6 net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild?rev=1.6&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild?rev=1.6&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild?r1=1.5&r2=1.6 |
| 42 |
|
| 43 |
Index: wireshark-1.6.10-r1.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild,v |
| 46 |
retrieving revision 1.5 |
| 47 |
retrieving revision 1.6 |
| 48 |
diff -u -r1.5 -r1.6 |
| 49 |
--- wireshark-1.6.10-r1.ebuild 31 Aug 2012 16:34:43 -0000 1.5 |
| 50 |
+++ wireshark-1.6.10-r1.ebuild 31 Aug 2012 16:50:26 -0000 1.6 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2012 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.6.10-r1.ebuild,v 1.5 2012/08/31 16:34:43 jer Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.10-r1.ebuild,v 1.6 2012/08/31 16:50:26 zerochaos Exp $ |
| 56 |
|
| 57 |
EAPI=4 |
| 58 |
PYTHON_DEPEND="python? 2" |
| 59 |
@@ -18,8 +18,6 @@ |
| 60 |
adns doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile |
| 61 |
+pcap portaudio python +caps selinux smi ssl threads zlib |
| 62 |
" |
| 63 |
-REQUIRED_USE="libadns? ( adns )" |
| 64 |
- |
| 65 |
RDEPEND=">=dev-libs/glib-2.14:2 |
| 66 |
zlib? ( sys-libs/zlib |
| 67 |
!=sys-libs/zlib-1.2.4 ) |
| 68 |
@@ -36,8 +34,8 @@ |
| 69 |
portaudio? ( media-libs/portaudio ) |
| 70 |
adns? ( |
| 71 |
!libadns? ( >=net-dns/c-ares-1.5 ) |
| 72 |
- libadns? ( net-libs/adns ) |
| 73 |
) |
| 74 |
+ libadns? ( net-libs/adns ) |
| 75 |
geoip? ( dev-libs/geoip ) |
| 76 |
lua? ( >=dev-lang/lua-5.1 ) |
| 77 |
selinux? ( sec-policy/selinux-wireshark )" |
| 78 |
@@ -137,6 +135,10 @@ |
| 79 |
else |
| 80 |
myconf+=" --without-adns --with-c-ares" |
| 81 |
fi |
| 82 |
+ else |
| 83 |
+ if use libadns; then |
| 84 |
+ myconf+=" --with-adns --without-c-ares" |
| 85 |
+ fi |
| 86 |
fi |
| 87 |
|
| 88 |
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.389 net-analyzer/wireshark/ChangeLog |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.389&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.389&content-type=text/plain |
| 96 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.388&r2=1.389 |
| 97 |
|
| 98 |
Index: ChangeLog |
| 99 |
=================================================================== |
| 100 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
| 101 |
retrieving revision 1.388 |
| 102 |
retrieving revision 1.389 |
| 103 |
diff -u -r1.388 -r1.389 |
| 104 |
--- ChangeLog 31 Aug 2012 16:45:21 -0000 1.388 |
| 105 |
+++ ChangeLog 31 Aug 2012 16:50:26 -0000 1.389 |
| 106 |
@@ -1,6 +1,10 @@ |
| 107 |
# ChangeLog for net-analyzer/wireshark |
| 108 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 109 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.388 2012/08/31 16:45:21 zerochaos Exp $ |
| 110 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.389 2012/08/31 16:50:26 zerochaos Exp $ |
| 111 |
+ |
| 112 |
+ 31 Aug 2012; Rick Farina <zerochaos@g.o> metadata.xml, |
| 113 |
+ wireshark-1.6.10-r1.ebuild: |
| 114 |
+ complete changes to remove REQUIRED_USE and update metadata use flag desc |
| 115 |
|
| 116 |
31 Aug 2012; Rick Farina <zerochaos@g.o> wireshark-1.8.2-r1.ebuild: |
| 117 |
remove requirement for required use |
Archives