Bump

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64

12 files changed, 195 insertions, 29 deletions

diff --git a/dev-python/ansi2html/ChangeLog b/dev-python/ansi2html/ChangeLog
index d536c42d88a2..3033cb383ff4 100644
--- a/dev-python/ansi2html/ChangeLog
+++ b/dev-python/ansi2html/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/ansi2html
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ChangeLog,v 1.7 2013/01/23 09:37:30 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ChangeLog,v 1.8 2013/03/11 06:26:09 patrick Exp $
+
+*ansi2html-0.9.4 (11 Mar 2013)
+
+  11 Mar 2013; Patrick Lauer <patrick@gentoo.org> +ansi2html-0.9.4.ebuild:
+  Bump
 
   23 Jan 2013; Corentin Chary <iksaif@gentoo.org> -ansi2html-0.9.3.ebuild:
   Remove unused version.
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index ae562ef7473b..6d4b82b9f0c0 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -2,7 +2,9 @@ AUX ansi2html-0.9.1-fix-0-control-code.patch 1002 SHA256 fb61a09cc668ca074baf8a6
 AUX ansi2html-0.9.1-fix-sys-argv-in-tests.patch 984 SHA256 57dcd3318a85afa618535870ced78291ad4c183b4d5d105f2d8e81bd3da40859 SHA512 3885a02e281a6d70f85d828abaa6430b5c1d729892da140576c1b9959582d537f8c968be72e71b95e09a205159289e260d6cec9c0b778f89370f09e0c006a068 WHIRLPOOL 22d5388a0842b3de27f905a0b94f598746032787500a7bf4c2ac7d0863b6597a10a4d9da9704b6d95f426263ad08a33af8ca1280c098f99e473f8a2c0e75fc90
 DIST ansi2html-0.9.1.tar.gz 30752 SHA256 72945cb51a15fbfd20c39e39256d838d3c7f0101232b5b697a5f0149401f7d42 SHA512 a5b06dc6b2c89c1dcd18b6d1b71aa5179720a1547d1421bdbe9f3974c159c2731a91d82919a1714e07824c39da4c32ada85ccb1be9c7a3e4207c8707a9b55998 WHIRLPOOL 7dd82815a2b9fc16c9317edfdc64b908d41e6345670cfad2fe0ac551d9b8a6e6f50375ac902e094f148f24f3d3003dfeefce35d065cc6e56c9b649bd3c97e74d
 DIST ansi2html-0.9.3.tar.gz 24178 SHA256 31653bbb3528624be03282ef617d96f92292b7da5d6b1541fc6b128a91ac825b SHA512 46c00c2f101b7c8ce7b3af9028c16a12a87da05fae9b92d9e5d8e1e5a60dac9ab49d6163852e33eb680338d35b371b0e64dcb858fa94724d8386a90a470ae8a1 WHIRLPOOL 67e5513e6af4a90e71b2403e1dfd2fab2d43a431f34d67c81b3ddc923e55c41099c05112209df89be186d2418ad2cee044d153d6748f09758042146cdac11301
+DIST ansi2html-0.9.4.tar.gz 27082 SHA256 8ab5d857bc9a789b4d3b7e3ced75b765f5c74ab8959cba585ac10066eec4b467 SHA512 5cc60687538309d2f5ea93a2e52d33af758e3c9372ce6dcc2286997a751d95cb6cc5a366614c36af6169b9189d7b5dda49c4d1b6e8b301ab4c592a8a9b650822 WHIRLPOOL da40dd7ef1f47fe80ff11f0c1f4f0f33613d8819c6d5e14c4b500977c70caa46b26c86a7796c71f4e8d95fcadb5223050f373e6237181886820ff2ccca45c761
 EBUILD ansi2html-0.9.1-r1.ebuild 979 SHA256 6d93034ab2a04182625de5e2d5695ad5d57de5ef87ca6d0cb61903eac9418b5e SHA512 d313990005c0d28ed8a7da53b0fee95e65d7c4cb5d0c6aebc46acd143d0270153e6830519b464b7e1736550c6670f0c287060725d508ea2daed3c4ba42b3c862 WHIRLPOOL b80928a3004e76016502c3a8d59f201baddc3ca3455269c97fe0ecc6dacaa2904e8db6f26bec703bee0542fdaea372a4cd56e9a145b5ece3b19ad2a9d0958bbe
 EBUILD ansi2html-0.9.3-r1.ebuild 901 SHA256 358c64fa861cf8d29db3900c89afb3316b3214f7090b34db0a1d716974841b33 SHA512 3ad3b104a3118130183a0ea95cf44ca36d9499bf1ace970198acbe40be4ef1e12d32efa6b2be88b15f9629ecc00f7ce88d28b20605e56effa90e7b83da476b7d WHIRLPOOL f15aaa77c50042d47279e67c048963d8e68ce02f249fdf879aabfc394a77f80f6bbd708223eeb6faf05bb81d21e73c7c93390c3c47acae94f77e1531962628b7
