9 files changed, 9 insertions, 404 deletions
diff --git a/dev-python/markupsafe/ChangeLog b/dev-python/markupsafe/ChangeLog
index 7d6a3a57cd6b..35373a80f9ab 100644
--- a/dev-python/markupsafe/ChangeLog
+++ b/dev-python/markupsafe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/markupsafe
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/ChangeLog,v 1.74 2014/11/19 15:02:22 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/ChangeLog,v 1.75 2015/02/01 16:35:45 mrueg Exp $
+
+  01 Feb 2015; Manuel Rüger <mrueg@gentoo.org>
+  -files/markupsafe-0.18-py3compat.patch, -markupsafe-0.12.ebuild,
+  -markupsafe-0.15-r1.ebuild, -markupsafe-0.15.ebuild, -markupsafe-0.18.ebuild,
+  -markupsafe-0.19.ebuild, -markupsafe-0.21.ebuild:
+  Remove old.
 
   19 Nov 2014; Ian Delaney <idella4@gentoo.org> markupsafe-0.23.ebuild:
   Add pypy3 support
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index f3709d057c57..ef9c90994928 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,26 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX markupsafe-0.18-py3compat.patch 4827 SHA256 7f9ff76d1e7fc2a298726aa623e9eb1b9fdba494a5cccda575937dfc027cce48 SHA512 bdd0541d1e217b382d4186e73c52dff551a610e662f32da01843fb462d2e13b0dc262715fec1b835ecb3f06a778224a889d1346fef201d742ded4a7d45c7c9d5 WHIRLPOOL 92d6542ad1125268ec3cfcb559c4493cc3a1c91ffad88a6c9d74d2843f233a7ba2ef711d97b0a7643b6d0877995f63dfce84cbbb6c863146d36121d0967e9f66
-DIST MarkupSafe-0.12.tar.gz 10939 SHA256 2670f759d00b3df50625b493b7bd20f808024dab278eecc2c8b890b4e8083757 SHA512 41a566ab39a494154c8b3bcdf8a4f1d4a028ec2982a24e9e0598dd4a13241f4fe77af22926627b0ec9437a4d214813f4ec5395243b6c4137b0a50d7fbe877076 WHIRLPOOL 682d12aa314515f25895b00a9dad66c0e117384a6e8e921b51750e679aa6ea9708b6cffe1f85a7380c1c96b419ece529f97455c13f3007e45b2e11f90cd9f276
-DIST MarkupSafe-0.15.tar.gz 11265 SHA256 339ec04d20ad9cdccbfe9f38dce6182cc504ce789e5d0f9647eaa752f0f95300 SHA512 151f293272c41ea3d941c525bf5ec81faad8ad390e3d64691e6f73cba1428aaf949784a02996e1b782a6ff5311d13d7f1ea0fa5c2cce51e7c40c2fe98e32d7a4 WHIRLPOOL e7fc6be55ec1eea583b5ababf8b4e631dae4d3f9cc5eed56a7efff09ca03f3e76b9becb13ee165971e1220be304b8ba23cae3af560e812507da3a94f33a50d44
-DIST MarkupSafe-0.18.tar.gz 11748 SHA256 b7d5d688bdd345bfa897777d297756688cf02e1b3742c56885e2e5c2b996ff82 SHA512 0438ddf0fdab465c40d9afba8c14ad346be0868df654c11130d05e329992d456a9bc278551970cbd09244a29c77213885d0c363c951b0cfd4d9aa95b248ecff5 WHIRLPOOL 5254f021625fcbf45c3bf94f10a69149a248ae316d0f2f58b34ae008f66bac276d033057dd4f10b79873a4fbcadbd1796afae53fba67593a6cc370e43d34b845
-DIST MarkupSafe-0.19.tar.gz 11807 SHA256 62fcc5d641df8b5ad271ebbd6b77a19cd92eceba1e1a990de4e96c867789f037 SHA512 3fa91de4967394c16a948a401fc7ee024c5e617bd90f0b41c47021656a57087169a9d0ac8af34656c00e6696dc20c3501041eee03a49686034bb611ef6eba45d WHIRLPOOL a71d59238872d675eef101a6b1322c0bac0711f0ee03a64aa33ed8b87e27710220beeede2fc3474c4c6c9c67de3b68d069a31462d82596b696dba238f4a25bc0
-DIST MarkupSafe-0.21.tar.gz 13091 SHA256 c6465cd6ed2b96509ef0100e7fff8718ed52c2affab1860ed5a9b67f604dd59a SHA512 ecedf56be7ad1723c4d7bf799e1aefb8ceb0a28840a1b8ffdc2dee0f734149430cf5dfd5d335591e9934cf223255475e9c04da5ab34ed69e7845298f599d81bc WHIRLPOOL d4d6526513c4ee1a8aec61cfe8548e6ee275a2aaed142760d71d50802519e74c641b08e77f35fec5b75b26129b9a7da70aca36c2ba09f14c9d2626264ca30699
 DIST MarkupSafe-0.23.tar.gz 13416 SHA256 a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3 SHA512 4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28 WHIRLPOOL 8104a8a795ed2e6b63a126fcbe2c8361ba21f9fee10e00f2b80aeafc55ea52daaf03b849d0ddbcbe5c244dbfef744c6e30f0c4681bc9108e2791afd438fba8d1
