12 files changed, 206 insertions, 21 deletions
diff --git a/dev-python/argh/ChangeLog b/dev-python/argh/ChangeLog
index 0a0276afc18e..b8d44efabed6 100644
--- a/dev-python/argh/ChangeLog
+++ b/dev-python/argh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/argh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/ChangeLog,v 1.1 2012/08/27 14:30:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/ChangeLog,v 1.2 2012/10/29 08:46:30 patrick Exp $
+
+*argh-0.16.0 (29 Oct 2012)
+
+  29 Oct 2012; Patrick Lauer <patrick@gentoo.org> +argh-0.16.0.ebuild:
+  Bump
 
 *argh-0.15.1 (27 Aug 2012)
 
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 3840f143c7d1..09dd2dcc9393 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,4 +1,6 @@
 DIST argh-0.15.1.tar.gz 14878 SHA256 8cca1201af8c15b7e77577ecddbca7cc867f943cb0bd2fb5c38461662b1aa80b SHA512 a1f64d9fd72e5e501e6dedf22e07a15d6a9abd392c6a3153c7a420ab13227af340b8a121069c7e33863c59dd61d19d65d3fe7d48ebcb5d429e2057626905a9c6 WHIRLPOOL 49913581270f2dcbf0cb8757edcafbe324ac0b1b8184466e20aaeb7e45ca3001f765be1e4f91a370f6801a165a70e1c0c11dfdbf21e2108eeea22508a19015f1
+DIST argh-0.16.0.tar.gz 15441 SHA256 97588a444b2a44a48e6d37b98850bb1a86f9597d2a355f4bd4b89e6107f4b43f SHA512 82444d5823be14ec1219d801fbe9e49276a09bf15dd9b20e2eccb50defe1eef1e540ed97e26c5ecc091e30675a71742eb30a106677de5502861e8d50b1adb953 WHIRLPOOL cd6b8a81067d5f5d52ad3fd46a0d08426440a32d9a7b2d676a11c89edb1edddf3cee490f246c40a0efc8b5e06cc1a92227e76f3f5d936e4e987cd8106071a207
 EBUILD argh-0.15.1.ebuild 553 SHA256 b2329db9b5c4daeed479834b0b9b27ba2ab329646b04a55114b83732abff34bc SHA512 5cf6f3e469b8760f5d2fc4a8c267fc8adaa2acd67545e2e21e80980c3766851f966e031a00d18054d993d31a9b68b075737eaed39e3cfea9276ab95e78eb6b18 WHIRLPOOL d5e0d24c8f6b5b06ca558c55ac4748c536816eb49d921f596793f28feb90c7e0462bd7b114e36fc17f60a2c7a59584fe77370cc49ee466367098cc7c1014ef11
