sci-visualization/qtiplot: Cleaned patch

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 26 insertions, 27 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index dca08a1a02b5..2cba4b7d2c67 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.106 2014/10/27 16:48:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.107 2014/10/27 16:49:07 jlec Exp $
+
+  27 Oct 2014; Justin Lecher <jlec@gentoo.org>
+  files/qtiplot-0.9.8.9-PyQt4-4.10.patch:
+  Cleaned patch
 
   27 Oct 2014; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.8.9-r2.ebuild,
   +files/qtiplot-0.9.8.9-PyQt4-4.10.patch:
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 26ac377a858f..c435cfaa59f4 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -5,7 +5,7 @@ AUX qtiplot-0.9.7.10-dont-install-qwt.patch 605 SHA256 161657d37de71ea58fc0e0af3
 AUX qtiplot-0.9.8.6-gold.patch 535 SHA256 601bdea70053618be63f446c7c35fc991587a5ca439260d75bcb84308d116784 SHA512 fae41593f480c0d32a4a1f619d735bbd67ff3d97ae5d2e6813ef7f487fb3dac6edb99022f34ab6e725358bddef988de025d2d6261c93f9c1429dd2329649b04f WHIRLPOOL 4d0f7e48049d70f9f314397e8b3378774f134bc6ea71a89bc26a08806436798c05be65c214d33e2fff7ff415712def6466e32e24f77bfee687d7cbcb6f8d0fb5
 AUX qtiplot-0.9.8.7-kde.patch 454 SHA256 5cfe122907403ed1f766118934aa42eac05db41efabd0c6618df17af16e3aff1 SHA512 6de43a6fea8dee412b5b9b0ca8d36099167febbf86292222077cbd9bc3055808e317ad1ef4b721b76b7fdec7b26520ee5edc27407b0ac44e0e2d73256424f620 WHIRLPOOL 15a5615d9851e4a9844b0529bf3bb7d2edb4449a7276d8575b6c2cc1b6438a4c81ddaf706f51878ad0fcf19dab0f369fc5664343021039a14cec6bbab4e13df7
 AUX qtiplot-0.9.8.8-system-gl2ps.patch 2436 SHA256 0787155b465aa6cdf4b2c12a87dd68e6b5aa2197b041b06a550023c1ca96c81c SHA512 d5342962c2710048eac398b3122bbf1bbfb7360dff2aad759fa8fe111d23b761f1bcfd8597ebba996813c082d9c746ad2d4b393e00c527845ca7a684f698b4d2 WHIRLPOOL a1e0addc9746f3e0829aa15f9549deadcfeb7621de307c2ec398cacecde49f67cc0288e5afc1f24079fa69f299ab90ea6846c407cb01aef525b01b5420e1214c
-AUX qtiplot-0.9.8.9-PyQt4-4.10.patch 1404 SHA256 9366b32434607ce4921bb2535736a505273d8e775589c84a399de9e1342ee255 SHA512 c3900f3ba5d287320a35490eead5af7de7c112fbf8ed9c561aeaf786809d7615de9d127fc39565d9924a04b4632da36fa8747c8b466ee9b878761ac8c814b6fd WHIRLPOOL 6ded72bddc3afc84aaa0eadd92b8b275e23e49bcb9bb9953c44872e70801bf2be380862883ee02d638a44cc3596a67c519c942b49f791f396de7719557ff7684
+AUX qtiplot-0.9.8.9-PyQt4-4.10.patch 1098 SHA256 cc7f66e28467d849101421eca45b0497245acb3affeca8323b66c96c7381ee48 SHA512 58268def88227cfb765873bc4b809c3f3851bf9bb09a3e3fd1b54e6158de9294226e3394968312c25cf452ddf02af9078a494e9d62149f458f5b67d21438c740 WHIRLPOOL ef8d0fa9c1ff1196dbf7b66fe6d716e462d0b524a3883e04cb820e4c3b44c7b22c0cb0f5851d62b1a5abfa101c2e7beb441f30b64a76b05597bab9c66f0134a9
 AUX qtiplot-0.9.8.9-adopt_to_alglib3.patch 3596 SHA256 5256ff47807762def7de5c00ef206c73c15d5c61c0fd1087aa6b1a7b866aca32 SHA512 7e1a1b1ce174c010c66025e3d84975d2f636924abf5f4f862d3e3a367731fb25856e017bc3fd8e6a726ce3d707143b704dafef8b272a6307b3f17747c2a35b67 WHIRLPOOL 1826c5131f59d42a70d66535b55936916e15cb6f8200e03521f762d82daf930588879eed958db8ceadcf652c3ca09a2ac029e3b1623446da1d3177cf6362aef5
 AUX qtiplot-0.9.8.9-crasher_without_internet.patch 939 SHA256 d2d51f7e560296c11501c6882d4e201c248afd9b0359670c276a33558d5953a4 SHA512 d32a0302ec508d9646b1e2c40a69329d376d9c8e859a607044e5fd9cfa6a59a5b89ff5c21c8a56c110cc0747ddf8538751f28309635c3ef97876abeae7782f4a WHIRLPOOL 424574675f53aa863fcf22c023f4c56250c1e6f345fbf181fb87a6c0eb4cffc5bf9bd8a54a97a55ef1d4d0be5872fc7464ca6de4d9b25844bf8412da8d3b5504
 AUX qtiplot-0.9.8.9-origin-2.patch 1713 SHA256 f48441a91326dbea572d52d9e22449fc29c3e205ce90925f277a1121233a4c40 SHA512 516addaab1a21aff57dece95e424afc7df6cbc5422962aef668f991d52122d07e44b8b17b985edde3074ac8d846c8f54a6ef857a5924ae393da56852692dd64d WHIRLPOOL d9455e9acfe6030c068f5076a1308eecbfbb5810af2a911a62242f58ce0e578a1dcf2c2a2c519dab26f4110ef7916b1663cf433c6e3bdeec8324178a0bc93a09
