Dropped version-2.0.3, bumped version-2.2.0, upstream patch fixes broken test, upstream issue #112, fixes Bug #437290

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64

4 files changed, 117 insertions, 23 deletions

diff --git a/dev-python/markdown/ChangeLog b/dev-python/markdown/ChangeLog
index d797c17dff45..5842f121d933 100644
--- a/dev-python/markdown/ChangeLog
+++ b/dev-python/markdown/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/markdown
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/ChangeLog,v 1.24 2012/10/07 15:42:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/ChangeLog,v 1.25 2012/11/10 12:19:15 idella4 Exp $
+
+*markdown-2.2.0 (11 Nov 2012)
+
+  11 Nov 2012; Ian Delaney <idella4@gentoo.org>
+  +files/markdown-2.2.0-tests.patch, +markdown-2.2.0.ebuild,
+  -markdown-2.0.3.ebuild:
+  Dropped version-2.0.3, bumped version-2.2.0, upstream patch fixes broken test,
+  upstream issue #112, fixes Bug #437290
 
   07 Oct 2012; Raúl Porcel <armin76@gentoo.org> markdown-2.1.1.ebuild:
   alpha/ia64/sparc/x86 stable wrt #437288
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index c08be5c24795..d9a77495fbdf 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST Markdown-2.0.3.tar.gz 71247 SHA256 fff5d887cbf82dca288e55c8c240c435ca6ca80fb11d0b3c9fc44464fdece740 SHA512 c269efe9924221e8e7b1d0ffc62df18f15760cf10149a73f5dae6bbbeaea25a32ae0c4d370f5d03b9e38c8cbd0dd0658a306365711f93733d1e8484bd68a30f0 WHIRLPOOL 76614b6a8321569eddf54bf10db76d75ff81fa02884a2c2cb702bc90aae457259ef1870cc6635c84bf1db95de6053eb5c7d103368588f5b93d54ef45f9c7d829
+AUX markdown-2.2.0-tests.patch 3555 SHA256 881c545feb128fc9e5367a3aa550e032617ae194c171f094063e3d26fb574e68 SHA512 5aee58ea26dca1d801f4b83a02e3b405c2ac8d8b881bec11e1e0b84c676a2242309bdd5e7d94f5a892893d068c0dd2ffaf842c62ec34156ba227972dc86b93dd WHIRLPOOL fc5125f6e62961d3db3e559e5daf8f81705561694ab80501e14559b4d91c7cdbdd6f35bd0832c0a7651a7dad1bce87b7d3ee3564edcdf84294caad31bd7018dd
 DIST Markdown-2.1.0.tar.gz 241583 SHA256 ab537478e98137c0fa1cb4149adae23ddc56490ca6e8bb1b6130d91ada81d964 SHA512 ed6df021068a72524fbd98e4204a50cdc78a3fae85c8173dc0103ed82aad7cd446b6d60772a3c299fc7b8e3f9e26a47585aa887385f37dd5c5d12d647a5a96ee WHIRLPOOL 02771f81b2a445d777de73ed19f35d46799d22e9b5a3163a83b8f8317e6f0f24b854eb09bd454f99c335e83b411943a32dd57738d28e5c817213815285fa08e6
 DIST Markdown-2.1.1.tar.gz 242852 SHA256 be6c8cc8163875062b60d759451fec1e55fd3426321b52a6a9077a3f95503864 SHA512 aa20209afc0f8b6bd3f39307b8487ffdf47b2ad017b8c6db70fcb2878c751a007c7f99bc71b1fe8abb7553468997a7b2be69f12211015835b94521a8c8c8657b WHIRLPOOL 2960850130190b0a123187160a0952d4e43f77cde0caddc3cc2142f361798e7c5fafd79c96a4ef03d51c3106db68cbccbffb03c1305f42bc808e63f10fe30b7b