-MISC ChangeLog 351 SHA256 d62b97db7a2c2582d7f7bdad216044ffd61c266b1adaada61c13d4ba43383a05 SHA512 3318af99d5f64c2166a6ffac1c411215f58e7f0dc0e9abe322c47e2e36dbcbfca8814c7704b39f5ae502f320f8cf82685f7c783ac5fff23828c113546a8d34e8 WHIRLPOOL 67a1971db90e974b66a4c17a9006d37de2ac674b780b4eedb639621f1450e0265cdaedc45fbbea902be2c7f579b23ad0c3339c5e0e64cf4e363b92e8e1d438c1
+EBUILD argh-0.16.0.ebuild 553 SHA256 da1c6990528244ca4afbf138c69b9cbd2d5a3ce9cf8986c86abbbab3880efb4b SHA512 8431e287056c0e712262492f103577b8141c33c8d12d26ab748a7052828848b3d78324497c6bc65e4fca11c3467b0da0a2116fd37263e07e9a6d8bde10a75ae9 WHIRLPOOL c55d9f47d34fb52913234eb01fbb0f03be2e234d6ae882c89abc74bf85fb04fda12dd86872e523da9075c3530c8d051375f18028451f1ca468bedf1c0578e1d9
+MISC ChangeLog 458 SHA256 de1d1dcbb43909c73953ffb35dcc2a24bcc0622cea1f54cdd88b5f2257f21a78 SHA512 87b9f65adf2595d6e5c0d1c7267e3dd1fb3031d219e2c7244b5dfe4f7480a17d7a02662558bdd3fe07a2331dd79db0cc34636b5fadecc53aee6626aac02529a2 WHIRLPOOL 5db45e83749f6fb3751eabb6c43cc503d58067194b315c4f6de96125c6a1d1e0ca1dff4bc8a168cd3981c1e96a4358e8a88db37001b49f85e75e168dd3a5447c
 MISC metadata.xml 227 SHA256 52465ae5527671b28ab9bd21ae69b6977959863effcbd1d613261c5d6ab3a59c SHA512 cff611358b70c7b563c521b1d3ce510da3d383c3040e6c7563cf4b284fe5cbcb2d113576f3577d12ce22ca37ddf358578aeff338a77e13b6eea1229dc14ba5c3 WHIRLPOOL 70d25300eb07f88caeb021ef50a42f099fa5256097780bf71282f50412b3b896778a0e1a92926afd90256eadb32efa99788352aa74fbd93688e2d48a1a8c6a04
diff --git a/dev-python/argh/argh-0.16.0.ebuild b/dev-python/argh/argh-0.16.0.ebuild
new file mode 100644
index 000000000000..54dcf949137b
--- /dev/null
+++ b/dev-python/argh/argh-0.16.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.16.0.ebuild,v 1.1 2012/10/29 08:46:30 patrick Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 2.5-jython"
+PYTHON_MODNAME="argh"
+
+inherit distutils
+
+DESCRIPTION="A simple argparse wrapper."
+HOMEPAGE="http://packages.python.org/argh/"
+SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-3"
+
+RDEPEND=""
+DEPEND=""
diff --git a/dev-python/chameleon/ChangeLog b/dev-python/chameleon/ChangeLog
index a2f02b1f2d0c..abb7fa25bbf7 100644
--- a/dev-python/chameleon/ChangeLog
+++ b/dev-python/chameleon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/chameleon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/ChangeLog,v 1.15 2012/06/28 06:14:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/ChangeLog,v 1.16 2012/10/29 08:50:39 patrick Exp $
+
+*chameleon-2.10 (29 Oct 2012)
+
+  29 Oct 2012; Patrick Lauer <patrick@gentoo.org> +chameleon-2.10.ebuild:
+  Bump
 
 *chameleon-2.9.2 (28 Jun 2012)
 
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 9ca7c2088862..1a237b15f494 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,6 +1,8 @@
+DIST Chameleon-2.10.tar.gz 156547 SHA256 3a9ea188a0acfab469152834fe909ef8691f2fe65950cd6d3c8d09be31f8b44d SHA512 9233041b602ed03cc579a87c1f8e0ffe297e27b8c4c7915b056eed97806f11f647137c0ee0e3979a9e8b2e21de25a637da5e72639dff03537507bf0f7a1f712c WHIRLPOOL 0ad0a03fbdb17f6dfc9ee89c12de4d99b51f97e3c0c29030fe95825a97d23442a6624b462de4b505726bec0fc5a63ca1ff097784b6903fc3fe9b39117077c35b
 DIST Chameleon-2.8.3.tar.gz 148662 SHA256 273811890999a5fee966298192311cc57f15b594d0fe370009df5d48d3e56a2b SHA512 627470f93c7be844f4dacebf2213cb27c9d5deba1dd49cc244b4df6c0118d2604b395f1b040352de90169841cff862c22b4ae31dd835537906e4a30ad4543b09 WHIRLPOOL 875267f4763e3cdfdb79a11fb045591d88e0453af944ce6b48a9c7573a9697d1b5bf22440612bc93475dc5e0f7ee4f29fa674defa99ead0abb04ffff2db4e7bb
 DIST Chameleon-2.9.2.tar.gz 151036 SHA256 92ff7b6bef0655033005257200d05dfa35a124c5b0b8e0a1ddde339d84668be0 SHA512 120486f72cf3b363fe7fdacd059e969604bb7fe6854ad786aa67afcc5934e86f7fb02259fa4af39f35f305f2259fe575361b9a92791bf2e6952954f0799d1ea8 WHIRLPOOL 891c9b1c64f502b92778e93eb68c7a009b2709aba3e2a00cf52f02b39f99bb4c58c51f27d7f9b538303f1fc19944de591309821a485756c32db67c48ee08a6be
+EBUILD chameleon-2.10.ebuild 1432 SHA256 5576fddbd472f01aae7659767e4f40ab87c6858057dcf506488f2d97d346de63 SHA512 838119d6a42a1d4adaf39e4d53eb54f27f86d68c098062b5db495744fadcdd9efc2a3711f3dfaede156bac90362ef1ca75aabf0da747a922f4f063b529980904 WHIRLPOOL d542cb514f340311195504aa627370c78e0aeb31d63f74609a23cce1063b183e6a856b1cfb2d46d513710301105d60a26a0a813e3d67ab48ffaffaab03ce43cb
 EBUILD chameleon-2.8.3-r1.ebuild 1436 SHA256 dc1054b421019db7af9d270a4e97a33e1422cd76b3a5a8e3fb515394066cd3d8 SHA512 a84877bb4553c24964bd9388f1fbea0e777c56538e660e93d88396479da7a93a833c5a2f44c0059b2d126f11dd4861c42eb1d549d2d3b1f6a7d41c4dd81e188b WHIRLPOOL 0ac22300d0a7bbf0168affb3da0d78710f608d76a3f33b2f3c75d59acdabb15fcf2cdc921422dff32da04331b22e14e8b218ea2064c306eb776f11e79fa41243
 EBUILD chameleon-2.9.2.ebuild 1433 SHA256 0eb6b4d2696bf4802dca92ee0449496c5e1a431eb65d4cd0f1d299aa9dbd7a46 SHA512 05c5f8c82d20b441c1c7f9ce44c43e00eb5a6235dbdcb4bb5423d06e92285626080b0b3c79b199c51e2c79b4cdfeb8dacf6f54ed6e172d4c59034a3193d2f2b4 WHIRLPOOL fdf03ea64a22842df7fcd2c65412727ff7306d53913bfd610f23584ff654c21268c9cbdbc1d771c854e1fcef28a9f09cd04c7dc14cb43d51b5994794ea8cb9a4
-MISC ChangeLog 2420 SHA256 fb980febe4be4796721131533b3cf31cebf27627bf187ea2d9ceed69edda49c9 SHA512 3b4c45feffb24ed085a34e40055ed70789f8a88ade27eb2cc955cceb00f31ac76a7b9f57a9f04e928471bbc0609da4600ca3fa230a9a5fc9a0dbf0d2b867220b WHIRLPOOL a9146ecd5ee85ef13e5ca36a61af1d0de530c55c0bb9c84b4b31743127682866fdc695ae683c0a38753d662c58452fb5b8d64ebc905ad0cc216a512fb9a56e74
+MISC ChangeLog 2533 SHA256 a6a494adc269c3a8126755dfc327e668acbc3a086bd28bf7ffcf6e17603c15c1 SHA512 6463c4f09b008c6cbb1f374fb8fa7ab802ff09a7d75b55b9d863e4ff8500025ee2c55694480c6e3e856a9a6be424d087ac69927fbb7b45a41246a2acdcf509f2 WHIRLPOOL 3c7ecb299909bb0de1ea1b8009d6417f453ad76617524c6cf2810e9e932925f25ff80843dba0da1db7be06481b6463a61d0070edb7de31c558de190a3c69baa1
 MISC metadata.xml 232 SHA256 c0cac02ffe32edb941fbfe04c5572a09534a29f17eefc8edb585a873eb061a86 SHA512 04c8fe97873a13e1adbb87e0a45fbbed06fc62a4ed817472da405d146e5302d2c5960ad1ea1d127f5938d552a506452a882fe2e54c6a99f8252caf2e18f1a48a WHIRLPOOL 8d6a77e092bcaac34f13e6a160cd065d78c240a9e22b7e10c5240da869e5580ae625327fa1e40b325a4ff5b073e186a77a878d26097712b636b268e1cc9f4ab4
diff --git a/dev-python/chameleon/chameleon-2.10.ebuild b/dev-python/chameleon/chameleon-2.10.ebuild
new file mode 100644
index 000000000000..63aa5d958b9e
--- /dev/null
+++ b/dev-python/chameleon/chameleon-2.10.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.10.ebuild,v 1.1 2012/10/29 08:50:39 patrick Exp $
+
+EAPI=3
+
+SUPPORT_PYTHON_ABIS=1
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils
+
+MY_PN="Chameleon"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="http://chameleon.repoze.org http://pypi.python.org/pypi/Chameleon"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc ; then
+		emake html || die "make html failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	delete_tests_and_incompatible_modules() {
+		rm -fr "${ED}$(python_get_sitedir)/chameleon/tests"
+
+		if [[ "$(python_get_version -l --major)" == "3" ]]; then
+			rm -f "${ED}$(python_get_sitedir)/chameleon/"{benchmark.py,py25.py}
+		fi
+
+		if [[ $(python_get_version -l) == "2.5" ]]; then
+			echo "raise SyntaxError" > \
+				"${ED}$(python_get_sitedir -b)/chameleon/py26.py"
+		fi
+	}
+	python_execute_function -q delete_tests_and_incompatible_modules
+
+	if use doc; then
+		pushd _build/html > /dev/null
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _static
+		popd > /dev/null
+	fi
+}
diff --git a/dev-python/decorator/ChangeLog b/dev-python/decorator/ChangeLog
index 79820c1dd401..06608e16c1ee 100644
--- a/dev-python/decorator/ChangeLog
+++ b/dev-python/decorator/ChangeLog
@@ -1,6 +1,11 @@
 # 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.56 2012/09/30 17:03:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/ChangeLog,v 1.57 2012/10/29 08:54:24 patrick Exp $
+
+*decorator-3.4.0 (29 Oct 2012)
+
+  29 Oct 2012; Patrick Lauer <patrick@gentoo.org> +decorator-3.4.0.ebuild:
+  Bump
 
   30 Sep 2012; Raúl Porcel <armin76@gentoo.org> decorator-3.3.1.ebuild,
   decorator-3.3.2.ebuild, decorator-3.3.3.ebuild:
@@ -209,4 +214,3 @@
   02 May 2008; Rob Cakebread <pythonhead@gentoo.org> +metadata.xml,
   +decorator-2.2.0.ebuild:
   Initial commit. Thanks Qiangning Hong <hongqn@gmail.com> bug #176640
-
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 1a782f22785c..aa6b11bda5fe 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
+DIST decorator-3.4.0.tar.gz 30333 SHA256 c20b404cbb7ee5cebd506688e0114e3cd76f5ce233805a51f36e1a7988d9d783 SHA512 94ae8ff3bf694b72ad85a04d02ed9b58c42d50341fbc7307a12fc5abcb8042d8f67df80b53e63afd4b692c52fbefec83b80b591cba036deee21e281a5e8ff249 WHIRLPOOL 05b1c59e23ca3ca38cf06a08ae7ef253779c18050445f37a7f926e69456979ab539966e1821a0bd97b63aeef343a89a681a01d0da54182992cdc769c1cdda5b4
 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
