Fix building with python3 (bug #435460 by Lars Wendler).

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

6 files changed, 83 insertions, 14 deletions

diff --git a/net-analyzer/scli/Manifest b/net-analyzer/scli/Manifest
index e88fdde73e34..fc196f4ffb5c 100644
--- a/net-analyzer/scli/Manifest
+++ b/net-analyzer/scli/Manifest
@@ -7,13 +7,13 @@ DIST scli-0.2.12.tar.gz 645131 SHA256 0cacc75aa7433613f07b3080799b7fcc873acf5015
 DIST scli-0.4.0.tar.gz 953401 SHA256 308511589260d3da9bc5817ace363180070ac83ccba9231b7b9a01e1b0c29fe1 SHA512 ceb81e51049def64cb6f2428263709802380f7f712575e327a71d8cc120d284a7d9c57679d76e22cfcaf5b160d0d46af0cefa1133c56972b43002cb94f120dcc WHIRLPOOL 29f72af56e1a934a30b147858cd3e7e5acd638546b46b275693b0241bb0006edb1e66fa8af5a7074d23125c02780f129d1c7df6356da45fce3c083a390886aeb
 EBUILD scli-0.2.12.ebuild 1082 SHA256 1ddf74b73e9eba8fe528dc6ae5640e638593b6c04a19314a470dd5dc19cd6585 SHA512 0da03d60efd32efd60a6103e5546c26629f3b274519d49ee8cdf4fa03fe3d5ccf84d4fdd74470b44e70b218964618a0a7c7282d5e3da2ca58ea0ae2bd5f656c3 WHIRLPOOL 4b2b23050ed670e33ee16086d6e57c2241e488c327a8161ada989b07f50ab4a41347b160205b2299c5a9fb760d64603fbe563c6fc4934535a387a21a69079536
 EBUILD scli-0.4.0-r1.ebuild 952 SHA256 ac80161dc36965787a9dd2476af4bff0250604bbb9d5cd7071e254c7ef62c5be SHA512 d73fb76b2c679db5ec1508ea54e1b7ae816d2d03602b361347424d3fdf5a8f010a27585bdc13cd1767466a4e55ed756ebdbfe929ff3d48d1fce5cf6c913555c0 WHIRLPOOL e68c9e461c22dba10670d0b870c499d0be7ec952c2d78ece0717a40949750672ef8903017d97a555dce85963e487b1c7db2c308ca4de7dcb541c8afb5a6e7374
-EBUILD scli-0.4.0.ebuild 898 SHA256 b26fcdfcf40b1a76c28535342280fd2d49a8aa01db21dfa1e77b4613448d2864 SHA512 941d50c3592b3c6108667163e71961e30914334675b437d86fe437abd263e41337c5d85143da693e1efdf7d591ebb9e0c405598def4f833ce4bd74c8708c9a05 WHIRLPOOL 9999a42668d81f4659fe886aff96c01fc41ee1c1a7fe95eb40dceaa2df1ed7ea0a6a0e6aa638312489d8cc811b2076b1a536026c76141b85efe73378f98b1929
-MISC ChangeLog 2292 SHA256 75f4cc4f6adf7c2a260c3312c3c85d60309c2b09b81801edc0e891adb883b54e SHA512 e0a7fe3def6fbd8db4b7847e4195c216e6b3fa0e85231daf65fa671cc6d4836483d30abe55437ab086421324de1163365186ab47b9387cd0818a7470a01c06d4 WHIRLPOOL 8c9a261a39f385eb3e262227acbac449caeda7fe21118d132bb131956a9926c2f1ac9c1cea63d786c5cee9cfef5a030a79355795d1bc03002c71314940a4962f
+EBUILD scli-0.4.0.ebuild 903 SHA256 889e742e000fcec1ac850b4e852d88a938577eb8c3737cf1543273fe4a6f8b1e SHA512 a029844ebd2b3ebfd505d16ce3a7b8b3db8b6096cbd840e0c7f037fd3071bae992a0c0f7e206b819840aed66a0aecb72d39b78e73e8839cfeb56633aea39d7b9 WHIRLPOOL 9cd03d7a6f47814e1e4b2c2c7cd839c349b728059ed8f49c2f0640b29b52b6c9005c3130767a31b027eacc9def706cc86cadbd359112a7a4c27e3e1b909bcfb9
+MISC ChangeLog 2402 SHA256 0e5907200c37fb74a6a9298923c96f9fe2a724a52b111a39502c13b45fcec314 SHA512 a566c5dac5f46ea6b00c5b89239eabb543fc0d7a40a8f16d729d5e7ad815652edf8ca2b40f2c3aeec4e08cb64a7f21faf1de0e7537c006ead00bcca501ba8679 WHIRLPOOL d95b1206fa317442d3d34f003f291bc64a22bb46c5c10a6b95e0dc2dcc4b6c1ffd1e80a9ccf04d770a695e9697f62f8657ddee275fcbaef6b7fd16c39de3c418
 MISC metadata.xml 160 SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b SHA512 3ac3a74a7cdf45b14884d967b10e4752f9cb06c579f6d7baf921f9be5450cbe7536c2e5a480ac3c95156eb6abb32e68f74cecc86b9ac0dcc4e0e1b4b255c3e20 WHIRLPOOL f7504ce9e3e8a58d19bba5448305f806c2ae01d0a8d2cf09d6bc6a089a6e1c28a1b12a80bb6020584b5ed21df94e4936b1695a54548704cb8679660b6b807955
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBfwAMACgkQVWmRsqeSphO21wCfUSyBhmxyTOYFGu95sTd1R2/N
-elQAmwQOI/+NkEusXKY+CCqkO7+YgY1S
-=7vOp
+iEYEAREIAAYFAlBgSasACgkQakKUmsHeVLIfmACeI6K32sG8r2PHEEfL7a0CFFX3
+LYEAoIPFGXf8Slqc51RPenOvWuYLzzOn
+=mDYz
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index fad5ab693c06..a46fde0d5a27 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # 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.396 2012/09/23 17:31:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.397 2012/09/24 11:57:15 jer Exp $
+
+  24 Sep 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.8.2-r2.ebuild,
+  wireshark-1.8.2-r3.ebuild, +files/wireshark-1.8.2-python3.patch:
+  Fix building with python3 (bug #435460 by Lars Wendler).
 
   23 Sep 2012; RaĂșl Porcel <armin76@gentoo.org> wireshark-1.6.10-r2.ebuild,
   wireshark-1.8.2-r2.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index fadba6f721ca..c04b0249f244 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,21 +5,22 @@ AUX wireshark-1.6.10-CVE-2012-3548.patch 665 SHA256 1eff10af3f07c4342c3fcd20a2f2
 AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b5a11b819768b66a7c848c2c3c90d8a SHA512 0ed1bce8b57942de72ee0a8d78ef7cc345ffea512248fa65acd4e8386a5aa61dde14663090578c78f3eee88c7966e8d40aa6d3dce13146c2adf5ed8ded019253 WHIRLPOOL a45a3d04c9823eb149174fbbaaeb5437e525d77da962aa627509941da3119e87d4eef26cb06b1d3534356c4fd1d4bf31bc102dbf8b3f69994a19dba8d730d05f
 AUX wireshark-1.8.1-ldflags.patch 312 SHA256 b4cf259892774b4a72ab90b7ea28fbf3c923993f8f68831627d79a45637f5948 SHA512 a6cae46b7bf1f82977f8c905f109efeb72b1bf7bf9413639dd0c783147070be04efac7ec5ac92c9eda682500c5596cfcb2ade424d7bd85278c7842f5aff2ad98 WHIRLPOOL 0aa07f0d26318d203ea2bfb0369eb4fe57f80958e24f20f8579e218d8c3967effb64461112cf30cd15322cc6ed76c75dac0091781ed4526c091f4cddb40daf29
 AUX wireshark-1.8.2-CVE-2012-3548.patch 722 SHA256 02e0ba7d19aa721e569aa5452bdfdd15786d440cdae48cdd932935c3f9e299a5 SHA512 279d3b91245ab6e9b2f9f88a208587ec068ae6d156edba993904fda422b931359d777b3cb8235e4301470ca3e3a12b3424fb4ea52a7d704bf62f7d81918c4d88 WHIRLPOOL 00a281fe94fea104c4381853144012bdc1eeebaa4557a89e4aacd2d4a85036a39992407f10b273a00867af77f343c988cd98c807fb658b4e36e4170bc24cdd6b
+AUX wireshark-1.8.2-python3.patch 2728 SHA256 e4656a840cd4ab09138ef18bf4fb45e6623ace40ff09b13cc42ec216aab75895 SHA512 1018c05648a21e9dce456de58fef92db7237a374ae4d1f1b050bcc13764f17a6eb6e97d3d5d73e6f584cdd389f588aa4a1c1e4843079e10d239ef95acf9e2c51 WHIRLPOOL 2dec75d08f650da2dae4540a616b728290646d4b9b0dfb52624ca7b1f79036125e85c49a2e7cf9696b74f71c8253970b35f5d10737c838cde3e5c6054532329a
 DIST wireshark-1.6.10.tar.bz2 22026939 SHA256 a00797d8cb436531a79cd823a53c6475cc2f52d41a72efff926af4a964dd56a6 SHA512 e99b7cf2d2bfbb3102ad41fea407b47577672927f0b0f4dee8cfadde6c4a8c638b6f1b0111846794a5c7beffb426122310ae67e43bfa26c1014c1362654962d7 WHIRLPOOL 43e2c08701ad099df48646e6ae3dcdd7d6d972247cbe0e9b592635dbf8050b770cefea708895b0b8def26020fae2fa7c9f04aee7195a422119a5dd168ce47237
 DIST wireshark-1.6.8.tar.bz2 21967111 SHA256 d4fbaffa4fd32543ed1d03b3097bf89a7d492e6d02e9bf8f8aa8a71281f3057f SHA512 1f2eae0b94632f0bc37dbab16afdba711e1b3c8b059390645c38523d114b2c2908ccd0c396fc0c3b89be8b6fb8a314fee7b1e16c57ce05e98bf88d923b55fc78 WHIRLPOOL b46571b9cf33d35158ef95c0df65fb4941ab2097d687ebc21501ca4f46bed176b91893adb910a884a16c1054d2be9cb52c68f4f552871a81c91c3618fec811f4
 DIST wireshark-1.8.2.tar.bz2 24121798 SHA256 3f0e688d889345033e0a7e4f36aea78248e5c7b32d0dfc19eac044188aac11cc SHA512 219ec8249072773719162851515eb9c29a01693c9ba4d57976afad1e58d30cac9aefb482d3c6113386c39cfab775919ad68a888e94de8d62af0e8b8da7c3991b WHIRLPOOL 08bbe59e096de90a99766aa49c6d419351b1e178f5eb2e9160e00900c695dd46515448571ebbf19172679db0637f82359757c302cd87ea176936eb32c3625ba1
 EBUILD wireshark-1.6.10-r2.ebuild 6467 SHA256 2174ef31aa5fc0d26553801da705a2aad3b3e16504b7c9e9d38050f5e3af6f4b SHA512 6213ceb2acea0e747e9042aab0670d50ce5243329fd79ec6dac985cff6dbe8eac20692a6eae7e15ac9c075887e30c57365571e354b22a92dcbc46222e10c58dd WHIRLPOOL 2208bcbb91355945cd989e10ccf67a2e3e4f2131fed8ec8525e1aa179894ccdf06daeb132f07131f5da6f11efd20e0f2a53db1dc42a1f2d233fab7ec0c869257
 EBUILD wireshark-1.6.10.ebuild 6555 SHA256 d403012e43b2f40cc2c5fb1a7cea94fdfb852a5723e25d2c903d698ce31d3980 SHA512 f7963b030ed853db666d44e72d5a74a0a0b458c9276e759513e29521a3fd96408d4c08f704d518068925a4eba1c91095f302161e3a68860c48b43accbbd41709 WHIRLPOOL 9a59004c31d610f4691eba3f0f743577fc9ad5de51f7c03ff70ca15ff714256f9db7bc4fe4ccefa7e416d6c69be29856c9ae08896639b135afa89dc7c1917d28
 EBUILD wireshark-1.6.8.ebuild 6453 SHA256 45983c22afd371ca12b7cfaaa7b8657bb2c661ecc78c7d639cd8f7067e73670d SHA512 ab98125603ada0828444414b8807760e4f5bf009547fe58110ba6cf3ff981df18bd34e7d17605ac11fdbd592a8ef9e0b5a1985775dbea11ea750b3aaedb9b6fe WHIRLPOOL 500f699b5f8d84c85cb2422745a95e2a47cdf7915cb030ea5d688a1cd2a772c9060b8058ee577eecfde2a9bfb4e2dcbe1c380fd113621cd9240e1db82d964110
-EBUILD wireshark-1.8.2-r2.ebuild 6408 SHA256 b07560c8bddf36ed52bc9083227c066e7ee46e8d99362b7ea430d016178341ba SHA512 21516a5f794c4c1bca0cce26278f2313f90552c0aef8d98ddfbe88a9e29172dcc6abd126cfceb2322901fee630be05a5889424a7ccf9124f38751bb1a2729be2 WHIRLPOOL 2538e1efce3a4b8f2dd40bde3d9b89f73c0c89698331511304a6aa5733067695a2099d32a536511b51d5c134d206e83ff49324b70156178a4096a8ccfd1efbb4
-EBUILD wireshark-1.8.2-r3.ebuild 6486 SHA256 019b83c8145569a1503c69d3029d6871ff6acf604ce8f502914707350fdb3ddc SHA512 76d6315bd593fa72ce3d4b04967438b0d59ae24d371b6d580c0064d5a478be31417d240a17d870e3bab5187da61851f5027d242e673675c638b77d05cd1cb332 WHIRLPOOL 0518de789f91947683eaedf29bac17fe7d89923f71ffde6e8427e15cd29ef3cc0532561be98d47455d1d0b343c17b68d52904d43505f105d0d58cd1961d42680
+EBUILD wireshark-1.8.2-r2.ebuild 6452 SHA256 aa2f95486747e586e9d9e205e61edb86635e6d5d399f82a65d7974ae39273dc4 SHA512 e036142cfe57f4f578064fa68c86c4c4fc7051ad1abe019ef4173c889fbc80f64e5aa0256aad7f18b3971381ffa5fb90fd0c65d3444ea1d7192ce8c5d399f417 WHIRLPOOL 0bf08520b458be8d87b28d4b940a10d1b4463944dbcd75e8d2f9e995ae3c014c83cf208d561911233ff7ee4c829e0ad20f9dd7c83db48fd62276d530ddc772a5
+EBUILD wireshark-1.8.2-r3.ebuild 6529 SHA256 dff7db5b279f94f45a39143af0fbb9efa830e9ec2bec20109543885de061a3d0 SHA512 218af752485bf9880430fe35a871ac7baf753717a6dd226e389d7b6bc90640460d84204d645c9020d763b3315a1be6efab8a7913748dad7c9c3fdb9f29fc3397 WHIRLPOOL 86bfb07b309f62605f727544c5e6029899669b760ac45c775627a71d8d80ffb8617255f067cc216c1894a68369da0c612cdbd7814dabeb53201a6c716af9df55
 EBUILD wireshark-1.8.2.ebuild 6412 SHA256 a401ed515922508b6f4b09bcbb25f2473c2b3dc612a629c994b77769e9f580c8 SHA512 7c5fc50ae831f99ebf827e4ca440f1fceb52cf0f414306615e01ddc11cc7996c693e8af1ec843764e0ffeaa200031c803463e8b5a96c609b1e8033e3374394c6 WHIRLPOOL 3968d7a5d3ce316a2c4d7610df50c3df4b2e12cb170a76577f584dd892772dd62d5fc4562ffeef00d07cdee8c0878a3c784c15c25efa206a45c1de1641627c0b
-MISC ChangeLog 57731 SHA256 f5d35f498c1be20fb1570aebe2cf8f9ae242c99b384e96a93083d5a2e9679728 SHA512 7fec13b3a2c04f3c0f2eb8ed7cde4af5457349b1c300a24637b11980f2143fd191556f1cc3bdbeaac7723009bdb04db6d3c8aba2a3ac1bc32c35f35137bcbc97 WHIRLPOOL a1ffe81db658677c9d395d6d646d54f39782f0ce654008240a56b38176d03ccf005d17be208e2ccd2773f11f39eb6e41778199761a6f91b216836e1b9be7b81e
+MISC ChangeLog 57928 SHA256 9b1b14e95ea56f08d0a2eb78d134ea26ed7d2316fb8d8aeb08c21031548b57f4 SHA512 378582cb5db928ada5ce79abc0714afd7b77036b3cf50fb60953337218b582ec99a6ca17a950eebfcdd133f56c37a73be8d42a4ede5be01c57092977199d67e2 WHIRLPOOL 58fab5be3ac9bc5dc5a3c94d14bb57093528bf29de5bd74fdcefe83da36daf776bbe6ec9f7b424df4774acaed35c1109143fc35f0ffa31c6fc1335615d898f40
 MISC metadata.xml 2623 SHA256 bcdcf620e279a08132402301bd4a15d7673ea55801e8dd26ef40acd87c353252 SHA512 15e5e0eeb2402c476250aff5bf81ad7a292c596c75eaa7fd9573aa0e72211ded20155c9861635749f3c0c4220a35f60b86b77069462e0a8b72c4e79aa7213960 WHIRLPOOL 76428ba9dfe2ec2b9eac22e7b30039475df597ca2dbe94782278ba1ffd41a207f5a7de2dd0d81c2d603707ca1f3d227491f17e45e07401758fef9d400ce65a20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBfR4oACgkQuQc30/atMkB5xACgljiMAKmV/xAacjGAgAgGa08t
-4QMAnR8Q4/+RkhmSZluuC35qZOk6W0SP
-=v5TB
+iEYEAREIAAYFAlBgSqEACgkQVWmRsqeSphNXMACfYC2GvxjTaMWI5Hf7i0FZQaF8
+0a8An2/kKZ5cZ1j3foyCfv+R0sGbruwk
+=xsph
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.2-python3.patch b/net-analyzer/wireshark/files/wireshark-1.8.2-python3.patch
new file mode 100644
index 000000000000..380580e0216b
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.8.2-python3.patch
@@ -0,0 +1,62 @@
+------------------------------------------------------------------------
+r43940 | morriss | 2012-07-23 13:04:37 -0400 (Mon, 23 Jul 2012) | 1 line
+
+Get rid of non-ASCII chars.  Also replace tabs with spaces and remove trailing white space.
+
+Index: epan/dissectors/packet-gtpv2.c
+===================================================================
+--- epan/dissectors/packet-gtpv2.c	(revision 43939)
++++ epan/dissectors/packet-gtpv2.c	(revision 43940)
+@@ -2233,7 +2233,7 @@
+ static void
+ dissect_gtpv2_bearer_ctx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, proto_item *item, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_)
+ {
+-    int         offset = 0; 
++    int         offset = 0;
+     tvbuff_t   *new_tvb;
+     proto_tree *grouped_tree;
+ 
+@@ -5884,13 +5884,13 @@
+            FT_BYTES, BASE_NONE, NULL, 0x0,
+            NULL, HFILL}
+         },
+-		/* Bit 1 – PVI (Pre-emption Vulnerability): See 3GPP TS 29.212[29], 
+-		 * clause 5.3.47 Pre-emption-Vulnerability AVP.
+-		 * 5.3.47 Pre-emption-Vulnerability AVP
+-		 * The following values are defined:
+-		 * PRE-EMPTION_VULNERABILITY_ENABLED (0)
+-		 * PRE-EMPTION_VULNERABILITY_DISABLED (1)
+-		 */
++        /* Bit 1 - PVI (Pre-emption Vulnerability): See 3GPP TS 29.212[29],
++         * clause 5.3.47 Pre-emption-Vulnerability AVP.
++         * 5.3.47 Pre-emption-Vulnerability AVP
++         * The following values are defined:
++         * PRE-EMPTION_VULNERABILITY_ENABLED (0)
++         * PRE-EMPTION_VULNERABILITY_DISABLED (1)
++         */
+         {&hf_gtpv2_bearer_qos_pvi,
+          {"PVI (Pre-emption Vulnerability)", "gtpv2.bearer_qos_pvi",
+           FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01,
+@@ -5901,13 +5901,13 @@
+           FT_UINT8, BASE_DEC, NULL, 0x3c,
+           NULL, HFILL}
+         },
+-		/* Bit 7 – PCI (Pre-emption Capability): See 3GPP TS 29.212[29], clause 5.3.46 Pre-emption-Capability AVP. 
+-		 * clause 5.3.46 Pre-emption-Capability AVP.
+-		 * 5.3.46 Pre-emption-Capability AVP
+-		 * The following values are defined:
+-		 * PRE-EMPTION_CAPABILITY_ENABLED (0)
+-		 * PRE-EMPTION_CAPABILITY_DISABLED (1)
+-		 */
++        /* Bit 7 - PCI (Pre-emption Capability): See 3GPP TS 29.212[29], clause 5.3.46 Pre-emption-Capability AVP.
++         * clause 5.3.46 Pre-emption-Capability AVP.
++         * 5.3.46 Pre-emption-Capability AVP
++         * The following values are defined:
++         * PRE-EMPTION_CAPABILITY_ENABLED (0)
++         * PRE-EMPTION_CAPABILITY_DISABLED (1)
++         */
+         {&hf_gtpv2_bearer_qos_pci,
+          {"PCI (Pre-emption Capability)", "gtpv2.bearer_qos_pci",
+           FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40,
+
+------------------------------------------------------------------------
diff --git a/net-analyzer/wireshark/wireshark-1.8.2-r2.ebuild b/net-analyzer/wireshark/wireshark-1.8.2-r2.ebuild
index d2d7fc358d2a..04ca44c0cc85 100644
--- a/net-analyzer/wireshark/wireshark-1.8.2-r2.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.2-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.2-r2.ebuild,v 1.5 2012/09/23 17:31:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r2.ebuild,v 1.6 2012/09/24 11:57:15 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -108,6 +108,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.1-ldflags.patch
 	epatch "${FILESDIR}"/${PN}-1.8.2-CVE-2012-3548.patch
+	epatch "${FILESDIR}"/${PN}-1.8.2-python3.patch
 	sed -i -e 's|.png||g' ${PN}.desktop || die
 	eautoreconf
 }
diff --git a/net-analyzer/wireshark/wireshark-1.8.2-r3.ebuild b/net-analyzer/wireshark/wireshark-1.8.2-r3.ebuild
index d50746ae8c1b..dc3154fd36f9 100644
--- a/net-analyzer/wireshark/wireshark-1.8.2-r3.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.2-r3.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.2-r3.ebuild,v 1.1 2012/09/22 02:41:02 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.2-r3.ebuild,v 1.2 2012/09/24 11:57:15 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -108,6 +108,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.1-ldflags.patch
 	epatch "${FILESDIR}"/${PN}-1.8.2-CVE-2012-3548.patch
+	epatch "${FILESDIR}"/${PN}-1.8.2-python3.patch
 	sed -i -e 's|.png||g' ${PN}.desktop || die
 	eautoreconf
 }