Correction to patch wrt Bug #457586

Package-Manager: portage-2.1.11.40/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

3 files changed, 18 insertions, 10 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 3252547ffad4..6c3fe43487b2 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.175 2013/03/04 06:15:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.176 2013/03/04 08:53:44 idella4 Exp $
+
+  04 Mar 2013; Ian Delaney <idella4@gentoo.org>
+  files/wxpython-2.8.12-drop-categories.patch:
+  Correction to patch wrt Bug #457586
 
   04 Mar 2013; Ian Delaney <idella4@gentoo.org>
   +files/wxpython-2.8.12-drop-categories.patch, wxpython-2.8.12.1-r1.ebuild:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index ac518e8f2638..2c3248d550c9 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
 AUX wxpython-2.8-cache-writable.patch 538 SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429 SHA512 e0232ff7bcb713358a2981b84b0eac3b3b0825d43b43dd6f19d3d21f9b45a9e63fbf39dc87c2fedc0342a88007ef43fcd9d890177dc38e15b4f89576fdf363a0 WHIRLPOOL c2c0488d0d5a840d1be68c95a2f53d3bce7d58798f0e09f2116f16655d73c8a5b525af7d7b836c7f820bd729acff441942510055b8f455a9b2f742361effd6c3
 AUX wxpython-2.8-wxversion-demo.patch 219 SHA256 19618386cf750f56051541c403153bf1c7e90764199e53818eb0c9557d026f1c SHA512 a20e79dc2f96400046dd5d5697533466529c30bde96a2e8ace1984c7e3fb42a6b38375cacddeb319253dbaabff6571b52af41da5268d22cfb294b11da56421f8 WHIRLPOOL 3af6ad578fcc1144f0172b4a959665441880ba20b9d471049f9c48602987e4265df34b180cd98727d0beadef66e6603fbdad7f1d0b0358a795b3372a8f46d2df
 AUX wxpython-2.8.11-drop-editra.patch 2197 SHA256 a0774e4c273485711cb3da4d70cf7bf0766a9f189fafdc7bae07186d553f341b SHA512 3800b68ba13c52e81a4411940e297f83f9e98c76b4d8d9d3e53ac55564a38b1376b57df337e4f009b1cbbd44199293554058341aa2122ec329c3a42dd38593a6 WHIRLPOOL c79b106c6cbcbc1089bcbdb13bc7e5aeb613a8f374edf7a3d4680d3240b27de2f1d8a0e15ddf13257d7878cc2828b8fe49b2db8ff23eeb1bf7f7ebcf69c9f885