-MISC ChangeLog 1240 SHA256 3261ddc994fb659f03a350292c5da5e6db6baeac01397ced0a28978658c72995 SHA512 c3c28c8d5a46202a4e7171cd9acc1396bda6abb336351caf2134cc6accff2d9218a893c242ce9561bbf8348e86c58814b532af5affa4c2090aa56fa1ee409c08 WHIRLPOOL 7f672cd9fb58074a004766bc9664ad6e165166438798a82543fa752047dc4f20e5f782fd662e4e9426254a8dd187e2c8b4d594d641ad061442b18e024c9797fb
+EBUILD ansi2html-0.9.4.ebuild 899 SHA256 90304fd6c82de828c5bf6321d438e36e902cc6d69823279702f0f0d1c3b3a597 SHA512 c3f6239efeeac5f415270215d2324eb41754ef59aa8fb6ffd1cd66a1c8fca5842a58a8ac945c1c899a9eea2f4160ea55b20ebd15bf936320b00f43206756fe68 WHIRLPOOL d6f9073391e719d66051c10d7e434599b91166ea6357f5fe6572ef11346508ed7967fba206ebaeaf3544bb9cd74243e881c721b2b972ce8d7d6cf19ae91ead8c
+MISC ChangeLog 1356 SHA256 188c70b12f131a2145fd6cbf122547226f370a18b3eaf06f68e28084f1d8454e SHA512 46b02b9d10f2d9b677650cb528002e8c36604a5f22bdba70757ee1414bdf94bac0edcfa692dd33b9e938231bb5aa4a15516e298d002ed700ac0f04219a2f4e56 WHIRLPOOL efeafb5fd72549969048f084d08d838df1be0b85d123ae0d5f9a8836e18d4a78a9d61c399ad6332a9ce295ad9a18efda8b7fae76fe4b9043894c82cc4da7ff91
 MISC metadata.xml 385 SHA256 028778014b2d0ca83ecb6d4222477d71ea22f256eea1ea7c428633b6f1d9715f SHA512 c8b65c1ea213d7d584a63672cec0adbcf50f8f52df7742c9edfc3512b4e841f54ef3c842c4263a3cfd3ded77ef0079ba5862cf70e421b7e9d0be2399f1b34a1a WHIRLPOOL e1dcd448707e67aa2d6819c340ba1080a2bd3e75343ce5984ea1d1ed2f25a7e68a8e9e124c4a58df00da2f13c15b4ddcd94974023cd228435111fd67691d7f0b
