diff options
Diffstat (limited to 'dev-python/wxpython')
-rw-r--r-- | dev-python/wxpython/ChangeLog | 11 | ||||
-rw-r--r-- | dev-python/wxpython/Manifest | 15 | ||||
-rw-r--r-- | dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch | 10 | ||||
-rw-r--r-- | dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch | 221 | ||||
-rw-r--r-- | dev-python/wxpython/wxpython-2.9.1.1.ebuild | 168 |
5 files changed, 418 insertions, 7 deletions
diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog index 860d0c84468d..58a806eb8acc 100644 --- a/dev-python/wxpython/ChangeLog +++ b/dev-python/wxpython/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/wxpython -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.138 2010/12/12 07:30:02 dirtyepic Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.139 2011/01/23 01:12:36 dirtyepic Exp $ + +*wxpython-2.9.1.1 (23 Jan 2011) + + 23 Jan 2011; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.9.1.1.ebuild, + +files/wxpython-2.9-wxversion-demo.patch, + +files/wxpython-2.9-wxversion-scripts.patch: + Version bump. 12 Dec 2010; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r2.ebuild, wxpython-2.8.10.1.ebuild, wxpython-2.8.11.0.ebuild: diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest index 05e3174327fc..55355ec3064f 100644 --- a/dev-python/wxpython/Manifest +++ b/dev-python/wxpython/Manifest @@ -7,23 +7,28 @@ AUX wxpython-2.8-drop-editra.patch 2276 RMD160 dc3b1e9fbf57d5c5c4c97c6f6ccaf1bc0 AUX wxpython-2.8-wxversion-demo.patch 219 RMD160 5ec8b5179fe03493786965849494adb0f697eb23 SHA1 92ccb9e099def1ff9ff842b5bfbbd769c1d06c6e SHA256 19618386cf750f56051541c403153bf1c7e90764199e53818eb0c9557d026f1c AUX wxpython-2.8.11-drop-editra.patch 2197 RMD160 49364666c2c71f58bc89d63dbce7086cf786ea95 SHA1 9777b6e20a095249eb9a51f99ecefdea709c5066 SHA256 a0774e4c273485711cb3da4d70cf7bf0766a9f189fafdc7bae07186d553f341b AUX wxpython-2.8.9-wxversion-scripts.patch 7730 RMD160 e93c7b883b1ad22011df069d8d6ad24938ea8b07 SHA1 cf05e834a6e4325f51881f62113922e3aa20f5c4 SHA256 55b1caa38295338dda3cc9ebfa4e43eb3be76959a0ee9b23a7b81085d80d7ba6 +AUX wxpython-2.9-wxversion-demo.patch 147 RMD160 5a666314fe5893d8246b73ebbc32e00b928c9e1a SHA1 73499356a2cd2f8262ca0624dea6f9b38f93a371 SHA256 79c0cb7455fe6947ba9b7278d98e2c6da156edd5e5c276b03cc7fff5d3073d14 +AUX wxpython-2.9-wxversion-scripts.patch 4600 RMD160 6bc6f7966c39c2e072aec65412858843c957b4d0 SHA1 983db57bcfd143378cd81d28a1008f0d04733e1c SHA256 6c5cd5f3daa51bf3c033f1c934ac1ce219a421a7e993660c64ac532a9dd96675 DIST wxPython-demo-2.8.10.1.tar.bz2 3605257 RMD160 00aa54621e3b0a16c2f77bb8b7663a64328c5e75 SHA1 2dc2df3ae3180866715ee7a2e9c2eb5bd7231ab2 SHA256 b2f15413e117547344a4b80db8bf6d2750c333454fcea427b38c9b62793643a0 DIST wxPython-demo-2.8.11.0.tar.bz2 3894559 RMD160 74337736081d809e85e212c72a45cfd7bd23c236 SHA1 9e9a148bf8590d69bc652c535c8dc5b860f01043 SHA256 b4463d50bb597b66471e218f94e6e6f94e05689735038348f9689de941cc24d3 +DIST wxPython-demo-2.9.1.1.tar.bz2 3925228 RMD160 082f1610dc2b2a9852d52077c09da54f3e162d73 SHA1 8b0fe8032d6e85950850d42dbd57882d1fda7fc9 SHA256 f3b689e17f347744b55fff948dc68f58905ba35a9647c3b3c2cf881374522371 DIST wxPython-docs-2.8.10.1.tar.bz2 2331639 RMD160 c1eadac650401895ae32739b316cda3c06cd60bf SHA1 d096994904aabdc23ca6717af640b32963798a16 SHA256 3992384869dcb3c757da5f4e63e7ef4ab24f2fa1842edd5e126be4856bb951c0 DIST wxPython-docs-2.8.11.0.tar.bz2 2331727 RMD160 da31b1da7e8f4862c404a14de2216216ab53aae4 SHA1 6d42177e72b93f286f55cc298bc7ab29531ffa7f SHA256 1e95cf1033902fd4c7abc1b9d34688179f8b699a0f74455fec541a6ad421590d DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 RMD160 86084386383904972df15aa65ca26d1ad1a28a5d SHA1 eedef5ef87824b28a6fe4d338420cf6249ac1f2f SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661 +DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a EBUILD wxpython-2.6.4.0-r2.ebuild 3575 RMD160 f72d7a65804adb476bbd6e993a5540338e7ea897 SHA1 3fe6fa815e14e5b982daef92a34b13ba795a252a SHA256 e610866d17d507d7fc6635418043a5e7e6ea259df4b0b976ffa3a9df719f4503 EBUILD wxpython-2.8.10.1.ebuild 5392 RMD160 b100a625596281e64247aa47fd435d69361b5f63 SHA1 be116a1f94bcb2ed3d8e1bdeebfcdbbcea5a5d0b SHA256 1e35b2d6e10ab8ddad6d81c6247a05a5ceda7852f281f9216f71abf0a211520c EBUILD wxpython-2.8.11.0.ebuild 5400 RMD160 a0bcd5f1c54510519bddb85402ffb50d1b60f916 SHA1 6c91694933f210e701ee659fdc510660d57a0b01 SHA256 98d5c314bfc250b8d05913285d40db92f303c2a0f98ad3ae4fe80afaa6cc15b0 -MISC ChangeLog 25811 RMD160 dc7b5fc30e7281c1447dee07a8d5ffa847f00bb4 SHA1 0fe9be766ba4c56336666da1974ed4de290e7c11 SHA256 6a06f76c9b9109b1ff9487d7c6f29b0d17048e37cd1b99f15df48185d0bebf2a +EBUILD wxpython-2.9.1.1.ebuild 4937 RMD160 d15d80370a119999b7dc05b86aeae5f20101afe9 SHA1 ee7b14d7294e42a1f78dce53ad888884b002bba2 SHA256 66ce700e35f37161463c607608adb36c64a205861514992c8fc5863d9f57059c +MISC ChangeLog 26026 RMD160 ba1a8340cfa711b71900712d3b47db925bad1e1a SHA1 65c48f612562094d64596f580eb28dc8727de8b6 SHA256 71d49768f7b5a47f14fde25ccdf965f4e3a251c7b38296317ed541825e62a347 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk0EezUACgkQiqiDRvmkBmKPXwCfYMnayflW73zDd53tmUTBl0/+ -DLQAoMFBxQzsye33+dyA1hkKtjhmm7fZ -=Lbod +iEYEARECAAYFAk07gdoACgkQiqiDRvmkBmKDfQCfYhiqNQa6Vu4YyvhsBhR/gCNb +TfcAn0+JH+GeN+myi5t4+eQIkcIKAfLr +=1O+7 -----END PGP SIGNATURE----- diff --git a/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch new file mode 100644 index 000000000000..c928ae27d851 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.9-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("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 new file mode 100644 index 000000000000..d037cc95decc --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch @@ -0,0 +1,221 @@ +--- 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/wxpython-2.9.1.1.ebuild b/dev-python/wxpython/wxpython-2.9.1.1.ebuild new file mode 100644 index 000000000000..7726a06c8f30 --- /dev/null +++ b/dev-python/wxpython/wxpython-2.9.1.1.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.1.1.ebuild,v 1.1 2011/01/23 01:12:36 dirtyepic Exp $ + +EAPI="3" +PYTHON_DEPEND="2" +WX_GTK_VER="2.9" +SUPPORT_PYTHON_ABIS="1" + +inherit alternatives eutils fdo-mime flag-o-matic multilib python 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 + examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" + +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-python/setuptools + >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] + >=x11-libs/gtk+-2.4 + >=x11-libs/pango-1.2 + >=dev-libs/glib-2.0 + media-libs/libpng + virtual/jpeg + media-libs/tiff + cairo? ( >=dev-python/pycairo-1.8.4 ) + opengl? ( >=dev-python/pyopengl-2.0.0.44 )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +RESTRICT_PYTHON_ABIS="3.*" + +S="${WORKDIR}/${MY_P}/wxPython" +DOC_S="${WORKDIR}/wxPython-${PV}" + +src_prepare() { + sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" + + epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-scripts.patch + # drop editra - we have it as a separate package now + epatch "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch + + if use examples; then + cd "${DOC_S}" + epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch + fi + + python_copy_sources +} + +src_configure() { + need-wxwidgets unicode + + append-flags -fno-strict-aliasing + + use opengl \ + && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ + || mypyconf="${mypyconf} BUILD_GLCANVAS=0" + + mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" + mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1" +} + +src_compile() { + building() { + "$(PYTHON)" setup.py ${mypyconf} build + } + python_execute_function -s building +} + +src_install() { + local mypyconf + + mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" + use opengl \ + && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ + || mypyconf="${mypyconf} BUILD_GLCANVAS=0" + + mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1" + + installation() { + "$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib $(python_get_sitedir) + } + python_execute_function -s installation + + # this should be temporary + dobin "${S}"/scripts/pyslices || die + dobin "${S}"/scripts/pysliceshell || die + + # Collision protection. + for file in "${D}"/usr/bin/*; do + mv "${file}" "${file}-${SLOT}" || die + done + 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 + + insinto /usr/share/applications + for x in {Py{AlaMode,Crust,Shell,Slices{,Shell}},XRCed}; do + newins "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop || die + done + insinto /usr/share/pixmaps + newins "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png || die + newins "${S}"/wx/py/PySlices_32.png PySlices-${SLOT}.png || die + newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png || die + + if use examples; then + dodir /usr/share/doc/${PF}/demo || die + dodir /usr/share/doc/${PF}/samples || die + cp -R "${DOC_S}"/demo/* "${D}"/usr/share/doc/${PF}/demo/ || die + cp -R "${DOC_S}"/samples/* "${D}"/usr/share/doc/${PF}/samples/ || die + 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 + + python_mod_optimize wx-2.9.1-gtk2 wxversion.py + + 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" + elog + if use examples; then + 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/" + fi + echo + elog "Editra is no longer packaged with wxpython in Gentoo." + elog "You can find it in the tree as app-editors/editra" + echo +} + +pkg_postrm() { + python_mod_cleanup wx-2.9.1-gtk2 wxversion.py + 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 +} |