4 files changed, 90 insertions, 2 deletions
diff --git a/dev-python/decorator/ChangeLog b/dev-python/decorator/ChangeLog
index 06608e16c1ee..b787325388fd 100644
--- a/dev-python/decorator/ChangeLog
+++ b/dev-python/decorator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/decorator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/ChangeLog,v 1.57 2012/10/29 08:54:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/ChangeLog,v 1.58 2012/12/20 23:33:47 mgorny Exp $
+
+*decorator-3.4.0-r1 (20 Dec 2012)
+
+  20 Dec 2012; Michał Górny <mgorny@gentoo.org> +decorator-3.4.0-r1.ebuild,
+  +files/decorator-3.4.0-test-failure-exit.patch:
+  Migrate to distutils-r1. Make tests actually fail.
 
 *decorator-3.4.0 (29 Oct 2012)
 
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index aa6b11bda5fe..1b6fc4e276a2 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX decorator-3.4.0-test-failure-exit.patch 1029 SHA256 a823613bf487387cf69d58e88727665e2fec0a4fe13bdda58c51539c82e48817 SHA512 067ff10747c2db973072615e49cec4439b99dfad0086975879eae686001cfdd6ded1a87e11c89081066da72871f3a78ac0a50972e19b67c475741458041e0589 WHIRLPOOL 5995d5dba0f35113b0fd61399837afb81e7c4a2de3082c72a72e10d8ee37e2a3f9abf504b58fc8aa4b24bd88ea04fc9bb1e7d90b81d2df77fea63cb50c31dfc1
 DIST decorator-3.3.1.tar.gz 28421 SHA256 2cf1b977a3728cfaf69ce976f3f41c93a01c148c4dd692e6917197ae1211bc1c SHA512 edd24d41d1b626856cea29f2b5fcab402453b4f02bb80707c280cedd41605554c794f6763b35a8ab4144a54bd4a2262051426726fe04e2e0b9bb5e3d45878795 WHIRLPOOL e849b18e3227486e12987ed578cafc8e541937ee63e9938daefabf98ccc779fa8559759e193db8b37041c5e090dcef4c9c293961b0444bbadd5db70fe0a45310
 DIST decorator-3.3.2.tar.gz 28506 SHA256 c878e3c9a4015893fddcc7a145017bd54bd51cda0eb234cab6a20fa02540cb1f SHA512 de1832741cd22ce652bf05df0b4903ce0e17ebbe4ee9539aaf95ae5624c47651f2982d4e351e92775486c50cd25e0b98ba6436bab93accb22f4d100a56e08401 WHIRLPOOL c989a646ab1963a8233a8a3f7fec3dea07ef20f27eb51e13de1e2513144607dd251112d037b091a03232a866dbf75ea81d6855b84f7666f388a7f9320fe208eb
 DIST decorator-3.3.3.tar.gz 28542 SHA256 1c14b2257e860958bc0e95a48d1946d90d5dfbed3e3353d7e1c65aa4cb2a0da2 SHA512 a803df8f3852868838cb17a234f0a5bbfb952f1c3ec65a3ef93f927d325f1366f165327475f9cf9866b0789778fc89078c249638eefbba3202230bb7c33ed5c8 WHIRLPOOL cb7d1def88148ed36b0e6288105f40e957d0f27ca54865804a7d4dfff62d51b416b82d938a4ad19e82e7b8902dcd86d959fee6642462b37c69ca7725bc65a117
@@ -5,6 +9,16 @@ DIST decorator-3.4.0.tar.gz 30333 SHA256 c20b404cbb7ee5cebd506688e0114e3cd76f5ce
 EBUILD decorator-3.3.1.ebuild 1009 SHA256 e730c6b199d8fe75495ac33a5d47f71536223811a6a4fd75ced8b64120690a8d SHA512 2d2fd29e1f31b1694d1261dc3f25ede2ca005bed8cbca0ec1675d1228dc795b712aa7e64cdfe3a80164961b62e51ad23716919f68a26bf8066b4a020a01a1d17 WHIRLPOOL 96c679a93332c9f2ae0e74f2dbb01131a15e332986bcc63809ece6e3cccb8df76750caf5784c4941cbed50b67a6dd170277cd834fb25bb129c537ea2b32f8efd
 EBUILD decorator-3.3.2.ebuild 1014 SHA256 de632b13730cdd7841dd2cde3b1210d5f10aef4ae74d086f5a25d43ec64de8d9 SHA512 24557ed3a7ded55148c9cacd2f5bbc760f71410b830473a173c2e88ca57d5a3c08f8bbf592237747dc025d1b007861aa077932ff8a487a7df8616e3790b385e1 WHIRLPOOL ecc8fd4622a8e30d29a25942b790d354f71ac3ca7da77d6b7267bef3e4d0a157e22e05c2de97c276dfb6b1108e51d15441d3cd1c6a87184e686f62eb5147875b
 EBUILD decorator-3.3.3.ebuild 1022 SHA256 8c54848654a19cc06108065f305525d90862a18c06342bd2a5dc96e0df13ab8a SHA512 9f7f2e392fba965f60d4c93db89671f01085003652bad46f9c0c59ff578c01a94c032f12d190d53ca46a36ce9d90ac6993d98d50d8093c644d1271df16dc835a WHIRLPOOL d1701ccaf0c8d12b1ce8eeecd20f57c77a9b83e2347b6261531bb9e71e26b73096d3f1cdd72582c5ae006ed3ad5a4c1978425d24c51f01bb2e69df8b60720ed3
+EBUILD decorator-3.4.0-r1.ebuild 948 SHA256 66683dcc61b0dbace60b8f8ed89a462845e84f8f45436601e23df114f7f7a09b SHA512 b070cc00414971e11ce41e652d031eca2fae1a8a935b1ba8686d00498d3a11c6f1d2b830b9f464ce7f7ad40cc25e79a1e6d28c94551ab22f984e1669424d4a2c WHIRLPOOL b680dccaba5fce6d96efc28af6eacddba7c5b57b453f72f354d87ef26e0277895c350d9f70686703087123dba92806c3577f85939b1edeeb7765c34c13123512
 EBUILD decorator-3.4.0.ebuild 1022 SHA256 d9051004cc2f12f6c761bf45dc09ef46fc846c22e9263f9cb12d962bd9edfc8e SHA512 4d75698682e5cb3676a11e4299c598984f677537d4ac6b171e1f311e22b9486aebaa12ba7363bae66b385225616f3505b74bc1d68790763d762fd9d7b1e79399 WHIRLPOOL d7e6939fccdde9d70b5f2afbc03e14f7194ef78f4eba996947da0b6c5e1b49b3b7b888bb3e357b16b4655e41bd6a7f71b5939a3769f0383a2ca90d4c7a6b2de2
-MISC ChangeLog 7141 SHA256 292d8258ab78e01ecb42a30e9897235ecb5b0fd63a5ebc999594b9ae1a202e1e SHA512 00ae09d4ec8dfe48c4b662c296ff19b326380ed88f81e316b0938e9c3dcbabcf74ae3d2779b713bb25d1604d7ca0fdb61335db20eada8e05f28e58ebded86274 WHIRLPOOL d3bff4b22fad9aa01a523962a310672483a36ed9ea4390841297e87ab26e90793556c942c2225aafe90c95333825c68057ef63c779b7fa635c58873c904b7df1
+MISC ChangeLog 7357 SHA256 aacdc8757053b674979b14414e4ea2405e6d92ea392a3f994c1f27defecee128 SHA512 b5035b77cdd192c754b4905ce5f18157b5a93f3f542a969db921dcded93ea155231b43594eeff2d98172a931c9f5415a3e7c98dc7baa23d132160be4b20ed3db WHIRLPOOL f75cc0bb35cc659cc9efedbb08be7806877f8061c1344a360329cd2a875e2ec487552874a29e6b2c14d053adf59cca8224f37b8fe57c71970bbbfd177c622678
 MISC metadata.xml 528 SHA256 298ae2cd6f8e86cd446479a6a32c872a9461c689d60208e1daf7cd772d9f652f SHA512 1606b075b7b5f33dcf52eb55f1d1c02722408eb3eb8e02513e73ce63be63a029ddc1a821d6e5c5239fb7ef1d2d45d4a165d442a5025759fba7095a1754a71173 WHIRLPOOL 0a17d92d65656bd7d00677b25b5b363ef2364ad8f30583da7a610b100684231517429fc16570bb7e7368f0aac50956c77fe803f87e09a02e656ca2a0e3c098dd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iJwEAQEIAAYFAlDToGEACgkQfXuS5UK5QB3LpQQAlLAW5IxIliOJwzyy/4RnYNwB
++VYGSDheVzrQ3rOOEDwasAZAFyFKV2lm6BhdFB7LLravvVqOQ1pmra0a4egqWbLk
+vOylSooCuezHBipPIVmKVSInOtSvH5GnXfeMA/cRn+9t3Z0nudryvdXQiTL6k/wT
+AWflzN/ZeY+8NJ9JA7E=
+=HUrF
+-----END PGP SIGNATURE-----
diff --git a/dev-python/decorator/decorator-3.4.0-r1.ebuild b/dev-python/decorator/decorator-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..e067571d4122
--- /dev/null
+++ b/dev-python/decorator/decorator-3.4.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/decorator-3.4.0-r1.ebuild,v 1.1 2012/12/20 23:33:47 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="http://pypi.python.org/pypi/decorator http://code.google.com/p/micheles/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+DOCS=( README.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-failure-exit.patch
+)
+
+python_test() {
+	local t=documentation.py
+	[[ ${EPYTHON} == python3* ]] && t=documentation3.py
+
+	"${PYTHON}" ${t} || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/decorator/files/decorator-3.4.0-test-failure-exit.patch b/dev-python/decorator/files/decorator-3.4.0-test-failure-exit.patch
new file mode 100644
index 000000000000..4126e2bdced0
--- /dev/null
+++ b/dev-python/decorator/files/decorator-3.4.0-test-failure-exit.patch
@@ -0,0 +1,35 @@
+From fb1fc865000c92fc431a04d54116001c35ec0cdd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
+Date: Fri, 21 Dec 2012 00:29:53 +0100
+Subject: [PATCH] Exit with failure when doctests fail.
+
+---
+ documentation.py  | 3 ++-
+ documentation3.py | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/documentation.py b/documentation.py
+index 3d5a5c0..0ddd681 100644
+--- a/documentation.py
++++ b/documentation.py
+@@ -1131,4 +1131,5 @@ def hello(user):
+     print('hello %s' % user)
+ 
+ if __name__ == '__main__':
+-    import doctest; doctest.testmod()
++    import doctest
++    sys.exit(0 if doctest.testmod()[0] == 0 else 1)
+diff --git a/documentation3.py b/documentation3.py
+index bd86cc6..4162d56 100644
+--- a/documentation3.py
++++ b/documentation3.py
+@@ -1167,4 +1167,5 @@ def hello(user):
+     print('hello %s' % user)
+ 
+ if __name__ == '__main__':
+-    import doctest; doctest.testmod()
++    import doctest
++    sys.exit(0 if doctest.testmod()[0] == 0 else 1)
+-- 
+1.8.0.2
+