-EBUILD markdown-2.0.3.ebuild 931 SHA256 fda629fb92452b2ca58a9bb8cb828f8312c543cd2a5d1a78d52fc669eae206f9 SHA512 3b90b1558e12ff9a79a9d7261383e70d6dd3e6cdb9d8d4e12c394d007936b22c4ae860d2a7c96ddc536316ea44d27b13c2efc78cfa6601d405989c170070d839 WHIRLPOOL 367885b89f53dd7e384313ffbf4133758a988b90695e97a98275a7ad5c9c7f18e411444dd133ef9c0048034bd937927b18669d93b58c768c9eebd5172396ee34
+DIST Markdown-2.2.0.tar.gz 236894 SHA256 98e1b0a0b2f87b8310d2060a560f427c24ee16c96c83c98ea416f1f8ddc379b5 SHA512 d4a5bbe8bb70dc0737805a52830f485be10d12d7fb628ee54be92bd1a1e11875dc6a6af280c3624b1b97eb7fb28976817b0b8fff45ac8ebe71245c26a4c058b8 WHIRLPOOL eca04fa3ebe8db33f8c0353f589048c75094662bddfbc0ffa4e2a6747f1e1c06c13e123530530fb35e24fe3ef1264efdc9dac1957b92612b45c98f39bcea6cd2
 EBUILD markdown-2.1.0.ebuild 1057 SHA256 baa418269c8ffb260f8b3ad0b12237450b8ab347228b0d1e7f448bdde4ae9004 SHA512 1f1f0dad9f9d4e122705aa7d3354d7e3c7455a030a78799567143a2f9b108ca38c00b8947743585185b210783a19b49a2ec226c752f81b9f890169b113d00d24 WHIRLPOOL ffc587d61dfb77816a1bc8f32a9a843771da69edca5a37bf3f6d277817abd37ef17ef3bed88a18ef4bd095986ea6433dd5766433ca8cbe09feaf81707a98c7cb
 EBUILD markdown-2.1.1.ebuild 1220 SHA256 9f7820878365bc318992fa3aa6bb5ea9ffb6cbb995de150b2fa0cd647d569f40 SHA512 19da87024e1062749e04811c8902536a876b1e05c04a040dde9b75adc05aa655e8cc0ba752644befda241b196c8d85289fc0bd09bb423904fe26738c68f72ed3 WHIRLPOOL 1e1e2db491e15325aca4d1d3fe158b6b0720c840dc6a3250953f575dae76b1e01f058846a4fc69516fedfff6d307ef49e87b22e9b84af39bf04fbb4bfc08c24c
-MISC ChangeLog 3336 SHA256 69b2f2efc6ab327536db98a2a320fd383e3eb5b31060b45068fa78e372b5324e SHA512 8e1e497aba571134916fc5e9fe56ca1fb8e0a165dca885c78800765305d9a65c58172936c203ecf1d144355995116cc679f25f2635a3c176085cfb204641e728 WHIRLPOOL e3374d0d1a65ea5c80ede12e70965abc3154b9c488398986085bc1ea7a2c8b1e2376f6aa81392ec14a823634ebc6d4522b1f7fc0daa9509b14634c920a23f381
+EBUILD markdown-2.2.0.ebuild 1318 SHA256 494937ff695e9ab84f1c17995e7166ee08cbfaae3357d657ed36eb34f6aca83d SHA512 1b8472cd8ea64d7824cf6095cc8276f005a1d6a26bdbc107993cf1db6a6eadaf0f72308d61ffefab5947177ab322f6687950bdb2a7c2f78ae74814e05f69bb52 WHIRLPOOL a8a1a17b1e9997870175b7d0e10f393d1eb5586249a459f9afa4981a3defe8317a980140fb5cb3ddf0f68b9b6d06ea7a9e64cb1f2e426f99b85646d7d73dbce4
+MISC ChangeLog 3625 SHA256 ced9cea7f1ab2f874a76c262cef1a1baf8d2d9ee0ead4cb28f2a0f5034c49ae7 SHA512 2407697bfd99b49e1a6cc3cf927d8a93b8d602b428786ad26de879542a828e8eb3ab1fa467121c1ee40f0c71e391a39139fa90f5d26bf9cec09be833bbf0c3c7 WHIRLPOOL 0dd4f80af803fcc3936d82263e51fb6b05b9d77b6fc3c27ee12bf3254f740394eb7b7fe10a7a1b9a5319bf855e46b37889c1043540786bbd1d017de5b9d055ee
 MISC metadata.xml 307 SHA256 3ec0e0e960786c21e3aef2fefe59d5cb727804b728c0d5bd67ef665ad514b0c5 SHA512 7668e9bc82401b223b3ce12d3231304febdbf93d215f8b9707cf64d5d4a879f6a8352aba5702b134d3c99c8efe7903ea3eb6c4125b49567e3301558188e7bc07 WHIRLPOOL 3340bf1c34c19340d8b7006b0f1822491ccd5381e0f41c8920e9c273937443e7bc9fc6bc3223421e363e2c20793c6cb8bde5de5993a4d7389c941fd6bea830b6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlBxoukACgkQuQc30/atMkBN6QCfVOvlGPLiUhH8WJRcVCRhRCuo