@@ -17,24 +17,24 @@ DIST qtiplot-0.9.8.9-origin.patch.bz2 104708 SHA256 e83d7212be0fadae31b14c8a86b6
 DIST qtiplot-0.9.8.9.tar.bz2 16202943 SHA256 a523ea259516d7581abaf2fe376507d152db32f71d88176cff18f5bc391b9ef0 SHA512 3a0cb7b49c508f56228e8e3a259b4fd34c872410ad14ef1d8656372e3e8ab9f92e59094a9cc1a75680099a8832f7472ad31462b3ae8a9e132ac7056d5245cf2a WHIRLPOOL 3cf9d9ab7d58301364a61f6c5ad51858ffe1e6214c5971c1d042c7894fcb70fa4b28fe0e6631f142ab8fa9b2c2b979e4e178bc44b1961cde70b29d9aaa2c7d3f
 EBUILD qtiplot-0.9.8.9-r1.ebuild 5877 SHA256 5d48d74df1cfac4c67e156bcf8da30c91633ab7c579f0781174fc2c5695fe1fa SHA512 25cae7c3206855c8500f32f4eefa370202c368f42c6f9729baacc69d4036ce30ad8d43d12b03a910e9411de5fa90ec54cf7d12761469f68ea4fb812ed52aa844 WHIRLPOOL 0e26416cd07b48ceceb6febd540d506b27dadeb3a87a5439047da57ee7049255f807fb11e47b5cb68fa331f841c330759f7bea4fb7a7784f9d28dc5ba891e2dc
 EBUILD qtiplot-0.9.8.9-r2.ebuild 6402 SHA256 6c3ca24c2713a9c49a93d33c89f8f351a15f7abb3d8fc04a46868c60bd9ca018 SHA512 fff99f325d3e6176869db85dceb20647453768ac19852f2a58a985aade4d20e72fac8783b0092d1d5280d63ba86ec4b30a21993d5d9229071aafb426361a73dd WHIRLPOOL 8ea88c76fb14d2439ede98ac4a9fd0e1eb1b3f2fcf113cd2641056a2fd12b122317c722bfb1034261707859da124f452e59d697b348568a965005def2879ea74
-MISC ChangeLog 24379 SHA256 a2d573ffc602841448c46184085977d062821456faaafaf4bb955a212f9b0d14 SHA512 c8c6cd346dbf59377715aba6019f14261db9ce28e2792a20812a8a86f576a4a54b44f6850c5e7bb2549a7f53d1ca90cf964da18059481350e2cc125b17c7db3e WHIRLPOOL 387e2f5bb748befe2b58bc938f8d0eb4ae02eca029a88b43acb3cce058467418e7ce13bce8f8c888e46b4c2ceaefc39f31cba666f12899b4ce46f81d2fac02c8
+MISC ChangeLog 24485 SHA256 b34229b929bc764692bbd052fc7582dc22c07f8f7430833bda6037752f56ade1 SHA512 da96eec8b85697070c7de38e8b322e6f769c2adb90f7c37c0e13026c1586add80e44a3c0e4340ab14eef8aa34119ec4d312b40a5e270d79049cb7a1d73856c65 WHIRLPOOL cdbd0409bf5415896735ce9bb6a2e74996d7c7e420117363c18bef66b7cf24d794d6e3d5f0039aaae194566ecc69d7acbea754ad8d40844fab3c4e00449d77ce
 MISC metadata.xml 534 SHA256 3cab41566b5f7dbdef0c2bf0a76387d9806cec46532f0f3c1a022f56809cb472 SHA512 8d86aa85afd2398fbf8ac46e22e44fb8f72eb7da0e9fa6ab936414837b85669d7f4f1236377a44bf5c2c15bc8dddb2c99ac34e563b3dc50df0cec2bf934d1357 WHIRLPOOL d1417dfa945016f885046521b06a06c93d9e2c44e65cdcc7e76ca574c921bebe29ce3f9569d99d93ef0013c2ae47fd1b592073b235cc2c593ab365a86e490789
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUTndLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUTneEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirtogQAJfWLv9nhbh/VkBuoJtfzs+X
-tloSlFZ5J8cEGHCNJe86vQtbZpJe+uE9ZZEzuIOUgl1bIr8Blsyq9UT6UJMaVnnQ
-4bUJ2O7Co5fuJEYAEX7djV1H05APM4WcVVdN+8T0kBV4Iitd4MnYCxCgzPqEJkGv
-9bIuceS9K2qLZ9CoivR41/rrihWx4lYwIWcOPPr4LNH76uUZAdtUfV5XritGDL2H
-pXCsbBJOxEDAw/sJH/NPMqiFYnpzFNpkj0re1d81J+AKcz0Wtojg6U+GAVa4AC8O
-UIX4Kr+rZRKMk92E+F1MHC+ATi7iHzQ6wXxTTx9fQW1rmDcU49OYHcBUZU1j8cn0
-RtHqF3glsTBQVJp5ojOnJhs32M6Wrlx/CJuFjBIGyG0WYfiEHBvcgRFJxmep+hyi
-g+gEIsWXfDuBM+cEF8pssKroIFIvoXBigwA1agJfHxFikBPHakb1odn5ZtBBBJZQ
-FvuZpUxWa9hdxtq0ue8L9XrJkpVI8WXn85jTSKAJoMbZlG8OKQ4O3WY+SWify8HL
-04lI3FtoTrc0OQJ2UKShCZqD69NoKR+pqjK+T0CccrCSKQJmFfMZ7IciMUJKp/SQ
-nhX7zHqnBHIb9/+W9zHo4onbkT/25lG/ksSNZMF3Gr71BHWphJHbo/BXHGApd/Jw
-BuRquho2CDaAKZWXvN8I
-=2dDv
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirXiIP/3S+nD7L0W4nfdSr6zM5Rn11
+C8b61ZiVgOiWf+2IIG6fzwlHi3x1Kz2Yer6Gz8FSgC57CAK8/bBQlnxCTlFbBBQ5
+k3/61KAgt7LAW/G+K2yEWKXUIFuUIxsz51vSHd1phk5LvLx+DH4j+jit7egIJs2Q
+hn7c5zjYjYjWmOEpLfKVtIbUaJfO0onmJAdbZvalpWHb4L95fbwjZyiHlKJmyYzN
+cAsKRDN5u1V2nR9u+FsEGAq1vc82ruqNmJZPKeQtMRFAg3CHMlonCo6tsQuEqzr6
+O97o2dh936cEImZLxpoX+L1ZAdASxhkhVPcJalv3aRuCZ27Eo2jPSKpbTNNhlu2+
+CVlI+oEyV6jLx4C1QJLM5wnakfkge+JhS9jT3dGn/t+6SCDc6szkRPyBygOp6wyj
+gHXYPGN9h/uO7h1UeaGT21WKt5HLm7WK1+rBIxeKooDvy9vGE9U8Cd76ImVuKwQU
+0kvhQyRDklmELTLXVRK6QWnmdWUZU9vKx0RvSyRzUNdRxMxMqfAkVEZaXUezwXGa
+niJsK2nemyhfGCrNr8hRFN5YFW+9muqMgF7my46B026qt36MGZn8ez15Wq5Ecqx6
+Lmd6DkH8LiGsvxS9G7sExBGFaVqXcOKUU6X1TJ3e5+XNr0SsHqHEmN2qPeMkoO1I
+hKWDA9BoiOZXWApkeCCB
+=M97u
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch
index db6b459180ba..a011782550d6 100644
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-PyQt4-4.10.patch
@@ -1,25 +1,20 @@
- qtiplot/python-sipcmd.py | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
+ qtiplot/python-sipcmd.py | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
 
 diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py
-index f643194..00edb6f 100755
+index f643194..d8d1ef2 100755
 --- a/qtiplot/python-sipcmd.py
 +++ b/qtiplot/python-sipcmd.py
-@@ -27,6 +27,26 @@
+@@ -27,6 +27,21 @@
  #                                                                          #
  ############################################################################
  
 -from PyQt4 import pyqtconfig
 -config = pyqtconfig.Configuration()
 -print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags])
-+#from PyQt4 import pyqtconfig
-+#config = pyqtconfig.Configuration()
-+#print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags])
 +from __future__ import print_function
-+#import sipconfig
++
 +import os
-+#config = sipconfig.Configuration()
-+#print("sip -I %s -t WS_X11 -t Q_WS_X11" % (os.path.join(config.default_sip_dir, "PyQt4")))
 +import sipconfig
 +import PyQt4.QtCore
 +