-AUX wxpython-2.8.12-drop-categories.patch 1454 SHA256 8bad59ba3039b27ec4b8073b8d1a3beba00337a2661735a4c2b81367848cc4cb SHA512 179394c8edc4f98eaec95d3014503ef2144eed97a074712c5604112ab8e6fbc7bdb758c620fa673fcbf841ea983180740c7f342217311e3b8c86c966919ca1f3 WHIRLPOOL 5e462b7a836c0f5c81456c1db78fed26be4d98aa9358e89bb9f44283acc00e461514d9937428798c401c9fc001822472c38fb4550c50fd824a3b37cf4dbd78cd
+AUX wxpython-2.8.12-drop-categories.patch 1554 SHA256 37c4e706e5a63e51995bbd99ceceace0cf12789aacbb6a8cc4ed6e13c2c22531 SHA512 d622cdd72db26ff44a058b9c4dd0a0a20b504d4799933636ffa3fd131e4746ae993ec80a74dc7a6496cb1306187222fb075004db547937b7c91857b8c18fe0e1 WHIRLPOOL 49fa7a4e53402d4fc4a77213fe3760ae271e85680fcc5d6a1623ef4a7621b926d672a760313c33b5450c7256b4964b8203bd6ce8543f55033a09ccd41f1cee23
 AUX wxpython-2.8.12-drop-editra.patch 2643 SHA256 bbe4960ab735f344916e36cb772a1a6c7e27d6540c7ee1dcd8437bff8fb6bee8 SHA512 d49e2ab9cbc388e21b387c04524979840a52b167fe718e333d742a427fc18d7dbab0d2554263697796c802b81435ae8499e33b640f5840b4b626d01bc2f9780d WHIRLPOOL 70dd7825b701d5bd4589f8e6c6c9881dba250ef03b5c4bde0bc552e8154f729439e17caee2bfb16922ddbe34db60be60e0eb2d91156a9a7a6ce35ccbde7241ba
 AUX wxpython-2.8.9-wxversion-scripts.patch 7730 SHA256 55b1caa38295338dda3cc9ebfa4e43eb3be76959a0ee9b23a7b81085d80d7ba6 SHA512 f6ff14045487b53733ed71ed4fd2d5a2d847d5f267f2c6348fefe38f1f0db11a3b0b4cbdd61a3a391d820bc39e13c0aa1b57360c045f49ae539212f08fb07332 WHIRLPOOL c4d946f0e1625623f8d98063901c790a99799eb7d46fb8afcbd59b458330bbe40bc9e1e29c954f8c0c07cd65afd1ec7b02d12fe53e803a6a742f9b01afbc733e
 AUX wxpython-2.9-wxversion-demo.patch 147 SHA256 79c0cb7455fe6947ba9b7278d98e2c6da156edd5e5c276b03cc7fff5d3073d14 SHA512 7fe67f8d292f186b9271e1f8761f53e0e68df9a85d7624aa401e907411f58e3d6961cea8bcee3a575c97b2ed1caf596a6a0b47acc72efe5b4222c8795302700d WHIRLPOOL 164f70695f19d45919f56e0b6986a019b6a21092bc52599bbb45f1ef0d74e5fb44777d551cb95d6757aa62312e33644a5d7042e5cd18e42e33c0f00b4000f4e5
@@ -24,12 +24,12 @@ EBUILD wxpython-2.8.12.1.ebuild 5151 SHA256 36b7e6c3622539299e15bc5c4aa30a00dde8
 EBUILD wxpython-2.9.3.1.ebuild 4357 SHA256 376646a25640952cd34e65bba00dafa0f2135f852eab9eb74073ccb437124405 SHA512 8a59a4b070e23a3d2faad2e6ad8ff2ad9ef7b28a84450b03a2a2ee1a01ba04a48a14649e32e6ca960c46d5d73ac010b811f4d0897cba9619e6f2a0fc017ef05c WHIRLPOOL bc3b733221f1cd78e417b5a9aff491d2efc84a3a56bf983572ef9ab02a17f5e0cf7a48d020b3994f6577ce59da5d1f1d76bff5b0dcdd018b33ec1299833840a6
 EBUILD wxpython-2.9.4.1-r1.ebuild 4429 SHA256 591677ccb0c0315bd1a0e38cb3cbfc1a65425a61226e73d57844c37b3655b52b SHA512 c0736d53c09d8bd3f45496c625aa78a5f835a9a2099e871cac4ab0de367243ff92aa4883e91941732d15585fb44d45d64bfd191bf6dd49be53aeca93f0140ea0 WHIRLPOOL 11ada9a38567a719c1a50e302af211f0c2aaf5fff5049f275621d6a12d8ff7052c8f352453b47b8abedd21966ef17cc62905db23b32427a6d7c814605b226fcd
 EBUILD wxpython-2.9.4.1.ebuild 4344 SHA256 e885f7b2c67644a64d1d162394fc62f7305bcf5635e2b21222313e6ae4af3e1d SHA512 b3a104f03f65c83952299a60a1101f56c6f1aeb675811275fc57e5d4c4d4bcff8a6215742fb624473566e4d1382b2fd9f8d6baa7de580176ab9560921935b1a2 WHIRLPOOL 509f43cef7e41c00d1e0ec4a3c1d43b4eaf9903090671e128140502b3de1791417ec670496a17c31d52658b325739564942145959ac1d932cfd973b66a4642e1