-MISC ChangeLog 7027 SHA256 f0d1fe9394200638d86e076d090d587ed9d4070b741a0857980822d6cc7e56ed SHA512 2e06d2623c38357606f53242f418907e76250c315563777188386667ef8521bd3375da3909c616d2074c689324925ea8bbf8bab42845df58e95f443740f32614 WHIRLPOOL 7ab641174a4b4bac8996f7e1abbfb1e8abcaf8a8399f4cb713beebe309e664f6e29d5c00e51b59147a4b2a948e388bfeddaa8913651943cb296d8038dbc22313
+EBUILD decorator-3.4.0.ebuild 1022 SHA256 d9051004cc2f12f6c761bf45dc09ef46fc846c22e9263f9cb12d962bd9edfc8e SHA512 4d75698682e5cb3676a11e4299c598984f677537d4ac6b171e1f311e22b9486aebaa12ba7363bae66b385225616f3505b74bc1d68790763d762fd9d7b1e79399 WHIRLPOOL d7e6939fccdde9d70b5f2afbc03e14f7194ef78f4eba996947da0b6c5e1b49b3b7b888bb3e357b16b4655e41bd6a7f71b5939a3769f0383a2ca90d4c7a6b2de2
+MISC ChangeLog 7141 SHA256 292d8258ab78e01ecb42a30e9897235ecb5b0fd63a5ebc999594b9ae1a202e1e SHA512 00ae09d4ec8dfe48c4b662c296ff19b326380ed88f81e316b0938e9c3dcbabcf74ae3d2779b713bb25d1604d7ca0fdb61335db20eada8e05f28e58ebded86274 WHIRLPOOL d3bff4b22fad9aa01a523962a310672483a36ed9ea4390841297e87ab26e90793556c942c2225aafe90c95333825c68057ef63c779b7fa635c58873c904b7df1
 MISC metadata.xml 528 SHA256 298ae2cd6f8e86cd446479a6a32c872a9461c689d60208e1daf7cd772d9f652f SHA512 1606b075b7b5f33dcf52eb55f1d1c02722408eb3eb8e02513e73ce63be63a029ddc1a821d6e5c5239fb7ef1d2d45d4a165d442a5025759fba7095a1754a71173 WHIRLPOOL 0a17d92d65656bd7d00677b25b5b363ef2364ad8f30583da7a610b100684231517429fc16570bb7e7368f0aac50956c77fe803f87e09a02e656ca2a0e3c098dd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlBoe3oACgkQuQc30/atMkBjAACgm0amYfuj2tr+UkvFQRIr2ckn
-5VsAnjfmG69TEDCRQxkTYG9glLrfktsX
-=F8Q0
------END PGP SIGNATURE-----
diff --git a/dev-python/decorator/decorator-3.4.0.ebuild b/dev-python/decorator/decorator-3.4.0.ebuild
new file mode 100644
index 000000000000..8fb5b909518f
--- /dev/null
+++ b/dev-python/decorator/decorator-3.4.0.ebuild
@@ -0,0 +1,35 @@
+# 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.ebuild,v 1.1 2012/10/29 08:54:24 patrick Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_TESTS_RESTRICTED_ABIS="2.4 2.5"
+
+inherit distutils
+
+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"
+RDEPEND=""
+
+DOCS="README.txt"
+PYTHON_MODNAME="decorator.py"
+
+src_test() {
+	testing() {
+		if [[ "${PYTHON_ABI}" == 3.* ]]; then
+			PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" documentation3.py
+		else
+			PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" documentation.py
+		fi
+	}
+	python_execute_function testing
+}
diff --git a/dev-python/pyx/ChangeLog b/dev-python/pyx/ChangeLog
index 6d2a5867af18..67a8f2bad7e4 100644
--- a/dev-python/pyx/ChangeLog
+++ b/dev-python/pyx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pyx
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.28 2011/07/29 22:54:35 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.29 2012/10/29 08:42:33 patrick Exp $
+
+*pyx-0.12 (29 Oct 2012)
+
+  29 Oct 2012; Patrick Lauer <patrick@gentoo.org> +pyx-0.12.ebuild:
+  Bump
 
 *pyx-0.11.1 (29 Jul 2011)
 
@@ -115,4 +120,3 @@
 
   10 May 2003; Alastair Tse <liquidx@gentoo.org> pyx-0.3.1.ebuild:
   Initial ebuild. Submitted by Dan Bullok <dan.gentoo@bullok.com>.
-
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index dce8436d3d7f..13bfb74959fb 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1,7 +1,9 @@
 AUX pyx-0.10.patch 5613 SHA256 d529acfc9f35b7b501064e31a036b7f3fbe37745d65c6ab1e00c2ac44f92de69 SHA512 4f5462db9354ac780ca9c1c43f03dcaaf1b935bc13bb13e0eae8b1a20e8af68c8660ed61da6aad4ac87d41a0cbfbdcc3b9773b01634f7aa2b4fb1e9ec5b3ca51 WHIRLPOOL d0ed1d5915cbf57f3ed36acaa76df68fbc978aa6f7b0c11c10328bcf252c0b98b312223e73d6c1f324b302572e85c24c06df8c44de8995da9487b098cebbf436
 DIST PyX-0.10.tar.gz 373614 SHA256 dfaa4a7790661d67d95f80b22044fdd8a9922483631950296ff1d7a9f85c8bba SHA512 20e5fe8dd237e3ed34ee1b91b604338fe3b49456318a29e0ec9676ea757d4e36c3fecb575f5b56b55b631f8276e046884e468f81100270ad1e5a49a1e583794e WHIRLPOOL 74b736e6cba35c01f11ecaa482c47ab19198c60310cf0ae63b1f6c87ff230d62c1f2a2044913e01c0703a726c02817afa296a18eb7b7fb7f1be4d3b55b32fb56
 DIST PyX-0.11.1.tar.gz 554987 SHA256 ba3f4be3c30d33be122afa10486903a5a2881e099f9e83cbda54779ebe3a2c5a SHA512 44eea803870a66ff0bab08d13a8b3388b5578ebc1c807d1d9dca0a93e6371e91b15d02917a00b3b20dc67abb5a21dabaf9b6e9257a561f85eeff2147ac73b478 WHIRLPOOL 70607b94341a2052ffa518b15ccfe0ac73f0d0592d9da57bb209fa90dfeeb05a1892c20dd978e5c70f1758c3861c70f59b03caa75e02cf3f626b19f41bcd276f
+DIST PyX-0.12.tar.gz 561692 SHA256 859285bc2bd51739b7eb72ecf4f7bc81355b28dcbf81e887d8cbf295526a05f2 SHA512 8e6d1bcc898a1b33e290ca8feb8084fb34b1bff17694ad469951533133b44b8f51912747bc034c74392d7903b3acc34afe2e35b2d34fe224e634db22447c4614 WHIRLPOOL 20f303365ead871c4ed0e2f647ad850fb57b3f2fc4510c1916a7ae00a1adcfced7c38121a59acfcf6cba3db0d67fa1180aadaaa6293ad83d9ca7768007ba2950
 EBUILD pyx-0.10-r1.ebuild 1367 SHA256 d9f9b72c04426cfd47eef9462cc73e17ea580dfc9f02c2c721cb8cea27af8cfd SHA512 02848b48465b8f04c35707a6e1addb52d4e4fbf387c1b2b684597c4d1ed6cfc5d161031732dcc597830204a8fdb71621d4ea72dfef5c08ae805393425587d701 WHIRLPOOL ece7a3e76cea8dba5cbdf7c37cca728fa73d9b238ab315544ed5f5f95eda7e1c594ae65b9bda4d6c3b2069c86d258f3e220589da96dc0bc069776a025f1f7c88
 EBUILD pyx-0.11.1.ebuild 1108 SHA256 46d5ad103f1fff4e33d54884e0c8159584fbb58784de69755dcda70bf1835d90 SHA512 46d41e76f052d4f66fccf99c2e651078cc6345ad0b77d3a2861366d06d14efcd2613888c52d076d3cb92afcbbff8e3a74b75ecbb67ae303beeb176ed2b651514 WHIRLPOOL a1c5348cd1542a5259926d156905cc02f5de4866dc906bbd12494926510f00c7c62594a32d177a3c6545b22e20395fcf392a24ac438de5876f40d716203c7bbf
