diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2003-03-26 03:26:05 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2003-03-26 03:26:05 +0000 |
| commit | 8eebc69bada9d89c3b1ddd28605722982a01fa32 (patch) | |
| tree | 8bc94bcb792f61b6f8901646e3ee5de161c72370 /dev-python/wxPython | |
| parent | moved 1.6.5 to stable (diff) | |
| download | historical-8eebc69bada9d89c3b1ddd28605722982a01fa32.tar.gz historical-8eebc69bada9d89c3b1ddd28605722982a01fa32.tar.bz2 historical-8eebc69bada9d89c3b1ddd28605722982a01fa32.zip | |
deps and sanity check
Diffstat (limited to 'dev-python/wxPython')
| -rw-r--r-- | dev-python/wxPython/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/wxPython/wxPython-2.4.0.6.ebuild | 28 |
2 files changed, 26 insertions, 7 deletions
diff --git a/dev-python/wxPython/ChangeLog b/dev-python/wxPython/ChangeLog index f44191bf31f5..1a7a2ccc1cf1 100644 --- a/dev-python/wxPython/ChangeLog +++ b/dev-python/wxPython/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for dev-python/wxPython # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/ChangeLog,v 1.21 2003/03/16 17:15:31 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/ChangeLog,v 1.22 2003/03/26 03:26:05 liquidx Exp $ *wxPython-2.4.0.6 (16 Mar 2003) + 26 Mar 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.6.ebuild: + add check to make sure wxGTK is compiled with the right use flags + 16 Mar 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.6.ebuild: version bump diff --git a/dev-python/wxPython/wxPython-2.4.0.6.ebuild b/dev-python/wxPython/wxPython-2.4.0.6.ebuild index 3b4ee1fe833c..f2401ec1017f 100644 --- a/dev-python/wxPython/wxPython-2.4.0.6.ebuild +++ b/dev-python/wxPython/wxPython-2.4.0.6.ebuild @@ -1,6 +1,8 @@ # 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.0.6.ebuild,v 1.1 2003/03/16 17:15:31 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.4.0.6.ebuild,v 1.2 2003/03/26 03:26:05 liquidx Exp $ + +IUSE="opengl gtk2" MY_P="${P/-/Src-}" S="${WORKDIR}/${MY_P}/${PN}" @@ -11,18 +13,33 @@ HOMEPAGE="http://www.wxpython.org/" SLOT="0" LICENSE="LGPL-2" KEYWORDS="~x86 ~ppc ~sparc ~alpha" -IUSE="opengl gtk2" DEPEND=">=dev-lang/python-2.1 - >=dev-libs/glib-1.2 - >=x11-libs/gtk+-1.2 =x11-libs/wxGTK-2.4.0* + gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 ) : ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* ) opengl? ( >=dev-python/PyOpenGL-2.0.0.44 )" pkg_setup() { # xfree should not install these, remove until the fixed # xfree is in main use. rm -f /usr/X11R6/include/{zconf.h,zlib.h} + + # make sure if you want gtk2, you have wxGTK with gtk2, and vice versa + if [ -n "`use gtk2`" ]; then + if [ ! -f "/usr/bin/wxgtk2u-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." + die "wxGTK needs to be compiled with gtk2" + fi + else + if [ ! -f "/usr/bin/wxgtk-config" ]; then + eerror "You need x11-libs/wxGTK compiled with GTK+1." + eerror "Either emerge wxGTK without 'gtk2' in your USE flags or" + eerror "emerge wxPython with 'gtk2' in your USE flags." + die "wxGTK needs to be compiled without gtk2" + fi + fi } src_compile() { @@ -41,9 +58,8 @@ src_compile() { myconf="${myconf} BUILD_GLCANVAS=1" else myconf="${myconf} BUILD_GLCANVAS=0" - patch -p1 < ${FILESDIR}/wxPython-2.3.3.1-noglcanvas.diff \ - || die "patch failed" fi + if [ `use gtk2` ]; then myconf="${myconf} WXPORT=gtk2" else |