* [gentoo-commits] dev/heroxbd:master commit in: dev-python/wxpython/files/, dev-python/wxpython/, eclass/
@ 2014-12-04 9:19 Benda XU
0 siblings, 0 replies; only message in thread
From: Benda XU @ 2014-12-04 9:19 UTC (permalink / raw
To: gentoo-commits
commit: 03cbb0c39bf7720f85819ed6fe5c2f0eaf87694f
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 4 09:06:29 2014 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Dec 4 09:06:29 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/heroxbd.git;a=commit;h=03cbb0c3
dev-python/wxpython from gx86 directly: the version from prefix is old.
---
dev-python/wxpython/ChangeLog | 103 +++++++-
dev-python/wxpython/Manifest | 40 +--
.../wxpython-2.8-no-preservatives-added.patch | 16 ++
.../files/wxpython-2.8.12-drop-categories.patch | 37 +++
.../wxpython-2.8.12.1-disable-egging-mode.patch | 34 +++
.../files/wxpython-2.9.4.1-wxversion-scripts.patch | 211 ++++++++++++++++
.../files/wxpython-3.0-wxversion-demo.patch | 10 +
.../files/wxpython-3.0.0.0-wxversion-scripts.patch | 211 ++++++++++++++++
dev-python/wxpython/metadata.xml | 12 +-
dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild | 195 +++++++++++++++
dev-python/wxpython/wxpython-2.8.12.1.ebuild | 178 -------------
dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild | 168 +++++++++++++
dev-python/wxpython/wxpython-3.0.0.0.ebuild | 163 ++++++++++++
dev-python/wxpython/wxpython-3.0.1.1.ebuild | 163 ++++++++++++
eclass/wxwidgets.eclass | 276 +++++----------------
15 files changed, 1395 insertions(+), 422 deletions(-)
diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 73a4df5..c595a43 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,105 @@
# ChangeLog for dev-python/wxpython
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.181 2013/08/13 09:31:28 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.208 2014/10/06 01:09:03 leio Exp $
+
+*wxpython-3.0.1.1 (06 Oct 2014)
+
+ 06 Oct 2014; Mart Raudsepp <leio@gentoo.org> +wxpython-3.0.1.1.ebuild:
+ Version bump
+
+ 19 May 2014; Michał Górny <mgorny@gentoo.org> -wxpython-2.8.12.1-r1.ebuild:
+ Drop the old versions that required python-exec:0.
+
+ 19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r2.ebuild:
+ Stable for alpha, wrt bug #499472
+
+ 18 Mar 2014; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r2.ebuild:
+ Stable for ia64, wrt bug #499472
+
+ 12 Mar 2014; Markus Meier <maekke@gentoo.org> wxpython-2.8.12.1-r2.ebuild:
+ arm stable, bug #499472
+
+ 12 Mar 2014; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r2.ebuild:
+ Stable for sparc, wrt bug #499472
+
+ 06 Mar 2014; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r2.ebuild:
+ Stable for ppc64, wrt bug #499472
+
+ 02 Mar 2014; Pacho Ramos <pacho@gentoo.org> wxpython-2.8.12.1-r2.ebuild:
+ amd64 stable, bug #499472
+
+ 24 Feb 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ wxpython-2.8.12.1-r2.ebuild:
+ x86 stable wrt bug #499472
+
+ 02 Feb 2014; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r2.ebuild:
+ Stable for ppc, wrt bug #499472
+
+ 28 Jan 2014; Jeroen Roovers <jer@gentoo.org> wxpython-2.8.12.1-r2.ebuild:
+ Stable for HPPA (bug #499472).
+
+ 27 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> -wxpython-2.8.12.1.ebuild,
+ -wxpython-2.9.3.1.ebuild, -wxpython-2.9.4.1-r1.ebuild:
+ Remove old.
+
+ 18 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> wxpython-3.0.0.0.ebuild:
+ Add libnotify USE flag to force a rebuild if the corresponding wxGTK flag
+ changes (bug #498068).
+
+*wxpython-3.0.0.0 (30 Dec 2013)
+
+ 30 Dec 2013; Ryan Hill <dirtyepic@gentoo.org> +wxpython-3.0.0.0.ebuild,
+ +files/wxpython-3.0.0.0-wxversion-scripts.patch,
+ +files/wxpython-3.0-wxversion-demo.patch:
+ Version bump (bug #485184).
+
+ 12 Dec 2013; Justin Lecher <jlec@gentoo.org> wxpython-2.8.12.1.ebuild,
+ wxpython-2.8.12.1-r1.ebuild, wxpython-2.8.12.1-r2.ebuild,
+ wxpython-2.9.4.1-r1.ebuild, wxpython-2.9.4.1-r2.ebuild, metadata.xml:
+ Call distutils-r1_python_install_all; don't use elog for empty lines
+
+ 30 Oct 2013; Michał Górny <mgorny@gentoo.org> wxpython-2.8.12.1-r1.ebuild,
+ wxpython-2.8.12.1-r2.ebuild, wxpython-2.9.4.1-r1.ebuild,
+ wxpython-2.9.4.1-r2.ebuild:
+ Update the dep to use dev-lang/python-exec.
+
+*wxpython-2.9.4.1-r2 (23 Oct 2013)
+*wxpython-2.8.12.1-r2 (23 Oct 2013)
+
+ 23 Oct 2013; Michał Górny <mgorny@gentoo.org> +wxpython-2.8.12.1-r2.ebuild,
+ +wxpython-2.9.4.1-r2.ebuild:
+ Support python-exec:2.
+
+ 06 Oct 2013; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.12.1.ebuild:
+ Drop to ~sh.
+
+ 17 Sep 2013; Michał Górny <mgorny@gentoo.org> wxpython-2.8.12.1-r1.ebuild,
+ wxpython-2.9.4.1-r1.ebuild:
+ Force python-exec:0 since the ebuild does hackery on top of script wrapping.
+
+ 06 Sep 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild:
+ Stable for sparc, wrt bug #477480
+
+ 05 Sep 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild:
+ Stable for ppc64, wrt bug #477480
+
+ 01 Sep 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild:
+ Stable for alpha, wrt bug #477480
+
+ 29 Aug 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild:
+ Stable for ia64, wrt bug #477480
+
+ 25 Aug 2013; Markus Meier <maekke@gentoo.org> wxpython-2.8.12.1-r1.ebuild:
+ arm stable, bug #477480
+
+ 19 Aug 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild:
+ Stable for ppc, wrt bug #477480
+
+ 18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild:
+ Stable for x86, wrt bug #477480
+
+ 15 Aug 2013; Jeroen Roovers <jer@gentoo.org> wxpython-2.8.12.1-r1.ebuild:
+ Stable for HPPA (bug #477480).
13 Aug 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild:
Stable for amd64, wrt bug #477480
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 7f6296d..297fa0f 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
AUX wxpython-2.8-cache-writable.patch 538 SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429 SHA512 e0232ff7bcb713358a2981b84b0eac3b3b0825d43b43dd6f19d3d21f9b45a9e63fbf39dc87c2fedc0342a88007ef43fcd9d890177dc38e15b4f89576fdf363a0 WHIRLPOOL c2c0488d0d5a840d1be68c95a2f53d3bce7d58798f0e09f2116f16655d73c8a5b525af7d7b836c7f820bd729acff441942510055b8f455a9b2f742361effd6c3
AUX wxpython-2.8-no-preservatives-added.patch 525 SHA256 590ef2435f3bb24ce061213628467652509aa39992d9b0f94e1c784952d523b8 SHA512 83e066d6798aea833304004d7270e3b7698e51581e9ac9c934b96fb438bbafb16cea15cc73297961893fd73fd18f95cade22c134aea6556962025fc3c12bdedd WHIRLPOOL 218e72aa785c762f0171987c79cb7d998864252ebd259537e463f134caabca17d8f5d5d75f2ec7791cf5353edb8331d173eb6f08d4fbb7f7713d9ca14ad91831
AUX wxpython-2.8-wxversion-demo.patch 219 SHA256 19618386cf750f56051541c403153bf1c7e90764199e53818eb0c9557d026f1c SHA512 a20e79dc2f96400046dd5d5697533466529c30bde96a2e8ace1984c7e3fb42a6b38375cacddeb319253dbaabff6571b52af41da5268d22cfb294b11da56421f8 WHIRLPOOL 3af6ad578fcc1144f0172b4a959665441880ba20b9d471049f9c48602987e4265df34b180cd98727d0beadef66e6603fbdad7f1d0b0358a795b3372a8f46d2df
@@ -12,35 +9,22 @@ AUX wxpython-2.8.9-wxversion-scripts.patch 7730 SHA256 55b1caa38295338dda3cc9ebf
AUX wxpython-2.9-wxversion-demo.patch 147 SHA256 79c0cb7455fe6947ba9b7278d98e2c6da156edd5e5c276b03cc7fff5d3073d14 SHA512 7fe67f8d292f186b9271e1f8761f53e0e68df9a85d7624aa401e907411f58e3d6961cea8bcee3a575c97b2ed1caf596a6a0b47acc72efe5b4222c8795302700d WHIRLPOOL 164f70695f19d45919f56e0b6986a019b6a21092bc52599bbb45f1ef0d74e5fb44777d551cb95d6757aa62312e33644a5d7042e5cd18e42e33c0f00b4000f4e5
AUX wxpython-2.9-wxversion-scripts.patch 4600 SHA256 6c5cd5f3daa51bf3c033f1c934ac1ce219a421a7e993660c64ac532a9dd96675 SHA512 fab5031bbbae567a5cc4a8adadcc7b3db0bebd55b1c8aae71217e5159a0e3f730ba98f8a8587bf9b6a715e8661292a962339c4362dbdf66d33f551c588d29aea WHIRLPOOL 8ff8d7e3346ce63db5ffc68079e3c4792d20fe99f7747076731398964cfaf94b15abfe5187013d3c035218979ac59bd16cddd007e3077df29214f08ccada9c82
AUX wxpython-2.9.4.1-wxversion-scripts.patch 4187 SHA256 79ae53ed557ff2de9d7936ece32a0f8ee6a26c9e921f248399adbc44ff3e17b5 SHA512 befed0b915205b191c9980cfa5074e11dc28d5bf8b62827b100cd2c41b56af638febda43fe93452f1d280eda86e19f5d8d95356143378d49b6e27d889d0815b1 WHIRLPOOL 058be7d59a2336ef94c19c44743c127a874b39e764a5c961cbeebce0eca79a82d0b47b51ce9aef359fab2fcd7edc6df700772dbc709b3d3df7896cdfdd2f89ef
+AUX wxpython-3.0-wxversion-demo.patch 147 SHA256 23e89aaf72171b2c0ec3a302f2252137c2c087a6672726e626d20fb430a1c763 SHA512 99682f18a520b68b313301784adaf71c1ab9181022b743de82c9cc6acfaa1fc77867ef43c00926f6d7bdde8ed29fac24b5eb72761209a2e2a1d498feee85a0a1 WHIRLPOOL 04cff26f220526c17bf8fa3249aaaa2fa6293e6ffb7a49ef4d06a634ec8cf684c92280e1b9cc1cc5dcc50897569b52f68fdfa1f1d4b1d2ab6ace553784ae309c
+AUX wxpython-3.0.0.0-wxversion-scripts.patch 4187 SHA256 1fbca19b7281245801160de2ebf8a1f00057840078355977f169cb20eafe32ad SHA512 74fe603daafdbc5a50daaa3411ea40243d1fdee2cb3bbd0e6e99bd73bd124137161cd682673f2c727faf92214bfa4d27c059021f19c92c581485bb1d6a5b49a6 WHIRLPOOL 10fcdfcf96fe992194d899941a7c75854c7afb016c39014e7827b90f09fa1cf523b22c9c668aea52084b85895989d498aa4a715626c716169686b1f144071f82
DIST wxPython-demo-2.8.12.1.tar.bz2 3906851 SHA256 252282193a80590b9eab436bef322701b21d35ad03b4b6ebb4824241ff947b5a SHA512 aab71cf4e4fb6632afd4607cbe5cdef6785c4ed3f1c7f67d6cef5487d1caee2f7652bfd974ba95a6a03e8d7809c94e291aca00c2fdf74ea29e118e1e30c947d5 WHIRLPOOL e9eb0803350e3dac8c5f2228a3f4d54a26ae4c4307c924729bbdff712747419fdfaa155d83ef1bea7dcb849dbacf9f48c323bf7997ed1df85f182ba3878d1324
-DIST wxPython-demo-2.9.3.1.tar.bz2 3959076 SHA256 6e26ead8c780ecbcebb68593a72cd28432b2e756a42e019286d970d6a92ac340 SHA512 98dc98f3332b93fc11c8c302e1aa07295a218b96dbad6a353498893935c1e206bab41bf429a262142c07999803be865c2ac3bb7630467861e76544733672c336 WHIRLPOOL ff75d7ad362afba2e79d6b2250a7d21721f135630e1cf63fdcca72241e8d407881a7e19db0e59dda94150d2cf80ed9b86ed1d303e5deb70781f902d6fd1ddc3d
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-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.3.1.tar.bz2 49131100 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d SHA512 16e5be3a2a98d64637866ecae7afb3a2835d21684077bb8a1b87d3c0cf37b75eb1169f3b8e16e38c5b85c04cce974dbfd5ba25d3d0a3016a47c005a05e5dbfc5 WHIRLPOOL ccae768ff87a95ee88d6259821be5e2073928278155743c0c16c75dd9b2262ac49ccb322dd4aa77ccfdac12d7de0e874a92b41171adacfa26ffb216f170751a7
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
-EBUILD wxpython-2.8.12.1-r1.ebuild 5628 SHA256 89204c850ed3f54ac4b4a5fa8277d0a0c7149b80e070fb5d9e0fa69baa60bf94 SHA512 a6307e4b71edac5216e8a34e3dfb752466a90a45952f2cd920049a89261ba9ab6402aa2862f17747c1723c73d1b1194130a6426043dab83d3d98688337eff58d WHIRLPOOL ff4e3897ed960e301c2ff7135b11aff7f9f224d25fb40950d557742411bdec5c79dd22de7ea79d9bcb5961f71491c48d65dc3453fd9998446ce9378f220f4d0f
-EBUILD wxpython-2.8.12.1.ebuild 5151 SHA256 36b7e6c3622539299e15bc5c4aa30a00dde859fc4e5b4ab754ecad0eedc0112e SHA512 e2b9c8ed35535b2ff66b62343b67a6fa814eea9c685549cfdfab02f83433b1905191b633a8f7507ed9d8e4820af99af39a80761816d10a11f96d06342d2d51af WHIRLPOOL 7b8893dcde348dc355f83fc8a347305c4b390e2f0b8272ea74e9c9a70efcef1ad054fe4aa329365986e7493df8a4b235b11d3d1359f3a531377a868851cbcf79
-EBUILD wxpython-2.9.3.1.ebuild 4423 SHA256 d373c252954d78fe241755d6e43757cb6c4e465fc00212411d282c5d9d65ce9c SHA512 0f1d00e47641d00b1d912754124fc9f39e31f9aa658f9680012ecbc6706065f4fc6c9f0266e13f916033ce1bf91b9dbdddcc11d28c270577cff89c005699ba29 WHIRLPOOL 60c1a4906c209407126836e21e62c51dcc97e72b592725a6d299f960793139795e104e08068e79926a15c2db0b94f45129f1596b32d0bd59fd53a23a1a83ddc3
-EBUILD wxpython-2.9.4.1-r1.ebuild 4796 SHA256 b1adbff44d4ff70baa3a620d311e40a68f2c0b725b0261296b52eef65670e2ad SHA512 68703bad02bc5860e94b84f2c84daef1e8b9b3053809ec70bcc7abf4c1906d28825d6365acd22e6f2fd5fff64f7bad6ce8bed2ebec156a2a70dde5ca41761c1f WHIRLPOOL 632dc210f2c8eabb054b3818c9440ff1810078b553d112e6de11821e70ca1d263850d36791d87b10283bba6dd0276c0b44061c02e6deb56e215ac1c44e4f1b91
-MISC ChangeLog 32335 SHA256 6a82a15be14b6200d174807c891d9595c8e5adf7ac9b63318b7732537d626142 SHA512 7c23a444a26606bf4b25f980a748735d5a8a13993dbce18ff73d1b29561c022ace2101f0970cdcdf1b9ff6ca320701170528443389dfd3996f6654126def934d WHIRLPOOL 7893423ec06f6d820fcf592734779e4d537ea521ce20eb0bb330de40e13eed7a679fd22e4f1fd307c78a20b250d4f2ea56745c80df7f0f0ab43822a649000739
-MISC metadata.xml 366 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff SHA512 260bafb8c2fba6a3d1b6c0dcb0fa4f1db5ccff7319395d9856997df816d3cfc69dc38859835eeafb693f22da6179e73227c87d820019793e639987085e596c6f WHIRLPOOL f8619bf36512bc3debe4fd4d810f5512485fe5f6041af2704898cef0123c9ba9512864763dc6fca78f400931a120b43f494e7384a567a79d42db507cd74b8062
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSCfzwAAoJELp701BxlEWf5e0P/RQAR11OIsGmOsBraNO6rldE
-3rdwb9bG8poZnIxttc8FMOQAHLftVFD58+Eq2Q0dzDHxHjF2gIcmhXykwwLzmTIF
-ui+lGvtG7Sb9QjuJChZ1ssfHPUz0fG1ZDa+azpUqXzwaUgB/UCGQqT9LQ5DpFtYD
-UuGDrR9ih3Ak44OkSyMt7vkrDQjqE5aJRzojVn8xEABLFuuDsMYfaEuaCVrAhfJa
-zlUV2d9AnQC5//F1OIhmAKIEC4/miE8Pi2WEEZqJ11KSHH/t/pKRLLEf4f5DvrGA
-GQHFtQvVpoH8IIsWBDe5eDWAuj+isYW+/rN+FaAiJyVkX4iAYaWPbADGTSXOJs+u
-E4tEG3fQ8IoDtjrVhzPfdxKYIr460OI6wjA0YoQVdcncZBk5D9b6WrD1RSl/QGk1
-TjQGeFin6YGJDRhtzfPkAF2iwRjcKlgg8VIEz1nvlKMl6ur5KZPVQGDHpI3d8wH5
-cflvYqcS/OxkkflKMkOyCaI9ZRp6khxQ6WFpC4uWt1+ID0pjgyYWNsqit7EECRkM
-KTfZ7zfWKnr471bJUOFC5Rs7ipAJBEkoPpbH26zuGpvJLccUZcZgdGyQelFn8lGR
-BkFAakEL1ZbG0zUkFvjDFIhw4hl2ng7xANkWuYtRbcXZqH9MX6YGAx7p3WpdHWxV
-KcyKANmFQ2WSVIKUrjG3
-=EUIE
------END PGP SIGNATURE-----
+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
+EBUILD wxpython-2.8.12.1-r2.ebuild 5708 SHA256 93c2cea4038a5d8fcfe6d1d2db586825fe69f6098571d35279c3d4a8cf7da4b9 SHA512 0be889af0b9a55a94e55643c5c6c397ceb58368cf8dfb4ff067ba71464aa55ef987cc3888268e6c2e2dc87af66b2d3ce343891a8e9effe344556343d4161686b WHIRLPOOL 81094252e0df00ac88fe35db495e29ac19e9f29899219bfef23946de8cde73c70e4ccf206cc0fb376b7070c91f09ef6fae84d2590dac3025a40b0fcafdfab8f5
+EBUILD wxpython-2.9.4.1-r2.ebuild 4882 SHA256 c9e93b5996caa02e9d5219b1f3358a5e1b9089646fecc335bddf2d1730838a26 SHA512 db43ab67839a5f1cbaf11ae0086a5a8246edf66bdff35fe6260dd4de959dba4801c4a8f5daf9bc040d3071442d54a461c4d0e0c665d12ea6015b65aaef29d390 WHIRLPOOL d5b8b74ef5edab244cfb7199184560bd1e586456464bd73105637d2e00e462f819e6cc32bc399a69c0ac327085494842deede429e0e487b583ba3f01608f4dd8
+EBUILD wxpython-3.0.0.0.ebuild 4737 SHA256 9365f0144ea62631b64174a30484b889b16451ba783361acba921dbc4fc0211d SHA512 cecaac75c8914378322459a50f410ddc15050b0c5f36f510e1f4331fc264d4c296575082f548d30ff504c6633113b3ce8064ba5215050c91d0b0ab7355ffc08e WHIRLPOOL 1eecfaf66373f7d267c1979e7aeccc2b44968c523f872bea9bb74c8e18eb353f40509c2f17f057ee819eecf10ed5729a8d28e3ac3e724b1c43677c72b5ab0e4f
+EBUILD wxpython-3.0.1.1.ebuild 4741 SHA256 b4f8ebcbe229b33f0ece7d4154f4e3cd55304334c493cf7cbe7448edce2c6f43 SHA512 cdaea755c5d2c213b49c0a8b0e3cce3563e6c57abeb26a8ea73259c0819829360108f8500cbbbbf666bf9c6c1f0acd782d5238ed1161c614ef0ba5d8b0c36586 WHIRLPOOL 03f8b5f406f8033c0b3d0d2314bdaa662834cec5ba1659b6c8fe80de6d297e9f3fbe416308e389a85208654065ae0f439ad5436178ddfd3f34ba4e3ffa2aea28
+MISC ChangeLog 36032 SHA256 08c1208c4f0a44ff7bc6b3bbacada2117c365dadc0d7f5033416075348b58622 SHA512 3ad6e44608aace4f95dcc296bbbe8b3ad574ed1a5259b24ac3f31ec119bbf7f3689bbeb41b776007ab901252ed92cce4d5af6755b0982163f1dd05696488fac9 WHIRLPOOL c6251aebcb2c10b281143af0dffacfeb08882ad2146846a1489c674c4d261fbf73e5a3ed176fe136170e5a9f5120f3ebfb24d15598e518e4d1cc22e03ba38180
+MISC metadata.xml 380 SHA256 4f8e2237b4a7281039211900504d5e8d7004e87c120631f18dd078a01178dfa8 SHA512 8b742161313fb1b1b0db6d07f1665988b061dbf2dd44c1e49e2fab8d1aa1dfbb218207c5696bcd027199a1ae2fbcb4673106c09d5169a44863deb021840288a8 WHIRLPOOL dbce4f031c171464b3cda63ec2f9c7f2841e108d441a45bfe1d7ec2d6b35874d9b04ab364836bb3d7be7ff12ef60e029fce7a841e156994f04820254bad91e6c
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
new file mode 100644
index 0000000..5e4221d
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch
@@ -0,0 +1,16 @@
+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.12-drop-categories.patch b/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch
new file mode 100644
index 0000000..d860238
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch
@@ -0,0 +1,37 @@
+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.1-disable-egging-mode.patch b/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch
new file mode 100644
index 0000000..1497a2c
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch
@@ -0,0 +1,34 @@
+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-2.9.4.1-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch
new file mode 100644
index 0000000..7067af9
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch
@@ -0,0 +1,211 @@
+--- 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/files/wxpython-3.0-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch
new file mode 100644
index 0000000..a4f6b0b
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 0000000..9f0cb89
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch
@@ -0,0 +1,211 @@
+--- 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 ba15621..b68c477 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>wxwidgets</herd>
-<herd>python</herd>
-<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>
+ <herd>wxwidgets</herd>
+ <herd>python</herd>
+ <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>
</pkgmetadata>
diff --git a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild
new file mode 100644
index 0000000..aac69dc
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild,v 1.12 2014/03/19 16:14:13 ago Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_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
+}
diff --git a/dev-python/wxpython/wxpython-2.8.12.1.ebuild b/dev-python/wxpython/wxpython-2.8.12.1.ebuild
deleted file mode 100644
index 9ecda05..0000000
--- a/dev-python/wxpython/wxpython-2.8.12.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1.ebuild,v 1.17 2012/09/05 09:36:33 jlec Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-WX_GTK_VER="2.8"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit alternatives distutils eutils fdo-mime 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="
- >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
- dev-libs/glib:2
- dev-python/setuptools
- 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 )
- opengl? ( dev-python/pyopengl )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/wxPython"
-DOC_S="${WORKDIR}/wxPython-${PV}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
-
-PYTHON_MODNAME="wx-${SLOT}-gtk2-unicode wxversion.py"
-
-src_prepare() {
- sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-
- epatch "${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch
- # drop editra - we have it as a separate package now
- epatch "${FILESDIR}"/${PN}-2.8.12-drop-editra.patch
-
- if use doc; then
- cd "${DOC_S}"
- epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch
- fi
-
- if use examples; then
- cd "${DOC_S}"
- epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
- fi
-
- python_copy_sources
-
- # Workaround, buildsystem uses CFLAGS as CXXFLAGS
- export CFLAGS="${CXXFLAGS}"
-}
-
-src_configure() {
- need-wxwidgets unicode
-
- DISTUTILS_GLOBAL_OPTIONS=(
- "* WX_CONFIG=${WX_CONFIG}"
- "* WXPORT=gtk2"
- "* UNICODE=1"
- "* BUILD_GLCANVAS=$(use opengl && echo 1 || echo 0)"
- )
-}
-
-distutils_src_install_post_hook() {
- # Collision protection.
- local file
- for file in "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/bin/"*; do
- mv "${file}" "${file}-${SLOT}"
- done
-}
-
-src_install() {
- local docdir file
-
- distutils_src_install
-
- # Collision protection.
- rename_files() {
- for file in "${D}$(python_get_sitedir)/"wx{version.*,.pth}; do
- mv "${file}" "${file}-${SLOT}" || return 1
- done
- }
- python_execute_function -q rename_files
-
- dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
-
- domenu "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
- newicon "${S}"/wx/py/PyCrust_32.png PyCrust.png
- newicon "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png
-
- docdir=${D}usr/share/doc/${PF}
-
- if use doc; then
- dodir /usr/share/doc/${PF}/docs
- cp -R "${DOC_S}"/docs/* "${docdir}"/docs/
- # For some reason newer API docs aren't available so use 2.8.9.2's
- cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${docdir}"/docs/
- fi
-
- if use examples; then
- dodir /usr/share/doc/${PF}/demo
- cp -R "${DOC_S}"/demo/* "${docdir}"/demo
- dodir /usr/share/doc/${PF}/samples
- cp -R "${DOC_S}"/samples/* "${docdir}"/samples
- [[ -e ${docdir}/samples/embedded/embedded ]] \
- && rm -f "${docdir}"/samples/embedded/embedded
- fi
-}
-
-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_execute_function -q create_symlinks
-
- distutils_pkg_postinst
-
- 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"
- echo
- if use doc; then
- elog "To access the general wxWidgets documentation, run"
- elog "/usr/share/doc/${PF}/docs/viewdocs.py"
- elog
- elog "wxPython documentation is available by pointing a browser"
- elog "at /usr/share/doc/${PF}/docs/api/index.html"
- fi
- if use examples; then
- elog
- 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"
- elog
- elog "Many more example apps and modules can be found in"
- elog "/usr/share/doc/${PF}/samples/"
- echo
- fi
- elog "Editra is not packaged with wxpython in Gentoo."
- elog "You can find it in the tree as app-editors/editra"
- echo
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
- 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_execute_function -q create_symlinks
-}
diff --git a/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild b/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild
new file mode 100644
index 0000000..a2621cc
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild,v 1.3 2013/12/12 12:57:30 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_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
+}
diff --git a/dev-python/wxpython/wxpython-3.0.0.0.ebuild b/dev-python/wxpython/wxpython-3.0.0.0.ebuild
new file mode 100644
index 0000000..13e973c
--- /dev/null
+++ b/dev-python/wxpython/wxpython-3.0.0.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-3.0.0.0.ebuild,v 1.2 2014/01/18 01:24:44 dirtyepic Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_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 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+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}"/${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() {
+ 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/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
+}
diff --git a/dev-python/wxpython/wxpython-3.0.1.1.ebuild b/dev-python/wxpython/wxpython-3.0.1.1.ebuild
new file mode 100644
index 0000000..aa30d6c
--- /dev/null
+++ b/dev-python/wxpython/wxpython-3.0.1.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-3.0.1.1.ebuild,v 1.1 2014/10/06 01:09:03 leio Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_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 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+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/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
+}
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index 16a0cc5..aa8f920 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -1,82 +1,71 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.34 2013/08/16 07:59:17 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.39 2014/04/21 21:55:31 ottxor Exp $
# @ECLASS: wxwidgets.eclass
# @MAINTAINER:
# wxwidgets@gentoo.org
# @BLURB: Manages build configuration for wxGTK-using packages.
# @DESCRIPTION:
-# The wxGTK libraries come in several different possible configurations
-# (release, debug, ansi, unicode, etc.) most of which can be installed
-# side-by-side. The purpose of this eclass is to provide ebuilds the ability
-# to build against a specific type of profile without interfering with the
-# user-set system configuration.
+# This eclass gives ebuilds the ability to build against a specific wxGTK
+# SLOT and profile without interfering with the system configuration. Any
+# ebuild with a x11-libs/wxGTK dependency must use this eclass.
#
-# Ebuilds that use wxGTK _must_ inherit this eclass.
+# There are two ways to do it:
#
-# - Using this eclass -
+# - set WX_GTK_VER before inheriting the eclass
+# - set WX_GTK_VER and call need-wxwidgets from a phase function
#
-# 1. set WX_GTK_VER to a valid wxGTK SLOT
-# 2. inherit wxwidgets
-# 3. add an appropriate DEPEND
-# 4. done
+# (where WX_GTK_VER is the SLOT you want)
#
-# @CODE
-# WX_GTK_VER="2.8"
-#
-# inherit wxwidgets
+# If your package has optional support for wxGTK (ie. by a USE flag) then
+# you should use need-wxwidgets. This is important because some packages
+# will force-enable wxGTK if they find WX_CONFIG set in the environment.
#
-# DEPEND="x11-libs/wxGTK:2.8[X]"
-# RDEPEND="${DEPEND}"
-# [...]
+# @CODE
+# inherit wxwidgets
+#
+# IUSE="X wxwidgets"
+# DEPEND="wxwidgets? ( x11-libs/wxGTK:2.8[X?] )"
+#
+# src_configure() {
+# if use wxwidgets; then
+# WX_GTK_VER="2.8"
+# if use X; then
+# need-wxwidgets unicode
+# else
+# need-wxwidgets base-unicode
+# fi
+# fi
+# econf --with-wx-config="${WX_CONFIG}"
+# }
# @CODE
#
-# This will get you the default configuration, which is what you want 99%
-# of the time (in 2.6 the default is "ansi", all other versions default to
-# "unicode").
+# That's about as complicated as it gets. 99% of ebuilds can get away with:
#
-# If your package has optional wxGTK support controlled by a USE flag or you
-# need to use the wxBase libraries (USE="-X") then you should not set
-# WX_GTK_VER before inherit and instead refer to the need-wxwidgets function
-# below.
+# @CODE
+# inherit wxwidgets
+# DEPEND="wxwidgets? ( x11-libs/wxGTK:2.8[X] )
+# ...
+# WX_GTK_VER=2.8 need-wxwidgets unicode
+# @CODE
#
-# The variable WX_CONFIG is exported, containing the absolute path to the
-# wx-config file to use. Most configure scripts use this path if it's set in
-# the environment or accept --with-wx-config="${WX_CONFIG}".
+# Note: unless you know your package works with wxbase (which is very
+# doubtful), always depend on wxGTK[X].
inherit eutils multilib
-case "${EAPI:-0}" in
- 0|1)
- EXPORT_FUNCTIONS pkg_setup
- ;;
- *)
- ;;
-esac
-
-# We do this globally so ebuilds can get sane defaults just by inheriting. They
-# can be overridden with need-wxwidgets later if need be.
-
-# ensure this only runs once
+# We do this in global scope so ebuilds can get sane defaults just by
+# inheriting.
if [[ -z ${WX_CONFIG} ]]; then
- # and only if WX_GTK_VER is set before inherit
if [[ -n ${WX_GTK_VER} ]]; then
- if [[ ${WX_GTK_VER} == 2.6 ]]; then
- wxchar="ansi"
- else
- wxchar="unicode"
- fi
- for wxtoolkit in gtk2 base; do
+ for wxtoolkit in mac gtk2 base; do
# newer versions don't have a seperate debug profile
for wxdebug in xxx release- debug-; do
- wxconf="${wxtoolkit}-${wxchar}-${wxdebug/xxx/}${WX_GTK_VER}"
- if [[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]]; then
- # if this is a wxBase install, die in pkg_setup
- [[ ${wxtoolkit} == "base" ]] && WXBASE_DIE=1
- else
- continue
- fi
+ wxconf="${wxtoolkit}-unicode-${wxdebug/xxx/}${WX_GTK_VER}"
+
+ [[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]] || continue
+
WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}"
WX_ECLASS_CONFIG="${WX_CONFIG}"
break
@@ -87,161 +76,66 @@ if [[ -z ${WX_CONFIG} ]]; then
fi
fi
-# @FUNCTION: wxwidgets_pkg_setup
-# @DESCRIPTION:
-#
-# It's possible for wxGTK to be installed with USE="-X", resulting in something
-# called wxBase. There's only ever been a couple packages in the tree that use
-# wxBase so this is probably not what you want. Whenever possible, use EAPI 2
-# USE dependencies(tm) to ensure that wxGTK was built with USE="X". This
-# function is only exported for EAPI 0 or 1 and catches any remaining cases.
-#
-# If you do use wxBase, don't set WX_GTK_VER before inherit. Use
-# need-wxwidgets() instead.
-
-wxwidgets_pkg_setup() {
- [[ -n $WXBASE_DIE ]] && check_wxuse X
-}
-
-# @FUNCTION: need-wxwidgets
-# @USAGE: <configuration>
+# @FUNCTION: need-wxwidgets
+# @USAGE: <profile>
# @DESCRIPTION:
#
# Available configurations are:
#
-# [2.6] ansi [>=2.8] unicode
-# unicode base-unicode
-# base
-# base-unicode
-#
-# If your package has optional wxGTK support controlled by a USE flag, set
-# WX_GTK_VER inside a conditional rather than before inherit. Some broken
-# configure scripts will force wxGTK on if they find ${WX_CONFIG} set.
-#
-# @CODE
-# src_configure() {
-# if use wxwidgets; then
-# WX_GTK_VER="2.8"
-# if use X; then
-# need-wxwidgets unicode
-# else
-# need-wxwidgets base-unicode
-# fi
-# fi
-# @CODE
-#
+# unicode (USE="X")
+# base-unicode (USE="-X")
need-wxwidgets() {
- debug-print-function $FUNCNAME $*
-
- local wxtoolkit wxchar wxdebug wxconf
+ local wxtoolkit wxdebug wxconf
if [[ -z ${WX_GTK_VER} ]]; then
- echo
eerror "WX_GTK_VER must be set before calling $FUNCNAME."
echo
- die "WX_GTK_VER missing"
+ die
fi
-
- if [[ ${WX_GTK_VER} != 2.6 && ${WX_GTK_VER} != 2.8 && ${WX_GTK_VER} != 2.9 ]]; then
- echo
- eerror "Invalid WX_GTK_VER: ${WX_GTK_VER} - must be set to a valid wxGTK SLOT."
- echo
- die "Invalid WX_GTK_VER"
+
+ if [[ ${WX_GTK_VER} != 2.8 && ${WX_GTK_VER} != 2.9 && ${WX_GTK_VER} != 3.0 ]]; then
+ eerror "Invalid WX_GTK_VER: ${WX_GTK_VER} - must be set to a valid wxGTK SLOT."
+ echo
+ die
fi
- debug-print "WX_GTK_VER is ${WX_GTK_VER}"
-
case $1 in
- ansi)
- debug-print-section ansi
- if [[ ${WX_GTK_VER} == 2.6 ]]; then
- wxchar="ansi"
- else
- wxchar="unicode"
- fi
- check_wxuse X
- ;;
- unicode)
- debug-print-section unicode
- check_wxuse X
- [[ ${WX_GTK_VER} == 2.6 ]] && check_wxuse unicode
- wxchar="unicode"
- ;;
- base)
- debug-print-section base
- if [[ ${WX_GTK_VER} == 2.6 ]]; then
- wxchar="ansi"
- else
- wxchar="unicode"
- fi
- ;;
- base-unicode)
- debug-print-section base-unicode
- [[ ${WX_GTK_VER} == 2.6 ]] && check_wxuse unicode
- wxchar="unicode"
- ;;
- # backwards compatibility
- gtk2)
- debug-print-section gtk2
- if [[ ${WX_GTK_VER} == 2.6 ]]; then
- wxchar="ansi"
- else
- wxchar="unicode"
- fi
- check_wxuse X
- ;;
- *)
- echo
- eerror "Invalid $FUNCNAME argument: $1"
+ unicode|base-unicode) ;;
+ *) eerror "Invalid $FUNCNAME profile: $1"
echo
- die "Invalid argument"
+ die
;;
esac
- debug-print "wxchar is ${wxchar}"
-
- # TODO: remove built_with_use
-
- # wxBase can be provided by both gtk2 and base installations
- if built_with_use =x11-libs/wxGTK-${WX_GTK_VER}* X; then
+ # wxbase is provided by both gtk2 and base installations
+ if has_version "x11-libs/wxGTK:${WX_GTK_VER}[aqua]"; then
+ wxtoolkit="mac"
+ elif has_version "x11-libs/wxGTK:${WX_GTK_VER}[X]"; then
wxtoolkit="gtk2"
else
wxtoolkit="base"
fi
- debug-print "wxtoolkit is ${wxtoolkit}"
-
- # debug or release?
- if [[ ${WX_GTK_VER} == 2.6 || ${WX_GTK_VER} == 2.8 ]]; then
- if built_with_use =x11-libs/wxGTK-${WX_GTK_VER}* debug; then
+ # 2.8 has a separate debug element
+ if [[ ${WX_GTK_VER} == 2.8 ]]; then
+ if has_version "x11-libs/wxGTK:${WX_GTK_VER}[debug]"; then
wxdebug="debug-"
else
wxdebug="release-"
fi
fi
- debug-print "wxdebug is ${wxdebug}"
-
- # put it all together
- wxconf="${wxtoolkit}-${wxchar}-${wxdebug}${WX_GTK_VER}"
+ wxconf="${wxtoolkit}-unicode-${wxdebug}${WX_GTK_VER}"
- debug-print "wxconf is ${wxconf}"
-
- # if this doesn't work, something is seriously screwed
if [[ ! -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]]; then
echo
eerror "Failed to find configuration ${wxconf}"
echo
- die "Missing wx-config"
+ die
fi
- debug-print "Found config ${wxconf} - setting WX_CONFIG"
-
export WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}"
-
- debug-print "WX_CONFIG is ${WX_CONFIG}"
-
export WX_ECLASS_CONFIG="${WX_CONFIG}"
echo
@@ -249,37 +143,3 @@ need-wxwidgets() {
einfo "Using wxWidgets: ${wxconf}"
echo
}
-
-
-# @FUNCTION: check_wxuse
-# @USAGE: <USE flag>
-# @DESCRIPTION:
-#
-# Provides a consistant way to check if wxGTK was built with a particular USE
-# flag enabled. A better way is EAPI 2 USE dependencies (hint hint).
-
-check_wxuse() {
- debug-print-function $FUNCNAME $*
-
- if [[ -z ${WX_GTK_VER} ]]; then
- echo
- eerror "WX_GTK_VER must be set before calling $FUNCNAME."
- echo
- die "WX_GTK_VER missing"
- fi
-
- # TODO: Remove built_with_use
-
- ebegin "Checking wxGTK-${WX_GTK_VER} for ${1} support"
- if built_with_use =x11-libs/wxGTK-${WX_GTK_VER}* "${1}"; then
- eend 0
- else
- eend 1
- echo
- eerror "${FUNCNAME} - You have requested functionality that requires ${1} support to"
- eerror "have been built into x11-libs/wxGTK."
- eerror
- eerror "Please re-merge =x11-libs/wxGTK-${WX_GTK_VER}* with the ${1} USE flag enabled."
- die "Missing USE flags."
- fi
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-12-04 9:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-04 9:19 [gentoo-commits] dev/heroxbd:master commit in: dev-python/wxpython/files/, dev-python/wxpython/, eclass/ Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox