bump, add patch to fix py3 support, fixes Bug #470952

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 201 insertions, 5 deletions

diff --git a/dev-python/markupsafe/ChangeLog b/dev-python/markupsafe/ChangeLog
index df2dd813e4e0..c636e93e94a2 100644
--- a/dev-python/markupsafe/ChangeLog
+++ b/dev-python/markupsafe/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/markupsafe
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/ChangeLog,v 1.46 2013/02/02 22:01:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/ChangeLog,v 1.47 2013/05/28 07:44:44 idella4 Exp $
+
+*markupsafe-0.18 (28 May 2013)
+
+  28 May 2013; Ian Delaney <idella4@gentoo.org>
+  +files/markupsafe-0.18-py3compat.patch, +markupsafe-0.18.ebuild,
+  markupsafe-0.12.ebuild:
+  bump, add patch to fix py3 support, fixes Bug #470952
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> markupsafe-0.15-r1.ebuild:
   Stable for x86, wrt bug #454314
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 177d1d3e69cf..a5b21f8a53e5 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,7 +1,20 @@
+-----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
-EBUILD markupsafe-0.12.ebuild 1237 SHA256 5e5a16f2945b8b07f70f8d734ac189a7b143ae4ee899493158c6105f58c27cb0 SHA512 f4850b2dbb2a1b1051a4189ce686791a7c1eda3f3733e5bec2657da8598591616234bbb917cc0cd31e83e83ab9eb1c98dfb3080554179fab82039782b19589ec WHIRLPOOL e37842665f32c70235b752fa525cca0f5e7cd1cfccd54fd3607b4fdf0d64c97218d7aa20d22ecd7d1db79bde636db32cc46eafda8d1014ce64015a04c495c060
+DIST MarkupSafe-0.18.tar.gz 11748 SHA256 b7d5d688bdd345bfa897777d297756688cf02e1b3742c56885e2e5c2b996ff82 SHA512 0438ddf0fdab465c40d9afba8c14ad346be0868df654c11130d05e329992d456a9bc278551970cbd09244a29c77213885d0c363c951b0cfd4d9aa95b248ecff5 WHIRLPOOL 5254f021625fcbf45c3bf94f10a69149a248ae316d0f2f58b34ae008f66bac276d033057dd4f10b79873a4fbcadbd1796afae53fba67593a6cc370e43d34b845
+EBUILD markupsafe-0.12.ebuild 1237 SHA256 9f74653a6e35ecedd51630d0e48308056e42eff99bd5943dfbaeae26a57752f1 SHA512 0db3f49ba34afb3c3f44f9b815308e95293f1da70437de5b42c5794c442f67ab0c72092b8db36ea0a124c7725ce651e04bdcffea03865af93d666cdc2afe71a2 WHIRLPOOL 1c7d0473e421f0baf2972ef87655865e82d8ab207c797048a2b9b2298fa1e377d2c969daf38d48e77598f75f1bd71c61f0b4868ed0d97501ebc3144988ebc040
 EBUILD markupsafe-0.15-r1.ebuild 893 SHA256 3674a0ab8007ea23139f712cd92d7fed7b0c41cd4cd7ab8df6eac99e3a264076 SHA512 328067283c3500e6da93a043f06127711afd92883422facdb7338bc1e24ecea4d5b1bce9d947f2b444a3eb82d0f6bb0447c4d43a05bea15c3aa084a3fe79cf29 WHIRLPOOL f1b42792197d126ceeadc24b5533fdf845eb0f7b39e58d7ae311efbd65691f8f71d7726ec1d3d47cd49882f86e81843eeac599c6d4740ec63d5cc70d3e544fc6
 EBUILD markupsafe-0.15.ebuild 1239 SHA256 8ba4f0d8e9880f53522e9d2ece3ebb74849f416393a16ddc9403e55fe0421a47 SHA512 c52735eefed94f1fcd0480ff5b1037a741df3be77b7521541491e97fc11e5cadf5ed9e36e5c58c1121670fb3b522bb32bc369af3e156dce5ad2f24044c8462c5 WHIRLPOOL 278b543fa4486f7f3c82eff17a0cc5e3ff80671a9b22bd9f175f04dd13175cb74826abdc435d9db416b6bcf5c68bae8b05ed9ec4f46d2c22c742408a9fc7171e
-MISC ChangeLog 5542 SHA256 418f916c44af60db6766eff733bf2ea65f9f179ba1fa315798872b028900295e SHA512 e4ed1f3b60f6df5d15aa81c777aa71bbf255af11246b190422ee8a117db98c66d1d085b7d8551dadf61d4cac817e151b170b1ca79e5640491c6024456629cddb WHIRLPOOL 6b9a8da74b2c4e42fbd3ebc58c978069bc64a2be981b1382bf6888f1c370744a793ad0eaa1aa60631b85a985694ef377db27f246600817eb51a4e8dd5e5d6666
+EBUILD markupsafe-0.18.ebuild 1016 SHA256 005fc4c3db021ca4628f54ed12cb973b62f280baca9a55beff99bbc2578f8bb8 SHA512 b40dfe0e7558c2f56d1a4e714050f139416a888f84d6e3578706a6586ac3ca72db7fe0240aeacf0cf05a56675fa5135509c5f98bcd2245e04f9077f71035f7f2 WHIRLPOOL c363b1bf64978c4f2a73206770e56e5310b98feb10b7d14e8a3b1d3cf9f93ce99fc2a3a1b5555a3e6bb01c05aafe24dd07cf20a9f393c8472d4d37dec2cd90aa
+MISC ChangeLog 5776 SHA256 a35a7f5d0f6c3d39a6cec5de17a311b5c4861bda5a1e87979a96f2d83605525b SHA512 06818dfb5fa143dca6ee90e97d744706299a49e1561183842f2eada523362598ebacbe74cdaf78b66f62056a5f7ff3993421daf78b21f6282a074001c07acdea WHIRLPOOL 011b114cada177e2502af3b51cb63c090c83f4b085113e4b6e1434e733c4583de172d450f5482546c9e24074ee4946c58aff67288dcdf9016e3dc10e73208b24
 MISC metadata.xml 233 SHA256 c688f03b5139f65be4363bc3f6dfc4a50a17c7a56c0760de8db2cdf2872b0919 SHA512 e3ee05a2dfbe9d69e22bf8827cbe2cf2ed1c5cff5d89b89a6b6919d298e42d30e0825860162959e30469dab3c35d0f173be3c19b249708573a303849dbb83390 WHIRLPOOL ce7c805bdab146ea06e863d75badedb752db7ca4d750ef628468aa1b3f05679e39707fcdb914816bfdea7ab17defe4243a5836d44c920bcdd9a225168c9d5dae
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlGkYHoACgkQso7CE7gHKw0tvwCbBcmAmxkXbk9g0KkNHdQ9wdKe
+BWQAoOEUjlBSoqUodRW1UTIaBE6Wmj7g
+=zMdE
+-----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
new file mode 100644
index 000000000000..c823037911a1
--- /dev/null
+++ b/dev-python/markupsafe/files/markupsafe-0.18-py3compat.patch
@@ -0,0 +1,142 @@
+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
index cacf772e3022..b9b0faa58a64 100644
--- a/dev-python/markupsafe/markupsafe-0.12.ebuild
+++ b/dev-python/markupsafe/markupsafe-0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.10 2012/02/20 14:57:21 patrick Exp $
+# $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"
diff --git a/dev-python/markupsafe/markupsafe-0.18.ebuild b/dev-python/markupsafe/markupsafe-0.18.ebuild
new file mode 100644
index 000000000000..8aea620f4e28
--- /dev/null
+++ b/dev-python/markupsafe/markupsafe-0.18.ebuild
@@ -0,0 +1,34 @@
+# 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.18.ebuild,v 1.1 2013/05/28 07:44:44 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_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
+}