-MISC ChangeLog 3856 SHA256 562980fdd82fd35480b81d253568d81e89e0e944446d20cdb70921c108a225ff SHA512 5d4b776b8981a47838a00ba68fd33cf48efb75aa642f298eaaff891596751761a4eb2cc080983d7a7e796c0fd62298cd90eb7183535cdc2f9e7f7c6f50f01d7c WHIRLPOOL 37434e2a32c02d81c40b8c9f14a121cea5a90aaa1f32cdf3e6fa2a581d3639ca0dde8eba533a079512befcfc4d834502f7b3cb80d8eb38860e03003dc8dd444e
+EBUILD pyx-0.12.ebuild 1105 SHA256 30204f11c6256f699b0b767508c0ce89c592803167e34d3b0076040a969ce3c3 SHA512 30f27a1e34bbb71cd28556a2074d2271ece6312bb476ad3f7bcad18d9747d4bfcc1289ab6233cab4ced63d6c48cc5bab53687d9d37b73d826c6afa22fb329bdf WHIRLPOOL e3fb858bcc680c320238547a15715cd5f59eaddbb2876128ed08b3a482e2b62a0bd5a30ce6527708a65625fdf28d1adee8b000231fe79b86fa2618034f7daa6f
+MISC ChangeLog 3955 SHA256 5194d10dc49ddd447840514dcd96f79e14fd75e6874e8cb47a15a2c882d3d29c SHA512 dcd72b12e89ffa70ff9ef651c7e8b4f077f2a067c04c4ef697c92048236a65852cacf8ab604ec1c951fb2f68f0a1f8c564384d99934528cea1ba7a927a2b44eb WHIRLPOOL edeac797d2e10aa5c9717495d8faf79041de4ffe1d46c58a0e600ae92788ea1909ea41ad1c6713464840b26a42a66477e1106da9400c10a2ab5ac9958d5b9a13
 MISC metadata.xml 445 SHA256 c25b950b71c3fa07bca83ec30403ba0647cfc116db7020eb60b41ffaedb753ef SHA512 a2182b98ea21dadbb96b70df51180affd7da6ba982e36a24d0e8268c95daa05ea1952facdf9a6091d60f57ec12cca79b7ecc52735b32d83f90c0e34a3eddeaaf WHIRLPOOL 8c71ae25e312f54c41648f23e393d654575d990e33406f451e682426fda905e81af623d3040eb6a23cc9494d7fb008ae8fc60de0a69316db4e7caaef00c948b9
diff --git a/dev-python/pyx/pyx-0.12.ebuild b/dev-python/pyx/pyx-0.12.ebuild
new file mode 100644
index 000000000000..73fec19c16bd
--- /dev/null
+++ b/dev-python/pyx/pyx-0.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.12.ebuild,v 1.1 2012/10/29 08:42:33 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils eutils
+
+MY_P="${P/pyx/PyX}"
+
+DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
+HOMEPAGE="http://pyx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/tex-base"
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS CHANGES"
+
+src_prepare() {
+	distutils_src_prepare
+	sed -i \
+		-e 's/^build_t1code=.*/build_t1code=1/' \
+		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
+		setup.cfg || die "setup.cfg fix failed"
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		cd "${S}/faq"
+		VARTEXFONTS="${T}"/fonts make pdf
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	use doc && dodoc faq/pyxfaq.pdf
+}