add installation of header files, this is needed for building plugins

Package-Manager: portage-2.1.11.24/cvs/Linux x86_64

3 files changed, 29 insertions, 8 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index d28c70611b69..9b8e93e3dfdb 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # 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.410 2012/10/07 19:23:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.411 2012/10/08 05:18:28 zerochaos Exp $
+
+  08 Oct 2012; Rick Farina <zerochaos@gentoo.org> wireshark-1.8.3-r1.ebuild:
+  add installation of header files, this is needed for building plugins
 
   07 Oct 2012; Jeroen Roovers <jer@gentoo.org> -wireshark-1.8.2-r2.ebuild,
   -wireshark-1.8.2-r3.ebuild, wireshark-1.8.3.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 01e4a721bd38..21eeaf5f0029 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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,14 +13,24 @@ 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 6546 SHA256 4592f1d50498a8467f10643d41b72c53bdd1b0221c50781bda3daa97ef25ac5c SHA512 294453788dd497905abe1c02a7dfb321dde9d415ac2cc57e3d90608a64f637a475542164962c8e7e07ed036e758f2a9b658bacd811f778cdf1dee28956f6947b WHIRLPOOL c60b01cbec145b1aa0b72b3b0443d07f760255c8a36b91a7932d32eac18108856f056e60097c45e811ec7cb2801e78632897b0fe63f031dd1eacc1ea77a61b0e
+EBUILD wireshark-1.8.3-r1.ebuild 6933 SHA256 09e07b421072dec19a3b94e075357931402e53751e1fd9868a4a94836577a4d1 SHA512 29807ceda56c21a0d57a3000d4a0374cd65c096d33020d4318a6b8d13ed7122b2c718a3ed95435221dc42a6ec019d4c00a9b53dd1c6d4d9e07dbe263771d35c6 WHIRLPOOL 5726ad0f4aad4cb2a3d1d306c36934ce8bdcc9444593ecec30c3f7552422ae79fa186f99d719236d72652f1e7224b80a8769b4810fb98e60fcebd217b6d294e4
 EBUILD wireshark-1.8.3.ebuild 6466 SHA256 71a3227fed20ce9c10f9eb246d9078c3b6886f95f69328a1379df452393ac46c SHA512 3c9df6e2c4d3bdd3f4f1260c8af86f89dcfaa8f440c62d7f1cca34a0d37c0a4bdb86b0c8cec5d64d6c8f863ce3bacf963c02581eeac7f7baf1eb563ba982c183 WHIRLPOOL 49caf5d25fec165e13835e276f1db56504f99edf9b0c7ca2e75fd49066ad7dae224966810f197781d321676188aa6745240fb47784bdad99775da5a305221447
-MISC ChangeLog 59737 SHA256 11e411705e9b8c21baf3a9d40e5c19063d07c56dfe2a0303d8dd30a34c32ee16 SHA512 1c155a68755ab7bd26f6ddbd0b3be71c2c29deec29e9d77dcc2957db883cd9bc818a23a570fdf46f8b58a2938ae7f0c472d70a158658fc0b713dfe64a63420ec WHIRLPOOL 72b75cd0d7452a8f9e3144eaac1444c53bbc0ac133bbf29016baf125c96ac86be64d5242fb8e786f005f9215d014e1dbcdd379fcbd2002c4b7533cb939b17868
+MISC ChangeLog 59893 SHA256 3be7811ef041f664962c4c1e2bf31bb4c43841a9e0298a5616d1cb801861ef9f SHA512 c3a6061ac05fc9843a2ead93a6416fd2acf6ec2f031a02177ad2c8be90761e0d9fb1afeb90353c377f5a0ff0d2b3b57b0557dff0bd80e258462966f806178058 WHIRLPOOL b64bb921785e68f386e45c9ab3d0817df78ac752bb287a354a47fe750ba83456489b9d7b9285e68384916139c54f3611fad6ba69ccf9c39b6f19f46350de83f9
 MISC metadata.xml 2599 SHA256 cf4ca16a34354680320097bea15b8d7e5d5397b61d28a5102799d70fd29bdf9e SHA512 53a98c625e6e2c01e2581e82b714755c75babd2b2483ef10752d7cc9ed67768521b2859cfdbf5b668f105fb9f4bdb177798683ee2bba886c8e12cb7cbc943125 WHIRLPOOL 26e25c5a2508be4184de6022529cef4c3ebb90e82d64d6aec06468185e9332181b7f28bcd5e5b0c4022a1de0ba0131dac70de56f30e4e6be333a87e9ce500e76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBx1swACgkQVWmRsqeSphOXDACfUyaskY/RG5xJCcApUMB55ma8
-/UIAn3qAn6kfuugfoswVTLeYFybAsTNT
-=M2Qk
+iQIcBAEBCgAGBQJQcmJjAAoJEKXdFCfdEflK40gP/2Q5+XihcN1LhC7kxodpppX+
+wh/GNUpDsfePwHXt3M1yMbpenvxHAaMyFAHB26OK2AgcMAXiwYH8aaWAiNqtTrHX
+ChAOXmeeR6RPVmTNjR2znJsw9afmxOYQ0FAOsWHJBawk4veCwHA9ZAx0dmFDpUav
+BUb5hzvqpqeJao75HHqXYzRFcSXz+xcsQa4/6cLHPFTKo5aClo21w+IgMZJqxfZ6
+uq2GeJ9y7QhtGpgNLLQebccNFcmyZAJpV7ICidVIIje3KHFCgeaXMchv4yTKTiO7
+pdOWwn0ZN+z8iLhGWpfN/yI+FtlPNjXvrdq+5+x/OyRE1QXIzupgnCZ5nNBiI8LT
+KofjLrNdbcvNHAejMO6z3Cwts0vzOpRmLNIRLHB5y49Wg5uB/TaIeuCzZ12uDhWC
+taNs5uMn2DloO2VhS6mJKyCC/s/R3PDUhV9RuRNPDd+zHZNYHaoSIgsifU3aYTMH
+CvYXBK663EyD4x9ROiS31pKEILJRl4NzKjj06+Nz2+XsT2my0F9o5Hdkyfppk5OY
+7LdpW8MBmE4czE+r6oEuQCXPrr9MAWUW3puBWmC/pt4CSTNU2b3FaHvRevckwHF2
+7xJ126V1Ut8tyPFg2ZEhDJnP9Oza2ubmR9aNtSTzI+wX0OwKeh8bb+oAAADBV+wH
+ibE+p/mGvj8RosljsrhL
+=lEU/
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.8.3-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.3-r1.ebuild
index fa968d4e56c5..ae05bac1ee8e 100644
--- a/net-analyzer/wireshark/wireshark-1.8.3-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.3-r1.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.1 2012/10/03 16:21:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.3-r1.ebuild,v 1.2 2012/10/08 05:18:28 zerochaos Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -207,6 +207,14 @@ 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
+        done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h