Remove old.

Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

5 files changed, 13 insertions, 519 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 3027cd5e1594..5d9a7cc02167 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.196 2014/01/18 01:24:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.197 2014/01/27 17:41:50 dirtyepic Exp $
+
+  27 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> -wxpython-2.8.12.1.ebuild,
+  -wxpython-2.9.3.1.ebuild, -wxpython-2.9.4.1-r1.ebuild:
+  Remove old.
 
   18 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> wxpython-3.0.0.0.ebuild:
   Add libnotify USE flag to force a rebuild if the corresponding wxGTK flag
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 1ce18e67aa67..0de744536c23 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -15,33 +15,28 @@ AUX wxpython-2.9.4.1-wxversion-scripts.patch 4187 SHA256 79ae53ed557ff2de9d7936e
 AUX wxpython-3.0-wxversion-demo.patch 147 SHA256 23e89aaf72171b2c0ec3a302f2252137c2c087a6672726e626d20fb430a1c763 SHA512 99682f18a520b68b313301784adaf71c1ab9181022b743de82c9cc6acfaa1fc77867ef43c00926f6d7bdde8ed29fac24b5eb72761209a2e2a1d498feee85a0a1 WHIRLPOOL 04cff26f220526c17bf8fa3249aaaa2fa6293e6ffb7a49ef4d06a634ec8cf684c92280e1b9cc1cc5dcc50897569b52f68fdfa1f1d4b1d2ab6ace553784ae309c
 AUX wxpython-3.0.0.0-wxversion-scripts.patch 4187 SHA256 1fbca19b7281245801160de2ebf8a1f00057840078355977f169cb20eafe32ad SHA512 74fe603daafdbc5a50daaa3411ea40243d1fdee2cb3bbd0e6e99bd73bd124137161cd682673f2c727faf92214bfa4d27c059021f19c92c581485bb1d6a5b49a6 WHIRLPOOL 10fcdfcf96fe992194d899941a7c75854c7afb016c39014e7827b90f09fa1cf523b22c9c668aea52084b85895989d498aa4a715626c716169686b1f144071f82
 DIST wxPython-demo-2.8.12.1.tar.bz2 3906851 SHA256 252282193a80590b9eab436bef322701b21d35ad03b4b6ebb4824241ff947b5a SHA512 aab71cf4e4fb6632afd4607cbe5cdef6785c4ed3f1c7f67d6cef5487d1caee2f7652bfd974ba95a6a03e8d7809c94e291aca00c2fdf74ea29e118e1e30c947d5 WHIRLPOOL e9eb0803350e3dac8c5f2228a3f4d54a26ae4c4307c924729bbdff712747419fdfaa155d83ef1bea7dcb849dbacf9f48c323bf7997ed1df85f182ba3878d1324
-DIST wxPython-demo-2.9.3.1.tar.bz2 3959076 SHA256 6e26ead8c780ecbcebb68593a72cd28432b2e756a42e019286d970d6a92ac340 SHA512 98dc98f3332b93fc11c8c302e1aa07295a218b96dbad6a353498893935c1e206bab41bf429a262142c07999803be865c2ac3bb7630467861e76544733672c336 WHIRLPOOL ff75d7ad362afba2e79d6b2250a7d21721f135630e1cf63fdcca72241e8d407881a7e19db0e59dda94150d2cf80ed9b86ed1d303e5deb70781f902d6fd1ddc3d
 DIST wxPython-demo-2.9.4.0.tar.bz2 3992754 SHA256 c1a57ef7c71ea1a332df98b80cfa7ba178ef6dcd24a31393dff905a145ba8b7b SHA512 dac61d9bb09deffd54c89c1a09803968a4c4b2951a00ebb4d618a2a1b48775c62e3ddf2c642e9005d7362fdeab44c07bc2a38bc96dc94a5c891982847d0c19fe WHIRLPOOL 2093d3d0f81c15b7ca1a346fae29429952d299f8e33d5c2e356846bd98df890b731fe4ef0311ec32b7a913a4038aa8881396d9878dde98322136ccb5244a867b
 DIST wxPython-demo-3.0.0.0.tar.bz2 3991989 SHA256 426aaf20c7b01f5e9fbd7bd41455441bb126585f5544a848a5fa060e07f7b443 SHA512 4fe8a87faacac99c54c4fcbdb707c9790b49f485186e1741cc1ba05e955e474ca4ea31ff704a57e73b32b4fad310ef490066743d1c6ad4339191cde2daec255d WHIRLPOOL c6a2b12111572164474083f66dd0e2eff12e4faea5ce880767bfba3de493e8d56e6747c659ff1a3d533d0f6bcde1d5c9daabb9bccb2148278cdce074f5ddcbae
 DIST wxPython-docs-2.8.12.1.tar.bz2 2331363 SHA256 1dfae3a74b91e2003856eed51698c51094f1a4e6688633ae61af7a22fa8a0ddb SHA512 88591ef4f61bcbac29050d7dfecc230f7338cc006e7c3abc072b15da478e4fd994ab73ee5d072cb8b84f9de62ce182f1774354b0a7a4502ea639e59fdf965358 WHIRLPOOL 97bc66c8f781b5092e2274edc0b9bac35c21c91a66e4c0da75d543dc471f25d02334b28a5afe4ad0681b7a018a93f08b6ef5d3c6afd127ccfc24da208252cd89
 DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8 SHA512 e114b2b44a7fd3ac292ca9735fb2e075459211384bc98d62ff2ba49e45111825101e74abd4af2ab0e5e52ede7b831641367c11a5c80e79f2da6ada3442463bfc WHIRLPOOL 91ccbe19e8311f0404fb0096efff68750fa0c3b505d05c9278e0488e138788dc399ff2345e13c712126475957a1c1fcc53556d70cd9c835524207be5758a6e2b
 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
-DIST wxPython-src-2.9.3.1.tar.bz2 49131100 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d SHA512 16e5be3a2a98d64637866ecae7afb3a2835d21684077bb8a1b87d3c0cf37b75eb1169f3b8e16e38c5b85c04cce974dbfd5ba25d3d0a3016a47c005a05e5dbfc5 WHIRLPOOL ccae768ff87a95ee88d6259821be5e2073928278155743c0c16c75dd9b2262ac49ccb322dd4aa77ccfdac12d7de0e874a92b41171adacfa26ffb216f170751a7
 DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
 DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
 DIST wxPython-src-3.0.0.0.tar.bz2 57831792 SHA256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 SHA512 9328f46817e0c1670a6be5d10347c8a7110c42a5332c5c35eb11ed0412d8dddeb15727d98606bb6c699af961cee171c41b82b1f24f3de25463259106660f7387 WHIRLPOOL 7865997e22db366a41bae8a5d5c47e4f46b20d17871377243abced3a6550c46588ea1d5a426d826ccf011c62898f87d6a55a14ac9b4153af4e0795d5f180a647
 EBUILD wxpython-2.8.12.1-r1.ebuild 5796 SHA256 38d8688b5f6c9dbb95ec3179c0a29f1331b5d18d8964ec390513650c8b023823 SHA512 52b63d46d2f2b593a153a7b08a860bc46243a311353a7e368e2881a3b376ca9e02946be28ebb95d12c0876a57b18ac146ae2c4d65abc8f2f20ccb6582616dc1f WHIRLPOOL da465f921826b1a5539ee623bd3c4ed5ec8a4460fd5520b4e7174793ff9c18472a4c707e65d1b01c58c0213e7dd31eadfd288abf5ef3434cee92b85c6b883e9f
 EBUILD wxpython-2.8.12.1-r2.ebuild 5717 SHA256 8118b8b44efb97afdcba977adb02cbc21a646ee2d123a2112ef99cd9afa3826e SHA512 dc9deacc76ccf5de65b38b5a60cccbc564f5edb4bd2637bb0f9feae6e847b22ffec9c639d6590a98d1e36762ecf91919f09e8e9401edbf018df5e3f24c5878a3 WHIRLPOOL 15608458198165573aa72a11eeaa573fd7a46753da4046a90ee2a62ef45f8c736d5d32334cfa8cfe50f046bcfe544149a9a994d6767ef0df53694ae5fa567e93
-EBUILD wxpython-2.8.12.1.ebuild 5147 SHA256 b52479fa70e5050e0e4d482067202783f3de62bd636120ff588a8787b53cdc4e SHA512 503705bedc000418249cf1269e6d9be95b48aa78a48121befad5e70c457f50e938fb284ad7a79cd2cc7b92fcf792c451026c1e8172728c38859fe5582fad1a61 WHIRLPOOL de9378daa01959e463f73f34e1a71369456872ed694b06c1bcd141e2b70bfd669ca5a5f372f7c666172f33ed386f4b91ca9e80b6ddd85d152c86fbcfc49998a7
-EBUILD wxpython-2.9.3.1.ebuild 4423 SHA256 d373c252954d78fe241755d6e43757cb6c4e465fc00212411d282c5d9d65ce9c SHA512 0f1d00e47641d00b1d912754124fc9f39e31f9aa658f9680012ecbc6706065f4fc6c9f0266e13f916033ce1bf91b9dbdddcc11d28c270577cff89c005699ba29 WHIRLPOOL 60c1a4906c209407126836e21e62c51dcc97e72b592725a6d299f960793139795e104e08068e79926a15c2db0b94f45129f1596b32d0bd59fd53a23a1a83ddc3
-EBUILD wxpython-2.9.4.1-r1.ebuild 4967 SHA256 5318eecd6aefb3ecff2e0972a0f0bc9e7d684ffed9d75f0540d5b8fb00ea51fe SHA512 8b2d875fb867ba9ce57e2f8a813392c20c53904e1c709e8b2a73c5eee67066a274cfcfec209ad0b17027fd7349fdb6962fa20e9a6164d153ed23cd212b430f74 WHIRLPOOL afefcd26a8685f527ab00039c1d17d87a306d061ebfd8b2b96d04013576c32c770d75aa944f2d79b1f21a375b9aa39a20700ab9859c2393579ac72318a2fee53
 EBUILD wxpython-2.9.4.1-r2.ebuild 4882 SHA256 c9e93b5996caa02e9d5219b1f3358a5e1b9089646fecc335bddf2d1730838a26 SHA512 db43ab67839a5f1cbaf11ae0086a5a8246edf66bdff35fe6260dd4de959dba4801c4a8f5daf9bc040d3071442d54a461c4d0e0c665d12ea6015b65aaef29d390 WHIRLPOOL d5b8b74ef5edab244cfb7199184560bd1e586456464bd73105637d2e00e462f819e6cc32bc399a69c0ac327085494842deede429e0e487b583ba3f01608f4dd8
 EBUILD wxpython-3.0.0.0.ebuild 4737 SHA256 9365f0144ea62631b64174a30484b889b16451ba783361acba921dbc4fc0211d SHA512 cecaac75c8914378322459a50f410ddc15050b0c5f36f510e1f4331fc264d4c296575082f548d30ff504c6633113b3ce8064ba5215050c91d0b0ab7355ffc08e WHIRLPOOL 1eecfaf66373f7d267c1979e7aeccc2b44968c523f872bea9bb74c8e18eb353f40509c2f17f057ee819eecf10ed5729a8d28e3ac3e724b1c43677c72b5ab0e4f
-MISC ChangeLog 34628 SHA256 964731126f87ed6485ca933c834e4874190fbe131454974141d6bf97975a536a SHA512 b4ec3e6ef82147c3a3e17c2416a81eea7b562f5ec8b978c84861448e2436ec4b6e1881fbb5fd59913867524b438d82e918b3291c4c6c252ba6f0a3bc237a337e WHIRLPOOL 9070caecc7f065414bce4ee1e3995ec3d4d4099438914c428c6d320e87d6a8f4c489dd6521d88669c02b5b3de61bb61441f0e5082e27d4f59cdd5cf7a5fd2869
+MISC ChangeLog 34775 SHA256 8a09bb553bf6f4fb44da6a6f47fcf7cb91f5de86e6b4511ad082a26384aa904d SHA512 2c25a39664a3d96ca71e382cfd791945e2d62fcd25f2b9e09c731fec11da9d8a8cc8de8f4f91915dd4baee18ea9b7f984c17928dc88ac65970cf3cea07ec546e WHIRLPOOL 43f834ab4ac31527d442e6a9b49eae52303f3d1818772e1eeb00f3f37957a4c4477acc4d5254e4e2b6d2f34d1fbcc81a31199178c1bcd93284d2fd78edee286d
 MISC metadata.xml 380 SHA256 4f8e2237b4a7281039211900504d5e8d7004e87c120631f18dd078a01178dfa8 SHA512 8b742161313fb1b1b0db6d07f1665988b061dbf2dd44c1e49e2fab8d1aa1dfbb218207c5696bcd027199a1ae2fbcb4673106c09d5169a44863deb021840288a8 WHIRLPOOL dbce4f031c171464b3cda63ec2f9c7f2841e108d441a45bfe1d7ec2d6b35874d9b04ab364836bb3d7be7ff12ef60e029fce7a841e156994f04820254bad91e6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS2dodAAoJEO04vUmVeoRj3SwH/2wF5OkI5w7vnOIcLexwEzIR
-THuJJFDvB0l5s7CaaJmFkU9AD7dFG661At0gdLVcjb+tiGGeiambkf0wWE6ZSpgy
-4PheTml4lkvZg7ZnCcLTB8s1UCvZe70ZdxHk4YibhWiAivGkgvriw9XkGTVFgVva
-AY0uJf0X3kiEs4lEG3QgoZnxXISq6l6ag3m1zkHrgnexRtGea9732Sy2J4X0eEnK
-O1GcreUBYKXtw9yIGOzh1k9ksnol9cxUsI5K7OtceqlTPfPxEzXnXMK0C8Y5WFjq
-rtHDBfG/ywU6A/VOhHtTlJaNguZuwVIbITAxa3kwLi25gTOIz5y4wcUrZGyy958=
-=zvG1
+iQEcBAEBCAAGBQJS5pybAAoJEO04vUmVeoRj/UYH/0r77d4Lya/YVYet4haOUtpO
+SqLJ2zLP0nQ0YwQhBA/rzW/o6LgH2iUS/cqKk93krHYGtzAFCg8P8TDePfVy4kvR
+/8m1MkLo69qarepkZQWvANcOE0v1dclIWjl1GOs+qbHZvmD3ecGew47uCLRryvrY
+Kd2ivIy+bdAFl43x1/j/+yUSRl/D6Qz6ebzb/6t5XxYIeDpDyJX5Xkbc4tQhe8/x
+52jNURZoXMNSkeNlSCCRdDcXluuFcW/xqwSGe4NrkLTQ5+8/jTCEF7lKJ7zfFSIv
+2JIIt9onVru7sMX5yUgwL1d/hgbd1RS8hGn+4oDqJbhN8IuA7vnbZxaJfcUaTa8=
+=25cy
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/wxpython-2.8.12.1.ebuild b/dev-python/wxpython/wxpython-2.8.12.1.ebuild
deleted file mode 100644
index b035c380b961..000000000000
--- a/dev-python/wxpython/wxpython-2.8.12.1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1.ebuild,v 1.19 2013/12/12 12:57:30 jlec Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-WX_GTK_VER="2.8"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit alternatives distutils eutils fdo-mime 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 ~amd64-fbsd ~x86-fbsd"
-IUSE="cairo doc examples opengl"
-
-RDEPEND="
-	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
-	dev-libs/glib:2
-	dev-python/setuptools
-	media-libs/libpng:0
-	media-libs/tiff:0
-	virtual/jpeg
-	x11-libs/gtk+:2
-	x11-libs/pango[X]
-	cairo?	( >=dev-python/pycairo-1.8.4 )
-	opengl?	( dev-python/pyopengl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/wxPython"
-DOC_S="${WORKDIR}/wxPython-${PV}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
-
-PYTHON_MODNAME="wx-${SLOT}-gtk2-unicode wxversion.py"
-
-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}-2.8.12-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
-
-	# Workaround, buildsystem uses CFLAGS as CXXFLAGS
-	export CFLAGS="${CXXFLAGS}"
-}
-
-src_configure() {
-	need-wxwidgets unicode
-
-	DISTUTILS_GLOBAL_OPTIONS=(
-		"* WX_CONFIG=${WX_CONFIG}"
-		"* WXPORT=gtk2"
-		"* UNICODE=1"
-		"* BUILD_GLCANVAS=$(use opengl && echo 1 || echo 0)"
-	)
-}
-
-distutils_src_install_post_hook() {
-	# Collision protection.
-	local file
-	for file in "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/bin/"*; do
-		mv "${file}" "${file}-${SLOT}"
-	done
-}
-
-src_install() {
-	local docdir file
-
-	distutils_src_install
-
-	# Collision protection.
-	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
-
-	domenu "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
-	newicon "${S}"/wx/py/PyCrust_32.png PyCrust.png
-	newicon "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png
-
-	docdir=${D}usr/share/doc/${PF}
-
-	if use doc; then
-		dodir /usr/share/doc/${PF}/docs
-		cp -R "${DOC_S}"/docs/* "${docdir}"/docs/
-		# For some reason newer API docs aren't available so use 2.8.9.2's
-		cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${docdir}"/docs/
-	fi
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/demo
-		cp -R "${DOC_S}"/demo/* "${docdir}"/demo
-		dodir /usr/share/doc/${PF}/samples
-		cp -R "${DOC_S}"/samples/* "${docdir}"/samples
-		[[ -e ${docdir}/samples/embedded/embedded ]] \
-			&& rm -f "${docdir}"/samples/embedded/embedded
-	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
-
-	distutils_pkg_postinst
-
-	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"
-	if use doc; then
-		echo
-		elog "To access the general wxWidgets documentation, run"
-		elog "/usr/share/doc/${PF}/docs/viewdocs.py"
-		echo
-		elog "wxPython documentation is available by pointing a browser"
-		elog "at /usr/share/doc/${PF}/docs/api/index.html"
-	fi
-	if use examples; then
-		echo
-		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"
-		echo
-		elog "Many more example apps and modules can be found in"
-		elog "/usr/share/doc/${PF}/samples/"
-	fi
-	echo
-	elog "Editra is not packaged with wxpython in Gentoo."
-	elog "You can find it in the tree as app-editors/editra"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	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
-}
diff --git a/dev-python/wxpython/wxpython-2.9.3.1.ebuild b/dev-python/wxpython/wxpython-2.9.3.1.ebuild
deleted file mode 100644
index 0e7f0deafb5f..000000000000
--- a/dev-python/wxpython/wxpython-2.9.3.1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.3.1.ebuild,v 1.6 2013/03/26 03:23:52 dirtyepic Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-WX_GTK_VER="2.9"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython 2.7-pypy-*"
-
-inherit alternatives distutils eutils fdo-mime 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
-	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
-
-LICENSE="wxWinLL-3"
-SLOT="2.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cairo examples opengl"
-
-RDEPEND="
-	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
-	dev-libs/glib:2
-	dev-python/setuptools
-	media-libs/libpng:0
-	media-libs/tiff:0
-	virtual/jpeg
-	x11-libs/gtk+:2
-	x11-libs/pango[X]
-	cairo?	( >=dev-python/pycairo-1.8.4 )
-	opengl?	( dev-python/pyopengl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/wxPython"
-DOC_S="${WORKDIR}/wxPython-${PV}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
-
-PYTHON_MODNAME="wx-${PV%.*}-gtk2 wxversion.py"
-
-src_prepare() {
-	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-
-	epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-scripts.patch
-	# drop editra - we have it as a separate package now
-	epatch "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
-	epatch "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
-
-	if use examples; then
-		cd "${DOC_S}"
-		epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
-	fi
-
-	python_copy_sources
-}
-
-src_configure() {
-	need-wxwidgets unicode
-
-	DISTUTILS_GLOBAL_OPTIONS=(
-		"* WX_CONFIG=${WX_CONFIG}"
-		"* WXPORT=gtk2"
-		"* UNICODE=1"
-		"* BUILD_GLCANVAS=$(use opengl && echo 1 || echo 0)"
-	)
-}
-
-distutils_src_install_post_hook() {
-	# Collision protection.
-	local file
-	for file in "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/bin/"*; do
-		mv "${file}" "${file}-${SLOT}"
-	done
-}
-
-src_install() {
-	local file x
-
-	distutils_src_install
-
-	# this should be temporary
-	dobin "${S}"/scripts/pyslices || die
-	dobin "${S}"/scripts/pysliceshell || die
-
-	# Collision protection.
-	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
-
-	for x in {Py{AlaMode,Crust,Shell,Slices{,Shell}},XRCed}; do
-		newmenu "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop
-	done
-	newicon "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png
-	newicon "${S}"/wx/py/PySlices_32.png PySlices-${SLOT}.png
-	newicon "${S}"/wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
-
-	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/ || die
-		cp -R "${DOC_S}"/samples/* "${D}"/usr/share/doc/${PF}/samples/ || die
-	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
-
-	distutils_pkg_postinst
-
-	echo
-	elog "Gentoo uses the Multi-version method for SLOT'ing."
-	elog "Developers, see this site for instructions on using"
-	elog "2.8 or 2.9 with your apps:"
-	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
-	elog
-	if use examples; then
-		elog "The demo.py app which contains demo modules with"
-		elog "documentation and source code has been installed at"
-		elog "/usr/share/doc/${PF}/demo/demo.py"
-		elog
-		elog "More example apps and modules can be found in"
-		elog "/usr/share/doc/${PF}/samples/"
-	fi
-	echo
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	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
-}
diff --git a/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild b/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild
deleted file mode 100644
index 47949ee10730..000000000000
--- a/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild,v 1.8 2013/12/12 12:57:30 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-WX_GTK_VER="2.9"
-
-inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
-
-MY_PN="wxPython-src"
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="mirror://sourceforge/wxpython/${MY_PN}-2.9.4.0.tar.bz2
-	examples? ( mirror://sourceforge/wxpython/wxPython-demo-2.9.4.0.tar.bz2 )
-	mirror://sourceforge/wxpython/${MY_PN}-2.9.4.1.patch"
-
-LICENSE="wxWinLL-3"
-SLOT="2.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cairo examples opengl"
-
-RDEPEND="
-	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
-	dev-libs/glib:2
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	virtual/jpeg
-	x11-libs/gtk+:2
-	x11-libs/pango[X]
-	cairo?	( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
-	opengl?	( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	dev-lang/python-exec:0[${PYTHON_USEDEP}]
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-2.9.4.0/wxPython"
-DOC_S="${WORKDIR}/wxPython-2.9.4.0"
-
-# The hacky build system seems to be broken with out-of-source builds,
-# and installs 'wx' package globally.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-# Force python-exec:0 due to the hackery in the ebuild, bug #484420.
-_PYTHON_WANT_PYTHON_EXEC2=0
-
-python_prepare_all() {
-	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-
-	cd .. || die
-	epatch "${DISTDIR}"/${MY_PN}-${PV}.patch
-
-	if use examples; then
-		cd "${DOC_S}"
-		epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
-	fi
-
-	cd "${S}" || die
-	local PATCHES=(
-		"${FILESDIR}"/${P}-wxversion-scripts.patch
-		# drop editra - we have it as a separate package now
-		"${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
-		"${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
-		# fix handling egg_info command
-		"${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	need-wxwidgets unicode
-
-	mydistutilsargs=(
-		WX_CONFIG="${WX_CONFIG}"
-		WXPORT=gtk2
-		UNICODE=1
-		BUILD_GLCANVAS=$(usex opengl 1 0)
-	)
-}
-
-python_compile() {
-	# We need to have separate libdirs due to hackery, bug #455332.
-	distutils-r1_python_compile \
-		build --build-purelib "${BUILD_DIR}"/lib.common
-}
-
-python_install() {
-	distutils-r1_python_install \
-		build --build-purelib "${BUILD_DIR}"/lib.common
-
-	# adjust the filenames for wxPython slots.
-	local file
-	for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
-		mv "${file}" "${file}-${SLOT}" || die
-	done
-	cd "${ED}"usr/bin || die
-	for file in *-"${EPYTHON}"; do
-		local wrapper=${file%-${EPYTHON}}
-
-		mv "${file}" "${file/-/-${SLOT}-}" || die
-
-		# wrappers are common to all impls, so a parallel run may
-		# move it for us. ln+rm is more failure-proof.
-		ln -fs python-exec "${wrapper}-${SLOT}" || die
-		rm -f "${wrapper}"
-	done
-}
-
-python_install_all() {
-	dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
-
-	for x in {Py{AlaMode,Crust,Shell},XRCed}; do
-		newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop
-	done
-	newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png
-	newicon wx/py/PySlices_32.png PySlices-${SLOT}.png
-	newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
-
-	if use examples; then
-		docinto demo
-		dodoc -r "${DOC_S}"/demo/.
-		docinto samples
-		dodoc -r "${DOC_S}"/samples/.
-
-		[[ -e ${docdir}/samples/embedded/embedded ]] \
-			&& rm -f "${docdir}"/samples/embedded/embedded
-
-		docompress -x /usr/share/doc/${PF}/{demo,samples}
-	fi
-	distutils-r1_python_install_all
-}
-
-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_foreach_impl create_symlinks
-
-	echo
-	elog "Gentoo uses the Multi-version method for SLOT'ing."
-	elog "Developers, see this site for instructions on using"
-	elog "2.8 or 2.9 with your apps:"
-	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
-	if use examples; then
-		echo
-		elog "The demo.py app which contains demo modules with"
-		elog "documentation and source code has been installed at"
-		elog "/usr/share/doc/${PF}/demo/demo.py"
-		echo
-		elog "More example apps and modules can be found in"
-		elog "/usr/share/doc/${PF}/samples/"
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-
-	update_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_foreach_impl update_symlinks
-}