-7lsAoKx1pG/n1VPYYOASCB6pICfXcAi9
-=tiHy
------END PGP SIGNATURE-----
diff --git a/dev-python/markdown/files/markdown-2.2.0-tests.patch b/dev-python/markdown/files/markdown-2.2.0-tests.patch
new file mode 100644
index 000000000000..ef05702c643b
--- /dev/null
+++ b/dev-python/markdown/files/markdown-2.2.0-tests.patch
@@ -0,0 +1,80 @@
+https://github.com/waylan/Python-Markdown/issues/112
+https://github.com/waylan/Python-Markdown/commit/5b3e724fb78da73ab87fb34e4ac9d9299773cfed
+
+--- markdown/__init__.py
++++ markdown/__init__.py
+@@ -37,6 +37,7 @@
+ import codecs
+ import sys
+ import logging
++import warnings
+ import util
+ from preprocessors import build_preprocessors
+ from blockprocessors import build_block_parser
+@@ -163,10 +164,10 @@
+             if isinstance(ext, basestring):
+                 ext = self.build_extension(ext, configs.get(ext, []))
+             if isinstance(ext, Extension):
+-                # might raise NotImplementedError, but that's the extension author's problem
+                 ext.extendMarkdown(self, globals())
+             elif ext is not None:
+-                raise ValueError('Extension "%s.%s" must be of type: "markdown.Extension".' \
++                raise TypeError(
++                    'Extension "%s.%s" must be of type: "markdown.Extension"'
+                     % (ext.__class__.__module__, ext.__class__.__name__))
+ 
+         return self
+@@ -200,19 +201,22 @@
+             module_name_old_style = '_'.join(['mdx', ext_name])
+             try: # Old style (mdx_<extension>)
+                 module = __import__(module_name_old_style)
+-            except ImportError:
+-                logger.warn("Failed loading extension '%s' from '%s' or '%s'"
+-                    % (ext_name, module_name, module_name_old_style))
+-                # Return None so we don't try to initiate none-existant extension
+-                return None
++            except ImportError, e:
++                message = "Failed loading extension '%s' from '%s' or '%s'" \
++                    % (ext_name, module_name, module_name_old_style)
++                e.args = (message,) + e.args[1:]
++                raise
+ 
+         # If the module is loaded successfully, we expect it to define a
+         # function called makeExtension()
+         try:
+             return module.makeExtension(configs.items())
+         except AttributeError, e:
+-            logger.warn("Failed to initiate extension '%s': %s" % (ext_name, e))
+-            return None
++            message = e.args[0]
++            message = "Failed to initiate extension " \
++                      "'%s': %s" % (ext_name, message)
++            e.args = (message,) + e.args[1:]
++            raise
+ 
+     def registerExtension(self, extension):
+         """ This gets called by the extension """
+--- tests/test_apis.py
++++ tests/test_apis.py
+@@ -245,18 +245,18 @@
+ 
+     def testLoadExtensionFailure(self):
+         """ Test failure of an extension to load. """
+-        self.assertRaises(ValueError, 
++        self.assertRaises(ImportError, 
+                         markdown.Markdown, extensions=['non_existant_ext']) 
+ 
+     def testLoadBadExtension(self):
+         """ Test loading of an Extension with no makeExtension function. """
+         _create_fake_extension(name='fake', has_factory_func=False)
+-        self.assertRaises(ValueError, markdown.Markdown, extensions=['fake'])
++        self.assertRaises(AttributeError, markdown.Markdown, extensions=['fake'])
+ 
+     def testNonExtension(self):
+         """ Test loading a non Extension object as an extension. """
+         _create_fake_extension(name='fake', is_wrong_type=True)
+-        self.assertRaises(ValueError, markdown.Markdown, extensions=['fake'])
++        self.assertRaises(TypeError, markdown.Markdown, extensions=['fake'])
+ 
+     def testBaseExtention(self):
+         """ Test that the base Extension class will raise NotImplemented. """
diff --git a/dev-python/markdown/markdown-2.0.3.ebuild b/dev-python/markdown/markdown-2.2.0.ebuild
index 9e31209ca9d6..f04c373928e5 100644
--- a/dev-python/markdown/markdown-2.0.3.ebuild
+++ b/dev-python/markdown/markdown-2.2.0.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.0.3.ebuild,v 1.9 2011/07/07 21:10:53 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.2.0.ebuild,v 1.1 2012/11/10 12:19:15 idella4 Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
+EAPI="4"
+PYTHON_DEPEND="2:2.6 3:3.1"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils
+inherit distutils eutils
 
 MY_PN="Markdown"
 MY_P=${MY_PN}-${PV}
@@ -18,14 +17,18 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~ppc-macos ~x86-macos"
-IUSE="doc pygments"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~ppc-macos ~x86-macos"
+IUSE="doc test pygments"
 
-DEPEND=""
+DEPEND="test? ( dev-python/nose )"
 RDEPEND="pygments? ( dev-python/pygments )"
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-tests.patch"
+}
+
 src_install() {
 	distutils_src_install
 
@@ -35,3 +38,15 @@ src_install() {
 		dodoc docs/extensions/*
 	fi
 }
+
+src_test() {
+	testing() {
+		cp -r run-tests.py tests build-${PYTHON_ABI}/ || return
+		cd build-${PYTHON_ABI}
+		if [[ $(python_get_version -l --major) == 3 ]]; then
+			2to3-${PYTHON_ABI} -n -w --no-diffs tests || return
+		fi
+		PYTHONPATH=lib "$(PYTHON)" run-tests.py
+	}
+	python_execute_function testing
+}