-EBUILD markupsafe-0.12.ebuild 1237 SHA256 9f74653a6e35ecedd51630d0e48308056e42eff99bd5943dfbaeae26a57752f1 SHA512 0db3f49ba34afb3c3f44f9b815308e95293f1da70437de5b42c5794c442f67ab0c72092b8db36ea0a124c7725ce651e04bdcffea03865af93d666cdc2afe71a2 WHIRLPOOL 1c7d0473e421f0baf2972ef87655865e82d8ab207c797048a2b9b2298fa1e377d2c969daf38d48e77598f75f1bd71c61f0b4868ed0d97501ebc3144988ebc040
-EBUILD markupsafe-0.15-r1.ebuild 875 SHA256 6f2fb98aaa539893d9a20f2214fcbe2f02286959779fc37230a6bea4a53b4124 SHA512 b406798b71f3d5b77a113c7cab72d000459f9d80e378efec58a95066371135ee3035ff672e5e6f4c5c801a44b76c0555ac8db41f2fc71a5419458404bc27a618 WHIRLPOOL 876969cdac36823d2ed94a111f503de8affbed3e4f4a3cb1adcecb5fce7593a0d40d0d20eefd9a53c1205c47c41386baadf193ea75d8e76b35aa51095c464c21
-EBUILD markupsafe-0.15.ebuild 1239 SHA256 8ba4f0d8e9880f53522e9d2ece3ebb74849f416393a16ddc9403e55fe0421a47 SHA512 c52735eefed94f1fcd0480ff5b1037a741df3be77b7521541491e97fc11e5cadf5ed9e36e5c58c1121670fb3b522bb32bc369af3e156dce5ad2f24044c8462c5 WHIRLPOOL 278b543fa4486f7f3c82eff17a0cc5e3ff80671a9b22bd9f175f04dd13175cb74826abdc435d9db416b6bcf5c68bae8b05ed9ec4f46d2c22c742408a9fc7171e
-EBUILD markupsafe-0.18.ebuild 1007 SHA256 9e175e9f21a8219b7d4db0f86b71b54960748fcd3bbf76614dee4aeb2ad6ae52 SHA512 29a69b9be8e68a33fbad67e6a6b83b116849150606b7006aa7a0df1add85a80049e753625ad2d1cf8c621b865bd723907388fcbb3d73ca69120c6c841531ed43 WHIRLPOOL e912e29fc1eb4db5140e9bc88887497040a85229b48e73f41e587d6c41a53c55fa4558358ee5f0831ac45d61ea02b6a62a58149fb8631781fe22a70a3d1f214e
-EBUILD markupsafe-0.19.ebuild 1007 SHA256 3c7f028fc065a3f35a81eb881d6f488dadb5b430a873f456c098fc7584d0361a SHA512 970c473a2e8c0a8e193d017505b48f6200b2c51ede342dd1f7bf08a28aa62dfc3e3e401e28ec54223934e099eb653c985a6dc18c7346d1d84839f7f9951e9968 WHIRLPOOL b14ce166ac59627d648a7c258d42477f7895151931c546b3283d6db88f1ecc69648ac3508520acf815de275ba86a6f2229528b535a05b132c5e96f8042382eb5
-EBUILD markupsafe-0.21.ebuild 1046 SHA256 7809b1aa5eed7f67993c6100173fec82ad89cdd93a8b16e1946e54ce8bd6606d SHA512 ea625e4c4cb6f87c6a68e253f5f44159df4284bd0777a9cc2fd1548514b66b8b6c7ac60f400458403ebcc0b3b260fff257b448227c5dc7fce162d0babe64e1e7 WHIRLPOOL 2fe5cc860494ceab2c98e06e185feed30d28e35aa140a724fb86ef57edf555d41724d4443eaf96c9c2b61a2ac96fed3d5eca8f76f70db112338f26f9e364bee3
 EBUILD markupsafe-0.23.ebuild 1043 SHA256 73e127210d76044486a307e1901dbc8c0407c22ee7d2c6814e5bfb5ea2209e50 SHA512 ebe26afdc534a045fc041ec3e4dd78d81f5b8c383f92f3b8caa164ae8c5ebbb70fad38f81d7975177b0eb249e2030ae086c0be3d9e2ae0db2dff27fdcb292404 WHIRLPOOL 70a1971d3bd5b6d6709b54d9085bc9f72a9e9d3545fe0e661d74a541e6aa44af8970c0a557f9ac0b38a90205172131a86d5f4506e598b4e776aadd623f9056e3
-MISC ChangeLog 8912 SHA256 62b74bb73ee9ec394083ccd82ef9c4373cbc33c5c83c94b3b2c8d0c9a2b894e4 SHA512 e19a8cf4caff4c42f0bd4118e6905977ca7e252f06a87a6fb2d188adafb210bce1bd5b3f260b9f5ff8cd7c8673b783c1601636b9a7a1584de97f2613f900285f WHIRLPOOL 9b595f67c8457cffc3ca3e29ef354888f222734b671aaeec1a777e65d03b6ab27f1ecd7c003d781fa7d00853c84a60b89de50af1713db318fc8c9052d22dd94f
+MISC ChangeLog 9172 SHA256 867b0ea122c6faa29ecfce198cccbbf597f7a1521af9a8a2d2b0ca140f014549 SHA512 39638b98b9ca265a73ffc01105acd3283d6a8021803d696d9f0fa086f3b80fb5858558ff7db110edb8656d3e813c7440c3f6162451e97c3cfc519e48e2a0892a WHIRLPOOL 3d7fbe531e8fe994f3b511d6296da1f2c1e1b896e2fa9b325fc7dd846948d2028e3de0dd1ccd7f1cd826fc5a1359de7fd1df2f7c57e4c7e02e5180bf07a4e0b4
 MISC metadata.xml 233 SHA256 c688f03b5139f65be4363bc3f6dfc4a50a17c7a56c0760de8db2cdf2872b0919 SHA512 e3ee05a2dfbe9d69e22bf8827cbe2cf2ed1c5cff5d89b89a6b6919d298e42d30e0825860162959e30469dab3c35d0f173be3c19b249708573a303849dbb83390 WHIRLPOOL ce7c805bdab146ea06e863d75badedb752db7ca4d750ef628468aa1b3f05679e39707fcdb914816bfdea7ab17defe4243a5836d44c920bcdd9a225168c9d5dae
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlRssQ4ACgkQso7CE7gHKw0DIQCfaWbJH/M1PbF702N/AMRCZzBt
-Dq0An1NtI2dWdh3p1/4314yvSMqVdh1l
-=xL0B
------END PGP SIGNATURE-----
diff --git a/dev-python/markupsafe/files/markupsafe-0.18-py3compat.patch b/dev-python/markupsafe/files/markupsafe-0.18-py3compat.patch
deleted file mode 100644
index c823037911a1..000000000000
--- a/dev-python/markupsafe/files/markupsafe-0.18-py3compat.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-https://github.com/tseaver/markupsafe/commit/553d9c3ba00e89967dfb608806f5703ef11c3f4c
-diff --git a/CHANGES b/CHANGES
-index 91a61c5..ec98481 100644
-diff --git a/markupsafe/__init__.py b/markupsafe/__init__.py
-index 25f00d3..902b2b2 100644
---- a/markupsafe/__init__.py
-+++ b/markupsafe/__init__.py
-@@ -10,12 +10,11 @@
- """
- import re
- from markupsafe._compat import text_type, string_types, int_types, \
--     unichr, PY2
-+     unichr, PY2, _EMPTY, _BLANK
- 
- 
- __all__ = ['Markup', 'soft_unicode', 'escape', 'escape_silent']
- 
--
- _striptags_re = re.compile(r'(<!--.*?-->|<[^>]*>)')
- _entity_re = re.compile(r'&([^;]+);')
- 
-@@ -65,7 +64,7 @@ class Markup(text_type):
-     """
-     __slots__ = ()
- 
--    def __new__(cls, base=u'', encoding=None, errors='strict'):
-+    def __new__(cls, base=_EMPTY, encoding=None, errors='strict'):
-         if hasattr(base, '__html__'):
-             base = base.__html__()
-         if encoding is None:
-@@ -139,7 +138,7 @@ def handle_match(m):
-                     return unichr(int(name[1:]))
-             except ValueError:
-                 pass
--            return u''
-+            return _EMPTY
-         return _entity_re.sub(handle_match, text_type(self))
- 
-     def striptags(self):
-@@ -150,7 +149,7 @@ def striptags(self):
-         >>> Markup("Main &raquo;  <em>About</em>").striptags()
-         u'Main \xbb About'
-         """
--        stripped = u' '.join(_striptags_re.sub('', self).split())
-+        stripped = _BLANK.join(_striptags_re.sub('', self).split())
-         return Markup(stripped).unescape()
- 
-     @classmethod
-diff --git a/markupsafe/_compat.py b/markupsafe/_compat.py
-index 29e4a3d..0cc647e 100644
---- a/markupsafe/_compat.py
-+++ b/markupsafe/_compat.py
-@@ -17,8 +17,18 @@
-     string_types = (str,)
-     unichr = chr
-     int_types = (int,)
-+
-+    def _u(s):
-+        return s
-+
- else:
-     text_type = unicode
-     string_types = (str, unicode)
-     unichr = unichr
-     int_types = (int, long)
-+
-+    def _u(s):
-+        return unicode(s, 'unicode_escape')
-+
-+_EMPTY = _u('')
-+_BLANK = _u(' ')
-diff --git a/markupsafe/tests.py b/markupsafe/tests.py
-index b34cc6e..f2f71a4 100644
---- a/markupsafe/tests.py
-+++ b/markupsafe/tests.py
-@@ -2,7 +2,7 @@
- import gc
- import unittest
- from markupsafe import Markup, escape, escape_silent
--from markupsafe._compat import text_type
-+from markupsafe._compat import text_type, _u
- 
- 
- class MarkupTestCase(unittest.TestCase):
-@@ -48,16 +48,16 @@ def test_tuple_interpol(self):
-         self.assertEqual(Markup('<em>%s:%s</em>') % (
-             '<foo>',
-             '<bar>',
--        ), Markup(u'<em>&lt;foo&gt;:&lt;bar&gt;</em>'))
-+        ), Markup(_u('<em>&lt;foo&gt;:&lt;bar&gt;</em>')))
- 
-     def test_dict_interpol(self):
-         self.assertEqual(Markup('<em>%(foo)s</em>') % {
-             'foo': '<foo>',
--        }, Markup(u'<em>&lt;foo&gt;</em>'))
-+        }, Markup(_u('<em>&lt;foo&gt;</em>')))
-         self.assertEqual(Markup('<em>%(foo)s:%(bar)s</em>') % {
-             'foo': '<foo>',
-             'bar': '<bar>',
--        }, Markup(u'<em>&lt;foo&gt;:&lt;bar&gt;</em>'))
-+        }, Markup(_u('<em>&lt;foo&gt;:&lt;bar&gt;</em>')))
- 
-     def test_escaping(self):
-         # escaping and unescaping
-@@ -73,7 +73,7 @@ def test_all_set(self):
-     def test_escape_silent(self):
-         assert escape_silent(None) == Markup()
-         assert escape(None) == Markup(None)
--        assert escape_silent('<foo>') == Markup(u'&lt;foo&gt;')
-+        assert escape_silent('<foo>') == Markup(_u('&lt;foo&gt;'))
- 
-     def test_splitting(self):
-         self.assertEqual(Markup('a b').split(), [
-@@ -101,8 +101,8 @@ def test_markup_leaks(self):
-             for item in range(1000):
-                 escape("foo")
-                 escape("<foo>")
--                escape(u"foo")
--                escape(u"<foo>")
-+                escape(_u("foo"))
-+                escape(_u("<foo>"))
-             counts.add(len(gc.get_objects()))
-         assert len(counts) == 1, 'ouch, c extension seems to leak objects'
- 
-diff --git a/setup.py b/setup.py
-index a5ca3ef..cac6084 100644
---- a/setup.py
-+++ b/setup.py
-@@ -81,7 +81,12 @@ def run_setup(with_binary):
-             'License :: OSI Approved :: BSD License',
-             'Operating System :: OS Independent',
-             'Programming Language :: Python',
-+            'Programming Language :: Python :: 2',
-+            'Programming Language :: Python :: 2.6',
-+            'Programming Language :: Python :: 2.7',
-             'Programming Language :: Python :: 3',
-+            'Programming Language :: Python :: 3.2',
-+            'Programming Language :: Python :: 3.3',
-             'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
-             'Topic :: Software Development :: Libraries :: Python Modules',
-             'Topic :: Text Processing :: Markup :: HTML'
-
diff --git a/dev-python/markupsafe/markupsafe-0.12.ebuild b/dev-python/markupsafe/markupsafe-0.12.ebuild
deleted file mode 100644
index b9b0faa58a64..000000000000
--- a/dev-python/markupsafe/markupsafe-0.12.ebuild
+++ /dev/null
@@ -1,52 +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/markupsafe/markupsafe-0.12.ebuild,v 1.11 2013/05/28 07:44:44 idella4 Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="setup.py"
-RESTRICT_PYTHON_ABIS="2.7-pypy-*"
-
-inherit distutils
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="http://pypi.python.org/pypi/MarkupSafe"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-set_global_options() {
-	if [[ "$(python_get_implementation)" != "Jython" ]]; then
-		DISTUTILS_GLOBAL_OPTIONS=("--with-speedups")
-	else
-		DISTUTILS_GLOBAL_OPTIONS=()
-	fi
-}
-
-distutils_src_compile_pre_hook() {
-	set_global_options
-}
-
-distutils_src_test_pre_hook() {
-	set_global_options
-}
-
-distutils_src_install_pre_hook() {
-	set_global_options
-}
-
-src_install() {
-	distutils_src_install
-	python_clean_installation_image
-}
diff --git a/dev-python/markupsafe/markupsafe-0.15-r1.ebuild b/dev-python/markupsafe/markupsafe-0.15-r1.ebuild
deleted file mode 100644
index 77f1f5862758..000000000000
--- a/dev-python/markupsafe/markupsafe-0.15-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.15-r1.ebuild,v 1.16 2014/03/31 20:58:23 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="http://pypi.python.org/pypi/MarkupSafe"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/markupsafe/markupsafe-0.15.ebuild b/dev-python/markupsafe/markupsafe-0.15.ebuild
deleted file mode 100644
index d4e930bc4a7b..000000000000
--- a/dev-python/markupsafe/markupsafe-0.15.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.15.ebuild,v 1.13 2012/05/09 00:11:59 aballier Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="http://pypi.python.org/pypi/MarkupSafe"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-set_global_options() {
-	if [[ "$(python_get_implementation)" = "CPython" ]]; then
-		DISTUTILS_GLOBAL_OPTIONS=("--with-speedups")
-	else
-		DISTUTILS_GLOBAL_OPTIONS=()
-	fi
-}
-
-distutils_src_compile_pre_hook() {
-	set_global_options
-}
-
-distutils_src_test_pre_hook() {
-	set_global_options
-}
-
-distutils_src_install_pre_hook() {
-	set_global_options
-}
-
-src_install() {
-	distutils_src_install
-	python_clean_installation_image
-}
diff --git a/dev-python/markupsafe/markupsafe-0.18.ebuild b/dev-python/markupsafe/markupsafe-0.18.ebuild
deleted file mode 100644
index 44ab5c6cd503..000000000000
--- a/dev-python/markupsafe/markupsafe-0.18.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.18.ebuild,v 1.5 2014/04/01 04:53:45 floppym Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="http://pypi.python.org/pypi/MarkupSafe"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	local PATCHES="${FILESDIR}"/markupsafe-0.18-py3compat.patch
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/markupsafe/markupsafe-0.19.ebuild b/dev-python/markupsafe/markupsafe-0.19.ebuild
deleted file mode 100644
index efba3f33b71f..000000000000
--- a/dev-python/markupsafe/markupsafe-0.19.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.19.ebuild,v 1.1 2014/04/12 06:20:35 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="http://pypi.python.org/pypi/MarkupSafe"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	local PATCHES="${FILESDIR}"/markupsafe-0.18-py3compat.patch
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/markupsafe/markupsafe-0.21.ebuild b/dev-python/markupsafe/markupsafe-0.21.ebuild
deleted file mode 100644
index d8f975bb507b..000000000000
--- a/dev-python/markupsafe/markupsafe-0.21.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.21.ebuild,v 1.2 2014/05/12 11:37:00 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="http://pypi.python.org/pypi/MarkupSafe"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile() {
-	distutils-r1_python_compile
-	if [[ ${EPYTHON} == python3.2 ]]; then
-		2to3 --no-diffs -n -w -f unicode ${PN} || die
-	fi
-}
-
-python_test() {
-	esetup.py test
-}