* [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/, dev-python/wxpython/files/
@ 2017-03-02 17:03 Mart Raudsepp
0 siblings, 0 replies; 8+ messages in thread
From: Mart Raudsepp @ 2017-03-02 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 52f94d9ce36171160f4a869cc096b221b06baf16
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 2 17:00:06 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 17:02:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f94d9c
dev-python/wxpython: dev-python/wxpython: remove old development cycle slot 2.9
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-python/wxpython/Manifest | 3 -
.../files/wxpython-2.9-wxversion-demo.patch | 10 -
.../files/wxpython-2.9-wxversion-scripts.patch | 221 ---------------------
.../files/wxpython-2.9.4.1-wxversion-scripts.patch | 211 --------------------
dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild | 167 ----------------
5 files changed, 612 deletions(-)
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 1381f3bed3e..65b69ca2e91 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,13 +1,10 @@
DIST wxPython-demo-2.8.12.1.tar.bz2 3906851 SHA256 252282193a80590b9eab436bef322701b21d35ad03b4b6ebb4824241ff947b5a SHA512 aab71cf4e4fb6632afd4607cbe5cdef6785c4ed3f1c7f67d6cef5487d1caee2f7652bfd974ba95a6a03e8d7809c94e291aca00c2fdf74ea29e118e1e30c947d5 WHIRLPOOL e9eb0803350e3dac8c5f2228a3f4d54a26ae4c4307c924729bbdff712747419fdfaa155d83ef1bea7dcb849dbacf9f48c323bf7997ed1df85f182ba3878d1324
-DIST wxPython-demo-2.9.4.0.tar.bz2 3992754 SHA256 c1a57ef7c71ea1a332df98b80cfa7ba178ef6dcd24a31393dff905a145ba8b7b SHA512 dac61d9bb09deffd54c89c1a09803968a4c4b2951a00ebb4d618a2a1b48775c62e3ddf2c642e9005d7362fdeab44c07bc2a38bc96dc94a5c891982847d0c19fe WHIRLPOOL 2093d3d0f81c15b7ca1a346fae29429952d299f8e33d5c2e356846bd98df890b731fe4ef0311ec32b7a913a4038aa8881396d9878dde98322136ccb5244a867b
DIST wxPython-demo-3.0.0.0.tar.bz2 3991989 SHA256 426aaf20c7b01f5e9fbd7bd41455441bb126585f5544a848a5fa060e07f7b443 SHA512 4fe8a87faacac99c54c4fcbdb707c9790b49f485186e1741cc1ba05e955e474ca4ea31ff704a57e73b32b4fad310ef490066743d1c6ad4339191cde2daec255d WHIRLPOOL c6a2b12111572164474083f66dd0e2eff12e4faea5ce880767bfba3de493e8d56e6747c659ff1a3d533d0f6bcde1d5c9daabb9bccb2148278cdce074f5ddcbae
DIST wxPython-demo-3.0.1.1.tar.bz2 3991248 SHA256 bb264db3369c7228f0356f1ad64f6a9ca3000b167bc1ce3fee94d3d2fa20d069 SHA512 b75ca80b5a247f5c97691c4c77c36d64ebe82d94803cd8d687b2110e9de290067c7da893797ae13d0a9f42a4da83170b630dcdeb9460657355c43005dfeac89a WHIRLPOOL 3db15c676252f4f96b585271d0ef005b84cbb4538f01db53e18c587b33fdfc5b57da40d9ba2f2c467063de79c81ed6440982fe5e21547a21fbe2d7d4e252f69c
DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 SHA256 8bf195138744898b4b6fbe11f52f7ee2f6319c2e3adf832917769b2e2d4994f3 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702 WHIRLPOOL a944790a4c7b38dc8d8d28c7def50f765cd5566118d801cb576a0ab9d8370a803f8feedbf3211d0352dd838c92d9d4f092eaf6d78354a1974f2345304dd7b2e1
DIST wxPython-docs-2.8.12.1.tar.bz2 2331363 SHA256 1dfae3a74b91e2003856eed51698c51094f1a4e6688633ae61af7a22fa8a0ddb SHA512 88591ef4f61bcbac29050d7dfecc230f7338cc006e7c3abc072b15da478e4fd994ab73ee5d072cb8b84f9de62ce182f1774354b0a7a4502ea639e59fdf965358 WHIRLPOOL 97bc66c8f781b5092e2274edc0b9bac35c21c91a66e4c0da75d543dc471f25d02334b28a5afe4ad0681b7a018a93f08b6ef5d3c6afd127ccfc24da208252cd89
DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8 SHA512 e114b2b44a7fd3ac292ca9735fb2e075459211384bc98d62ff2ba49e45111825101e74abd4af2ab0e5e52ede7b831641367c11a5c80e79f2da6ada3442463bfc WHIRLPOOL 91ccbe19e8311f0404fb0096efff68750fa0c3b505d05c9278e0488e138788dc399ff2345e13c712126475957a1c1fcc53556d70cd9c835524207be5758a6e2b
DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
-DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
-DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
DIST wxPython-src-3.0.0.0.tar.bz2 57831792 SHA256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 SHA512 9328f46817e0c1670a6be5d10347c8a7110c42a5332c5c35eb11ed0412d8dddeb15727d98606bb6c699af961cee171c41b82b1f24f3de25463259106660f7387 WHIRLPOOL 7865997e22db366a41bae8a5d5c47e4f46b20d17871377243abced3a6550c46588ea1d5a426d826ccf011c62898f87d6a55a14ac9b4153af4e0795d5f180a647
DIST wxPython-src-3.0.1.1.tar.bz2 58139645 SHA256 d51463fe760e2fc00271678700c216809f9db32a6081a1808bd4b7c884dc0a32 SHA512 71f75c1e36c9ac27c15d768f69662b18ff1c66ad111ef6ef8579dfdb5296d7c37ffce9f60000afeac289cd6288980037d3a7eb3ea8d6d25e619d8692cf41b914 WHIRLPOOL bb03b78048b368b1c2f5a8b8689aecf412953ff789b2a8d2ef4826112fdc6bff8ed881255d05859ac07f915dd1070f6147d6bfdd97b0ab4b0939c024df3b855a
DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d
diff --git a/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch
deleted file mode 100644
index c928ae27d85..00000000000
--- a/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- demo/demo.org
-+++ demo/demo.py
-@@ -1,4 +1,7 @@
- #!/usr/bin/env python
-
-+import wxversion
-+wxversion.select("2.9")
-+
- import Main
- Main.main()
diff --git a/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch
deleted file mode 100644
index d037cc95dec..00000000000
--- a/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch
+++ /dev/null
@@ -1,221 +0,0 @@
---- a/distrib/PyAlaMode.desktop
-+++ b/distrib/PyAlaMode.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyAlaMode
-+Name=PyAlaMode (2.9)
- Comment=GUI Python Shell with Filling and editor windows
--Exec=pyalamode
--Icon=PyCrust.png
-+Exec=pyalamode-2.9
-+Icon=/usr/share/pixmaps/PyCrust-2.9.png
- Terminal=false
- Type=Application
- Categories=Application;Development;
---- a/distrib/PyCrust.desktop
-+++ b/distrib/PyCrust.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyCrust
-+Name=PyCrust (2.9)
- Comment=GUI Python Shell with Filling
--Exec=pycrust
--Icon=PyCrust.png
-+Exec=pycrust-2.9
-+Icon=/usr/share/pixmaps/PyCrust-2.9.png
- Terminal=false
- Type=Application
- Categories=Application;Development;
---- a/distrib/PyShell.desktop
-+++ b/distrib/PyShell.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyShell
-+Name=PyShell (2.9)
- Comment=GUI Python Shell
--Exec=pyshell
--Icon=PyCrust.png
-+Exec=pyshell-2.9
-+Icon=/usr/share/pixmaps/PyCrust-2.9.png
- Terminal=false
- Type=Application
- Categories=Application;Development;
---- a/distrib/PySlices.desktop
-+++ b/distrib/PySlices.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PySlices
-+Name=PySlices (2.9)
- Comment=GUI Python Shell with Filling
--Exec=pyslices
--Icon=PySlices.png
-+Exec=pyslices-2.9
-+Icon=/usr/share/pixmaps/PySlices-2.9.png
- Terminal=false
- Type=Application
- Categories=Application;Development;
---- a/distrib/PySlicesShell.desktop
-+++ b/distrib/PySlicesShell.desktop
-@@ -1,9 +1,9 @@
-
- [Desktop Entry]
--Name=PySlicesShell
-+Name=PySlicesShell (2.9)
- Comment=GUI Python Shell
--Exec=pysliceshell
--Icon=PySlices.png
-+Exec=pysliceshell-2.9
-+Icon=/usr/share/pixmaps/PySlices-2.9.png
- Terminal=false
- Type=Application
- Categories=Application;Development;
---- a/distrib/XRCed.desktop
-+++ b/distrib/XRCed.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=XRCed
-+Name=XRCed (2.9)
- Comment=wxPython XRC resource editor
--Exec=xrced
--Icon=XRCed.png
-+Exec=xrced-2.9
-+Icon=/usr/share/pixmaps/XRCed-2.9.png
- Terminal=false
- Type=Application
- Categories=Application;Development;
---- a/scripts/editra
-+++ b/scripts/editra
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.Editra.launcher import main
- main()
---- a/scripts/genaxmodule
-+++ b/scripts/genaxmodule
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.genaxmodule import main
- main()
---- a/scripts/helpviewer
-+++ b/scripts/helpviewer
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.helpviewer import main
- main()
---- a/scripts/img2png
-+++ b/scripts/img2png
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.img2png import main
- main()
---- a/scripts/img2py
-+++ b/scripts/img2py
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.img2py import main
- main()
---- a/scripts/img2xpm
-+++ b/scripts/img2xpm
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.img2xpm import main
- main()
---- a/scripts/pyalacarte
-+++ b/scripts/pyalacarte
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PyAlaCarte import main
- main()
---- a/scripts/pyalamode
-+++ b/scripts/pyalamode
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PyAlaMode import main
- main()
---- a/scripts/pycrust
-+++ b/scripts/pycrust
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PyCrust import main
- main()
---- a/scripts/pyshell
-+++ b/scripts/pyshell
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PyShell import main
- main()
---- a/scripts/pyslices
-+++ b/scripts/pyslices
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PySlices import main
- main()
---- a/scripts/pysliceshell
-+++ b/scripts/pysliceshell
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PySlicesShell import main
- main()
---- a/scripts/pywrap
-+++ b/scripts/pywrap
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PyWrap import main
- main()
---- a/scripts/pywxrc
-+++ b/scripts/pywxrc
-@@ -1,5 +1,7 @@
- #!/usr/bin/env python
-
-+import wxversion
-+wxversion.select("2.9")
- from wx.tools.pywxrc import main
- main()
-
---- a/scripts/xrced
-+++ b/scripts/xrced
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.XRCed.xrced import main
- main()
diff --git a/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch
deleted file mode 100644
index 7067af9eee7..00000000000
--- a/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch
+++ /dev/null
@@ -1,211 +0,0 @@
---- a/distrib/PyAlaMode.desktop
-+++ b/distrib/PyAlaMode.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyAlaMode
-+Name=PyAlaMode (2.9)
- Comment=GUI Python Shell with Filling and editor windows
--Exec=pyalamode
--Icon=PyCrust
-+Exec=pyalamode-2.9
-+Icon=PyCrust-2.9
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PyCrust.desktop
-+++ b/distrib/PyCrust.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyCrust
-+Name=PyCrust (2.9)
- Comment=GUI Python Shell with Filling
--Exec=pycrust
--Icon=PyCrust
-+Exec=pycrust-2.9
-+Icon=PyCrust-2.9
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PyShell.desktop
-+++ b/distrib/PyShell.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyShell
-+Name=PyShell (2.9)
- Comment=GUI Python Shell
--Exec=pyshell
--Icon=PyCrust
-+Exec=pyshell-2.9
-+Icon=PyCrust-2.9
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PySlices.desktop
-+++ b/distrib/PySlices.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PySlices
-+Name=PySlices (2.9)
- Comment=GUI Python Shell with Filling
--Exec=pyslices
--Icon=PySlices
-+Exec=pyslices-2.9
-+Icon=PySlices-2.9
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PySlicesShell.desktop
-+++ b/distrib/PySlicesShell.desktop
-@@ -1,9 +1,8 @@
--
- [Desktop Entry]
--Name=PySlicesShell
-+Name=PySlicesShell (2.9)
- Comment=GUI Python Shell
--Exec=pysliceshell
--Icon=PySlices
-+Exec=pysliceshell-2.9
-+Icon=PySlices-2.9
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/XRCed.desktop
-+++ b/distrib/XRCed.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=XRCed
-+Name=XRCed (2.9)
- Comment=wxPython XRC resource editor
--Exec=xrced
--Icon=XRCed
-+Exec=xrced-2.9
-+Icon=XRCed-2.9
- Terminal=false
- Type=Application
- Categories=Development;
---- a/scripts/genaxmodule
-+++ b/scripts/genaxmodule
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.genaxmodule import main
- main()
---- a/scripts/helpviewer
-+++ b/scripts/helpviewer
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.helpviewer import main
- main()
---- a/scripts/img2png
-+++ b/scripts/img2png
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.img2png import main
- main()
---- a/scripts/img2py
-+++ b/scripts/img2py
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.img2py import main
- main()
---- a/scripts/img2xpm
-+++ b/scripts/img2xpm
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.img2xpm import main
- main()
---- a/scripts/pyalacarte
-+++ b/scripts/pyalacarte
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PyAlaCarte import main
- main()
---- a/scripts/pyalamode
-+++ b/scripts/pyalamode
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PyAlaMode import main
- main()
---- a/scripts/pycrust
-+++ b/scripts/pycrust
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PyCrust import main
- main()
---- a/scripts/pyshell
-+++ b/scripts/pyshell
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PyShell import main
- main()
---- a/scripts/pyslices
-+++ b/scripts/pyslices
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PySlices import main
- main()
---- a/scripts/pysliceshell
-+++ b/scripts/pysliceshell
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PySlicesShell import main
- main()
---- a/scripts/pywrap
-+++ b/scripts/pywrap
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.py.PyWrap import main
- main()
---- a/scripts/pywxrc
-+++ b/scripts/pywxrc
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.pywxrc import main
- main()
---- a/scripts/xrced
-+++ b/scripts/xrced
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.9")
-
- from wx.tools.XRCed.xrced import main
- main()
diff --git a/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild b/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild
deleted file mode 100644
index eee6e611086..00000000000
--- a/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-WX_GTK_VER="2.9"
-
-inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
-
-MY_PN="wxPython-src"
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="
- mirror://sourceforge/wxpython/${MY_PN}-2.9.4.0.tar.bz2
- examples? ( mirror://sourceforge/wxpython/wxPython-demo-2.9.4.0.tar.bz2 )
- mirror://sourceforge/wxpython/${MY_PN}-2.9.4.1.patch"
-
-LICENSE="wxWinLL-3"
-SLOT="2.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cairo examples opengl"
-
-RDEPEND="
- dev-lang/python-exec:2[${PYTHON_USEDEP}]
- >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
- dev-libs/glib:2
- dev-python/setuptools[${PYTHON_USEDEP}]
- media-libs/libpng:0=
- media-libs/tiff:0
- virtual/jpeg
- x11-libs/gtk+:2
- x11-libs/pango[X]
- cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-2.9.4.0/wxPython"
-DOC_S="${WORKDIR}/wxPython-2.9.4.0"
-
-# The hacky build system seems to be broken with out-of-source builds,
-# and installs 'wx' package globally.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-
- cd .. || die
- epatch "${DISTDIR}"/${MY_PN}-${PV}.patch
-
- if use examples; then
- cd "${DOC_S}"
- epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
- fi
-
- cd "${S}" || die
- local PATCHES=(
- "${FILESDIR}"/${P}-wxversion-scripts.patch
- # drop editra - we have it as a separate package now
- "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
- "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
- # fix handling egg_info command
- "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
- )
-
- distutils-r1_python_prepare_all
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- need-wxwidgets unicode
-
- mydistutilsargs=(
- WX_CONFIG="${WX_CONFIG}"
- WXPORT=gtk2
- UNICODE=1
- BUILD_GLCANVAS=$(usex opengl 1 0)
- )
-}
-
-python_compile() {
- # We need to have separate libdirs due to hackery, bug #455332.
- distutils-r1_python_compile \
- build --build-purelib "${BUILD_DIR}"/lib.common
-}
-
-python_install() {
- distutils-r1_python_install \
- build --build-purelib "${BUILD_DIR}"/lib.common
-
- # adjust the filenames for wxPython slots.
- local file
- for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
- mv "${file}" "${file}-${SLOT}" || die
- done
- cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die
- for file in *; do
- mv "${file}" "${file}-${SLOT}" || die
-
- # wrappers are common to all impls, so a parallel run may
- # move it for us. ln+rm is more failure-proof.
- ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
- rm -f "${ED}usr/bin/${file}"
- done
-}
-
-python_install_all() {
- dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
-
- for x in {Py{AlaMode,Crust,Shell},XRCed}; do
- newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop
- done
- newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png
- newicon wx/py/PySlices_32.png PySlices-${SLOT}.png
- newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
-
- if use examples; then
- docinto demo
- dodoc -r "${DOC_S}"/demo/.
- docinto samples
- dodoc -r "${DOC_S}"/samples/.
-
- [[ -e ${docdir}/samples/embedded/embedded ]] \
- && rm -f "${docdir}"/samples/embedded/embedded
-
- docompress -x /usr/share/doc/${PF}/{demo,samples}
- fi
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- create_symlinks() {
- alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
- alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
- }
- python_foreach_impl create_symlinks
-
- echo
- elog "Gentoo uses the Multi-version method for SLOT'ing."
- elog "Developers, see this site for instructions on using"
- elog "2.8 or 2.9 with your apps:"
- elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
- if use examples; then
- echo
- elog "The demo.py app which contains demo modules with"
- elog "documentation and source code has been installed at"
- elog "/usr/share/doc/${PF}/demo/demo.py"
- echo
- elog "More example apps and modules can be found in"
- elog "/usr/share/doc/${PF}/samples/"
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-
- update_symlinks() {
- alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
- alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
- }
- python_foreach_impl update_symlinks
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/, dev-python/wxpython/files/
@ 2018-08-16 21:33 Mart Raudsepp
0 siblings, 0 replies; 8+ messages in thread
From: Mart Raudsepp @ 2018-08-16 21:33 UTC (permalink / raw
To: gentoo-commits
commit: 588e187498e47395f5fb24bd6029c684bea17911
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 21:22:41 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 21:32:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=588e1874
dev-python/wxpython: remove last-rited 2.8 SLOT
Bug: https://bugs.gentoo.org/661284
Package-Manager: Portage-2.3.46, Repoman-2.3.10
dev-python/wxpython/Manifest | 4 -
.../files/wxpython-2.8-cache-writable.patch | 20 ---
.../files/wxpython-2.8-wxversion-demo.patch | 10 --
.../files/wxpython-2.8.12-drop-categories.patch | 37 ----
.../files/wxpython-2.8.12-drop-editra.patch | 55 ------
.../files/wxpython-2.8.9-wxversion-scripts.patch | 191 --------------------
dev-python/wxpython/metadata.xml | 1 -
dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild | 194 ---------------------
8 files changed, 512 deletions(-)
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index dfefe577e68..7c15b2e2009 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,2 @@
-DIST wxPython-demo-2.8.12.1.tar.bz2 3906851 BLAKE2B 73e6b662b0f8a0ca719cc21bee8a457b7175231547b495d29be0733e48e2ac16e739b6a3a25fd0de643dfbbe5dbde07e36b983746bcf873a16d0f35598f505a4 SHA512 aab71cf4e4fb6632afd4607cbe5cdef6785c4ed3f1c7f67d6cef5487d1caee2f7652bfd974ba95a6a03e8d7809c94e291aca00c2fdf74ea29e118e1e30c947d5
DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
-DIST wxPython-docs-2.8.12.1.tar.bz2 2331363 BLAKE2B f3d640bb8a7da2880e8ec5c30797381320943a618ace7844818036d6a9137cbfd1187281e751efefb0cb3b39543dc85f833773abcc2334a226f815b93eacb5da SHA512 88591ef4f61bcbac29050d7dfecc230f7338cc006e7c3abc072b15da478e4fd994ab73ee5d072cb8b84f9de62ce182f1774354b0a7a4502ea639e59fdf965358
-DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 BLAKE2B c56937a0f582ab123f5e6019aa8b84a56d04d6d18ccec6ab103c7443decc68f008585f71137e6da25c5d1d5c483845e688e5e175712312bc94b03876d0a986e6 SHA512 e114b2b44a7fd3ac292ca9735fb2e075459211384bc98d62ff2ba49e45111825101e74abd4af2ab0e5e52ede7b831641367c11a5c80e79f2da6ada3442463bfc
-DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3
DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
diff --git a/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch b/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch
deleted file mode 100644
index 57f26b37c2e..00000000000
--- a/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Use /tmp for cache files since the user won't have
-write permissions on ${DOCDIR}.
-
-diff -Naurp docs-orig/viewdocs.py docs/viewdocs.py
---- docs-orig/viewdocs.py 2008-09-28 15:59:16.000000000 -0600
-+++ docs/viewdocs.py 2009-01-18 00:16:27.000000000 -0600
-@@ -16,11 +16,11 @@ if not basePath:
-
-
- # test for write access
--if os.access(basePath, os.W_OK):
-+if os.access('/tmp', os.W_OK):
-
- # setup the args
- args = ['',
-- '--cache='+basePath,
-+ '--cache=/tmp',
- os.path.join(basePath, 'wx.zip'),
- ]
-
diff --git a/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch
deleted file mode 100644
index 97829198a0b..00000000000
--- a/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- demo/demo.org 2005-04-28 03:00:13.431583384 +0000
-+++ demo/demo.py 2005-04-28 03:00:31.886777768 +0000
-@@ -1,4 +1,7 @@
- #!/usr/bin/env python
-
-+import wxversion
-+wxversion.select("2.8")
-+
- import Main
- Main.main()
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
deleted file mode 100644
index d860238e94d..00000000000
--- a/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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,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,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,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,4 @@
- Icon=XRCed.png
- Terminal=false
- Type=Application
--Categories=Application;Development;
-+Categories=Development;
diff --git a/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch
deleted file mode 100644
index 4b49f30a138..00000000000
--- a/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/wxPython/setup.py
-+++ b/wxPython/setup.py
-@@ -887,20 +887,6 @@ WX_PKGLIST = [ 'wx',
- 'wx.tools',
- 'wx.tools.XRCed',
- 'wx.tools.XRCed.plugins',
-- 'wx.tools.Editra',
-- 'wx.tools.Editra.src',
-- 'wx.tools.Editra.src.autocomp',
-- 'wx.tools.Editra.src.eclib',
-- 'wx.tools.Editra.src.ebmlib',
-- 'wx.tools.Editra.src.extern',
-- 'wx.tools.Editra.src.extern.aui',
-- 'wx.tools.Editra.src.extern.dexml',
-- 'wx.tools.Editra.src.extern.pygments',
-- 'wx.tools.Editra.src.extern.pygments.filters',
-- 'wx.tools.Editra.src.extern.pygments.formatters',
-- 'wx.tools.Editra.src.extern.pygments.lexers',
-- 'wx.tools.Editra.src.extern.pygments.styles',
-- 'wx.tools.Editra.src.syntax',
- ]
-
- if not EGGing:
-@@ -927,7 +913,6 @@ else:
- opj('scripts/pywrap'),
- opj('scripts/pywxrc'),
- opj('scripts/xrced'),
-- opj('scripts/editra'),
- ]
- if os.name == 'nt':
- SCRIPTS.append( opj('scripts/genaxmodule') )
-@@ -941,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb')
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
-
--DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
--DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
--DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
-- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
--DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
--DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
--DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
--DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
--DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
-
-
- ## import pprint
-@@ -1000,7 +976,6 @@ if EGGing:
- 'pyshell = wx.py.PyShell:main',
- 'pywrap = wx.py.PyWrap:main',
- 'helpviewer = wx.tools.helpviewer:main',
-- 'editra = wx.tools.Editra.launcher:main',
- 'xrced = wx.tools.XRCed.xrced:main',
- ],
- },
diff --git a/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch
deleted file mode 100644
index 6a456781230..00000000000
--- a/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop
---- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop 2009-02-21 15:04:55.000000000 -0600
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyAlaMode
-+Name=PyAlaMode (2.8)
- Comment=GUI Python Shell with Filling and editor windows
--Exec=pyalamode
--Icon=PyCrust.png
-+Exec=pyalamode-2.8
-+Icon=/usr/share/pixmaps/PyCrust.png
- Terminal=false
- Type=Application
- Categories=Application;Development;
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop
---- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop 2009-02-21 15:06:42.000000000 -0600
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyCrust
-+Name=PyCrust (2.8)
- Comment=GUI Python Shell with Filling
--Exec=pycrust
--Icon=PyCrust.png
-+Exec=pycrust-2.8
-+Icon=/usr/share/pixmaps/PyCrust.png
- Terminal=false
- Type=Application
- Categories=Application;Development;
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop
---- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop 2009-02-21 15:08:19.000000000 -0600
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyShell
-+Name=PyShell (2.8)
- Comment=GUI Python Shell
--Exec=pyshell
--Icon=PyCrust.png
-+Exec=pyshell-2.8
-+Icon=/usr/share/pixmaps/PyCrust.png
- Terminal=false
- Type=Application
- Categories=Application;Development;
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop
---- wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop 2009-02-21 15:09:22.000000000 -0600
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=XRCed
-+Name=XRCed (2.8)
- Comment=wxPython XRC resource editor
--Exec=xrced
--Icon=XRCed.png
-+Exec=xrced-2.8
-+Icon=/usr/share/pixmaps/XRCed.png
- Terminal=false
- Type=Application
- Categories=Application;Development;
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/editra wxPython-src-2.8.9.2/wxPython/scripts/editra
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/editra 2008-02-29 14:32:17.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/editra 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.tools.Editra.launcher import main
- main()
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule 2008-02-29 14:32:17.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.tools.genaxmodule import main
- main()
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer wxPython-src-2.8.9.2/wxPython/scripts/helpviewer
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/helpviewer 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.tools.helpviewer import main
- main()
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png wxPython-src-2.8.9.2/wxPython/scripts/img2png
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/img2png 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.tools.img2png import main
- main()
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py wxPython-src-2.8.9.2/wxPython/scripts/img2py
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py 2008-02-29 14:32:17.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/img2py 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.tools.img2py import main
- main()
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm wxPython-src-2.8.9.2/wxPython/scripts/img2xpm
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/img2xpm 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.tools.img2xpm import main
- main()
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.py.PyAlaCarte import main
- main()
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode wxPython-src-2.8.9.2/wxPython/scripts/pyalamode
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pyalamode 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.py.PyAlaMode import main
- main()
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust wxPython-src-2.8.9.2/wxPython/scripts/pycrust
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pycrust 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.py.PyCrust import main
- main()
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell wxPython-src-2.8.9.2/wxPython/scripts/pyshell
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pyshell 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.py.PyShell import main
- main()
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap wxPython-src-2.8.9.2/wxPython/scripts/pywrap
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pywrap 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.py.PyWrap import main
- main()
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc wxPython-src-2.8.9.2/wxPython/scripts/pywxrc
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc 2008-02-29 14:32:17.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pywxrc 2009-02-21 15:09:58.000000000 -0600
-@@ -1,5 +1,7 @@
- #!/usr/bin/env python
-
-+import wxversion
-+wxversion.select("2.8")
- from wx.tools.pywxrc import main
- main()
-
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced wxPython-src-2.8.9.2/wxPython/scripts/xrced
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced 2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/scripts/xrced 2009-02-21 15:03:24.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
-
- from wx.tools.XRCed.xrced import main
- main()
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index d87904c379c..f6588d2f5c3 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -11,7 +11,6 @@
</maintainer>
<use>
<flag name="examples">Install interactive demo module browser and sample applets.</flag>
- <flag name="doc">Install HTML wxWidgets docs and wxpython API reference.</flag>
</use>
<upstream>
<remote-id type="sourceforge">wxpython</remote-id>
diff --git a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild
deleted file mode 100644
index bb3bb88a6dd..00000000000
--- a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-WX_GTK_VER="2.8"
-
-inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
-
-MY_P="${P/wxpython-/wxPython-src-}"
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="
- mirror://sourceforge/wxpython/${MY_P}.tar.bz2
- doc? (
- mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2
- mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 )
- examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
-
-LICENSE="wxWinLL-3"
-SLOT="2.8"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cairo doc examples opengl"
-
-RDEPEND="
- dev-lang/python-exec:2[${PYTHON_USEDEP}]
- >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
- dev-libs/glib:2
- dev-python/setuptools[${PYTHON_USEDEP}]
- media-libs/libpng:0=
- media-libs/tiff:0
- virtual/jpeg
- x11-libs/gtk+:2
- x11-libs/pango[X]
- cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/wxPython"
-DOC_S="${WORKDIR}/wxPython-${PV}"
-
-# The hacky build system seems to be broken with out-of-source builds,
-# and installs 'wx' package globally.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-
- if use doc; then
- cd "${DOC_S}" || die
- epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch
- fi
-
- if use examples; then
- cd "${DOC_S}" || die
- epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
- fi
-
- cd "${S}" || die
-
- local PATCHES=(
- "${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch
- # drop editra - we have it as a separate package now
- "${FILESDIR}"/${PN}-2.8.12-drop-editra.patch
- "${FILESDIR}"/${PN}-2.8.12-drop-categories.patch
- "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
- # fix handling egg_info command
- "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
- )
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- append-flags -fno-strict-aliasing
- # Workaround, buildsystem uses CFLAGS as CXXFLAGS
- export CFLAGS="${CXXFLAGS}"
- need-wxwidgets unicode
-
- mydistutilsargs=(
- WX_CONFIG="${WX_CONFIG}"
- WXPORT=gtk2
- UNICODE=1
- BUILD_GLCANVAS=$(usex opengl 1 0)
- )
-}
-
-python_compile() {
- # We need to have separate libdirs due to hackery, bug #455332.
- distutils-r1_python_compile \
- build --build-purelib "${BUILD_DIR}"/lib.common
-}
-
-python_install() {
- distutils-r1_python_install \
- build --build-purelib "${BUILD_DIR}"/lib.common
-
- # adjust the filenames for wxPython slots.
- local file
- for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
- mv "${file}" "${file}-${SLOT}" || die
- done
- cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die
- for file in *; do
- mv "${file}" "${file}-${SLOT}" || die
-
- # wrappers are common to all impls, so a parallel run may
- # move it for us. ln+rm is more failure-proof.
- ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
- rm -f "${ED}usr/bin/${file}"
- done
-}
-
-python_install_all() {
- dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
-
- domenu distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
- newicon wx/py/PyCrust_32.png PyCrust.png
- newicon wx/tools/XRCed/XRCed_32.png XRCed.png
-
- docdir=${D}usr/share/doc/${PF}
-
- if use doc; then
- docinto docs
- dodoc -r "${DOC_S}"/docs/.
- # For some reason newer API docs aren't available so use 2.8.9.2's
- dodoc -r "${WORKDIR}"/wxPython-2.8.9.2/docs/.
-
- docompress -x /usr/share/doc/${PF}/docs
- fi
-
- if use examples; then
- docinto demo
- dodoc -r "${DOC_S}"/demo/.
- docinto samples
- dodoc -r "${DOC_S}"/samples/.
-
- [[ -e ${docdir}/samples/embedded/embedded ]] \
- && rm -f "${docdir}"/samples/embedded/embedded
-
- docompress -x /usr/share/doc/${PF}/{demo,samples}
- fi
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- create_symlinks() {
- alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
- alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
- }
- python_foreach_impl create_symlinks
-
- echo
- elog "Gentoo uses the Multi-version method for SLOT'ing."
- elog "Developers, see this site for instructions on using"
- elog "2.6 or 2.8 with your apps:"
- elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
- if use doc; then
- echo
- elog "To access the general wxWidgets documentation, run"
- elog "/usr/share/doc/${PF}/docs/viewdocs.py"
- echo
- elog "wxPython documentation is available by pointing a browser"
- elog "at /usr/share/doc/${PF}/docs/api/index.html"
- fi
- if use examples; then
- echo
- elog "The demo.py app which contains hundreds of demo modules"
- elog "with documentation and source code has been installed at"
- elog "/usr/share/doc/${PF}/demo/demo.py"
- echo
- elog "Many more example apps and modules can be found in"
- elog "/usr/share/doc/${PF}/samples/"
- fi
- echo
- elog "Editra is not packaged with wxpython in Gentoo."
- elog "You can find it in the tree as app-editors/editra"
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-
- update_symlinks() {
- alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
- alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
- }
- python_foreach_impl update_symlinks
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/, dev-python/wxpython/files/
@ 2020-09-25 20:22 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2020-09-25 20:22 UTC (permalink / raw
To: gentoo-commits
commit: e0b6c15bfcbb7b81d050c851119d25afbd6cc4b1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 20:18:27 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 20:21:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b6c15b
dev-python/wxpython: Remove old (py2.7)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/wxpython/Manifest | 2 -
.../wxpython-2.8-no-preservatives-added.patch | 16 --
.../files/wxpython-2.8.11-drop-editra.patch | 48 -----
.../wxpython-2.8.12.1-disable-egging-mode.patch | 34 ----
.../files/wxpython-3.0-wxversion-demo.patch | 10 -
.../files/wxpython-3.0.0.0-wxversion-scripts.patch | 211 ---------------------
dev-python/wxpython/metadata.xml | 3 -
dev-python/wxpython/wxpython-3.0.2.0.ebuild | 162 ----------------
8 files changed, 486 deletions(-)
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index c4e1500ef0a..c68723eb916 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,3 +1 @@
DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
-DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
-DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
diff --git a/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch b/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch
deleted file mode 100644
index 5e4221d5150..00000000000
--- a/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Portage preserve-libs removes the linker name (.so) of a library but leaves
-the soname (.so.4) and realname (.so.4.0) installed. findLib searches for
-mywxlibname.* and returns true if anything is found. Disaster ensues.
-
-
---- a/wxPython/config.py
-+++ b/wxPython/config.py
-@@ -612,7 +612,7 @@ def findLib(name, libdirs):
- dirs = libdirs[:]
- for d in dirs:
- p = os.path.join(d, name)
-- if glob.glob(p+'*') != []:
-+ if glob.glob(p+'*.so') != []:
- return True
- return False
-
diff --git a/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch
deleted file mode 100644
index 9555bb57ef4..00000000000
--- a/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/wxPython/setup.py
-+++ b/wxPython/setup.py
-@@ -887,13 +887,6 @@ WX_PKGLIST = [ 'wx',
- 'wx.tools',
- 'wx.tools.XRCed',
- 'wx.tools.XRCed.plugins',
-- 'wx.tools.Editra',
-- 'wx.tools.Editra.src',
-- 'wx.tools.Editra.src.autocomp',
-- 'wx.tools.Editra.src.eclib',
-- 'wx.tools.Editra.src.ebmlib',
-- 'wx.tools.Editra.src.extern',
-- 'wx.tools.Editra.src.syntax',
- ]
-
- if not EGGing:
-@@ -920,7 +913,6 @@ else:
- opj('scripts/pywrap'),
- opj('scripts/pywxrc'),
- opj('scripts/xrced'),
-- opj('scripts/editra'),
- ]
- if os.name == 'nt':
- SCRIPTS.append( opj('scripts/genaxmodule') )
-@@ -934,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb')
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
-
--DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
--DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
--DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
-- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
--DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
--DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
--DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
--DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
--DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
-
-
- ## import pprint
-@@ -993,7 +976,6 @@ if EGGing:
- 'pyshell = wx.py.PyShell:main',
- 'pywrap = wx.py.PyWrap:main',
- 'helpviewer = wx.tools.helpviewer:main',
-- 'editra = wx.tools.Editra.launcher:main',
- 'xrced = wx.tools.XRCed.xrced:main',
- ],
- },
diff --git a/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch b/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch
deleted file mode 100644
index 1497a2c7076..00000000000
--- a/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c4072ed7bc923039e544319f52d0761b7a4600a4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 22 Apr 2013 18:02:37 +0200
-Subject: [PATCH] Trigger 'EGGing' mode only by 'bdist_egg' and not 'egg_info'.
-
-We use the 'egg_info' command to explicitly enforce temporary EGG file
-location outside the source tree on Gentoo. As a result, our build
-command activates the 'EGGing' mode and wxPython is not installed
-properly.
-
-I believe that the 'EGGing' mode should be activated only by an explicit
-call to 'bdist_egg' command where the expected files are actually
-created. The 'egg_info' command is a more broad one and is often used
-implicitly, e.g. by the 'install' command.
----
- config.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.py b/config.py
-index 4fbd83f..b45707d 100644
---- a/config.py
-+++ b/config.py
-@@ -23,7 +23,7 @@
- import sys, os, glob, fnmatch, tempfile
- import subprocess
-
--EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv
-+EGGing = 'bdist_egg' in sys.argv
- if not EGGing:
- from distutils.core import setup, Extension
- else:
---
-1.8.1.5
-
diff --git a/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch
deleted file mode 100644
index a4f6b0b07a3..00000000000
--- a/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- demo/demo.org
-+++ demo/demo.py
-@@ -1,4 +1,7 @@
- #!/usr/bin/env python
-
-+import wxversion
-+wxversion.select("3.0")
-+
- import Main
- Main.main()
diff --git a/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch
deleted file mode 100644
index 9f0cb892226..00000000000
--- a/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch
+++ /dev/null
@@ -1,211 +0,0 @@
---- a/distrib/PyAlaMode.desktop
-+++ b/distrib/PyAlaMode.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyAlaMode
-+Name=PyAlaMode (3.0)
- Comment=GUI Python Shell with Filling and editor windows
--Exec=pyalamode
--Icon=PyCrust
-+Exec=pyalamode-3.0
-+Icon=PyCrust-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PyCrust.desktop
-+++ b/distrib/PyCrust.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyCrust
-+Name=PyCrust (3.0)
- Comment=GUI Python Shell with Filling
--Exec=pycrust
--Icon=PyCrust
-+Exec=pycrust-3.0
-+Icon=PyCrust-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PyShell.desktop
-+++ b/distrib/PyShell.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyShell
-+Name=PyShell (3.0)
- Comment=GUI Python Shell
--Exec=pyshell
--Icon=PyCrust
-+Exec=pyshell-3.0
-+Icon=PyCrust-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PySlices.desktop
-+++ b/distrib/PySlices.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PySlices
-+Name=PySlices (3.0)
- Comment=GUI Python Shell with Filling
--Exec=pyslices
--Icon=PySlices
-+Exec=pyslices-3.0
-+Icon=PySlices-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PySlicesShell.desktop
-+++ b/distrib/PySlicesShell.desktop
-@@ -1,9 +1,8 @@
--
- [Desktop Entry]
--Name=PySlicesShell
-+Name=PySlicesShell (3.0)
- Comment=GUI Python Shell
--Exec=pysliceshell
--Icon=PySlices
-+Exec=pysliceshell-3.0
-+Icon=PySlices-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/XRCed.desktop
-+++ b/distrib/XRCed.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=XRCed
-+Name=XRCed (3.0)
- Comment=wxPython XRC resource editor
--Exec=xrced
--Icon=XRCed
-+Exec=xrced-3.0
-+Icon=XRCed-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/scripts/genaxmodule
-+++ b/scripts/genaxmodule
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.tools.genaxmodule import main
- main()
---- a/scripts/helpviewer
-+++ b/scripts/helpviewer
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.tools.helpviewer import main
- main()
---- a/scripts/img2png
-+++ b/scripts/img2png
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.tools.img2png import main
- main()
---- a/scripts/img2py
-+++ b/scripts/img2py
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.tools.img2py import main
- main()
---- a/scripts/img2xpm
-+++ b/scripts/img2xpm
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.tools.img2xpm import main
- main()
---- a/scripts/pyalacarte
-+++ b/scripts/pyalacarte
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.py.PyAlaCarte import main
- main()
---- a/scripts/pyalamode
-+++ b/scripts/pyalamode
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.py.PyAlaMode import main
- main()
---- a/scripts/pycrust
-+++ b/scripts/pycrust
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.py.PyCrust import main
- main()
---- a/scripts/pyshell
-+++ b/scripts/pyshell
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.py.PyShell import main
- main()
---- a/scripts/pyslices
-+++ b/scripts/pyslices
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.py.PySlices import main
- main()
---- a/scripts/pysliceshell
-+++ b/scripts/pysliceshell
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.py.PySlicesShell import main
- main()
---- a/scripts/pywrap
-+++ b/scripts/pywrap
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.py.PyWrap import main
- main()
---- a/scripts/pywxrc
-+++ b/scripts/pywxrc
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.tools.pywxrc import main
- main()
---- a/scripts/xrced
-+++ b/scripts/xrced
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
-
- from wx.tools.XRCed.xrced import main
- main()
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index f0783659f22..0796b4162e0 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -9,9 +9,6 @@
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
- <use>
- <flag name="examples">Install interactive demo module browser and sample applets.</flag>
- </use>
<upstream>
<remote-id type="github">wxWidgets/Phoenix</remote-id>
</upstream>
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
deleted file mode 100644
index afaf8aa1491..00000000000
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-WX_GTK_VER="3.0"
-
-inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
-
-MY_PN="wxPython-src"
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="
- mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2
- examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
-
-LICENSE="wxWinLL-3"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~sparc x86"
-IUSE="cairo examples libnotify opengl"
-
-RDEPEND="
- dev-lang/python-exec:2[${PYTHON_USEDEP}]
- >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X]
- dev-libs/glib:2
- dev-python/setuptools[${PYTHON_USEDEP}]
- media-libs/libpng:0=
- media-libs/tiff:0
- virtual/jpeg
- x11-libs/gtk+:2
- x11-libs/pango[X]
- cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}/wxPython"
-DOC_S="${WORKDIR}/wxPython-${PV}"
-
-# The hacky build system seems to be broken with out-of-source builds,
-# and installs 'wx' package globally.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-
- if use examples; then
- cd "${DOC_S}"
- epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
- fi
-
- cd "${S}"
- local PATCHES=(
- "${FILESDIR}"/${PN}-3.0.0.0-wxversion-scripts.patch
- # drop editra - we have it as a separate package now
- "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
- "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
- # fix handling egg_info command
- "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
- )
-
- distutils-r1_python_prepare_all
-}
-
-src_configure() {
- need-wxwidgets unicode
-
- mydistutilsargs=(
- WX_CONFIG="${WX_CONFIG}"
- WXPORT=gtk2
- UNICODE=1
- BUILD_GLCANVAS=$(usex opengl 1 0)
- )
-}
-
-python_compile() {
- # We need to have separate libdirs due to hackery, bug #455332.
- distutils-r1_python_compile \
- build --build-purelib "${BUILD_DIR}"/lib.common
-}
-
-python_install() {
- distutils-r1_python_install \
- build --build-purelib "${BUILD_DIR}"/lib.common
-
- # adjust the filenames for wxPython slots.
- local file
- for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
- mv "${file}" "${file}-${SLOT}" || die
- done
- cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die
- for file in *; do
- mv "${file}" "${file}-${SLOT}" || die
-
- # wrappers are common to all impls, so a parallel run may
- # move it for us. ln+rm is more failure-proof.
- ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
- rm -f "${ED}usr/bin/${file}"
- done
-}
-
-python_install_all() {
- dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
-
- for x in {Py{AlaMode,Crust,Shell},XRCed}; do
- newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop
- done
- newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png
- newicon wx/py/PySlices_32.png PySlices-${SLOT}.png
- newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
-
- if use examples; then
- docinto demo
- dodoc -r "${DOC_S}"/demo/.
- docinto samples
- dodoc -r "${DOC_S}"/samples/.
-
- [[ -e ${docdir}/samples/embedded/embedded ]] \
- && rm -f "${docdir}"/samples/embedded/embedded
-
- docompress -x /usr/share/doc/${PF}/{demo,samples}
- fi
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- create_symlinks() {
- alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
- alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
- }
- python_foreach_impl create_symlinks
-
- echo
- elog "Gentoo uses the Multi-version method for SLOT'ing."
- elog "Developers, see this site for instructions on using"
- elog "it with your apps:"
- elog "http://wiki.wxpython.org/MultiVersionInstalls"
- if use examples; then
- echo
- elog "The demo.py app which contains demo modules with"
- elog "documentation and source code has been installed at"
- elog "/usr/share/doc/${PF}/demo/demo.py"
- echo
- elog "More example apps and modules can be found in"
- elog "/usr/share/doc/${PF}/samples/"
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-
- update_symlinks() {
- alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
- alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
- }
- python_foreach_impl update_symlinks
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/, dev-python/wxpython/files/
@ 2022-07-03 9:51 Andrew Ammerlaan
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Ammerlaan @ 2022-07-03 9:51 UTC (permalink / raw
To: gentoo-commits
commit: 30940b89964a21e240087099e4a7859c4ee9e214
Author: Thomas Bettler <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Wed Apr 27 17:23:12 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 09:50:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30940b89
dev-python/wxpython: apply upstream fix
Correct types of arguments to ScrolledWindow.SetScrollbars
Related: https://github.com/wxWidgets/Phoenix/pull/2005
Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25228
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../files/wxpython-4.0.7-ultimatelistctrl.patch | 85 ++++++++++++++++++++
dev-python/wxpython/wxpython-4.0.7-r2.ebuild | 92 ++++++++++++++++++++++
2 files changed, 177 insertions(+)
diff --git a/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch b/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch
new file mode 100644
index 000000000000..9d1cc7649e1f
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch
@@ -0,0 +1,85 @@
+From https://github.com/wxWidgets/Phoenix/commit/3eb9eb32dc3285435039f6c420c398665372a1ad
+From 3eb9eb32dc3285435039f6c420c398665372a1ad Mon Sep 17 00:00:00 2001
+From: Glen Whitney <glen@studioinfinity.org>
+Date: Tue, 31 Aug 2021 11:06:27 -0700
+Subject: [PATCH] fix: Correct types of arguments to
+ ScrolledWindow.SetScrollbars
+
+---
+ demo/Mask.py | 2 +-
+ demo/OGL.py | 2 +-
+ wx/lib/agw/ultimatelistctrl.py | 14 +++++++-------
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/demo/Mask.py b/demo/Mask.py
+index 5f0c2cdde..109b8f30b 100644
+--- a/demo/Mask.py
++++ b/demo/Mask.py
+@@ -56,7 +56,7 @@ def __init__(self, parent):
+ mask = wx.Mask(self.bmp_withcolourmask, wx.WHITE)
+ self.bmp_withcolourmask.SetMask(mask)
+
+- self.SetScrollbars(20, 20, 700/20, 460/20)
++ self.SetScrollbars(20, 20, 700//20, 460//20)
+
+ self.Bind(wx.EVT_PAINT, self.OnPaint)
+
+diff --git a/demo/OGL.py b/demo/OGL.py
+index 72ca543dd..d475e5011 100644
+--- a/demo/OGL.py
++++ b/demo/OGL.py
+@@ -272,7 +272,7 @@ def __init__(self, parent, log, frame):
+
+ maxWidth = 1000
+ maxHeight = 1000
+- self.SetScrollbars(20, 20, maxWidth/20, maxHeight/20)
++ self.SetScrollbars(20, 20, maxWidth//20, maxHeight//20)
+
+ self.log = log
+ self.frame = frame
+diff --git a/wx/lib/agw/ultimatelistctrl.py b/wx/lib/agw/ultimatelistctrl.py
+index c60867684..14fc41f86 100644
+--- a/wx/lib/agw/ultimatelistctrl.py
++++ b/wx/lib/agw/ultimatelistctrl.py
+@@ -9654,8 +9654,8 @@ def RecalculatePositions(self, noRefresh=False):
+ self._linesPerPage = clientHeight//lineHeight
+
+ self.SetScrollbars(SCROLL_UNIT_X, lineHeight,
+- (self.GetHeaderWidth()-decrement)/SCROLL_UNIT_X,
+- (entireHeight + lineHeight - 1)/lineHeight,
++ (self.GetHeaderWidth()-decrement)//SCROLL_UNIT_X,
++ (entireHeight + lineHeight - 1)//lineHeight,
+ self.GetScrollPos(wx.HORIZONTAL),
+ self.GetScrollPos(wx.VERTICAL),
+ True)
+@@ -9676,8 +9676,8 @@ def RecalculatePositions(self, noRefresh=False):
+ decrement = SCROLL_UNIT_X
+
+ self.SetScrollbars(SCROLL_UNIT_X, SCROLL_UNIT_Y,
+- (self.GetHeaderWidth()-decrement)/SCROLL_UNIT_X,
+- (entireHeight + SCROLL_UNIT_Y - 1)/SCROLL_UNIT_Y,
++ (self.GetHeaderWidth()-decrement)//SCROLL_UNIT_X,
++ (entireHeight + SCROLL_UNIT_Y - 1)//SCROLL_UNIT_Y,
+ self.GetScrollPos(wx.HORIZONTAL),
+ self.GetScrollPos(wx.VERTICAL),
+ True)
+@@ -9728,8 +9728,8 @@ def RecalculatePositions(self, noRefresh=False):
+ line._gi.ExtendWidth(widthMax)
+
+ self.SetScrollbars(SCROLL_UNIT_X, lineHeight,
+- (x + SCROLL_UNIT_X)/SCROLL_UNIT_X,
+- (y + lineHeight)/lineHeight,
++ (x + SCROLL_UNIT_X)//SCROLL_UNIT_X,
++ (y + lineHeight)//lineHeight,
+ self.GetScrollPos(wx.HORIZONTAL),
+ self.GetScrollPos(wx.VERTICAL),
+ True)
+@@ -9797,7 +9797,7 @@ def RecalculatePositions(self, noRefresh=False):
+ break # Everything fits, no second try required.
+
+ self.SetScrollbars(SCROLL_UNIT_X, lineHeight,
+- (entireWidth + SCROLL_UNIT_X)/SCROLL_UNIT_X,
++ (entireWidth + SCROLL_UNIT_X)//SCROLL_UNIT_X,
+ 0,
+ self.GetScrollPos(wx.HORIZONTAL),
+ 0,
diff --git a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
new file mode 100644
index 000000000000..2e17a2286297
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+WX_GTK_VER="3.0-gtk3"
+
+DISTUTILS_IN_SOURCE_BUILD="1"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets
+
+MY_PN="wxPython"
+MY_PV="${PV}.post2"
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="https://www.wxpython.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
+
+LICENSE="wxWinLL-3"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test webkit"
+# Tests broken: #726812, #722716
+RESTRICT="test"
+#RESTRICT="!test? ( test )"
+
+# wxPython doesn't seem to be able to optionally disable features. webkit is
+# optionally patched out because it's so huge, but other elements are not,
+# which makes us have to require all features from wxGTK
+RDEPEND="
+ >=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
+ media-libs/libpng:0=
+ media-libs/tiff:0
+ media-libs/libjpeg-turbo:0"
+
+BDEPEND="${RDEPEND}
+ app-doc/doxygen
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ test? (
+ ${VIRTUALX_DEPEND}
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
+ "${FILESDIR}/${P}-ultimatelistctrl.patch"
+)
+
+python_prepare_all() {
+ if ! use webkit; then
+ eapply "${FILESDIR}/${PN}-4.0.6-no-webkit.patch"
+ rm unittests/test_webview.py || die
+ fi
+ # Most of these tests disabled below fail because of the virtx/portage
+ # environment, but some fail for unknown reasons.
+ rm unittests/test_uiaction.py \
+ unittests/test_notifmsg.py \
+ unittests/test_mousemanager.py \
+ unittests/test_display.py \
+ unittests/test_pi_import.py \
+ unittests/test_lib_agw_thumbnailctrl.py \
+ unittests/test_sound.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_configure() {
+ setup-wxwidgets
+}
+
+python_compile() {
+ DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die
+ ${PYTHON} build.py build_py \
+ --use_syswx \
+ --no_magic \
+ --jobs=$(makeopts_jobs) \
+ --release || die
+}
+
+python_install() {
+ distutils-r1_python_install --skip-build
+}
+
+python_test() {
+ virtx epytest unittests
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/, dev-python/wxpython/files/
@ 2023-02-17 8:40 Arsen Arsenović
0 siblings, 0 replies; 8+ messages in thread
From: Arsen Arsenović @ 2023-02-17 8:40 UTC (permalink / raw
To: gentoo-commits
commit: 6abcc6cb062e9d7625c9a96a0adb6a8a0fb19ded
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 14:40:26 2023 +0000
Commit: Arsen Arsenović <arsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 08:38:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6abcc6cb
dev-python/wxpython: add 4.2.0
Thanks to Ștefan Talpalaru <stefantalpalaru <AT> yahoo.com> for his notes in the
bump bug.
Closes: https://bugs.gentoo.org/542672
Closes: https://bugs.gentoo.org/766914
Closes: https://bugs.gentoo.org/890953
Signed-off-by: Sam James <sam <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/29407
Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>
dev-python/wxpython/Manifest | 1 +
.../wxpython/files/wxpython-4.2.0-flags.patch | 16 +++
.../files/wxpython-4.2.0-no-attrdict.patch | 13 +++
.../wxpython/files/wxpython-4.2.0-no-webkit.patch | 27 +++++
dev-python/wxpython/wxpython-4.2.0.ebuild | 125 +++++++++++++++++++++
5 files changed, 182 insertions(+)
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index c68723eb916e..197729320098 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1 +1,2 @@
DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
+DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
diff --git a/dev-python/wxpython/files/wxpython-4.2.0-flags.patch b/dev-python/wxpython/files/wxpython-4.2.0-flags.patch
new file mode 100644
index 000000000000..12af1e211b4a
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.0-flags.patch
@@ -0,0 +1,16 @@
+--- a/buildtools/config.py
++++ b/buildtools/config.py
+@@ -236,9 +236,12 @@ class Configuration(object):
+ for lst in [self.cflags, self.cxxflags]:
+ lst.append('-O3')
+
++ self.cflags += os.environ.get('CFLAGS', '').split()
++ self.cxxflags += os.environ.get('CXXFLAGS', '').split()
++
+ lflags = self.getWxConfigValue('--libs')
+ self.MONOLITHIC = (lflags.find("_xrc") == -1)
+- self.lflags = lflags.split()
++ self.lflags = lflags.split() + os.environ.get('LDFLAGS', '').split()
+
+ self.WXBASENAME = self.getWxConfigValue('--basename')
+ self.WXRELEASE = self.getWxConfigValue('--release')
diff --git a/dev-python/wxpython/files/wxpython-4.2.0-no-attrdict.patch b/dev-python/wxpython/files/wxpython-4.2.0-no-attrdict.patch
new file mode 100644
index 000000000000..b3e4beff2cfe
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.0-no-attrdict.patch
@@ -0,0 +1,13 @@
+As in https://src.fedoraproject.org/rpms/python-wxpython4/raw/rawhide/f/no-attrdict.patch.
+--- a/buildtools/config.py
++++ b/buildtools/config.py
+@@ -27,8 +27,6 @@ from distutils.dep_util import newer
+
+ import distutils.sysconfig
+
+-from attrdict import AttrDict
+-
+ runSilently = False
+
+ #----------------------------------------------------------------------
+
diff --git a/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch b/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch
new file mode 100644
index 000000000000..5ab48cef727d
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch
@@ -0,0 +1,27 @@
+--- a/wscript
++++ b/wscript
+@@ -244,15 +244,6 @@
+ uselib_store='WXGL', mandatory=True,
+ msg='Finding libs for WXGL')
+
+- if cfg.checkSetup(wxConfigDir, 'wxUSE_WEBVIEW'):
+- wv_libs = '--libs webview,core,net'
+- else:
+- wv_libs = '--libs core,net'
+- conf.check_cfg(path=conf.options.wx_config, package='',
+- args='--cxxflags ' + wv_libs + rpath,
+- uselib_store='WXWEBVIEW', mandatory=True,
+- msg='Finding libs for WXWEBVIEW')
+-
+ conf.check_cfg(path=conf.options.wx_config, package='',
+ args='--cxxflags --libs xml,core,net' + rpath,
+ uselib_store='WXXML', mandatory=True,
+@@ -600,7 +591,6 @@
+ makeETGRule(bld, 'etg/_stc.py', '_stc', 'WXSTC')
+ makeETGRule(bld, 'etg/_html.py', '_html', 'WXHTML')
+ makeETGRule(bld, 'etg/_glcanvas.py', '_glcanvas', 'WXGL')
+- makeETGRule(bld, 'etg/_html2.py', '_html2', 'WXWEBVIEW')
+ makeETGRule(bld, 'etg/_xml.py', '_xml', 'WXXML')
+ makeETGRule(bld, 'etg/_xrc.py', '_xrc', 'WXXRC')
+ makeETGRule(bld, 'etg/_richtext.py', '_richtext', 'WXHTML WXRICHTEXT')
+
diff --git a/dev-python/wxpython/wxpython-4.2.0.ebuild b/dev-python/wxpython/wxpython-4.2.0.ebuild
new file mode 100644
index 000000000000..1c2f64bef4fe
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.2.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_IN_SOURCE_BUILD="1"
+PYTHON_COMPAT=( python3_{9..11} )
+WX_GTK_VER="3.2-gtk3"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets
+
+MY_PN="wxPython"
+MY_PV="${PV/_p/.post}"
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="https://www.wxpython.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
+
+LICENSE="wxWinLL-3"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test webkit"
+# Tests broken: #726812, #722716
+# Nearly there as of 4.2.0 but still quite flaky (inconsistent set of failures)
+RESTRICT="!test? ( test ) test"
+
+# wxPython doesn't seem to be able to optionally disable features. webkit is
+# optionally patched out because it's so huge, but other elements are not,
+# which makes us have to require all features from wxGTK
+RDEPEND="
+ >=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
+ media-libs/libpng:=
+ media-libs/tiff:=
+ media-libs/libjpeg-turbo:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-doc/doxygen
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/sip-6.6.2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ test? (
+ ${VIRTUALX_DEPEND}
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=(
+ #"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
+ "${FILESDIR}/${PN}-4.2.0-no-attrdict.patch"
+ "${FILESDIR}/${PN}-4.2.0-flags.patch"
+)
+
+python_prepare_all() {
+ if ! use webkit; then
+ eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
+ rm unittests/test_webview.py || die
+ fi
+
+ # Most of these tests disabled below fail because of the virtx/portage
+ # environment, but some fail for unknown reasons.
+ rm unittests/test_uiaction.py \
+ unittests/test_notifmsg.py \
+ unittests/test_mousemanager.py \
+ unittests/test_display.py \
+ unittests/test_pi_import.py \
+ unittests/test_lib_agw_thumbnailctrl.py \
+ unittests/test_sound.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_configure() {
+ setup-wxwidgets
+}
+
+python_compile() {
+ DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die
+
+ # Refresh the bundled/pregenerated sip files
+ ${PYTHON} build.py sip || die
+
+ # Build the bindings
+ ${PYTHON} build.py build_py \
+ --use_syswx \
+ --no_magic \
+ --jobs="$(makeopts_jobs)" \
+ --verbose \
+ --release || die
+}
+
+python_test() {
+ EPYTEST_DESELECT=(
+ # Aborts, needs investigation
+ unittests/test_utils.py::utils_Tests::test_utilsSomeOtherStuff
+
+ # Failures, need investigation
+ unittests/test_frame.py::frame_Tests::test_frameRestore
+ unittests/test_fswatcher.py::fswatcher_Tests::test_fswatcher1
+ unittests/test_intl.py::intl_Tests::test_intlGetString
+ unittests/test_lib_busy.py::lib_busy_Tests::test_lib_busy5
+ unittests/test_lib_mixins_inspection.py::wit_TestCase::test_App_OnInit
+ unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1
+ unittests/test_lib_pubsub_topicmgr.py::lib_pubsub_TopicMgr2_GetOrCreate_DefnProv::test20_UseProvider
+ unittests/test_windowid.py::IdManagerTest::test_newIdRef03
+ unittests/test_auibook.py::auibook_Tests::test_auibook02
+ unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerPersistValue
+ unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore
+ unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric
+ unittests/test_auiframemanager.py::auiframemanager_Tests::test_auiframemanager02
+ )
+
+ # We use pytest-forked as opensuse does to avoid tests corrupting each
+ # other.
+ virtx epytest --forked -n "$(makeopts_jobs)" unittests
+}
+
+python_install() {
+ distutils-r1_python_install --skip-build
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/, dev-python/wxpython/files/
@ 2023-07-24 13:02 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2023-07-24 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 20e4a78f858ef07e3941610d65222027a5bf488a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 13:01:12 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 13:01:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20e4a78f
dev-python/wxpython: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/wxpython/Manifest | 1 -
.../wxpython/files/wxpython-4.0.6-no-webkit.patch | 27 -------
.../files/wxpython-4.0.6-skip-broken-tests.patch | 91 ----------------------
.../files/wxpython-4.0.7-ultimatelistctrl.patch | 85 --------------------
dev-python/wxpython/wxpython-4.0.7-r4.ebuild | 91 ----------------------
5 files changed, 295 deletions(-)
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 197729320098..7487d3ee61f7 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,2 +1 @@
-DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
diff --git a/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch b/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch
deleted file mode 100644
index 795de3a933ff..000000000000
--- a/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru wxPython-4.0.5-orig/wscript wxPython-4.0.5/wscript
---- wxPython-4.0.5-orig/wscript 2019-05-18 22:03:12.000000000 -0400
-+++ wxPython-4.0.5/wscript 2019-05-22 07:59:46.522966555 -0400
-@@ -230,15 +230,6 @@
- uselib_store='WXGL', mandatory=True,
- msg='Finding libs for WXGL')
-
-- if cfg.checkSetup(wxConfigDir, 'wxUSE_WEBVIEW'):
-- wv_libs = '--libs webview,core,net'
-- else:
-- wv_libs = '--libs core,net'
-- conf.check_cfg(path=conf.options.wx_config, package='',
-- args='--cxxflags ' + wv_libs + rpath,
-- uselib_store='WXWEBVIEW', mandatory=True,
-- msg='Finding libs for WXWEBVIEW')
--
- if isDarwin:
- conf.check_cfg(path=conf.options.wx_config, package='',
- args='--cxxflags --libs core,net' + rpath,
-@@ -591,7 +582,6 @@
- makeETGRule(bld, 'etg/_stc.py', '_stc', 'WXSTC')
- makeETGRule(bld, 'etg/_html.py', '_html', 'WXHTML')
- makeETGRule(bld, 'etg/_glcanvas.py', '_glcanvas', 'WXGL')
-- makeETGRule(bld, 'etg/_html2.py', '_html2', 'WXWEBVIEW')
- makeETGRule(bld, 'etg/_xml.py', '_xml', 'WXXML')
- makeETGRule(bld, 'etg/_xrc.py', '_xrc', 'WXXRC')
- makeETGRule(bld, 'etg/_richtext.py', '_richtext', 'WXHTML WXRICHTEXT')
diff --git a/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch b/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch
deleted file mode 100644
index 22a56162726b..000000000000
--- a/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ru wxPython-4.0.6-orig/unittests/test_frame.py wxPython-4.0.6/unittests/test_frame.py
---- wxPython-4.0.6-orig/unittests/test_frame.py 2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_frame.py 2019-05-24 10:15:51.350004356 -0400
-@@ -50,7 +50,7 @@
- f.Close()
-
-
-- def test_frameRestore(self):
-+ def xtest_frameRestore(self):
- f = wx.Frame(self.frame, title="Title", pos=(50,50), size=(100,100))
- f.Show()
- f.Maximize()
-diff -ru wxPython-4.0.6-orig/unittests/test_graphics.py wxPython-4.0.6/unittests/test_graphics.py
---- wxPython-4.0.6-orig/unittests/test_graphics.py 2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_graphics.py 2019-05-24 10:16:06.520256643 -0400
-@@ -23,7 +23,7 @@
- gc = wx.GraphicsContext.Create(img)
- self.assertTrue(gc.IsOk())
-
-- def test_gcCreate4(self):
-+ def xtest_gcCreate4(self):
- class MyPanel(wx.Panel):
- def __init__(self, parent):
- super(MyPanel, self).__init__(parent)
-diff -ru wxPython-4.0.6-orig/unittests/test_lib_pubsub_provider.py wxPython-4.0.6/unittests/test_lib_pubsub_provider.py
---- wxPython-4.0.6-orig/unittests/test_lib_pubsub_provider.py 2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_lib_pubsub_provider.py 2019-05-24 10:16:49.649969339 -0400
-@@ -49,7 +49,7 @@
-
- class lib_pubsub_Except(wtc.PubsubTestCase):
-
-- def test1(self):
-+ def xtest1(self):
-
- self.pub.addTopicDefnProvider(my_topics, self.pub.TOPIC_TREE_FROM_CLASS)
-
-diff -ru wxPython-4.0.6-orig/unittests/test_lib_pubsub_topicmgr.py wxPython-4.0.6/unittests/test_lib_pubsub_topicmgr.py
---- wxPython-4.0.6-orig/unittests/test_lib_pubsub_topicmgr.py 2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_lib_pubsub_topicmgr.py 2019-05-24 10:17:18.276438743 -0400
-@@ -215,7 +215,7 @@
- assert 1 == topicMgr.getNumDefnProviders()
- topicMgr.clearDefnProviders()
-
-- def test20_UseProvider(self):
-+ def xtest20_UseProvider(self):
- #
- # Test the use of definition providers for topics. We create
- # two so we can check that more than one can work together.
-diff -ru wxPython-4.0.6-orig/unittests/test_sizer.py wxPython-4.0.6/unittests/test_sizer.py
---- wxPython-4.0.6-orig/unittests/test_sizer.py 2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_sizer.py 2019-05-24 10:18:03.937181671 -0400
-@@ -71,7 +71,7 @@
- self.assertTrue(items[1].IsSpacer())
- self.assertTrue(items[2].Border == 5)
-
-- def test_iter(self):
-+ def xtest_iter(self):
- bs = wx.BoxSizer()
- widgetlist = [wx.Panel(self.frame) for _ in range(5)]
-
-diff -ru wxPython-4.0.6-orig/unittests/test_utils.py wxPython-4.0.6/unittests/test_utils.py
---- wxPython-4.0.6-orig/unittests/test_utils.py 2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_utils.py 2019-05-24 11:14:09.399035368 -0400
-@@ -34,7 +34,7 @@
- with wx.BusyCursor():
- self.myYield()
-
-- def test_utilsSomeOtherStuff(self):
-+ def xtest_utilsSomeOtherStuff(self):
- wx.GetBatteryState()
- wx.GetPowerType()
- wx.GetKeyState(wx.WXK_F1)
-diff -ru wxPython-4.0.6-orig/unittests/test_windowid.py wxPython-4.0.6/unittests/test_windowid.py
---- wxPython-4.0.6-orig/unittests/test_windowid.py 2019-05-21 19:12:12.000000000 -0400
-+++ wxPython-4.0.6/unittests/test_windowid.py 2019-05-24 10:18:24.158508491 -0400
-@@ -28,12 +28,12 @@
- assert isinstance(ref, wx.WindowIDRef)
-
-
-- def test_newIdRef03(self):
-+ def xtest_newIdRef03(self):
- """Check that Auto ID Management is enabled (--enable-autoidman)"""
- # This test is expected to fail if autoID mangagement is turned on
-- # because a reference to the ID is not being saved, so it will be
-+ # because a reference to the ID is not being saved, so it will be
- # unreserved when the first widget is destroyed.
--
-+
- id = wx.Window.NewControlId()
- b = wx.Button(self.frame, id, 'button')
- b.Destroy()
diff --git a/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch b/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch
deleted file mode 100644
index 9d1cc7649e1f..000000000000
--- a/dev-python/wxpython/files/wxpython-4.0.7-ultimatelistctrl.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From https://github.com/wxWidgets/Phoenix/commit/3eb9eb32dc3285435039f6c420c398665372a1ad
-From 3eb9eb32dc3285435039f6c420c398665372a1ad Mon Sep 17 00:00:00 2001
-From: Glen Whitney <glen@studioinfinity.org>
-Date: Tue, 31 Aug 2021 11:06:27 -0700
-Subject: [PATCH] fix: Correct types of arguments to
- ScrolledWindow.SetScrollbars
-
----
- demo/Mask.py | 2 +-
- demo/OGL.py | 2 +-
- wx/lib/agw/ultimatelistctrl.py | 14 +++++++-------
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/demo/Mask.py b/demo/Mask.py
-index 5f0c2cdde..109b8f30b 100644
---- a/demo/Mask.py
-+++ b/demo/Mask.py
-@@ -56,7 +56,7 @@ def __init__(self, parent):
- mask = wx.Mask(self.bmp_withcolourmask, wx.WHITE)
- self.bmp_withcolourmask.SetMask(mask)
-
-- self.SetScrollbars(20, 20, 700/20, 460/20)
-+ self.SetScrollbars(20, 20, 700//20, 460//20)
-
- self.Bind(wx.EVT_PAINT, self.OnPaint)
-
-diff --git a/demo/OGL.py b/demo/OGL.py
-index 72ca543dd..d475e5011 100644
---- a/demo/OGL.py
-+++ b/demo/OGL.py
-@@ -272,7 +272,7 @@ def __init__(self, parent, log, frame):
-
- maxWidth = 1000
- maxHeight = 1000
-- self.SetScrollbars(20, 20, maxWidth/20, maxHeight/20)
-+ self.SetScrollbars(20, 20, maxWidth//20, maxHeight//20)
-
- self.log = log
- self.frame = frame
-diff --git a/wx/lib/agw/ultimatelistctrl.py b/wx/lib/agw/ultimatelistctrl.py
-index c60867684..14fc41f86 100644
---- a/wx/lib/agw/ultimatelistctrl.py
-+++ b/wx/lib/agw/ultimatelistctrl.py
-@@ -9654,8 +9654,8 @@ def RecalculatePositions(self, noRefresh=False):
- self._linesPerPage = clientHeight//lineHeight
-
- self.SetScrollbars(SCROLL_UNIT_X, lineHeight,
-- (self.GetHeaderWidth()-decrement)/SCROLL_UNIT_X,
-- (entireHeight + lineHeight - 1)/lineHeight,
-+ (self.GetHeaderWidth()-decrement)//SCROLL_UNIT_X,
-+ (entireHeight + lineHeight - 1)//lineHeight,
- self.GetScrollPos(wx.HORIZONTAL),
- self.GetScrollPos(wx.VERTICAL),
- True)
-@@ -9676,8 +9676,8 @@ def RecalculatePositions(self, noRefresh=False):
- decrement = SCROLL_UNIT_X
-
- self.SetScrollbars(SCROLL_UNIT_X, SCROLL_UNIT_Y,
-- (self.GetHeaderWidth()-decrement)/SCROLL_UNIT_X,
-- (entireHeight + SCROLL_UNIT_Y - 1)/SCROLL_UNIT_Y,
-+ (self.GetHeaderWidth()-decrement)//SCROLL_UNIT_X,
-+ (entireHeight + SCROLL_UNIT_Y - 1)//SCROLL_UNIT_Y,
- self.GetScrollPos(wx.HORIZONTAL),
- self.GetScrollPos(wx.VERTICAL),
- True)
-@@ -9728,8 +9728,8 @@ def RecalculatePositions(self, noRefresh=False):
- line._gi.ExtendWidth(widthMax)
-
- self.SetScrollbars(SCROLL_UNIT_X, lineHeight,
-- (x + SCROLL_UNIT_X)/SCROLL_UNIT_X,
-- (y + lineHeight)/lineHeight,
-+ (x + SCROLL_UNIT_X)//SCROLL_UNIT_X,
-+ (y + lineHeight)//lineHeight,
- self.GetScrollPos(wx.HORIZONTAL),
- self.GetScrollPos(wx.VERTICAL),
- True)
-@@ -9797,7 +9797,7 @@ def RecalculatePositions(self, noRefresh=False):
- break # Everything fits, no second try required.
-
- self.SetScrollbars(SCROLL_UNIT_X, lineHeight,
-- (entireWidth + SCROLL_UNIT_X)/SCROLL_UNIT_X,
-+ (entireWidth + SCROLL_UNIT_X)//SCROLL_UNIT_X,
- 0,
- self.GetScrollPos(wx.HORIZONTAL),
- 0,
diff --git a/dev-python/wxpython/wxpython-4.0.7-r4.ebuild b/dev-python/wxpython/wxpython-4.0.7-r4.ebuild
deleted file mode 100644
index 7b34ac3aec81..000000000000
--- a/dev-python/wxpython/wxpython-4.0.7-r4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_IN_SOURCE_BUILD="1"
-PYTHON_COMPAT=( python3_{9..10} )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="wxPython"
-WX_GTK_VER="3.0-gtk3"
-
-inherit distutils-r1 multiprocessing virtualx wxwidgets pypi
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="https://www.wxpython.org/"
-SRC_URI="$(pypi_sdist_url --no-normalize "${PYPI_PN}" "${PV}.post2")"
-
-LICENSE="wxWinLL-3"
-SLOT="4.0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="test webkit"
-# Tests broken: #726812, #722716
-RESTRICT="test"
-#RESTRICT="!test? ( test )"
-
-# wxPython doesn't seem to be able to optionally disable features. webkit is
-# optionally patched out because it's so huge, but other elements are not,
-# which makes us have to require all features from wxGTK
-RDEPEND="
- >=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
- media-libs/libpng:=
- media-libs/tiff:=
- media-libs/libjpeg-turbo:="
-
-BDEPEND="${RDEPEND}
- app-doc/doxygen
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- test? (
- ${VIRTUALX_DEPEND}
- dev-python/appdirs[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${PYPI_PN}-${PV}.post2"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
- "${FILESDIR}/${P}-ultimatelistctrl.patch"
-)
-
-python_prepare_all() {
- if ! use webkit; then
- eapply "${FILESDIR}/${PN}-4.0.6-no-webkit.patch"
- rm unittests/test_webview.py || die
- fi
- # Most of these tests disabled below fail because of the virtx/portage
- # environment, but some fail for unknown reasons.
- rm unittests/test_uiaction.py \
- unittests/test_notifmsg.py \
- unittests/test_mousemanager.py \
- unittests/test_display.py \
- unittests/test_pi_import.py \
- unittests/test_lib_agw_thumbnailctrl.py \
- unittests/test_sound.py || die
-
- distutils-r1_python_prepare_all
-}
-
-src_configure() {
- setup-wxwidgets
-}
-
-python_compile() {
- DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die
- ${PYTHON} build.py build_py \
- --use_syswx \
- --no_magic \
- --jobs=$(makeopts_jobs) \
- --release || die
-}
-
-python_install() {
- distutils-r1_python_install --skip-build
-}
-
-python_test() {
- virtx epytest unittests
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/, dev-python/wxpython/files/
@ 2023-09-10 16:29 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-09-10 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 3270eeb0bb5f0834dc54da4f20b2e9d856510cb2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 16:28:41 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 16:28:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3270eeb0
dev-python/wxpython: fix build w/ cython-3
Closes: https://bugs.gentoo.org/911703
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../wxpython/files/wxpython-4.2.0-cython-3.patch | 19 +++++++++++++++++++
dev-python/wxpython/wxpython-4.2.0.ebuild | 1 +
2 files changed, 20 insertions(+)
diff --git a/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch b/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch
new file mode 100644
index 000000000000..aff380108b8e
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/911703
+https://github.com/wxWidgets/Phoenix/pull/2441
+
+From aeb557d01e7cd37176ebbf0f1ae6d0b53c115378 Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt@techie.net>
+Date: Tue, 25 Jul 2023 12:42:32 -0400
+Subject: [PATCH] Fix compatibility with Cython 3.0.0
+
+Remove unused import which seems to be removed in Cython 3.
+--- a/wx/svg/_nanosvg.pyx
++++ b/wx/svg/_nanosvg.pyx
+@@ -42,7 +42,6 @@ for manipulating the SVG shape info in memory.
+
+ import sys
+
+-cimport cython.object
+ from cpython.buffer cimport (
+ Py_buffer, PyObject_CheckBuffer, PyObject_GetBuffer, PyBUF_SIMPLE,
+ PyBuffer_Release)
diff --git a/dev-python/wxpython/wxpython-4.2.0.ebuild b/dev-python/wxpython/wxpython-4.2.0.ebuild
index d5528c5f28f0..5d44d61b86f0 100644
--- a/dev-python/wxpython/wxpython-4.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-4.2.0.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
#"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
"${FILESDIR}/${PN}-4.2.0-no-attrdict.patch"
"${FILESDIR}/${PN}-4.2.0-flags.patch"
+ "${FILESDIR}/${PN}-4.2.0-cython-3.patch"
)
python_prepare_all() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/, dev-python/wxpython/files/
@ 2024-06-11 20:35 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-06-11 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 3ca52fb3c834bde19c8a6faaec15c234d0cbcfc5
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Jun 11 20:11:15 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 20:31:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca52fb3
dev-python/wxpython: add 4.2.1-r1 enable Python-3.12
Closes: https://bugs.gentoo.org/929520
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...python-4.2.1-integer-division-for-randint.patch | 26 +++++
dev-python/wxpython/wxpython-4.2.1-r1.ebuild | 127 +++++++++++++++++++++
2 files changed, 153 insertions(+)
diff --git a/dev-python/wxpython/files/wxpython-4.2.1-integer-division-for-randint.patch b/dev-python/wxpython/files/wxpython-4.2.1-integer-division-for-randint.patch
new file mode 100644
index 000000000000..b98624d7df8f
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.1-integer-division-for-randint.patch
@@ -0,0 +1,26 @@
+From https://github.com/wxWidgets/Phoenix/pull/2508
+From 3b042c863f4092f802a877a972fd6eb284451a78 Mon Sep 17 00:00:00 2001
+From: Ben Greiner <code@bnavigator.de>
+Date: Sat, 6 Jan 2024 21:58:29 +0100
+Subject: [PATCH] integer division for randint
+
+Python 3.12 does not accept floats for random.randint() anymore
+---
+ unittests/test_dcDrawLists.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/unittests/test_dcDrawLists.py b/unittests/test_dcDrawLists.py
+index 9e35e5eaf..6696a79a0 100644
+--- a/unittests/test_dcDrawLists.py
++++ b/unittests/test_dcDrawLists.py
+@@ -63,8 +63,8 @@ def makeRandomRectangles():
+ rects = []
+
+ for i in range(num):
+- W = random.randint(10, w/2)
+- H = random.randint(10, h/2)
++ W = random.randint(10, w//2)
++ H = random.randint(10, h//2)
+ x = random.randint(0, w - W)
+ y = random.randint(0, h - H)
+ rects.append( (x, y, W, H) )
diff --git a/dev-python/wxpython/wxpython-4.2.1-r1.ebuild b/dev-python/wxpython/wxpython-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..5364e1b56160
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.2.1-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_IN_SOURCE_BUILD="1"
+PYTHON_COMPAT=( python3_{10..12} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="wxPython"
+WX_GTK_VER="3.2-gtk3"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets pypi
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="
+ https://www.wxpython.org/
+ https://github.com/wxWidgets/Phoenix/
+ https://pypi.org/project/wxPython/
+"
+
+LICENSE="wxWinLL-3"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test webkit"
+RESTRICT="!test? ( test )"
+
+# wxPython doesn't seem to be able to optionally disable features. webkit is
+# optionally patched out because it's so huge, but other elements are not,
+# which makes us have to require all features from wxGTK
+DEPEND="
+ >=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
+ media-libs/libpng:=
+ media-libs/tiff:=
+ media-libs/libjpeg-turbo:=
+"
+RDEPEND="
+ ${DEPEND}
+"
+BDEPEND="
+ app-text/doxygen
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/sip-6.6.2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ test? (
+ ${VIRTUALX_DEPEND}
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.0-flags.patch"
+ "${FILESDIR}/${PN}-4.2.0-cython-3.patch"
+ "${FILESDIR}/${PN}-4.2.1-integer-division-for-randint.patch"
+)
+
+python_prepare_all() {
+ if ! use webkit; then
+ eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
+ fi
+
+ distutils-r1_python_prepare_all
+}
+
+src_configure() {
+ setup-wxwidgets
+}
+
+python_compile() {
+ DOXYGEN="$(type -P doxygen)" ${PYTHON} build.py dox etg --nodoc || die
+
+ # Refresh the bundled/pregenerated sip files
+ "${EPYTHON}" build.py sip || die
+
+ # Build the bindings
+ "${EPYTHON}" build.py build_py \
+ --use_syswx \
+ --no_magic \
+ --jobs="$(makeopts_jobs)" \
+ --verbose \
+ --release || die
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # virtx probably
+ unittests/test_display.py::display_Tests::test_display
+ unittests/test_frame.py::frame_Tests::test_frameRestore
+ unittests/test_mousemanager.py::mousemanager_Tests::test_mousemanager1
+ unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardChar
+ unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardKeyDownUp
+ unittests/test_uiaction.py::uiaction_MouseTests
+
+ # assertion (TODO)
+ unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric
+ unittests/test_lib_agw_piectrl.py::lib_agw_piectrl_Tests::test_lib_agw_piectrlCtor
+
+ # seems to rely on state from a previous test (sigh)
+ unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore
+
+ # requires Spanish localization
+ unittests/test_intl.py::intl_Tests::test_intlGetString
+
+ # TODO
+ unittests/test_tipwin.py::tipwin_Tests::test_tipwinCtor
+ unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1
+ unittests/test_windowid.py::IdManagerTest::test_newIdRef03
+ )
+ local EPYTEST_IGNORE=()
+ if ! use webkit; then
+ EPYTEST_IGNORE+=( unittests/test_webview.py )
+ fi
+
+ # We use pytest-forked as opensuse does to avoid tests corrupting each
+ # other.
+ virtx epytest --forked -n "$(makeopts_jobs)" unittests
+}
+
+python_install() {
+ distutils-r1_python_install --skip-build
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-06-11 20:35 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-02 17:03 [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/, dev-python/wxpython/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2018-08-16 21:33 Mart Raudsepp
2020-09-25 20:22 Michał Górny
2022-07-03 9:51 Andrew Ammerlaan
2023-02-17 8:40 Arsen Arsenović
2023-07-24 13:02 Michał Górny
2023-09-10 16:29 Sam James
2024-06-11 20:35 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox