Removed obsolete versions, changed 2.4.2.4 to use new wxwidgets eclass

8 files changed, 27 insertions, 265 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index b43999728f3f..34b8326c481d 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/wxPython
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.6 2004/08/02 19:46:07 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.7 2004/08/07 06:32:35 pythonhead Exp $
+
+  06 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> -wxpython-2.4.0.7.ebuild,
+  -wxpython-2.4.1.2.ebuild, wxpython-2.4.2.4.ebuild:
+  Removed obsolete versions, changed 2.4.2.4 to use new wxwidgets eclass
 
   02 Aug 2004; Rob Cakebread <pythonhead@gentoo.org>
   +files/controsl2.py.patch:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 04345db8a250..36b247126390 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,9 +1,4 @@
 MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
-MD5 e11efdbd81a393a1733db932d753cc47 wxpython-2.4.0.7.ebuild 3004
-MD5 ce88e056727f5cdfa54452ad71324283 wxpython-2.4.1.2.ebuild 2368
-MD5 42342c0a0864267d9ae0b7c704676d17 ChangeLog 7386
-MD5 222b95f1da61243305a8605ae9c191c5 wxpython-2.4.2.4.ebuild 3357
-MD5 88f72c81ee2c594876b3bddc9e14bb72 files/digest-wxpython-2.4.0.7 73
-MD5 ce3003c042f7c8fe4700193e357ad2ad files/digest-wxpython-2.4.1.2 73
+MD5 aedd6a31dc773da60832df0d4a50983d wxpython-2.4.2.4.ebuild 2377
+MD5 3084a144dcf8078af3b8d01f81d900d9 ChangeLog 7714
 MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4 73
