now builds opengl (if requested) and gizmos extensions properly.

4 files changed, 125 insertions, 2 deletions

diff --git a/dev-python/wxPython/ChangeLog b/dev-python/wxPython/ChangeLog
index c39530b3bfe9..5133678adbf3 100644
--- a/dev-python/wxPython/ChangeLog
+++ b/dev-python/wxPython/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for dev-python/wxPython
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/ChangeLog,v 1.4 2002/08/22 19:35:19 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/ChangeLog,v 1.5 2002/08/29 18:39:22 raker Exp $
+
+*wxPython-2.3.2.1-r2 (29 Aug 2002)
+
+  29 Aug 2002; Nick Hadaway <raker@gentoo.org> wxPython-2.3.2.1-r2.ebuild,
+  file/digest-wxPython-2.3.2.1-r2, files/ledctrl.diff :
+  GLCANVAS and GIZMOS extensions are now re-enabled and we should have a
+  full-featured ebuild of wxPython.
 
 *wxPython-2.3.2.1-r1 (2 Jul 2002)
 
-  22 Aug 2002; Nick Hadaway <raker@gentoo.org> wxPython-2.3.2.1-r1,
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org> wxPython-2.3.2.1-r1.ebuild,
   files/noglcanvas.diff, files/nogizmos.diff :
   Ebuild disables glcancas and gizmos extensions as they currently are 
   not building correctly.
diff --git a/dev-python/wxPython/files/digest-wxPython-2.3.2.1-r2 b/dev-python/wxPython/files/digest-wxPython-2.3.2.1-r2
new file mode 100644
index 000000000000..2dac4ca0b00e
--- /dev/null
+++ b/dev-python/wxPython/files/digest-wxPython-2.3.2.1-r2
@@ -0,0 +1 @@
+MD5 e57b4d030c4ba43a9030fdaee083011c wxPython-2.3.2.1.tar.gz 2845829
diff --git a/dev-python/wxPython/files/ledctrl.diff b/dev-python/wxPython/files/ledctrl.diff
new file mode 100644
index 000000000000..c86e08cc34bd
--- /dev/null
+++ b/dev-python/wxPython/files/ledctrl.diff
@@ -0,0 +1,60 @@
+--- ledctrl.cpp	Thu Aug 29 12:36:52 2002
++++ ledctrl.cpp-cvs	Thu Aug 29 12:36:22 2002
+@@ -134,6 +134,7 @@
+ {
+     if (Value != m_Value)
+     {
++#ifdef __WXDEBUG__
+         if (!Value.IsEmpty())
+         {
+             for(size_t i=0; i<Value.Length(); i++) {
+@@ -142,6 +143,7 @@
+                              wxT("wxLEDNumberCtrl can only display numeric string values."));
+             }
+         }
++#endif
+ 
+         m_Value = Value;
+         RecalcInternals(GetClientSize());
+@@ -191,7 +193,7 @@
+             DrawDigit(MemDc, DIGITALL, i);
+ 
+         // Draw the digits.
+-        switch (m_Value[i])
++        switch (m_Value.GetChar(i))
+         {
+             case '0' :
+                 DrawDigit(MemDc, DIGIT0, i);
+@@ -230,7 +232,7 @@
+                 // just skip it
+                 break;
+             default :
+-                wxFAIL_MSG(_("Unknown digit value"));
++                wxFAIL_MSG(wxT("Unknown digit value"));
+                 break;
+         }
+     }
+@@ -318,12 +320,12 @@
+     if ((Height * 0.07) < 1)
+         m_LineMargin = 1;
+     else
+-        m_LineMargin = Height * 0.07;
++        m_LineMargin = (int)(Height * 0.07);
+ 
+     if ((Height * 0.35) < 1)
+         m_LineLength = 1;
+     else
+-        m_LineLength = Height * 0.35;
++        m_LineLength = (int)(Height * 0.35);
+ 
+     m_LineWidth = m_LineMargin;
+ 
+@@ -344,7 +346,7 @@
+             m_LeftStartPos = (ClientWidth - ValueWidth) / 2;
+             break;
+         default :
+-            wxFAIL_MSG(_("Unknown alignent value for wxLEDNumberCtrl."));
++            wxFAIL_MSG(wxT("Unknown alignent value for wxLEDNumberCtrl."));
+             break;
+     }
+ }
diff --git a/dev-python/wxPython/wxPython-2.3.2.1-r2.ebuild b/dev-python/wxPython/wxPython-2.3.2.1-r2.ebuild
new file mode 100644
index 000000000000..acfd51b380be
--- /dev/null
+++ b/dev-python/wxPython/wxPython-2.3.2.1-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxPython/wxPython-2.3.2.1-r2.ebuild,v 1.1 2002/08/29 18:39:22 raker Exp $
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python."
+SRC_URI="mirror://sourceforge/wxpython/${P}.tar.gz"
+HOMEPAGE="http://www.wxpython.org/"
+
+DEPEND=">=dev-lang/python-2.1
+	=dev-libs/glib-1.2*
+	=x11-libs/gtk+-1.2*
+	x11-libs/wxGTK
+	opengl? ( >=dev-python/PyOpenGL-2.0.0.44 )"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="x86 sparc sparc64"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}/contrib/gizmos/contrib/src/gizmos
+	patch -p0 < ${FILESDIR}/ledctrl.diff || die "patch failed"
+	cd ${S}
+
+}
+
+src_compile() {
+
+	local myconf
+	myconf=""
+
+#Other possible configuration variables are BUILD_OGL and BUILD_STC.
+#BUILD_OGL builds the Object Graphics Library extension module.
+#BUILD_STC builds the wxStyledTextCtrl (the Scintilla wrapper) extension module.
+#Both these variable are enabled by default.  To disable them set equal to zero
+#and add to myconf.
+
+	if use opengl; then
+		myconf="${myconf} BUILD_GLCANVAS=1"
+	else
+		myconf="${myconf} BUILD_GLCANVAS=0"
+	fi
+        
+	python setup.py build || die
+}
+
+src_install () {
+
+	python setup.py install --prefix=${D}/usr || die
+
+	dodoc BUILD.unix.txt CHANGES.txt MANIFEST.in PKG-INFO README.txt
+}