Remove as planned. Bug 330683.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 5 insertions, 287 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 5b112e366335..fe70ba429429 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.152 2011/12/09 05:04:54 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.153 2011/12/09 15:34:23 ssuominen Exp $
+
+  09 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -files/scripts-multiver-2.6.1.0.diff, -wxpython-2.6.4.0-r2.ebuild:
+  old
 
 *wxpython-2.8.12.1 (09 Dec 2011)
 
diff --git a/dev-python/wxpython/files/scripts-multiver-2.6.1.0.diff b/dev-python/wxpython/files/scripts-multiver-2.6.1.0.diff
deleted file mode 100644
index 24586a60eafa..000000000000
--- a/dev-python/wxpython/files/scripts-multiver-2.6.1.0.diff
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -cr scripts/helpviewer scripts.mine/helpviewer
-*** scripts/helpviewer	Wed Nov 12 21:03:49 2003
---- scripts.mine/helpviewer	Wed Apr 27 04:07:31 2005
-***************
-*** 1,4 ****
---- 1,7 ----
-  #!/usr/bin/env python
-  
-+ import wxversion
-+ wxversion.select("2.6")
-+ 
-  from wx.tools.helpviewer import main
-  main()
-diff -cr scripts/img2png scripts.mine/img2png
-*** scripts/img2png	Wed Nov 12 21:03:49 2003
---- scripts.mine/img2png	Wed Apr 27 04:07:04 2005
-***************
-*** 1,5 ****
---- 1,8 ----
-  #!/usr/bin/env python
-  
-+ import wxversion
-+ wxversion.select("2.6")
-+ 
-  from wx.tools.img2png import main
-  main()
-  
-diff -cr scripts/img2py scripts.mine/img2py
-*** scripts/img2py	Wed Nov 12 21:03:49 2003
---- scripts.mine/img2py	Wed Apr 27 04:07:36 2005
-***************
-*** 1,5 ****
---- 1,8 ----
-  #!/usr/bin/env python
-  
-+ import wxversion
-+ wxversion.select("2.6")
-+ 
-  import sys
-  from wx.tools.img2py import main
-  main(sys.argv[1:])
-diff -cr scripts/img2xpm scripts.mine/img2xpm
-*** scripts/img2xpm	Wed Nov 12 21:03:49 2003
---- scripts.mine/img2xpm	Wed Apr 27 04:07:14 2005
-***************
-*** 1,5 ****
---- 1,8 ----
-  #!/usr/bin/env python
-  
-+ import wxversion
-+ wxversion.select("2.6")
-+ 
-  from wx.tools.img2xpm import main
-  main()
-  
-diff -cr scripts/pyalacarte scripts.mine/pyalacarte
-*** scripts/pyalacarte	Wed Jul  2 23:12:38 2003
---- scripts.mine/pyalacarte	Wed Apr 27 04:07:40 2005
-***************
-*** 1,4 ****
---- 1,7 ----
-  #!/usr/bin/env python
-  
-+ import wxversion
-+ wxversion.select("2.6")
-+ 
-  from wx.py.PyAlaCarte import main
-  main()
-diff -cr scripts/pyalamode scripts.mine/pyalamode
-*** scripts/pyalamode	Wed Jul  2 23:12:37 2003
---- scripts.mine/pyalamode	Wed Apr 27 04:07:21 2005
-***************
-*** 1,4 ****
---- 1,7 ----
-  #!/usr/bin/env python
-  
-+ import wxversion
-+ wxversion.select("2.6")
-+ 
-  from wx.py.PyAlaMode import main
-  main()
-diff -cr scripts/pycrust scripts.mine/pycrust
-*** scripts/pycrust	Wed Jul  2 23:12:37 2003
---- scripts.mine/pycrust	Wed Apr 27 04:07:43 2005
-***************
-*** 1,4 ****
---- 1,7 ----
-  #!/usr/bin/env python
-  
-+ import wxversion
-+ wxversion.select("2.6")
-+ 
-  from wx.py.PyCrust import main
-  main()
-diff -cr scripts/pyshell scripts.mine/pyshell
-*** scripts/pyshell	Wed Jul  2 23:12:37 2003
---- scripts.mine/pyshell	Wed Apr 27 04:07:25 2005
-***************
-*** 1,4 ****
---- 1,7 ----
-  #!/usr/bin/env python
-  
-+ import wxversion
-+ wxversion.select("2.6")
-+ 
-  from wx.py.PyShell import main
-  main()
-diff -cr scripts/pywrap scripts.mine/pywrap
-*** scripts/pywrap	Wed Jul  2 23:12:37 2003
---- scripts.mine/pywrap	Wed Apr 27 04:07:46 2005
-***************
-*** 1,4 ****
---- 1,7 ----
-  #!/usr/bin/env python
-  
-+ import wxversion
-+ wxversion.select("2.6")
-+ 
-  from wx.py.PyWrap import main
-  main()
-diff -cr scripts/pywxrc scripts.mine/pywxrc
-*** scripts/pywxrc	Mon Oct  4 20:03:33 2004
---- scripts.mine/pywxrc	Wed Apr 27 04:07:28 2005
-***************
-*** 1,5 ****
---- 1,8 ----
-  #!/usr/bin/env python
-  
-+ import wxversion
-+ wxversion.select("2.6")
-+ 
-  from wx.tools.pywxrc import main
-  main()
-  
-diff -cr scripts/xrced scripts.mine/xrced
-*** scripts/xrced	Wed Nov 12 21:03:49 2003
---- scripts.mine/xrced	Wed Apr 27 04:07:49 2005
-***************
-*** 1,4 ****
---- 1,7 ----
-  #!/usr/bin/env python
-  
-+ import wxversion
-+ wxversion.select("2.6")
-+ 
-  from wx.tools.XRCed.xrced import main
-  main()
diff --git a/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild b/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild
deleted file mode 100644
index d881b0587e6a..000000000000
--- a/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.4.0-r2.ebuild,v 1.17 2011/04/21 01:20:09 arfrever Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit alternatives eutils fdo-mime python flag-o-matic python wxwidgets
-
-MY_P="${P/wxpython-/wxPython-src-}"
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2"
-
-LICENSE="wxWinLL-3"
-SLOT="2.6"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="opengl unicode"
-
-RDEPEND="
-	dev-python/setuptools
-	>=x11-libs/wxGTK-${PV}:2.6[X,opengl?]
-	x11-libs/gtk+:2
-	>=x11-libs/pango-1.2
-	dev-libs/glib:2
-	media-libs/libpng
-	virtual/jpeg
-	media-libs/tiff
-	>=sys-libs/zlib-1.1.4
-	opengl? ( >=dev-python/pyopengl-2.0.0.44 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-S="${WORKDIR}/${MY_P}/wxPython"
-
-src_prepare() {
-	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-	epatch "${FILESDIR}"/scripts-multiver-2.6.1.0.diff
-
-	python_copy_sources
-}
-
-src_configure() {
-	WX_GTK_VER="2.6"
-
-	if use unicode; then
-		need-wxwidgets unicode
-	else
-		need-wxwidgets ansi
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	use opengl \
-		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-
-	use unicode \
-		&& mypyconf="${mypyconf} UNICODE=1" \
-		|| mypyconf="${mypyconf} UNICODE=0"
-
-	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG} WXPORT=gtk2"
-}
-
-src_compile() {
-	building() {
-		"$(PYTHON)" setup.py ${mypyconf} build
-	}
-	python_execute_function -s building
-}
-
-src_install() {
-	installation() {
-		"$(PYTHON)" setup.py ${mypyconf} install --root="${D}" \
-			--install-purelib "$(python_get_sitedir)"
-	}
-	python_execute_function -s installation
-
-	# Collision protection.
-	for file in "${D}"usr/bin/*; do
-		mv "${file}" "${file}-${SLOT}"
-	done
-
-	rename_files() {
-		for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
-			mv "${file}" "${file}-${SLOT}" || return 1
-		done
-
-		for dir in "${D}$(python_get_sitedir)"/wx-${SLOT}-gtk2-{ansi,unicode}; do
-			if [[ -d ${dir} ]]; then
-				cp -R "${D}$(python_get_sitedir)"/wxaddons/ "${dir}" || return 1
-				wxaddons_copied=1
-			fi
-		done
-
-		[[ ${wxaddons_copied} ]] && rm -rf "${D}$(python_get_sitedir)"/wxaddons/
-	}
-	python_execute_function -q rename_files
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	create_symlinks() {
-		alternatives_auto_makesym \
-			"$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
-		alternatives_auto_makesym \
-			"$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
-	}
-	python_execute_function -q create_symlinks
-
-	use unicode && wxchar=unicode || wxchar=ansi
-	python_mod_optimize wx-${SLOT}-gtk2-${wxchar} wxversion.py
-
-	echo
-	elog "Gentoo uses the Multi-version method for SLOT'ing."
-	elog "Developers see this site for instructions on using 2.6 or 2.8"
-	elog "with your apps:"
-	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
-	echo
-}
-
-pkg_postrm() {
-	python_mod_cleanup wx-${SLOT}-gtk2-${wxchar} wxversion.py
-	fdo-mime_desktop_database_update
-
-	create_symlinks() {
-		alternatives_auto_makesym \
-			"$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
-		alternatives_auto_makesym \
-			"$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
-	}
-	python_execute_function -q create_symlinks
-}