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

(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)

3 files changed, 19 insertions, 12 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/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/