cleanup

6 files changed, 0 insertions, 264 deletions

diff --git a/dev-python/wxPython/Manifest b/dev-python/wxPython/Manifest
index 4eb9254528f8..42e2bd3ba084 100644
--- a/dev-python/wxPython/Manifest
+++ b/dev-python/wxPython/Manifest
@@ -1,9 +1,4 @@
 MD5 61b055db57f12b6f8d1800dbeb456417 ChangeLog 4284
 MD5 028027d2871c90469b2f389475c25a30 wxPython-2.4.0.7.ebuild 3117
-MD5 92b5b8da4e94527db71aece6cfed5b58 wxPython-2.4.0.2.ebuild 2235
-MD5 5900b9aab05c70db682559da716bfb91 wxPython-2.4.0.6.ebuild 3118
 MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
 MD5 88f72c81ee2c594876b3bddc9e14bb72 files/digest-wxPython-2.4.0.7 73
-MD5 da22eb14f789d103f8802058263951da files/digest-wxPython-2.4.0.2 73
-MD5 b9e15002ddba12f3653a8cfdc638a0cc files/wxPython-2.3.3.1-noglcanvas.diff 3207
-MD5 92e5a7bd582253eaaf918f6896f74027 files/digest-wxPython-2.4.0.6 73
diff --git a/dev-python/wxPython/files/digest-wxPython-2.4.0.2 b/dev-python/wxPython/files/digest-wxPython-2.4.0.2
deleted file mode 100644
index 7e366a3f648f..000000000000
--- a/dev-python/wxPython/files/digest-wxPython-2.4.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 217a2cfe79b280b4cd2d7f32c24339f6 wxPythonSrc-2.4.0.2.tar.gz 11700089
diff --git a/dev-python/wxPython/files/digest-wxPython-2.4.0.6 b/dev-python/wxPython/files/digest-wxPython-2.4.0.6
deleted file mode 100644
index ddc1dc09b75f..000000000000
--- a/dev-python/wxPython/files/digest-wxPython-2.4.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8cc3ba528fc6e3a470d6dccd251c9238 wxPythonSrc-2.4.0.6.tar.gz 12219547
diff --git a/dev-python/wxPython/files/wxPython-2.3.3.1-noglcanvas.diff b/dev-python/wxPython/files/wxPython-2.3.3.1-noglcanvas.diff
deleted file mode 100644
index 0c9462e1914f..000000000000
--- a/dev-python/wxPython/files/wxPython-2.3.3.1-noglcanvas.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -urN wxPython-2.3.2.1/setup.py wxPython-2.3.2.1-modified/setup.py
---- wxPython-2.3.2.1/setup.py	Thu Dec 20 11:33:42 2001
-+++ wxPython-2.3.2.1-modified/setup.py	Thu Aug 22 14:04:04 2002
-@@ -28,7 +28,7 @@
- """
- 
- 
--BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
-+BUILD_GLCANVAS = 0 # If true, build the contrib/glcanvas extension module
- BUILD_OGL = 1      # If true, build the contrib/ogl extension module
- BUILD_STC = 1      # If true, build the contrib/stc extension module
- BUILD_XRC = 1      # XML based resource system
-@@ -500,43 +500,43 @@
- #----------------------------------------------------------------------
- # Define the GLCanvas extension module
- #----------------------------------------------------------------------
--
--CTRB_SRC =  opj(WXDIR, 'contrib/src')
--CTRB_INC =  opj(WXDIR, 'contrib/include/wx')
--
--if BUILD_GLCANVAS or GL_ONLY:
--    msg('Preparing GLCANVAS...')
--    location = 'contrib/glcanvas'
--    swig_files = ['glcanvas.i']
--    other_sources = []
--
--    swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
--                            USE_SWIG, swig_force, swig_args, swig_deps)
--
--    gl_libs = []
--    if os.name == 'posix':
--        gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
--        gl_lflags = string.split(gl_config) + lflags
--        gl_libs = libs
--    else:
--        other_sources = [opj(location, 'msw/myglcanvas.cpp')]
--        gl_libs = libs + ['opengl32', 'glu32']
--        gl_lflags = lflags
--
--    ext = Extension('glcanvasc',
--                    swig_sources + other_sources,
--
--                    include_dirs = includes,
--                    define_macros = defines,
--
--                    library_dirs = libdirs,
--                    libraries = gl_libs,
--
--                    extra_compile_args = cflags,
--                    extra_link_args = gl_lflags,
--                    )
--
--    wxpExtensions.append(ext)
-+#
-+#CTRB_SRC =  opj(WXDIR, 'contrib/src')
-+#CTRB_INC =  opj(WXDIR, 'contrib/include/wx')
-+#
-+#if BUILD_GLCANVAS or GL_ONLY:
-+#    msg('Preparing GLCANVAS...')
-+#    location = 'contrib/glcanvas'
-+#    swig_files = ['glcanvas.i']
-+#    other_sources = []
-+#
-+#    swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
-+#                            USE_SWIG, swig_force, swig_args, swig_deps)
-+#
-+#    gl_libs = []
-+#    if os.name == 'posix':
-+#        gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
-+#        gl_lflags = string.split(gl_config) + lflags
-+#        gl_libs = libs
-+#    else:
-+#        other_sources = [opj(location, 'msw/myglcanvas.cpp')]
-+#        gl_libs = libs + ['opengl32', 'glu32']
-+#        gl_lflags = lflags
-+#
-+#    ext = Extension('glcanvasc',
-+#                    swig_sources + other_sources,
-+#
-+#                    include_dirs = includes,
-+#                    define_macros = defines,
-+#
-+#                    library_dirs = libdirs,
-+#                    libraries = gl_libs,
-+#
-+#                    extra_compile_args = cflags,
-+#                    extra_link_args = gl_lflags,
-+#                    )
-+#
-+#    wxpExtensions.append(ext)
- 
- 
- #----------------------------------------------------------------------
diff --git a/dev-python/wxPython/wxPython-2.4.0.2.ebuild b/dev-python/wxPython/wxPython-2.4.0.2.ebuild
deleted file mode 100644
index 4ae00f75ee1c..000000000000
--- a/dev-python/wxPython/wxPython-2.4.0.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.2.ebuild,v 1.5 2003/07/08 00:58:46 liquidx Exp $
-
-MY_P="${P/-/Src-}"
-S="${WORKDIR}/${MY_P}/${PN}"
-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="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*
-        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}
-}
-
-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.0.6.ebuild b/dev-python/wxPython/wxPython-2.4.0.6.ebuild
deleted file mode 100644
index ff750e1acea1..000000000000
--- a/dev-python/wxPython/wxPython-2.4.0.6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.6 2003/06/22 12:16:00 liquidx Exp $
-
-IUSE="opengl gtk2"
-
-MY_P="${P/-/Src-}"
-S="${WORKDIR}/${MY_P}/${PN}"
-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="LGPL-2"
-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 ) : ( =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" -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
-}