diff --git a/dev-python/ansi2html/ansi2html-0.9.4.ebuild b/dev-python/ansi2html/ansi2html-0.9.4.ebuild
new file mode 100644
index 000000000000..b9892b0cfb2c
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-0.9.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.4.ebuild,v 1.1 2013/03/11 06:26:09 patrick Exp $
+
+EAPI=5
+
+# ordereddict is need for < 2.7, but it's not packaged (yet)
+PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="http://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -w tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/autopep8/ChangeLog b/dev-python/autopep8/ChangeLog
index e9462c17305d..a37f19c3d401 100644
--- a/dev-python/autopep8/ChangeLog
+++ b/dev-python/autopep8/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/autopep8
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/ChangeLog,v 1.28 2013/01/28 18:45:33 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/ChangeLog,v 1.29 2013/03/11 06:20:27 patrick Exp $
+
+*autopep8-0.8.7 (11 Mar 2013)
+
+  11 Mar 2013; Patrick Lauer <patrick@gentoo.org> +autopep8-0.8.7.ebuild:
+  Bump
 
   28 Jan 2013; Kacper Kowalik <xarthisius@gentoo.org> autopep8-0.8.6-r1.ebuild:
   Drop redundant PYTHONPATH in python_test, thanks to mgorny for hint
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 1515dc972695..651c9b4af6ed 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,28 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX autopep8-0.5.2-issue-10.patch 837 SHA256 ec7a48d8163113d0b034c388d12ced60299019b7502d9d4a8561bfbc7ff54908 SHA512 9a30714208645bd4697d5403850f6fec2ca6b5169b406a1c22aa8565f75036190bb6d15e6d19c77540f1b3319c0ec4967646a1c1af3ca34039bc34cca6537b76 WHIRLPOOL 8f3144639993b1525d7f36417d2e87e82fe97a21d420431670840d4521da0ba760b2d491e69f0f83c9aff07fa711fb9b67c53fb1e0d7bc2cdc87b01f2cf47dff
 DIST autopep8-0.5.2.tar.gz 10049 SHA256 a9a808bac49605036bdeaa4bf5b50a9bbf87088a54b9a2e54e18c85abcecb70f SHA512 9d27a9b2c7cf90a7ea420732ac13675c6bc93435d9d9dc4e437e3e2e121d4b2931b995da77d751e2dbcf4c2c5379fda6c4c3c0f6cc222b461d4daa95e9ec2564 WHIRLPOOL 5b4f6ca08695da516f6579399de1decb3a1be6b2520a636812f1b68cb6ee7e05cb546fe7537513deb3f9a3f914808ffeaa956d1daa2c4e0bcf14f22071e9e7c8
 DIST autopep8-0.8.6.tar.gz 48048 SHA256 ee3ffd6b6f4484a06aeb8b47c148b74eb7b51d3ca4003c163b4e522bd555c2d6 SHA512 0430bc2c0427816945c0e433736fd4d5515b7842391c7e1dc5680cf3a4752c60d4d37d4331a60c8808f09ed02c3753e851894f86040968af9506ed0d0cef74e4 WHIRLPOOL 2c3d976fb32fe6e0129a2416ff51563e9d007314dfa0ee3d9819df8df4e934ca9a02bbc48d114b1d6374e53851e4fdf54e10f22cc6e4336d1e249dc22e812878
+DIST autopep8-0.8.7.tar.gz 48884 SHA256 8742d3e5fe19a7926af248bf43016d41600e64e71d15af5158f8cf0e1099263f SHA512 aaa02a6ca93586b2493f915dc145c835214a22470f7fe6c93d21ae6e6c1f56b001f3ae2089fad629099bbf8752c167ca6271ac75d25511458f9d8eb4c6409d8a WHIRLPOOL e16f35cb4dec502103f651893a7ee0c340a595a578da52f08763c8ac6d29842f25b7d18c4cb6387b329d79a3ba51fdeca9015da5f80c9ab72de852c40145e52e
 EBUILD autopep8-0.5.2-r1.ebuild 915 SHA256 5403942b748a78ec6c9dece2168ed921930073fa174df92a93fd0f1a931464a0 SHA512 7cdf39b60704c44d4231e15b1d47b1fbed03470601462faa6280c8469fe76508e166776ab4ef3b1ecce2b2053f3b68eaf3058c42d087d66d22132c0214030bdc WHIRLPOOL f1d8663eaeb6312a382115fba3b1690a61db6c030c9a97509b13cbeef59c469f470e16357c52abacf10d0eac56b59ed342895b80c287fa3756c1358cd20094eb
 EBUILD autopep8-0.8.6-r1.ebuild 1192 SHA256 fde3e2db149f8734a9e4e37413f9bafb34f5fe7756e50bd0f49b0fe726963a2d SHA512 9b258d834f48493816f2deee55a8258b63886f7b5d153266b165c880c5a909408129c5797c7dca8fbf13e5d98108473bf991ab56d62cfa4cdde783e3ba4929df WHIRLPOOL 91c1267dc658cc3f4b2de04f43f8ce209d84733cec73a64b8ce4615f3d3ad62a523224ef20fef0e1877b305a0ce5aa36b7cea0212b0b5b1372b2cc5d773b62f7
+EBUILD autopep8-0.8.7.ebuild 1186 SHA256 657503b95307c569f3a27e10647531110a6d6f440183fe2cfb2d1392ade0dd20 SHA512 50375e6c0e8ea73a3b3fe7d89549d24eaffef5743917de52f53d5d4569c20d2e5310fd27ded357c81c310846b2c4ef7ddfb39ad50ca429f824b6842810024054 WHIRLPOOL 396c5a170570d250f108fe2adac893a0ee687388f165df5b3255be78fdf75a0e00018fd5fec30a2e94853de5affefcaa05553137de21c1e6092cc84b5bb56bbc
 EBUILD autopep8-9999.ebuild 1027 SHA256 ac319ccddf48cf4f03d2d0dd9cd92dd557654eaa541f97979c522eba915ef92a SHA512 6a2b2fd4c72f68c2e6de2cab76a6eb86b60c2f3c65d5d61686fe9a1beef4edcdbb87080f46a57c977901693cf1ab995ca8f711103d783d1cfb8ee7c2eb097d0b WHIRLPOOL 7f92ce4b9464b3bfe26a4ae7514f2e2b07b9bb6ed17248fcd528726b52e6a2a75b1d3cd5c2905289afb694c9e95f7fffc68d5d28f20d6e32a5e3f18618f1ea94
-MISC ChangeLog 4896 SHA256 45140ca1cf11304951970ffeee7e710598ddf729be94f546659fcf4ca908ff86 SHA512 9b6761ebfe575169e9be2331c6e026cda339daafc8765d1454eb1ad1aeccff34209f796be3abf937047f8951276b6eac2d48fe893c2f4168e711d838f8a58e43 WHIRLPOOL 6a9c4af9f9c536771c7177544a79583dd548ff37dbcabc5cd09d3e11718ce957e5798e3e9f03d181c5f43095a68d9419c4db6f46f91036be7924b916a926929c
+MISC ChangeLog 5006 SHA256 59e88932bbc2b227a1ad8c9722b1b390f46db45c912eb46872a46ba9217905e9 SHA512 f0c0bbaa630a95a0a1b317e52e2f908d485c54903a90265e343c299c48ddab61f8d9fbcd9c586271a0a069bc2956de6eafa1c0bf408563d0eab02cc50ef1d96e WHIRLPOOL a48f38b9f4b2565a5f14a2cdffc1e9e620389a072da990f629407d2f0360a2eedb1f65a7bfac8123fdd2281d61c0091603a4c1fae873593fc8b67a067549ba96
 MISC metadata.xml 530 SHA256 a2f56d83d1c4bdf0768bb33384e0e75d633daf05eecf8f6f2e9bac8fa51345b2 SHA512 9c477975be3c9f8f6ce59b1b37406b2606b598bdbdd16ad4e3afaa8d5adc696047cf8001344afe209f8cea389a29dad7d62832dde6ec9a552568c33c202522e8 WHIRLPOOL e4263d8dbb41d74fd0a01de118a594002120d36ee9abb2b1ea183145dabd28845f9da74e5c11e1cfa66c4bd2c957fe9fdda2f0cce00c42604f15d08a6b93ea1f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRBsdSAAoJEF0huFKJUZL5I9IP/ijKMNRB/6nLoVSIwplIr9cL
-nSGkDd41SUWu8+nqa2pajF/PcIV4Iw3n+Hp+T9w+r2uy0aumVG9BI1fVsywbXivn
-M5Rvq7DCoVYPH8qX3POguDsVfIDkixH1BsctL5bmKtaKKRyAprVh93ikmyqKr+Y5
-bG9ji9tniT6uu3y6llY07hBprJ2pUrSogGrRzAEq/4M8JGQN8NoQkmaQ8FnTcW3p
-mRaF9n4nQ5SHt3ECu+MwlYImVZMu4F8C6eM1c1gTkRLJBTC2SNo/n3eIxDtMixys
-H9yRK6+jc6Y3oNZRIwFKoDQNJS9hfQH+l1SrwETtObsCfOYFX9UhYaO9fEEFa7eP
-hmxW9qBSiJx0029Bb2gw/BV0GqF767bwrJtP+YXCWPh/+u56EW9KIqhYXq11ab7A
-JiVKPjBpSwYvD167CqHa2VfkeKwMXZ4bukeWg/GiCECQ7G9ByxX+Q52BKSUavO6v
-FA1+BWVLUWyyratj8LxoPfw50AL62enCOBe/8Dc1gT3JRPD7rm5f7IOwzcbEa1f6
-080No0CnXYkTP+HffAqEZtGaP0z1RWUdZLJyJ3EGqJ5UfHdkRITdsMl33JQi66fk
-o6dTmc5a1mKQOWdVhG6ExmArJfPEMsZISK2S2sEoh2mCkr4Ik41Qs1IricQDVFv4
-3AAf6admrIZ7Tj/kBBSN
-=Lsc/
------END PGP SIGNATURE-----
diff --git a/dev-python/autopep8/autopep8-0.8.7.ebuild b/dev-python/autopep8/autopep8-0.8.7.ebuild
new file mode 100644
index 000000000000..1a2f7a5f056c
--- /dev/null
+++ b/dev-python/autopep8/autopep8-0.8.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-0.8.7.ebuild,v 1.1 2013/03/11 06:20:27 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8"
+SRC_URI="https://github.com/hhatto/${PN}/tarball/ver${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-python/pep8-1.3.2
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${PYTHON}" setup.py test || die
+}
+
+pkg_postinst() {
+	ewarn "Since this version of autopep depends on >=dev-python/pep8-1.3"
+	ewarn "it is affected by https://github.com/jcrocholl/pep8/issues/45"
+	ewarn "(indentation checks inside triple-quotes)."
+	ewarn "If you do not want to be affected by this, then add the"
+	ewarn "following lines to your local package.mask:"
+	ewarn "  >=dev-python/pep8-1.3"
+	ewarn "  >=dev-python/autopep8-0.6"
+}
diff --git a/dev-python/odfpy/ChangeLog b/dev-python/odfpy/ChangeLog
index 0da199912afe..8028a1cca4a9 100644
--- a/dev-python/odfpy/ChangeLog
+++ b/dev-python/odfpy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/odfpy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/odfpy/ChangeLog,v 1.8 2013/01/11 06:46:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/odfpy/ChangeLog,v 1.9 2013/03/11 06:23:59 patrick Exp $
+
+*odfpy-0.9.6 (11 Mar 2013)
+
+  11 Mar 2013; Patrick Lauer <patrick@gentoo.org> +odfpy-0.9.6.ebuild:
+  Bump
 
 *odfpy-0.9.5 (11 Jan 2013)
 
diff --git a/dev-python/odfpy/Manifest b/dev-python/odfpy/Manifest
index 8c44517ef55a..a57d7086e651 100644
--- a/dev-python/odfpy/Manifest
+++ b/dev-python/odfpy/Manifest
@@ -2,8 +2,10 @@ AUX odfpy-0.9.4-tests.patch 1084 SHA256 374b3fcde5c4887d794f05ebb7e28bdb1de6aad2
 DIST odfpy-0.9.2.tar.gz 398078 SHA256 8ed47b5e0d0c8fa31f5fcc53896d8201c28b3df018f26d3c1dbc361e44d93536 SHA512 b32cd0949cea192c3418c0fd92e5a7f61473429575044446d41b3d464b78f80da9bde959a3779ad615fa60d5a0392f8df58d4ed74e56a35c6a6c5704dbae92a4 WHIRLPOOL 72a7eb35dcc5e8356b1f9878866897de53f9d5755a16aa25313e32ed04bc77b078115a9ae029ae17c3bc43b0cedf3c334d8fb812f2c06c93e65426942405ef7a
 DIST odfpy-0.9.4.tar.gz 463006 SHA256 e8a8b99c4cf16ef34b22f49dfab27ea9b8be6a18f423beec7fa29af13a7a73c8 SHA512 d6589176187a082f4719f1ad4d1471f71d65cfc7851ef5e9154e85beee7f422065e3c7457900394ff6485c7100d64fea8c4e8b91ff66aefbbf255fe6e4ac588e WHIRLPOOL 7d123cb2f16d2c4edf400744da8bb6c07d4559143d8b13f51733384f9afcf52800739498be5068892b61048318529d1bda0c4e066cb535f488da65eb388dbec4
 DIST odfpy-0.9.5.tar.gz 463546 SHA256 8f62af3d48884dcf257831719d38a9c93cd63cb57202ee6a9165e5d64a5f55e4 SHA512 f013bab0124a29fac2ec853fa0e6eca7027368704e3682f20653110d82d831e73bd2f225fc080d8f0a8fea92c7c196f651ea95622fa51805c9613b917cdf88e6 WHIRLPOOL 5c2c5af759856ce52019cdea491b01a296d1358cbe0b9b6fafbde04e9511a3024e4db8bef685d648936e2d2a5d51803e5d87089d1f52978e81765bf6ad6e2ad4
+DIST odfpy-0.9.6.tar.gz 452061 SHA256 907f62853858913bc3d5b00e4be4f4e5d56ab3f0d51125a54e949824b560f0bf SHA512 6e49e956426695984d634c2409129741b84d093886fe8012dc17196e20abff77bb486c986e497b0f35642ad0de60a8bbf3cf07352d85ea509cab7da9f3fa470b WHIRLPOOL 11625e99a500eb9e6c13b1c1cb19486689accbb2f8dc6f93a858496ba5f60a1513a89302bce24c1603ef0d46a17bca1126a40c4532f9fafb2cab3b0263c1acd8
 EBUILD odfpy-0.9.2.ebuild 976 SHA256 dd75e0c7d4aa961f592363229d25ff5516abfcdcfe95439e53d2f07e6a3c0756 SHA512 827e4b719cd1ef913a140de109b0d48c6616785b5b2c070e78fd7d7cb5cb839a213e6761936fa6b6045b835d98f27dc403933017ed6b950058b79cb2dce95495 WHIRLPOOL eb9aed6dabae5235da5892e361e9d825c671f82faf5638dae694eb2b275a621be0605689577fdb0527130f1445932a52d424cbcf6a1eb7f71cb23184c8942027
 EBUILD odfpy-0.9.4.ebuild 1037 SHA256 99a57386b427d7bbe745cac8b732b0148d9666c47eb3370bc0fdb1e4a699906a SHA512 72dfc1963305ccb17bb8c61a017f731036a59aa1a5c909fc7fcea370907fd6c75c93bf62b788518704d2af3d986c048a37dafd6419c6c19160e3540b0e5d4ae3 WHIRLPOOL 17f21f7e976b122620c572a95ab57c712ab6bce4049618259adfceda803bea63434d3357e26a57ab93f4bb1f660faf6ecb71bd3a43a474ebcd2e9cc11a68ae05
 EBUILD odfpy-0.9.5.ebuild 1044 SHA256 e1268871a0172733d948c987bde50c8d8f6ff569b75ecf6cb3df922af2eb19dc SHA512 286bde3976a15049bfd29d274d32dc1f5b8c2a759ed55b2b09f25b9c2db2eee97a3c712a922efacaa2c9e3ea3e32f611b23fa9151812efe366430f740cea7871 WHIRLPOOL 633db1a8446dff7a961678a30969bfc9f186590ed6f58d69020250b5785c69b96a0a0062c4592e2ab88fb2f2bbdb9c0f314a469bb6ce8b313f43f445a4d5d6fa
-MISC ChangeLog 1290 SHA256 fa0f49db184159c5cd782f592473d7b31d57ce828ecf8517e7c4a05b0c1528de SHA512 5edb44d308cd06d40aa5b4ad5ce12660b80bcce690b203491811dbc671396e9584c8c051a275256b72dc8689f18fd2fc292023e7ce7016ee628b97b8b09f16ff WHIRLPOOL b858b57cba82fcdab66fe1a2bc500b4e9fe187f56ef020b8ea3095f7cd90f1c7c759a57e470d49dfbb1362bcd01a37e5f01e2f0874097e1a395ca6c04266fe8e
+EBUILD odfpy-0.9.6.ebuild 1044 SHA256 3b2e04b7c477e44e37f7d49094369b9ca2e8e924c9d6f12cc99cf827a9d9704b SHA512 addc85ea87ddef0e4f0efe21f74edf576fac4d1ceccfc8c61a46b7319bebbc09a0cc871f1219c5d1b6e418a32bb7169c7411f4020bcf2e32ab1b3cac0d4375e9 WHIRLPOOL 7994312b79332ef29525225c59ff406176606c5ae702e6afa75ca087767f997c9f64d3dcb3764fd2ee16a63dad79aab91d4f18325cf5a03e63fb5b57d80798c4
+MISC ChangeLog 1397 SHA256 f4e545ed7b741bc15a8bee39deed32c95a8314cc598356ed6c07c6ada96eb35f SHA512 3c6d59d085da108784dfd40a2c80b3ad05066ce26cd927b79e02ef016136fb592226e43b09a6e43bc459c288bfc68009f27212d580cc1cc87d77ad4ee9a29d72 WHIRLPOOL 2b2f8b398feddafbafba27a070d2c42bbfdf9f58f4c3b71f52756746c18a435cca17194b8c3153931c088871d232d1344c1dc89a23f6ced418e732da0c90cfad
 MISC metadata.xml 228 SHA256 d018a90ef92cc71c0307746e709e5a1954935ce83490467b0054f803f786bf7e SHA512 3a87fb6337796d1d4330e8734a76dbd47f70ca38d0b82a2e016fc79692e8801b2b48e0a286e4a781013126ddcf53ef910a3bb819e3ad4ca355692d165a374442 WHIRLPOOL f6ca80faf3e682a05bfe5c530947459328f65f741a01cffd26c9d46178022ece7ebbe4955957abb1010385b2e8ef5577c4e8462463158e29324d6adf61cf9abb
