Revision bump because CONTENT changed. Replace USE=ipsec with USE=crypt (bug #431888 comment #6).

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

4 files changed, 26 insertions, 29 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 8d1f3a4bab9d..7a70dc51083c 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.412 2012/10/08 05:20:22 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.413 2012/10/08 18:21:54 jer Exp $
+
+*wireshark-1.8.3-r2 (08 Oct 2012)
+
+  08 Oct 2012; Jeroen Roovers <jer@gentoo.org> -wireshark-1.8.3-r1.ebuild,
+  +wireshark-1.8.3-r2.ebuild, metadata.xml:
+  Revision bump because CONTENT changed. Replace USE=ipsec with USE=crypt (bug
+  #431888 comment #6).
 
   08 Oct 2012; Rick Farina <zerochaos@gentoo.org> wireshark-1.8.3-r1.ebuild:
   whitespace fix, sorry
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 114c8c052dfc..54f7a5cc08a6 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX wireshark-1.6.10-CVE-2012-3548.patch 665 SHA256 1eff10af3f07c4342c3fcd20a2f2ba3edd852c93caf7dd85a1588a5cf892667c SHA512 9ce4a836da7369558a3b5e39154ce80b8390b07cd47bd9414df19f1604f82aa91866764e02e16ec6b0f8d5043a43a5b350ab1fea11614ca1da7dfb25fc29f67b WHIRLPOOL 03c35a70b6cc7ffd8cf2a8ddb2f97f42bf56dff69956a3b7bf3166667b4db711704c4e70e766849bed9a355b6a6e5e2eb88f505b0d82f64e59cd1c9c149303df
 AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b5a11b819768b66a7c848c2c3c90d8a SHA512 0ed1bce8b57942de72ee0a8d78ef7cc345ffea512248fa65acd4e8386a5aa61dde14663090578c78f3eee88c7966e8d40aa6d3dce13146c2adf5ed8ded019253 WHIRLPOOL a45a3d04c9823eb149174fbbaaeb5437e525d77da962aa627509941da3119e87d4eef26cb06b1d3534356c4fd1d4bf31bc102dbf8b3f69994a19dba8d730d05f
@@ -13,24 +13,14 @@ DIST wireshark-1.6.11.tar.bz2 22048186 SHA256 8bbac117e3f516e566c1c8f997c3ddd41e
 DIST wireshark-1.8.3.tar.bz2 24123989 SHA256 83a85ff506b5e2a70f03c49de7af291802404983a23c7779e0f4ac3e672a2fb3 SHA512 acc6a6fcbf86f67d3d5cb9cfbe4eed3699465f4687c2eca88fa51b417b3bbb68e80630ae5ace814e1a5dfd6f269b286237e4dcaafe510eb4ce87bde044413504 WHIRLPOOL d7358a96efad5e00b3783683f71e03cc1ec07a27ac704bab399ec5ee555c9bb68aeb0275fbe6c79e94afa70bd600cfaaa1efda952413c9cdc1e60836e573b544
 EBUILD wireshark-1.6.10-r2.ebuild 6466 SHA256 fa0a4d2f19852240721045b58abe661eaf37c8c9628c6b3a5922771cb440969a SHA512 23a182b2576934ea2a51e0a0db46eff805a0db9b1863f8ad2710e76aa8fed276a22e7742c8985a955a49a8aee4d1db66e2e8f5a199d3a706698f6b41240c2349 WHIRLPOOL 25d142b6f0664d45dbb32b45409eb33b883707d15c083f33eb266558f0f9f712ee8d17dcf4456816aaa58ce977ff151da0ea26369437bb8832042601f3856e46
 EBUILD wireshark-1.6.11.ebuild 6415 SHA256 f2eca4384db45bdeda0c18d3340b8054ee9372af7a86f831dc7c65307303ad26 SHA512 80f52bb4cdfcd783180e94e7bf8d1387efb59ce1b22b1c59f72367ac25136f7bcdf4d85830d24a5c020ef3a3cc4475c308b078da7336b7f7efa178c7dfed01cc WHIRLPOOL d33784df6404f78c1d45f380fef6b2ac880fc1f2eedbedbb26e13c342a2093042257672cdc4d2f05281b7c4cc5805d080dccda052f47e420ff2e3cb734ee4ff4
-EBUILD wireshark-1.8.3-r1.ebuild 6898 SHA256 bb356c449fa2f991d690e007e9461f2f7aa5ffb296cf43e8fb94060543271746 SHA512 d548acfebe62421aecc4d5ea2021cc60f580e6b34e0d42e4e933c6c125537a5c77db74db5a69f18473f95942009c53bc47ef986029f7b0f5bbb0d73afaa1ec6a WHIRLPOOL b6fdd436bf727178e9dc2cffe9c285b8b364da2658229543c4f54e847f3b9a21a8fc954724df8bd37e64570ae42e4444fab3d786115c384bf192a9607a71fd10
+EBUILD wireshark-1.8.3-r2.ebuild 6855 SHA256 7a3efd9769a0e7c57b688de8f1c33578016e709b49fe07b7d04a09f1eeb61552 SHA512 f628d7ca54621cc81d87b6d3627984d9d28e7185ad28c0f56c1b8a3f02b8d7dcf3a75a918a4cae7c32ea88f285ea7b0488161bd555cd77400c40be689f14b495 WHIRLPOOL 44725173df78c0b5ecce675d1cf524e12e51427ddd153d42f597090f53713629ce153fc91c11a017d27190038f739737d335102fc2205ccace604814bf0930de
 EBUILD wireshark-1.8.3.ebuild 6466 SHA256 71a3227fed20ce9c10f9eb246d9078c3b6886f95f69328a1379df452393ac46c SHA512 3c9df6e2c4d3bdd3f4f1260c8af86f89dcfaa8f440c62d7f1cca34a0d37c0a4bdb86b0c8cec5d64d6c8f863ce3bacf963c02581eeac7f7baf1eb563ba982c183 WHIRLPOOL 49caf5d25fec165e13835e276f1db56504f99edf9b0c7ca2e75fd49066ad7dae224966810f197781d321676188aa6745240fb47784bdad99775da5a305221447
-MISC ChangeLog 59995 SHA256 f45b83f92170c1f60bfa1b72282b6b090a9ea49026cfb2568a112749936a1a76 SHA512 6f0f361a723c32d9c0aa65c5831e423164b09df8e55cd204fc605c4ca841c0e59872dfad5a9f48e16ffcd9f42d1b95da6979684ecb7ce4da3a84b40859c1cf51 WHIRLPOOL 8820c310c25d1258f4ed744181f369e09cb3bc1afd35b07223d94a9d22ad3cf18fd197371d546e01e73c47536e58ed66bf47a96ed804ba074e740f02c53f0121
-MISC metadata.xml 2599 SHA256 cf4ca16a34354680320097bea15b8d7e5d5397b61d28a5102799d70fd29bdf9e SHA512 53a98c625e6e2c01e2581e82b714755c75babd2b2483ef10752d7cc9ed67768521b2859cfdbf5b668f105fb9f4bdb177798683ee2bba886c8e12cb7cbc943125 WHIRLPOOL 26e25c5a2508be4184de6022529cef4c3ebb90e82d64d6aec06468185e9332181b7f28bcd5e5b0c4022a1de0ba0131dac70de56f30e4e6be333a87e9ce500e76
+MISC ChangeLog 60246 SHA256 9cfaae51dd9a722cfecb7b92d605a9579cbb1899ea7523dad68af0a1b50d35ac SHA512 32d96c14094c3756de26e142b8f4dee0721772118754a0fa406e98e5802105714b3eb5819d16fa02236e908be27d939850a12b6955520146bc8f87ca5c54b276 WHIRLPOOL acc10a2c8c723125f0469aa7c48fd8d5145cef287ac343f94896c2871972c4fc189f23ae99e06900e7b155d6646a6c428ec8576e3d53daff47f5cf96de5c4d95
+MISC metadata.xml 2589 SHA256 5a4eeb9572df6946a2b3ffbb5f5f4955cfd709ccb79cd23ec6aed41f49b60dab SHA512 bc027bd22193d1a613f26fe30265f5fac0f22cac0c1ed8cfa148fa6bf7c4a4777c76cbaeea5f5f19591d8c78695d13eb29cc00f225c2b44ad1d8a63a8881bafe WHIRLPOOL 5596bd3eb91bdbb1fd9ac2386d72e6a038c3966ad53a81889fc6d4bf32b2ffe75b8f55fdf84a7a84ff2b7b2dcddcaf0dc889ea6595537796ca30e7e5e11494bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQcmLPAAoJEKXdFCfdEflKXtAP/2++sdRP/BB5f4TVZMV5xEU5
-KYZzKAq1198AEnYgH/ERZPX+XjrIxQzIopRN8OqdAMw646+pbxudoMCe2JV6h75h
-VzaY9p7r8SAzcVgcJwK0g1+/v5lCvK1n8xbGRdrWJTL+4whqFNan861nbUWoT6jl
-kLmNuq7COELmp1/v5J9u/ctPB7w3e6vGA7SnpU9MQV3fivH7i7T3HZi9CMXHulEU
-RLqGmE0HQDtTajvwjUJz6d6wkR2NzwvUD3e7JcvukBfOWe8yV24eQREF4LXG6nAN
-u5713wcki4QL+mTvjTwAAUbrrJhY2vnyev6pGa7AHvBkoE38ms3IBG4RZVuMJMZq
-3xcM6wUpsfQUppyyoNZQz30hfklb1NSIfboda1AcMiMnIO6gLUQ2ZDXg4TypTOFi
-EdUSF//WF/8LrGmElw93zpGIwopBTgsZiWziusyIEB4lP4OKXqal8hir1n2sSLK3
-oENQt5Zpx0BX40zJXPzIJwkpiN3mPvgDwIbGxL6RZbYv79hWJm6dShT4+TEU4DyG
-H0Qbm31EUFjwTU2VGzQQA6nlPoMmPbEi6OWz5FDpfFSTY5aipxCiKg23SNlZomcW
-Rjk26Ovov+1doeeZM9ZKaeq4nS6BkpRF7HSARZoyUKaS+LoAbjVLDrz7QHLnGu01
-z9B73ixtWn9aFulszMzK
-=9eV6
+iEYEAREIAAYFAlBzGcMACgkQVWmRsqeSphPHOgCfVD9KEE+1Xyeevl3688wgvFDU
+dF4AmQFjn0eCyVHL3A8Nrf9hetTV/8VX
+=KK23
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 9bf156bf564a..8ae8c80b8816 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -35,9 +35,9 @@
 </longdescription>
 <use>
 <flag name='adns'>Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
+<flag name='crypt'>Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
 <flag name='doc-pdf'>Build documentation in pdf format (US and a4 paper sizes)</flag>
-<flag name='gcrypt'>Use (<pkg>dev-libs/libgcrypt</pkg>) to decrypt IPsec traffic</flag>
-<flag name='ipsec'>Use (<pkg>dev-libs/libgcrypt</pkg>) to decrypt IPsec traffic</flag>
+<flag name='gcrypt'>Use <pkg>dev-libs/libgcrypt</pkg> to decrypt IPsec traffic</flag>
 <flag name='libadns'>Use <pkg>net-lib/adns</pkg> (DEPRECATED) instead of <pkg>net-dns/c-ares</pkg> to resolve DNS names</flag>
 <flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
 <flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
diff --git a/net-analyzer/wireshark/wireshark-1.8.3-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.3-r2.ebuild
index b28aebac1313..2dc4b3649447 100644
--- a/net-analyzer/wireshark/wireshark-1.8.3-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.3-r1.ebuild,v 1.3 2012/10/08 05:20:22 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.3-r2.ebuild,v 1.1 2012/10/08 18:21:54 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	adns +caps doc doc-pdf geoip gtk ipsec ipv6 kerberos libadns lua +pcap
+	adns +caps doc doc-pdf geoip gtk crypt ipv6 kerberos libadns lua +pcap
 	portaudio profile python selinux smi ssl zlib
 "
 RDEPEND="
@@ -28,7 +28,7 @@ RDEPEND="
 		dev-libs/atk
 		x11-misc/xdg-utils )
 	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
-	ipsec? ( dev-libs/libgcrypt )
+	crypt? ( dev-libs/libgcrypt )
 	pcap? ( net-libs/libpcap )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
@@ -171,7 +171,7 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable profile profile-build) \
 		$(use_with caps libcap) \
-		$(use_with ipsec gcrypt) \
+		$(use_with crypt gcrypt) \
 		$(use_with geoip) \
 		$(use_with kerberos krb5) \
 		$(use_with lua) \
@@ -207,11 +207,11 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
 		doc/{randpkt.txt,README*}
 
-	#stolen from debian/rules to install headers needed to build plugins
-	dodir /usr/include/wireshark/
-	for F in `cat "${S}"/debian/wireshark-dev.header-files`
-	do
-		cp --parents "${F}" "${ED}"/usr/include/wireshark || die
+	# install headers
+	local wsheader
+	for wsheader in $( echo $(< debian/wireshark-dev.header-files ) ); do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
 	done
 
 	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/