summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-02-22 16:43:57 +0000
committerJeroen Roovers <jer@gentoo.org>2013-02-22 16:43:57 +0000
commit2c0aee00c35c4ac07c99d9d145a5dfb6c40dc1d7 (patch)
tree9d4dde61810c46d9f5e299d684dfafa61b249524 /net-analyzer
parentKeyword amd64-linux and x86-linux (diff)
downloadhistorical-2c0aee00c35c4ac07c99d9d145a5dfb6c40dc1d7.tar.gz
historical-2c0aee00c35c4ac07c99d9d145a5dfb6c40dc1d7.tar.bz2
historical-2c0aee00c35c4ac07c99d9d145a5dfb6c40dc1d7.zip
Restore old use pcap && use_enable filecaps logic.
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/wireshark/ChangeLog5
-rw-r--r--net-analyzer/wireshark/Manifest10
-rw-r--r--net-analyzer/wireshark/wireshark-1.9.0.ebuild10
3 files changed, 14 insertions, 11 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 2de549726cb6..ea04f6465239 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
# 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.449 2013/02/22 16:32:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.450 2013/02/22 16:43:54 jer Exp $
+
+ 22 Feb 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.9.0.ebuild:
+ Restore old use pcap && use_enable filecaps logic.
22 Feb 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.9.0.ebuild:
Fix USE=pcap USE=filecaps confusion.
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 8dcdb8750f0f..d093a887ae9d 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -11,13 +11,13 @@ EBUILD wireshark-1.6.13-r1.ebuild 5295 SHA256 063ea6ae0a34d71f3c64b2d4e7edeabd99
EBUILD wireshark-1.6.13.ebuild 6409 SHA256 2084d4b6fbe051f2954e0e70f43e8b69bc4415f7843511d0778a982ab08185c5 SHA512 06e5ed612d116caa105a9c0713cf8cc9af2f7c81bdc07d2cddf5dfcab4d0f0bd15ba86c8902d251369448e8998091d413e24a22a9fe813aeb1fe571a85bcf29f WHIRLPOOL aa1752218035641aacc74fa0ef553908ed13a219c29268d7eb37833b3dd0bb2e26d845056b45901826427d8b8a4a31c9b00b4b68d2be43bfaafeee89e1833eaa
EBUILD wireshark-1.8.5-r1.ebuild 5682 SHA256 0152c2ad5950d5baf2f5ad0beebb4bb93b7202b787a8b1170d386803b05c9a13 SHA512 b6a447760f4a67f187fbf95b80904eb57937dfca49037c72c945971cd1f7c491cd9aa46e8040dd75018f6375638b02265ba22d8f1661bb896ba95b2ed85f6166 WHIRLPOOL 4342e097f6c2f559be7edbd7ae284b7d494c974b8b97c7af701bd62e9d6cc4d4acc270e047e1a0a93f6e5a953211cf4fff932e84d72f55c9ef133857d43671a8
EBUILD wireshark-1.8.5.ebuild 6796 SHA256 f6b50852f4c03692aa88a9d98f3f7edc8131d7cb8f490e483b50358180472630 SHA512 b389b70836ad0e3539e9f1e7eca73362e9ebc87a078422def834559818b0145defca90539284c98657ef704d73b94da14253c90c95f4e6f96c408826a8e2537a WHIRLPOOL 61054a9accda9ac0661bdee3d35c2e7281fcf5c867f1d0f3c789acb86188153507e13a91b3e442f58da69cf5ea9eb548f7c314803ffb3d21eb4c4bd6945c1f77
-EBUILD wireshark-1.9.0.ebuild 5630 SHA256 f381515e2ef036639dce284e532fd0477eb9561e8e697b7ded727d8d78ee6095 SHA512 90837acc4de56c98b4ba46a39de62ac4ee99f792060d541ea4ea4ac680cf288c29e1113c2a296d81e17fcf327aa4f679f66c36e4b93d07235e3a34a52016f553 WHIRLPOOL 38ca594445ba8b70654110b9cfa1e38ec8366d17746431c1d7e91135f5b096b200c1428ab0a22d9025e10f2bedf642b5dc0a61932cbb26e26e2b84d94fe0b15f
-MISC ChangeLog 65106 SHA256 05510af4ad96184bed717baf6780a79c8e145b4a5ce4c5d4ab49e76957a97aca SHA512 4fb376fddfe3933a21cf1cf1d3dffe46a82633036d73eab39b15e4b63a13f148026cdad2cba8b855a86b12c421aa5972f8df0254bcbad143137b96050eb20c13 WHIRLPOOL 19b033e018aec0b80156fa39d1e14d283726d2f71cee35fc6d70ee735c9f7f04df6d59bfa8cbfc724c359ea775ea6dd4ee16d4e257b1a5a29ef6ef4d6c067cd5
+EBUILD wireshark-1.9.0.ebuild 5655 SHA256 371d8d2568bb406b878bc7125694cc26049238a4d735838d5f07b83c6487caf6 SHA512 6bc55bb0e229e5cbc50cb34e8698fd0029d4ace1d157aa541435de7fad5fcbc91f0ccaff67a5d875cc6512af27a5aee68e05a224945fec71f8b3056c82112b53 WHIRLPOOL eed14dd36029384138cb6ef915a5ba715a4797a376a8c721be7a1f976dfed49ef7d2858752d9e62937270606ddeed8eec6211ef4e62720fc089789873afc1f09
+MISC ChangeLog 65231 SHA256 bf72afb10e76d760b97bb2a2dc2292905be6c63466720ad3175d942b342e4306 SHA512 799721f1356beb547c85eb989462759fc12b0229e8a4a09dd1f84da04fb5cd4defede9d8d4b117ceffcd9fa083979b12e02a593664ef7644761c0149a73875c3 WHIRLPOOL 6ad0589a43ff1636535f2eb8fcf83159c9467e0c2cceadb4d7f443168cf2e1010d5d5985de21ed55252a36c09e36d2225f81697a10d4f2794f4ec70bf3d3a7d9
MISC metadata.xml 2418 SHA256 dd08d4e30f9d896a88e2b0c1fbe7d990e8c73a39d7ec8b884185c06f1108af17 SHA512 4a9fdaac45bf03108db7801ff31facae98605af040e0630001e0add32abcf9eace9f05053fed82bba5eb08a1ad3446c1d74d8d56f67157d71050a3b0924a84a1 WHIRLPOOL 786ff710de3d1c348de4993c07bc4912c1d62f56db353febcb69e295fbb5eb7e6fed9f17e99cfa497d6c50b8686565e806ebbd759dca5519173a0a9b7f891f93
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlEnnZIACgkQVWmRsqeSphN+vQCeKESC1Off9poso0gqtPCYi23I
-LoUAoIDqKwlEYAleMzqDVYFWrxZ8Wzo3
-=sk0V
+iEYEAREIAAYFAlEnoEwACgkQVWmRsqeSphNMSwCdHvHoJ84SDU1ojkQW/qA8+bgg
+iSkAniySj/gs8vbmQqrq44Znzv0QkfI6
+=Dnf3
-----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.9.0.ebuild b/net-analyzer/wireshark/wireshark-1.9.0.ebuild
index b794d06f02a3..3526dd17963d 100644
--- a/net-analyzer/wireshark/wireshark-1.9.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.9.0.ebuild
@@ -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.9.0.ebuild,v 1.2 2013/02/22 16:32:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.9.0.ebuild,v 1.3 2013/02/22 16:43:54 jer Exp $
EAPI="5"
PYTHON_DEPEND="python? 2"
@@ -125,18 +125,18 @@ src_configure() {
# dumpcap requires libcap, setuid-install requires dumpcap
econf \
- $(use_enable filecaps setuid-install) \
- $(use_enable filecaps setcap-install) \
+ $(use pcap && use_enable !filecaps setuid-install) \
+ $(use pcap && use_enable filecaps setcap-install) \
$(use_enable gtk wireshark) \
$(use_enable ipv6) \
$(use_enable profile profile-build) \
$(use_with crypt gcrypt) \
- $(use_with pcap dumpcap-group wireshark) \
- $(use_with pcap) \
$(use_with filecaps libcap) \
$(use_with geoip) \
$(use_with kerberos krb5) \
$(use_with lua) \
+ $(use_with pcap dumpcap-group wireshark) \
+ $(use_with pcap) \
$(use_with portaudio) \
$(use_with python) \
$(use_with smi libsmi) \