From 58ff136faf807d982034a32dc3dfc922d0cbcc08 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sun, 29 Apr 2007 04:05:13 +0000 Subject: [PATCH] Remove wxpython-2.4 from the tree. Bug #146073. Package-Manager: portage-2.1.2.5 --- dev-python/wxpython/ChangeLog | 7 +- dev-python/wxpython/Manifest | 27 +--- .../wxpython/files/digest-wxpython-2.4.2.4-r3 | 3 - .../wxpython/files/digest-wxpython-2.4.2.4-r4 | 3 - .../files/wxpython-2.4.2.4-64bit.patch | 58 ------- .../wxpython/wxpython-2.4.2.4-r3.ebuild | 134 ----------------- .../wxpython/wxpython-2.4.2.4-r4.ebuild | 141 ------------------ 7 files changed, 10 insertions(+), 363 deletions(-) delete mode 100644 dev-python/wxpython/files/digest-wxpython-2.4.2.4-r3 delete mode 100644 dev-python/wxpython/files/digest-wxpython-2.4.2.4-r4 delete mode 100644 dev-python/wxpython/files/wxpython-2.4.2.4-64bit.patch delete mode 100644 dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild delete mode 100644 dev-python/wxpython/wxpython-2.4.2.4-r4.ebuild diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog index 449954b77afa..80edb7835171 100644 --- a/dev-python/wxpython/ChangeLog +++ b/dev-python/wxpython/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/wxpython # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.53 2007/04/07 02:43:07 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.54 2007/04/29 04:05:13 dirtyepic Exp $ + + 29 Apr 2007; Ryan Hill + -files/wxpython-2.4.2.4-64bit.patch, -wxpython-2.4.2.4-r3.ebuild, + -wxpython-2.4.2.4-r4.ebuild: + Remove wxpython-2.4 from the tree. Bug #146073. 07 Apr 2007; Ryan Hill wxpython-2.6.3.3.ebuild: When USE="opengl" make sure wxGTK was built with opengl support. diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest index 759f50715b65..1e8a4dd54821 100644 --- a/dev-python/wxpython/Manifest +++ b/dev-python/wxpython/Manifest @@ -10,25 +10,12 @@ AUX wxpy-config.py 3265 RMD160 c090972f980b4380c113b1c6e7328dd2b5565194 SHA1 594 MD5 3966851c4cfba6f57e620747f1630523 files/wxpy-config.py 3265 RMD160 c090972f980b4380c113b1c6e7328dd2b5565194 files/wxpy-config.py 3265 SHA256 1097d2b169f3c97f149032f5f647e1920d89288dc91981ad85b2d3ae28baf8ef files/wxpy-config.py 3265 -AUX wxpython-2.4.2.4-64bit.patch 2740 RMD160 b8b32d0d30a51c67dc5e6edc87e2ab92887dc2f4 SHA1 e2e773fca23c6724e90b689dd529075241dd382d SHA256 7be7cb9c23c0cfff3856afb048c0f6edce52a88cb60decbde440e487ad10902a -MD5 c65909b7cf3da15ff758ab3cf91e5889 files/wxpython-2.4.2.4-64bit.patch 2740 -RMD160 b8b32d0d30a51c67dc5e6edc87e2ab92887dc2f4 files/wxpython-2.4.2.4-64bit.patch 2740 -SHA256 7be7cb9c23c0cfff3856afb048c0f6edce52a88cb60decbde440e487ad10902a files/wxpython-2.4.2.4-64bit.patch 2740 AUX wxversion.py 14404 RMD160 d69feda3e74ca3cbd3777f13809495e374fc1189 SHA1 315054ad575aba30e9d1638b8f6ab4bc830df66c SHA256 24d63e045301a1c5e354e551c4500db9b656908f3243a5f292d7d1345f1a8f55 MD5 49c68d8febf658844a392bd0108fdf10 files/wxversion.py 14404 RMD160 d69feda3e74ca3cbd3777f13809495e374fc1189 files/wxversion.py 14404 SHA256 24d63e045301a1c5e354e551c4500db9b656908f3243a5f292d7d1345f1a8f55 files/wxversion.py 14404 DIST wxPython-src-2.6.1.0.tar.gz 18452406 RMD160 211b6bad3b9062180e67cf13e40c810b1e3fff9b SHA1 e7f46b0eb83fb0e316e0d5b49fd38b3b7f00b95b SHA256 cd4f03fcd1a9e8c27881414e83ceb66ce07ca9fe0d42292830a9f9894e4c4335 DIST wxPython-src-2.6.3.3.tar.bz2 18963104 RMD160 7feacff6808574143590a0a421ee60f3692eb783 SHA1 e55a3a8cfbd1aff394be15297ae205a8c597bed8 SHA256 fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb -DIST wxPythonSrc-2.4.2.4.tar.gz 13130195 RMD160 f00398193193f4788e82103e68020a574ac6de5b SHA1 61d339c962a48128e6c7b8a7b93999759ea218e3 SHA256 ae64f838adefe109905e3fbd6b656d088cf6ae9732131893bafc03198edb563a -EBUILD wxpython-2.4.2.4-r3.ebuild 3677 RMD160 bf087ec035fcdc550485fdc7c54807db36b43044 SHA1 3d0cb212754d288c4dbd5f3bddc8ce55d540e28b SHA256 af453e608d766cf2e2a177254999befe19cf120346dd9d0e30faa7d70b95ca6e -MD5 8a8fc524a7db8995846846d3525e6f95 wxpython-2.4.2.4-r3.ebuild 3677 -RMD160 bf087ec035fcdc550485fdc7c54807db36b43044 wxpython-2.4.2.4-r3.ebuild 3677 -SHA256 af453e608d766cf2e2a177254999befe19cf120346dd9d0e30faa7d70b95ca6e wxpython-2.4.2.4-r3.ebuild 3677 -EBUILD wxpython-2.4.2.4-r4.ebuild 3762 RMD160 d0bdc4a8b4fd626f0e337067d08b35cd9856995e SHA1 7c72ec9a9cd6deac44392708f30f96d5e800716c SHA256 2f5fbf42cc99cb95347ea871656bb7215c0dd5861270a53f06feb4deb4312656 -MD5 46058249b6665c6126b1889f8102e0d9 wxpython-2.4.2.4-r4.ebuild 3762 -RMD160 d0bdc4a8b4fd626f0e337067d08b35cd9856995e wxpython-2.4.2.4-r4.ebuild 3762 -SHA256 2f5fbf42cc99cb95347ea871656bb7215c0dd5861270a53f06feb4deb4312656 wxpython-2.4.2.4-r4.ebuild 3762 EBUILD wxpython-2.6.1.0.ebuild 3665 RMD160 81804b4cd19509c2106389f06fb298506fdf3e49 SHA1 059c59e09de40da130f4af65097864586997b304 SHA256 a3cdf970912d42187441825705edaaf7678ae0eafff069efdc3024508f2e45dd MD5 97d74923d83b505ea00adb6e0fe27e36 wxpython-2.6.1.0.ebuild 3665 RMD160 81804b4cd19509c2106389f06fb298506fdf3e49 wxpython-2.6.1.0.ebuild 3665 @@ -37,20 +24,14 @@ EBUILD wxpython-2.6.3.3.ebuild 3177 RMD160 c77875d6b7b8d0093e2fca8b4e6881ccbe845 MD5 b06947cedf36e5a3df85acbea76204ce wxpython-2.6.3.3.ebuild 3177 RMD160 c77875d6b7b8d0093e2fca8b4e6881ccbe84573b wxpython-2.6.3.3.ebuild 3177 SHA256 8257fa6185b21e496f79bda3c4f62fde0a29180e94209262ea4a675fd10a4b65 wxpython-2.6.3.3.ebuild 3177 -MISC ChangeLog 13425 RMD160 6438982fcfc43928d6d0a52ceaa7e476d168bd08 SHA1 a8c7fe1ddde3a7b5301235ee5a7938932658aae8 SHA256 af5f4f7a051c700014838e72860247dd1b8bee7216cf514db4f571d4d4f88566 -MD5 de0c6fca511c5abfa776483036e83190 ChangeLog 13425 -RMD160 6438982fcfc43928d6d0a52ceaa7e476d168bd08 ChangeLog 13425 -SHA256 af5f4f7a051c700014838e72860247dd1b8bee7216cf514db4f571d4d4f88566 ChangeLog 13425 +MISC ChangeLog 13624 RMD160 3b95d60762b2f3950a442eac3f9abfa6f7c55de9 SHA1 3eaf3a66aba7d341424b86d3faa9629b8b48e96e SHA256 8b796bc58289518f959ef1cba65c843efee433e010b0e577e1b90d655a11ab5d +MD5 c9549307bf1ed4f68087f1b3d080026c ChangeLog 13624 +RMD160 3b95d60762b2f3950a442eac3f9abfa6f7c55de9 ChangeLog 13624 +SHA256 8b796bc58289518f959ef1cba65c843efee433e010b0e577e1b90d655a11ab5d ChangeLog 13624 MISC metadata.xml 182 RMD160 ea41002477d2dd03185feb91318022c593ab267f SHA1 104f632f29e5a0bafbe01ab77d3565326054ab3b SHA256 1d83e81ebf161f14a972d059a5af2cac192b64c4e3ca059347204d14b5f270e5 MD5 f3c5a27935083d6431dbc3401b897b92 metadata.xml 182 RMD160 ea41002477d2dd03185feb91318022c593ab267f metadata.xml 182 SHA256 1d83e81ebf161f14a972d059a5af2cac192b64c4e3ca059347204d14b5f270e5 metadata.xml 182 -MD5 4b26091499d1073df9236514a1719111 files/digest-wxpython-2.4.2.4-r3 265 -RMD160 e051d4a65cfdc6215a5b9a3a4a45bbf3707df51d files/digest-wxpython-2.4.2.4-r3 265 -SHA256 9ebb12c8fb97ef5148f0e1a6c27d6d0b1a3963079c648236475796c2d5ab8771 files/digest-wxpython-2.4.2.4-r3 265 -MD5 4b26091499d1073df9236514a1719111 files/digest-wxpython-2.4.2.4-r4 265 -RMD160 e051d4a65cfdc6215a5b9a3a4a45bbf3707df51d files/digest-wxpython-2.4.2.4-r4 265 -SHA256 9ebb12c8fb97ef5148f0e1a6c27d6d0b1a3963079c648236475796c2d5ab8771 files/digest-wxpython-2.4.2.4-r4 265 MD5 fbbd2475bb624660159cd7d059b5114d files/digest-wxpython-2.6.1.0 268 RMD160 bae16c6faa209219e21bce08c74d509650f31f18 files/digest-wxpython-2.6.1.0 268 SHA256 9c471738678619dddb0569143f1f46d3d0ab92c4b1b8f5d76b69f3c5e9697b12 files/digest-wxpython-2.6.1.0 268 diff --git a/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r3 b/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r3 deleted file mode 100644 index 3fa7e90407ac..000000000000 --- a/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ea4eb68e10a0c2a9be643b35dcb78e41 wxPythonSrc-2.4.2.4.tar.gz 13130195 -RMD160 f00398193193f4788e82103e68020a574ac6de5b wxPythonSrc-2.4.2.4.tar.gz 13130195 -SHA256 ae64f838adefe109905e3fbd6b656d088cf6ae9732131893bafc03198edb563a wxPythonSrc-2.4.2.4.tar.gz 13130195 diff --git a/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r4 b/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r4 deleted file mode 100644 index 3fa7e90407ac..000000000000 --- a/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ea4eb68e10a0c2a9be643b35dcb78e41 wxPythonSrc-2.4.2.4.tar.gz 13130195 -RMD160 f00398193193f4788e82103e68020a574ac6de5b wxPythonSrc-2.4.2.4.tar.gz 13130195 -SHA256 ae64f838adefe109905e3fbd6b656d088cf6ae9732131893bafc03198edb563a wxPythonSrc-2.4.2.4.tar.gz 13130195 diff --git a/dev-python/wxpython/files/wxpython-2.4.2.4-64bit.patch b/dev-python/wxpython/files/wxpython-2.4.2.4-64bit.patch deleted file mode 100644 index d2e6c792daa8..000000000000 --- a/dev-python/wxpython/files/wxpython-2.4.2.4-64bit.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- wxPythonSrc-2.4.2.4/wxPython/src/gtk/html.cpp~ 2003-06-25 22:35:44.000000000 +0100 -+++ wxPythonSrc-2.4.2.4/wxPython/src/gtk/html.cpp 2006-01-05 17:50:12.000000000 +0000 -@@ -4198,7 +4198,7 @@ - int _arg1 = (int ) -1; - wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxDefaultSize; -- int _arg4 = (int ) (wxHW_SCROLLBAR_AUTO); -+ long _arg4 = (long ) (wxHW_SCROLLBAR_AUTO); - wxString * _arg5 = (wxString *) &wxPyHtmlWindowNameStr; - PyObject * _argo0 = 0; - wxPoint temp; -@@ -4210,7 +4210,7 @@ - char _ptemp[128]; - - self = self; -- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOiO:new_wxHtmlWindow",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_obj5)) -+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOlO:new_wxHtmlWindow",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_obj5)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } -@@ -4292,7 +4292,7 @@ - int _arg2 = (int ) -1; - wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; - wxSize * _arg4 = (wxSize *) &wxDefaultSize; -- int _arg5 = (int ) (wxHW_SCROLLBAR_AUTO); -+ long _arg5 = (long ) (wxHW_SCROLLBAR_AUTO); - wxString * _arg6 = (wxString *) &wxPyHtmlWindowNameStr; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; -@@ -4304,7 +4304,7 @@ - char *_kwnames[] = { "self","parent","id","pos","size","style","name", NULL }; - - self = self; -- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iOOiO:wxHtmlWindow_Create",_kwnames,&_argo0,&_argo1,&_arg2,&_obj3,&_obj4,&_arg5,&_obj6)) -+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iOOlO:wxHtmlWindow_Create",_kwnames,&_argo0,&_argo1,&_arg2,&_obj3,&_obj4,&_arg5,&_obj6)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } ---- wxPythonSrc-2.4.2.4/wxPython/src/gtk/misc2.cpp~ 2003-06-25 22:35:35.000000000 +0100 -+++ wxPythonSrc-2.4.2.4/wxPython/src/gtk/misc2.cpp 2006-01-05 17:50:44.000000000 +0000 -@@ -943,7 +943,7 @@ - int _result; - wxString * _arg0; - wxString * _arg1 = (wxString *) &wxPyEmptyString; -- int _arg2 = (int ) wxOK|wxCENTRE; -+ long _arg2 = (long ) wxOK|wxCENTRE; - wxWindow * _arg3 = (wxWindow *) NULL; - int _arg4 = (int ) -1; - int _arg5 = (int ) -1; -@@ -953,7 +953,7 @@ - char *_kwnames[] = { "message","caption","style","parent","x","y", NULL }; - - self = self; -- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|OiOii:wxMessageBox",_kwnames,&_obj0,&_obj1,&_arg2,&_argo3,&_arg4,&_arg5)) -+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|OlOii:wxMessageBox",_kwnames,&_obj0,&_obj1,&_arg2,&_argo3,&_arg4,&_arg5)) - return NULL; - { - _arg0 = wxString_in_helper(_obj0); diff --git a/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild b/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild deleted file mode 100644 index 840cfeed9837..000000000000 --- a/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild,v 1.3 2007/01/05 22:12:48 dirtyepic Exp $ - -inherit eutils wxwidgets python multilib - -MY_P="${P/wxpython-/wxPythonSrc-}" -S="${WORKDIR}/${MY_P}/wxPython" -DESCRIPTION="A blending of the wxWindows C++ class library with Python" -HOMEPAGE="http://www.wxpython.org/" -SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz" - -LICENSE="wxWinLL-3" -SLOT="2.4" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" -IUSE="gtk gtk2 unicode opengl tiff jpeg png" - -RDEPEND=">=dev-lang/python-2.1 - =x11-libs/wxGTK-2.4.2* - gtk2? ( >=x11-libs/gtk+-2.0 - >=x11-libs/pango-1.2 - >=dev-libs/glib-2.0 ) - unicode? ( >=x11-libs/gtk+-2.0 - >=x11-libs/pango-1.2 - >=dev-libs/glib-2.0 ) - !gtk2? ( =x11-libs/gtk+-1.2* - =dev-libs/glib-1.2* ) - png? ( media-libs/libpng ) - jpeg? ( media-libs/jpeg ) - tiff? ( media-libs/tiff ) - >=sys-libs/zlib-1.1.4 - opengl? ( >=dev-python/pyopengl-2.0.0.44 )" - -DEPEND="${RDEPEND} - gtk2? ( dev-util/pkgconfig )" - -pkg_setup() { - if use unicode; then - ! use gtk2 && die "You must put gtk2 in your USE if you need unicode support" - fi -} - -src_compile() { - local mypyconf - - if ! use gtk2; then - need-wxwidgets gtk || die "Emerge wxGTK with wxgtk1 in USE" - elif use unicode; then - need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE" - else - need-wxwidgets gtk2 || die "Emerge wxGTK with gtk2 in USE" - fi - - use opengl \ - && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ - || mypyconf="${mypyconf} BUILD_GLCANVAS=0" - - use gtk2 \ - && mypyconf="${mypyconf} WXPORT=gtk2" \ - || mypyconf="${mypyconf} WXPORT=gtk" - - use unicode && mypyconf="${mypyconf} UNICODE=1" - - python setup.py ${mypyconf} build || die "build failed" -} - -src_install() { - python_version - local mypyconf - local dest - local wx_name - local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages - - use opengl \ - && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ - || mypyconf="${mypyconf} BUILD_GLCANVAS=0" - use gtk2 \ - && mypyconf="${mypyconf} WXPORT=gtk2" \ - || mypyconf="${mypyconf} WXPORT=gtk" - use unicode && mypyconf="${mypyconf} UNICODE=1" - - - # This can all be removed when 2.4.3 is released: - # Future: Make sure we don't clobber existing wxversion.py or wx.pth - # from SLOT'd versions. - if use unicode; then - wx_name=wx-${PV:0:3}-gtk2-unicode - elif use gtk2; then - wx_name=wx-${PV:0:3}-gtk2-ansi - else - wx_name=wx-${PV:0:3}-gtk-ansi - fi - dest=${site_pkgs}/${wx_name} - dodir ${site_pkgs} - dodir ${dest} - - python setup.py ${mypyconf} install --prefix=/usr \ - --install-lib=${dest} --root=${D} || die - - echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \ - die "Couldn't create wx.pth" - elog "Setting ${wx_name} as system default wxPython" - echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \ - die "Couldn't create wx.pth" - - cp ${FILESDIR}/wxversion.py ${D}/${site_pkgs} || \ - die "Couldn't copy wxversion.py" - dodir ${site_pkgs} - - cp ${FILESDIR}/wxpy-config.py ${D}/${site_pkgs}/ || \ - die "Couldn't copy wxpy-config.py" -} - -pkg_postinst() { - - elog "Gentoo now uses the Multi-version method for SLOT'ing" - elog "Developers see this site for instructions on using 2.4 or 2.6" - elog "with your apps:" - elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" -} - -pkg_postrm() { - python_version - site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages - cd ${site_pkgs} - #If 2.4 is removed, set 2.6 as default version: - for wxver in "wx-2.6-gtk2-unicode" "wx-2.6-gtk2-ansi" "wx-2.6-gtk" - do - if [ -e "${wxver}" ]; then - echo "Setting ${wxver} as system default." - echo "${wxver}" > "wx.pth" - fi - done -} diff --git a/dev-python/wxpython/wxpython-2.4.2.4-r4.ebuild b/dev-python/wxpython/wxpython-2.4.2.4-r4.ebuild deleted file mode 100644 index aefb35861e35..000000000000 --- a/dev-python/wxpython/wxpython-2.4.2.4-r4.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4-r4.ebuild,v 1.1 2007/02/03 15:18:32 blubb Exp $ - -inherit eutils wxwidgets python multilib - -MY_P="${P/wxpython-/wxPythonSrc-}" -S="${WORKDIR}/${MY_P}/wxPython" -DESCRIPTION="A blending of the wxWindows C++ class library with Python" -HOMEPAGE="http://www.wxpython.org/" -SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz" - -LICENSE="wxWinLL-3" -SLOT="2.4" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="gtk gtk2 unicode opengl tiff jpeg png" - -RDEPEND=">=dev-lang/python-2.1 - =x11-libs/wxGTK-2.4.2* - gtk2? ( >=x11-libs/gtk+-2.0 - >=x11-libs/pango-1.2 - >=dev-libs/glib-2.0 ) - unicode? ( >=x11-libs/gtk+-2.0 - >=x11-libs/pango-1.2 - >=dev-libs/glib-2.0 ) - !gtk2? ( =x11-libs/gtk+-1.2* - =dev-libs/glib-1.2* ) - png? ( media-libs/libpng ) - jpeg? ( media-libs/jpeg ) - tiff? ( media-libs/tiff ) - >=sys-libs/zlib-1.1.4 - opengl? ( >=dev-python/pyopengl-2.0.0.44 )" - -DEPEND="${RDEPEND} - gtk2? ( dev-util/pkgconfig )" - -pkg_setup() { - if use unicode; then - ! use gtk2 && die "You must put gtk2 in your USE if you need unicode support" - fi -} - -src_unpack() { - unpack ${A} - cd ${S} - - epatch "${FILESDIR}"/${P}-64bit.patch -} - -src_compile() { - local mypyconf - - if ! use gtk2; then - need-wxwidgets gtk || die "Emerge wxGTK with wxgtk1 in USE" - elif use unicode; then - need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE" - else - need-wxwidgets gtk2 || die "Emerge wxGTK with gtk2 in USE" - fi - - use opengl \ - && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ - || mypyconf="${mypyconf} BUILD_GLCANVAS=0" - - use gtk2 \ - && mypyconf="${mypyconf} WXPORT=gtk2" \ - || mypyconf="${mypyconf} WXPORT=gtk" - - use unicode && mypyconf="${mypyconf} UNICODE=1" - - python setup.py ${mypyconf} build || die "build failed" -} - -src_install() { - python_version - local mypyconf - local dest - local wx_name - local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages - - use opengl \ - && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ - || mypyconf="${mypyconf} BUILD_GLCANVAS=0" - use gtk2 \ - && mypyconf="${mypyconf} WXPORT=gtk2" \ - || mypyconf="${mypyconf} WXPORT=gtk" - use unicode && mypyconf="${mypyconf} UNICODE=1" - - - # This can all be removed when 2.4.3 is released: - # Future: Make sure we don't clobber existing wxversion.py or wx.pth - # from SLOT'd versions. - if use unicode; then - wx_name=wx-${PV:0:3}-gtk2-unicode - elif use gtk2; then - wx_name=wx-${PV:0:3}-gtk2-ansi - else - wx_name=wx-${PV:0:3}-gtk-ansi - fi - dest=${site_pkgs}/${wx_name} - dodir ${site_pkgs} - dodir ${dest} - - python setup.py ${mypyconf} install --prefix=/usr \ - --install-lib=${dest} --root=${D} || die - - echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \ - die "Couldn't create wx.pth" - elog "Setting ${wx_name} as system default wxPython" - echo ${wx_name} > ${D}/${site_pkgs}/wx.pth || \ - die "Couldn't create wx.pth" - - cp ${FILESDIR}/wxversion.py ${D}/${site_pkgs} || \ - die "Couldn't copy wxversion.py" - dodir ${site_pkgs} - - cp ${FILESDIR}/wxpy-config.py ${D}/${site_pkgs}/ || \ - die "Couldn't copy wxpy-config.py" -} - -pkg_postinst() { - - elog "Gentoo now uses the Multi-version method for SLOT'ing" - elog "Developers see this site for instructions on using 2.4 or 2.6" - elog "with your apps:" - elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" -} - -pkg_postrm() { - python_version - site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages - cd ${site_pkgs} - #If 2.4 is removed, set 2.6 as default version: - for wxver in "wx-2.6-gtk2-unicode" "wx-2.6-gtk2-ansi" "wx-2.6-gtk" - do - if [ -e "${wxver}" ]; then - echo "Setting ${wxver} as system default." - echo "${wxver}" > "wx.pth" - fi - done -} -- 2.26.2