-MISC ChangeLog 31214 SHA256 8b66bb2ea7c44672d94020a56ccfa65ceca4474011df1e1b35a36d699dce1efc SHA512 7567b7ce925c05832a4fa40f3b6f491886046be600baf295a5b5de1ffd799d68b55beadb9df9d0ad621bcbd17c582255d3e991b314cfa6bb28a179891cf9dd6a WHIRLPOOL 383e494c003dcc13cf16403ae275fbc69484bb33ec0d4de3560d0f6dd2b65297cfa00529276f6e37d46e65cd303c5371bc304f039ad1f09cf6541a740f602775
+MISC ChangeLog 31348 SHA256 537af6e9076fc79d0c17ece17b6a58fb989b5b07dd19a147f8ac8f64477046c7 SHA512 635cdd0a52fc9c0a3669f0bbe7b534f44525295c1835d10391306a553393021131edba2b7a4c4480419298a9b274dd6bb63769d43b7df6ed144f9e816721fef2 WHIRLPOOL c0bc0333be56e6a2f15fdc9fda3ec1417df51537e6d10c4d66cfa4c006d21a67d2b2963c0719edd58cc9155f33f8a62f9bd5ad1082b40613ee7a9795aecd60a0
 MISC metadata.xml 366 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff SHA512 260bafb8c2fba6a3d1b6c0dcb0fa4f1db5ccff7319395d9856997df816d3cfc69dc38859835eeafb693f22da6179e73227c87d820019793e639987085e596c6f WHIRLPOOL f8619bf36512bc3debe4fd4d810f5512485fe5f6041af2704898cef0123c9ba9512864763dc6fca78f400931a120b43f494e7384a567a79d42db507cd74b8062
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlE0PBgACgkQso7CE7gHKw1DJACfVUXpvxDc/77qt5qjCKLeoy9S
-FssAoKnPRybllsBTMNABSF4jJ5z33YcN
-=b00v
+iEYEAREIAAYFAlE00ZEACgkQso7CE7gHKw1B8QCfYgB1kS4weK9hecTe5aKh+t5d
+1cUAn3GXRhWuzJgH8+fpZNPz0352pck8
+=9brg
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch b/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch
index 245e2da34573..d860238e94de 100644
--- a/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch
+++ b/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch
@@ -2,32 +2,36 @@ Fix QA issue wrt Bug 457586
 diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyAlaMode.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyAlaMode.desktop
 --- distrib/PyAlaMode.desktop	2007-07-19 06:33:55.000000000 +0800
 +++ distrib/PyAlaMode.desktop	2013-03-04 13:48:51.737419595 +0800
-@@ -5,4 +5,3 @@
+@@ -5,4 +5,4 @@
  Icon=PyCrust.png
  Terminal=false
  Type=Application
 -Categories=Application;Development;
++Categories=Development;
 diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyCrust.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyCrust.desktop
 --- distrib/PyCrust.desktop	2007-07-19 06:33:55.000000000 +0800
 +++ distrib/PyCrust.desktop	2013-03-04 13:49:12.209418445 +0800
-@@ -5,4 +5,3 @@
+@@ -5,4 +5,4 @@
  Icon=PyCrust.png
  Terminal=false
  Type=Application
 -Categories=Application;Development;
++Categories=Development;
 diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyShell.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyShell.desktop
 --- distrib/PyShell.desktop	2007-07-19 06:33:55.000000000 +0800
 +++ distrib/PyShell.desktop	2013-03-04 13:49:28.713417518 +0800
-@@ -5,4 +5,3 @@
+@@ -5,4 +5,4 @@
  Icon=PyCrust.png
  Terminal=false
  Type=Application
 -Categories=Application;Development;
++Categories=Development;
 diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/XRCed.desktop wxPython-src-2.8.12.1/wxPython/distrib/XRCed.desktop
 --- distrib/XRCed.desktop	2007-07-19 06:33:55.000000000 +0800
 +++ distrib/XRCed.desktop	2013-03-04 13:49:46.345416526 +0800
-@@ -5,4 +5,3 @@
+@@ -5,4 +5,4 @@
  Icon=XRCed.png
  Terminal=false
  Type=Application
 -Categories=Application;Development;
++Categories=Development;