diff options
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/wxPython/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/wxPython/wxPython-2.4.2.4.ebuild | 28 |
2 files changed, 27 insertions, 5 deletions
diff --git a/dev-python/wxPython/Manifest b/dev-python/wxPython/Manifest index 12ccc8358815..6a27e4b2e3cf 100644 --- a/dev-python/wxPython/Manifest +++ b/dev-python/wxPython/Manifest @@ -1,8 +1,8 @@ -MD5 9f8598f02f796d6fe56786dcf33a2aa0 ChangeLog 5156 +MD5 ab3d7f7e4500b19c134193f377191e45 ChangeLog 5335 MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182 MD5 9a7de975602ab6d3fd83add64d895925 wxPython-2.4.0.7.ebuild 2996 MD5 672638de67beeaf41c5fe8a4ff3f22f2 wxPython-2.4.1.2.ebuild 2366 -MD5 403ce5aa34879bd373ae51266682c859 wxPython-2.4.2.4.ebuild 2335 +MD5 2e7ad9c0ad565dffac396a53d2524f2d wxPython-2.4.2.4.ebuild 3349 MD5 99504d777b11bc0266e7487ee59496dd files/controls2.py.patch 2202 MD5 88f72c81ee2c594876b3bddc9e14bb72 files/digest-wxPython-2.4.0.7 73 MD5 ce3003c042f7c8fe4700193e357ad2ad files/digest-wxPython-2.4.1.2 73 diff --git a/dev-python/wxPython/wxPython-2.4.2.4.ebuild b/dev-python/wxPython/wxPython-2.4.2.4.ebuild index 62c667b4de68..3e37fa21a119 100644 --- a/dev-python/wxPython/wxPython-2.4.2.4.ebuild +++ b/dev-python/wxPython/wxPython-2.4.2.4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.4.2.4.ebuild,v 1.4 2003/10/08 21:16:14 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.4.2.4.ebuild,v 1.5 2003/10/12 03:00:05 liquidx Exp $ inherit eutils -IUSE="opengl tiff jpeg png gtk2" +IUSE="opengl tiff jpeg png gtk2 unicode" MY_P="${P/-/Src-}" S="${WORKDIR}/${MY_P}/${PN}" @@ -35,7 +35,7 @@ DEPEND="${RDEPEND} pkg_setup() { # make sure if you want gtk2, you have wxGTK with gtk2, and vice versa if [ -n "`use gtk2`" ]; then - if [ ! -f "/usr/bin/wxgtk2u-2.4-config" -a ! -f "/usr/bin/wxgtk2-2.4-config" -a ! -f "/usr/bin/wxgtk2d-2.4-config" ]; then + if [ ! -f "/usr/bin/wxgtk2u-2.4-config" -a ! -f "/usr/bin/wxgtk2ud-2.4-config" -a ! -f "/usr/bin/wxgtk2-2.4-config" -a ! -f "/usr/bin/wxgtk2d-2.4-config" ]; then eerror "You need x11-libs/wxGTK compiled with GTK+2 support." eerror "Either emerge wxGTK with 'gtk2' in your USE flags or" eerror "emerge wxPython without 'gtk2' in your USE flags." @@ -49,6 +49,24 @@ pkg_setup() { die "wxGTK needs to be compiled without gtk2" fi fi + + # make sure that wxPython and wxGTK have same unicode setting: + if [ -n "`use unicode`" ]; then + if [ ! -f "/usr/bin/wxgtk2u-2.4-config" -a ! -f "/usr/bin/wxgtk2ud-2.4-config" ]; then + eerror "You need x11-libs/wxGTK compiled with Unicode support." + eerror "Either emerge wxGTK with 'unicode' in your USE flags or" + eerror "emerge wxPython without 'unicode' in your USE flags." + die "wxGTK needs to be compiled with unicode" + fi + else + if [ ! -f "/usr/bin/wxgtk-2.4-config" -a ! -f "/usr/bin/wxgtk2-2.4-config" -a ! -f "/usr/bin/wxgtkd-2.4-config" -a ! -f "/usr/bin/wxgtk2d-2.4-config" ]; then + eerror "You need x11-libs/wxGTK compiled without Unicode." + eerror "Either emerge wxGTK without 'unicode' in your USE flags or" + eerror "emerge wxPython with 'unicode' in your USE flags." + die "wxGTK needs to be compiled without unicode" + fi + fi + } src_compile() { @@ -61,6 +79,8 @@ src_compile() { use gtk2 \ && mypyconf="${mypyconf} WXPORT=gtk2" \ || mypyconf="${mypyconf} WXPORT=gtk" + + use unicode && mypyconf="${mypyconf} UNICODE=1" python setup.py ${mypyconf} build || die "build failed" } @@ -75,6 +95,8 @@ src_install() { use gtk2 \ && mypyconf="${mypyconf} WXPORT=gtk2" \ || mypyconf="${mypyconf} WXPORT=gtk" + + use unicode && mypyconf="${mypyconf} UNICODE=1" python setup.py ${mypyconf} install --prefix=/usr --root=${D} || die } |