-MD5 37295268538eed996c33360b0af9e529 files/controsl2.py.patch 2203
diff --git a/dev-python/wxpython/files/controsl2.py.patch b/dev-python/wxpython/files/controsl2.py.patch
deleted file mode 100644
index bf5ac197f454..000000000000
--- a/dev-python/wxpython/files/controsl2.py.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN wxPythonSrc-2.4.1.2/wxPython/src/gtk/controls2.py wxPythonSrc-2.4.1.2-modified/wxPython/src/gtk/controls2.py
---- wxPythonSrc-2.4.1.2/wxPython/src/gtk/controls2.py	2003-06-12 18:25:30.000000000 -0500
-+++ wxPythonSrc-2.4.1.2-modified/wxPython/src/gtk/controls2.py	2003-07-10 18:19:51.000000000 -0500
-@@ -642,7 +642,7 @@
-         return "<%s.%s instance; proxy of C++ wxListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
-     
-     def GetColumn(self, *_args, **_kwargs):
--        val = ontrols2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
-+        val = controls2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
-         if val is not None: val.thisown = 1
-         return val
-     
-diff -urN wxPythonSrc-2.4.1.2/wxPython/src/mac/controls2.py wxPythonSrc-2.4.1.2-modified/wxPython/src/mac/controls2.py
---- wxPythonSrc-2.4.1.2/wxPython/src/mac/controls2.py	2003-05-16 13:36:52.000000000 -0500
-+++ wxPythonSrc-2.4.1.2-modified/wxPython/src/mac/controls2.py	2003-07-10 18:20:41.000000000 -0500
-@@ -642,7 +642,7 @@
-         return "<%s.%s instance; proxy of C++ wxListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
-     
-     def GetColumn(self, *_args, **_kwargs):
--        val = ontrols2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
-+        val = controls2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
-         if val is not None: val.thisown = 1
-         return val
-     
-diff -urN wxPythonSrc-2.4.1.2/wxPython/src/msw/controls2.py wxPythonSrc-2.4.1.2-modified/wxPython/src/msw/controls2.py
---- wxPythonSrc-2.4.1.2/wxPython/src/msw/controls2.py	2003-05-07 14:29:04.000000000 -0500
-+++ wxPythonSrc-2.4.1.2-modified/wxPython/src/msw/controls2.py	2003-07-10 18:20:11.000000000 -0500
-@@ -645,7 +645,7 @@
-         return "<%s.%s instance; proxy of C++ wxListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
-     
-     def GetColumn(self, *_args, **_kwargs):
--        val = ontrols2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
-+        val = controls2c.wxListCtrl_GetColumn(self, *_args, **_kwargs)
-         if val is not None: val.thisown = 1
-         return val
-     
-
diff --git a/dev-python/wxpython/files/digest-wxpython-2.4.0.7 b/dev-python/wxpython/files/digest-wxpython-2.4.0.7
deleted file mode 100644
index a10374ead06a..000000000000
--- a/dev-python/wxpython/files/digest-wxpython-2.4.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7864b56ff1422697a310f91f54c7ed6 wxPythonSrc-2.4.0.7.tar.gz 11819092
diff --git a/dev-python/wxpython/files/digest-wxpython-2.4.1.2 b/dev-python/wxpython/files/digest-wxpython-2.4.1.2
deleted file mode 100644
index 00b6ca04f3cc..000000000000
--- a/dev-python/wxpython/files/digest-wxpython-2.4.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 515fa95c5c0497404a858213b6586411 wxPythonSrc-2.4.1.2.tar.gz 12443750
diff --git a/dev-python/wxpython/wxpython-2.4.0.7.ebuild b/dev-python/wxpython/wxpython-2.4.0.7.ebuild
deleted file mode 100644
index c1dce34e9a1c..000000000000
--- a/dev-python/wxpython/wxpython-2.4.0.7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.0.7.ebuild,v 1.3 2004/07/20 20:09:35 kloeri Exp $
-
-IUSE="opengl gtk2"
-
-#MY_P="${P/-/Src-}"
-MY_P="${P/wxpython-/wxPythonSrc-}"
-S="${WORKDIR}/${MY_P}/wxPython"
-DESCRIPTION="A blending of the wxWindows C++ class library with Python."
-SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
-HOMEPAGE="http://www.wxpython.org/"
-
-SLOT="0"
-LICENSE="wxWinLL-3"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-
-DEPEND=">=dev-lang/python-2.1
-	=x11-libs/wxGTK-2.4.0*
-	gtk2? (
-		>=x11-libs/gtk+-2.0
-		>=dev-libs/glib-2.0 )
-	!gtk2? (
-		=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 use gtk2; then
-		if [ ! -f "/usr/bin/wxgtk2u-2.4-config" -a ! -f "/usr/bin/wxgtk2-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() {
-	# create links so the build doesnt fail
-	for d in ogl stc xrc gizmos ; do
-		ln -s ${S}/../contrib/ ${S}/contrib/${d}/contrib
-	done
-
-	#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.
-	local myconf=""
-	if use opengl; then
-		myconf="${myconf} BUILD_GLCANVAS=1"
-	else
-		myconf="${myconf} BUILD_GLCANVAS=0"
-	fi
-
-	if use gtk2; then
-		myconf="${myconf} WXPORT=gtk2"
-	else
-		myconf="${myconf} WXPORT=gtk"
-	fi
-
-	python setup.py ${myconf} build || die "build failed"
-}
-
-src_install() {
-	#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.
-	local myconf=""
-	if use opengl; then
-		myconf="${myconf} BUILD_GLCANVAS=1"
-	else
-		myconf="${myconf} BUILD_GLCANVAS=0"
-	fi
-	if use gtk2; then
-		myconf="${myconf} WXPORT=gtk2"
-	else
-		myconf="${myconf} WXPORT=gtk"
-	fi
-
-	python setup.py ${myconf} install --prefix=/usr --root=${D} || die
-}
diff --git a/dev-python/wxpython/wxpython-2.4.1.2.ebuild b/dev-python/wxpython/wxpython-2.4.1.2.ebuild
deleted file mode 100644
index 56540399d0e0..000000000000
--- a/dev-python/wxpython/wxpython-2.4.1.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.1.2.ebuild,v 1.3 2004/07/20 20:09:35 kloeri Exp $
-
-inherit eutils
-
-IUSE="opengl tiff jpeg png gtk2"
-
-MY_P="${P/wxpython-/wxPythonSrc-}"
-S="${WORKDIR}/${MY_P}/wxPython"
-DESCRIPTION="A blending of the wxWindows C++ class library with Python."
-SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
-HOMEPAGE="http://www.wxpython.org/"
-
-SLOT="0"
-LICENSE="wxWinLL-3"
-KEYWORDS="x86 ~ppc sparc ~alpha hppa"
-
-RDEPEND=">=dev-lang/python-2.1
-	=x11-libs/wxGTK-2.4.1*
-	gtk2? ( >=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() {
-	# make sure if you want gtk2, you have wxGTK with gtk2, and vice versa
-	if use gtk2; then
-		if [ ! -f "/usr/bin/wxgtk2u-2.4-config" -a ! -f "/usr/bin/wxgtk2-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_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/controls2.py.patch
-}
-
-src_compile() {
-	local mypyconf
-
-	use opengl \
-		&& 	mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-
-	use gtk2 \
-		&&	mypyconf="${mypyconf} WXPORT=gtk2" \
-		|| mypyconf="${mypyconf} WXPORT=gtk"
-
-	python setup.py ${mypyconf} build || die "build failed"
-}
-
-src_install() {
-	local mypyconf
-
-	use opengl \
-		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-
-	use gtk2 \
-		&& mypyconf="${mypyconf} WXPORT=gtk2" \
-		|| mypyconf="${mypyconf} WXPORT=gtk"
-
-	python setup.py ${mypyconf} install --prefix=/usr --root=${D} || die
-}
diff --git a/dev-python/wxpython/wxpython-2.4.2.4.ebuild b/dev-python/wxpython/wxpython-2.4.2.4.ebuild
index d91c6ab88561..75a0eced9e9a 100644
--- a/dev-python/wxpython/wxpython-2.4.2.4.ebuild
+++ b/dev-python/wxpython/wxpython-2.4.2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.ebuild,v 1.6 2004/08/02 14:47:46 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4.ebuild,v 1.7 2004/08/07 06:32:35 pythonhead Exp $
 
-inherit eutils
+inherit eutils wxwidgets
 
 MY_P="${P/wxpython-/wxPythonSrc-}"
 S="${WORKDIR}/${MY_P}/wxPython"
@@ -13,13 +13,16 @@ SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
 LICENSE="wxWinLL-3"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha arm amd64 ia64 hppa"
-IUSE="opengl tiff jpeg png gtk2 unicode"
+IUSE="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 )
@@ -32,45 +35,26 @@ DEPEND="${RDEPEND}
 	gtk2? ( dev-util/pkgconfig )"
 
 pkg_setup() {
-	# make sure if you want gtk2, you have wxGTK with gtk2, and vice versa
-	if use gtk2; 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 with '-gtk2' in your USE flags."
-			die "wxGTK needs to be compiled with USE='gtk2'"
-		fi
-	else
-		if [ ! -f "/usr/bin/wxgtk-2.4-config" ]; then
-			eerror "You need x11-libs/wxGTK compiled with GTK+1."
-			eerror "Either re-emerge wxGTK with '-gtk2' in your USE flags or"
-			eerror "emerge wxpython with '-gtk2' in your USE flags."
-			die "wxGTK needs to be compiled with USE='-gtk2'"
-		fi
-	fi
-
-	# make sure that wxpython and wxGTK have same unicode setting:
-	if 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
+	einfo "You can now have gtk, gtk2 and unicode versions of wxGTK"
+	einfo "simultaneously installed as of >=wxGTK-2.4.2-r2."
+	einfo "This means you can have wxpython installed using any one of those"
+	einfo "versions by setting gtk2, unicode, or -gtk2 (for gtk1) in USE"
+	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 -no_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"