Remove old.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

3 files changed, 5 insertions, 233 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 03a4bb09c7b6..cefd6dd88129 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.150 2011/07/16 09:34:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.151 2011/12/09 03:29:30 dirtyepic Exp $
+
+  09 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> -wxpython-2.8.10.1.ebuild,
+  -files/wxpython-2.8-drop-editra.patch:
+  Remove old.
 
   16 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> wxpython-2.8.11.0.ebuild:
   ppc64 stable wrt #364203
diff --git a/dev-python/wxpython/files/wxpython-2.8-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8-drop-editra.patch
deleted file mode 100644
index bd1705c62ee5..000000000000
--- a/dev-python/wxpython/files/wxpython-2.8-drop-editra.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/setup.py wxPython-src-2.8.9.2/wxPython/setup.py
---- wxPython-src-2.8.9.2-orig/wxPython/setup.py	2009-02-21 13:13:31.000000000 -0600
-+++ wxPython-src-2.8.9.2/wxPython/setup.py	2009-02-21 13:14:12.000000000 -0600
-@@ -878,12 +878,6 @@ WX_PKGLIST =      [ 'wx',
-                     'wx.tools',
-                     'wx.tools.XRCed',
-                     'wx.tools.XRCed.plugins',
--                    'wx.tools.Editra',
--                    'wx.tools.Editra.src',
--                    'wx.tools.Editra.src.autocomp',
--                    'wx.tools.Editra.src.eclib',
--                    'wx.tools.Editra.src.extern',
--                    'wx.tools.Editra.src.syntax',
-                     ]
- 
- if not EGGing:
-@@ -910,7 +904,6 @@ else:
-                opj('scripts/pywrap'),
-                opj('scripts/pywxrc'),
-                opj('scripts/xrced'),
--               opj('scripts/editra'),
-                ]
- 
- 
-@@ -922,16 +915,6 @@ DATA_FILES += find_data_files('wx/tools/
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
- 
--DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
--DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
--DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
--                              '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
--DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
--DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
--DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
--DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
--DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
--
- 
- ## import pprint
- ## pprint.pprint(DATA_FILES)
-@@ -981,7 +964,6 @@ if EGGing:
-                                   'pyshell = wx.py.PyShell:main',
-                                   'pywrap = wx.py.PyWrap:main',
-                                   'helpviewer = wx.tools.helpviewer:main',
--                                  'editra = wx.tools.Editra.launcher:main',
-                                   'xrced = wx.tools.XRCed.xrced:main',
-                                   ], 
-             },
diff --git a/dev-python/wxpython/wxpython-2.8.10.1.ebuild b/dev-python/wxpython/wxpython-2.8.10.1.ebuild
deleted file mode 100644
index a11c4d80d563..000000000000
--- a/dev-python/wxpython/wxpython-2.8.10.1.ebuild
+++ /dev/null
@@ -1,183 +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.8.10.1.ebuild,v 1.20 2011/04/21 01:20:09 arfrever Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-WX_GTK_VER="2.8"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit alternatives eutils fdo-mime flag-o-matic multilib 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
-	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2
-		   mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 )
-	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
-
-LICENSE="wxWinLL-3"
-SLOT="2.8"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="cairo doc examples opengl"
-
-RDEPEND="
-	dev-python/setuptools
-	>=x11-libs/wxGTK-${PV}:2.8[X,opengl?]
-	x11-libs/gtk+:2
-	>=x11-libs/pango-1.2
-	dev-libs/glib:2
-	media-libs/libpng
-	virtual/jpeg
-	media-libs/tiff
-	cairo?	( >=dev-python/pycairo-1.8.4 )
-	opengl?	( >=dev-python/pyopengl-2.0.0.44 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-S="${WORKDIR}/${MY_P}/wxPython"
-DOC_S="${WORKDIR}/wxPython-${PV}"
-
-src_prepare() {
-	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-
-	epatch "${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch
-	# drop editra - we have it as a separate package now
-	epatch "${FILESDIR}"/${PN}-${SLOT}-drop-editra.patch
-
-	if use doc; then
-		cd "${DOC_S}"
-		epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch
-	fi
-
-	if use examples; then
-		cd "${DOC_S}"
-		epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
-	fi
-
-	python_copy_sources
-}
-
-src_configure() {
-	need-wxwidgets unicode
-
-	append-flags -fno-strict-aliasing
-
-	use opengl \
-		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-
-	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
-	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
-}
-
-src_compile() {
-	building() {
-		"$(PYTHON)" setup.py ${mypyconf} build
-	}
-	python_execute_function -s building
-}
-
-src_install() {
-	local mypyconf
-
-	mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}"
-	use opengl \
-		&& mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
-		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
-
-	mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1"
-
-	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
-	}
-	python_execute_function -q rename_files
-
-	dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
-
-	insinto /usr/share/applications
-	doins "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
-	insinto /usr/share/pixmaps
-	newins "${S}"/wx/py/PyCrust_32.png PyCrust.png
-	newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png
-
-	if use doc; then
-		dodir /usr/share/doc/${PF}/docs
-		cp -R "${DOC_S}"/docs/* "${D}"usr/share/doc/${PF}/docs/
-		# For some reason 2.8.10.1 api docs are not available, so use 2.8.9.2's
-		cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${D}"usr/share/doc/${PF}/docs/
-	fi
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/demo
-		dodir /usr/share/doc/${PF}/samples
-		cp -R "${DOC_S}"/demo/* "${D}"/usr/share/doc/${PF}/demo/
-		cp -R "${DOC_S}"/samples/* "${D}"/usr/share/doc/${PF}/samples/
-	fi
-}
-
-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
-
-	python_mod_optimize wx-${SLOT}-gtk2-unicode wxversion.py
-
-	echo
-	elog "Gentoo uses the Multi-version method for SLOT'ing."
-	elog "Developers, see this site for instructions on using"
-	elog "2.6 or 2.8 with your apps:"
-	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
-	elog
-	if use doc; then
-		elog "To access the general wxWidgets documentation, run"
-		elog "/usr/share/doc/${PF}/docs/viewdocs.py"
-		elog
-		elog "wxPython documentation is available by pointing a browser"
-		elog "at /usr/share/doc/${PF}/docs/api/index.html"
-		elog
-	fi
-	if use examples; then
-		elog "The demo.py app which contains hundreds of demo modules"
-		elog "with documentation and source code has been installed at"
-		elog "/usr/share/doc/${PF}/demo/demo.py"
-		elog
-		elog "Many more example apps and modules can be found in"
-		elog "/usr/share/doc/${PF}/samples/"
-	fi
-	echo
-	ewarn "Editra is no longer packaged with wxpython in Gentoo."
-	ewarn "You can find it in the tree as app-editors/editra"
-	echo
-}
-
-pkg_postrm() {
-	python_mod_cleanup wx-${SLOT}-gtk2-unicode 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
-}