version bump

5 files changed, 32 insertions, 11 deletions

diff --git a/dev-python/wxPython/ChangeLog b/dev-python/wxPython/ChangeLog
index 68a40c3e3d7b..23398a982a03 100644
--- a/dev-python/wxPython/ChangeLog
+++ b/dev-python/wxPython/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2003/03/26 11:49:26 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/ChangeLog,v 1.24 2003/04/27 00:39:49 liquidx Exp $
+
+*wxPython-2.4.0.7 (27 Apr 2003)
+
+  27 Apr 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.7.ebuild:
+  version bump
 
 *wxPython-2.4.0.6 (16 Mar 2003)
 
diff --git a/dev-python/wxPython/Manifest b/dev-python/wxPython/Manifest
index c6a582e24c7e..668ac01c8caf 100644
--- a/dev-python/wxPython/Manifest
+++ b/dev-python/wxPython/Manifest
@@ -1,5 +1,5 @@
-MD5 0e18d29836988500822c57c724c7cd84 ChangeLog 3811
-MD5 5a53e701e96b8a776302be442f45b47b wxPython-2.4.0.7.ebuild 3081
+MD5 0db925d43b17c9063d78039ab2524bb2 ChangeLog 3934
+MD5 e29c99600abf4b1c42f19f922a1698b0 wxPython-2.4.0.7.ebuild 3081
 MD5 0938f70998dfcb709f808d7121c2305e wxPython-2.4.0.2.ebuild 2320
 MD5 5a53e701e96b8a776302be442f45b47b wxPython-2.4.0.6.ebuild 3081
 MD5 88f72c81ee2c594876b3bddc9e14bb72 files/digest-wxPython-2.4.0.7 73
diff --git a/dev-python/wxPython/files/digest-wxPython-2.4.0.1 b/dev-python/wxPython/files/digest-wxPython-2.4.0.1
deleted file mode 100644
index d8b6ef9da352..000000000000
--- a/dev-python/wxPython/files/digest-wxPython-2.4.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1eb8149cb76fd2a4bf5f0c51dc08c2f4 wxPythonSrc-2.4.0.1.tar.gz 11567630
diff --git a/dev-python/wxPython/files/digest-wxPython-2.4.0.7 b/dev-python/wxPython/files/digest-wxPython-2.4.0.7
new file mode 100644
index 000000000000..a10374ead06a
--- /dev/null
+++ b/dev-python/wxPython/files/digest-wxPython-2.4.0.7
@@ -0,0 +1 @@
+MD5 c7864b56ff1422697a310f91f54c7ed6 wxPythonSrc-2.4.0.7.tar.gz 11819092
diff --git a/dev-python/wxPython/wxPython-2.4.0.1.ebuild b/dev-python/wxPython/wxPython-2.4.0.7.ebuild
index 1befb7f12e5a..c7ca5102a4cc 100644
--- a/dev-python/wxPython/wxPython-2.4.0.1.ebuild
+++ b/dev-python/wxPython/wxPython-2.4.0.7.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.1.ebuild,v 1.5 2003/02/13 11:40:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.4.0.7.ebuild,v 1.1 2003/04/27 00:39:49 liquidx Exp $
+
+IUSE="opengl gtk2"
 
 MY_P="${P/-/Src-}"
 S="${WORKDIR}/${MY_P}/${PN}"
@@ -10,19 +12,34 @@ HOMEPAGE="http://www.wxpython.org/"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-IUSE="opengl gtk2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 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-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."
+            die "wxGTK needs to be compiled with gtk2"
+        fi
+    else
+    	if [ ! -f "/usr/bin/wxgtk-2.4-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