diff --git a/dev-python/odfpy/odfpy-0.9.6.ebuild b/dev-python/odfpy/odfpy-0.9.6.ebuild
new file mode 100644
index 000000000000..38875aafcc73
--- /dev/null
+++ b/dev-python/odfpy/odfpy-0.9.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/odfpy/odfpy-0.9.6.ebuild,v 1.1 2013/03/11 06:23:59 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils
+
+DESCRIPTION="Python API and tools to manipulate OpenDocument files"
+HOMEPAGE="https://joinup.ec.europa.eu/software/odfpy/home http://pypi.python.org/pypi/odfpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PYTHON_MODNAME="odf"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${PN}-0.9.4-tests.patch"
+}
+
+src_test() {
+	cd tests || die
+	testing() {
+		local exit_status=0 test
+		for test in test*.py; do
+			einfo "Running ${test} ..."
+			PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" "${test}"
+			[[ $? -ne 0 ]] && exit_status=1
+		done
+		return ${exit_status}
+	}
+	python_execute_function testing
+}
diff --git a/dev-python/pyftpdlib/ChangeLog b/dev-python/pyftpdlib/ChangeLog
index 86c86a49409d..8dcdce451782 100644
--- a/dev-python/pyftpdlib/ChangeLog
+++ b/dev-python/pyftpdlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pyftpdlib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v 1.23 2012/12/30 14:02:49 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/ChangeLog,v 1.24 2013/03/11 06:27:13 patrick Exp $
+
+*pyftpdlib-1.0.1 (11 Mar 2013)
+
+  11 Mar 2013; Patrick Lauer <patrick@gentoo.org> +pyftpdlib-1.0.1.ebuild:
+  Bump
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> pyftpdlib-0.7.0.ebuild:
   Stable for sparc, wrt bug #418969
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 5ea7fe4b1d26..f9b9cf9065db 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,6 +1,8 @@
 DIST pyftpdlib-0.6.0.tar.gz 128878 SHA256 547afb8bca676e508dbb15c42a9fd3f5af6bdc289781a4c22abd007f74e9936a SHA512 e382a98d4e483b086e0a5055ff034d6fb25feeba32eeab4dce6a17a1d0a2a53571ea9c9b124d7a249d5a7f53f5739cdfdee7553a6db22e1181bc68abfa7b797f WHIRLPOOL 5c0ee7c2ba81a790f580f72a59c040a0dd637627bcd546b1dabe9aea7ccb3d6d9c422ea79c8ea065eed234f582496515ce81e86b5508e3b44dbce22f9c596e4d
 DIST pyftpdlib-0.7.0.tar.gz 94898 SHA256 a11a4b6b5cffa7eab8fb48b24cc90777c21fbedb8873fa15c2231526df0596c6 SHA512 d08a81771538f6b898cb327fd44f2743c8da06d5bff07cd720731dc7f0072f3be6dfba19841b7b6ac3e9c8ba91fdad72c191e0e83e0f8b069f147ccb2f6bc169 WHIRLPOOL aee4d5a9c13eb059eaaf61f2798a194be1e955a0d69c3c7f2e5c06d860ecf837ea282d850b9672ff1a0efc9ce2c1a82fc354d2bad09efe6547440076bc60cf59
+DIST pyftpdlib-1.0.1.tar.gz 116428 SHA256 bec5c2af5942c3970d53b1a9fa27286eba40c2089e3e0ef653ff6f5ed0c4865b SHA512 478f04cb156a6178f03aee40190f17b65e42f04c60311936bf068d11f9ffbd8ae9a118fea456386ccf5184e3fed6270b40b4dfec6523902e310f78ec73785be8 WHIRLPOOL 71b34ef1031b402b2be0d7aac64f796820a20e022fc71fb451777cc4dc50b28ba48dca20608958cd670d90a9baf839c8e4933ddb63b0484fff425faaa5e5e3b1
 EBUILD pyftpdlib-0.6.0.ebuild 1273 SHA256 37a780cd94c90c6bbe1ec105bf4c30950842db9f0657abbe201e722e3023cede SHA512 267c2ed25d8a33952f3cb1c88f02985d2b4667adc61ec3d59b5c666a1c36031341e55220f6544df62d4c19115dc55574f11dc7ec5abdde3a8fef6147cea04995 WHIRLPOOL f174f0587987dd7e6ae86053047fe7c046c29d9786adaf910c4090b87a91e4d1fcddd9651b68e60956731a8fafc9e1f4e52758ed473cfed9b2ac730123cecb96
 EBUILD pyftpdlib-0.7.0.ebuild 1261 SHA256 458b025ecbbd3fee660922c593aa6f8dc5ee24e95b44be02dc1d2dab3f5f0ef8 SHA512 ab806aa913ca606f72569c601ae8ea96f8baeec105e83a4db360785bfe4894293fe4ce7efca907c8d225b903c019064eb5998e90863792a46125aac01e62b9f7 WHIRLPOOL 821224a94c29c5c39185de9dc068d3ba8e971a217d26ad26e98e117f033831d8fb1bdf22e0e7037a87b44277a9e3208894980cbf6613c4ab0a165c5a9413728d
-MISC ChangeLog 2874 SHA256 41603d8d15b16f6ba39f82654272ebff193e8ffb9b950cdea31b521e5d6e438c SHA512 cb0f1e08522f46843a7630c5e45921efc0a1bc40077ff365b40121e8087883ea83789983160467ddeb1209687ce7cf98121beda991dd561ad8538d6fd44b7102 WHIRLPOOL bfbcdbb7f918abe148908bf384a5941c4e67bcadf62b144267b8f7cebf83689a16664145c5a5778ac62d167542d93449fb60dc11b58b7c398c297365ac79c858
+EBUILD pyftpdlib-1.0.1.ebuild 1273 SHA256 aec29e46523778b6c76b23d69d14c61f973338c12d4419e7c86c1186a8a2151f SHA512 7655fb7a54313d73e783cfd8f1764805a8a6a96fef1d1fdd09b9293e78ec90d0b683cdddc6232fefd5b371f96b56d62ccef7a22b1844849c3468be42214212fb WHIRLPOOL e15758cdd4dfa33604bfbd894968953c196b9bca8c58694346492f1cfda03bcbb516e36f17e4b319780cda386362139978ba1045c436aab653ca72ae63667f10
+MISC ChangeLog 2993 SHA256 c21c6090580305a9a2d67f87133a6e88e56591a21bce1042068ac2689432fcd6 SHA512 c10de89e6af623bfc21cc49a5cd60d261ae4d5edf2be85eb15d9c993bb68723509e8e2319801697ce19d0c5b2e8284675138bdef135b611a31f42c3905ed9103 WHIRLPOOL 2a60f5bd5fbedfff7c683f2a0d641dc86cf18b8434b1f3c3fd877afd020b160a4d3b0ae34b48f3651437af6d31609cfeaef4cf21d7e095122c789e5eedcff240
 MISC metadata.xml 338 SHA256 f7d97b3fe24029a19e8e06b81b3c8479f612adf2ac64dcb148073289a6661b6b SHA512 b82fc5de0e5c6c07d07af2912371a8281ac3e4e34f07562ab808f0dd40fce79ca59c76c74845d59c9fa51d8dac8edfdb8152dfc6bf5433d4e7be0f7dff265e79 WHIRLPOOL 70e62672714d6a6fd0d71ae57241816f47f2bc1dbe485ab6ccdab26fee970cfb7f4a9acd3c35c1ce3d13f69747fbb08166b4f321d0d19f2bf223dd841b00a93f
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild
new file mode 100644
index 000000000000..a72b0035ea64
--- /dev/null
+++ b/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild,v 1.1 2013/03/11 06:27:13 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="ssl"
+PYTHON_USE_WITH_OPT="ssl"
+SUPPORT_PYTHON_ABIS="1"
+# pypy has no spwd.so
+PYTHON_TESTS_RESTRICTED_ABIS="2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Python FTP server library"
+HOMEPAGE="http://code.google.com/p/pyftpdlib/ http://pypi.python.org/pypi/pyftpdlib"
+SRC_URI="http://pyftpdlib.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="examples ssl"
+
+DEPEND="ssl? (
+	dev-lang/python:2.7
+	dev-python/pyopenssl
+)"
+RDEPEND="${DEPEND}"
+
+DOCS="CREDITS HISTORY"
+
+src_test() {
+	testing() {
+		for test in test/{test_ftpd.py,test_contrib.py}; do
+			PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" $test || die
+		done
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r demo test
+	fi
+}