[gentoo-commits] dev/dev-zero:master commit in: dev-python/speaklater/, dev-python/flask-mongoengine/, dev-python/mongoengine/, ...

[Tiziano Müller]

commit:     8d27fb1834a0a02c20169ebee34fd48b79192654
Author:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 11:17:16 2016 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 11:17:16 2016 +0000
URL:        https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=8d27fb18

dev-python/*: add several version-bumped/eapi-bumped packages with updated PYTHON_COMPAT

 dev-python/aniso8601/Manifest                      |   1 +
 dev-python/aniso8601/aniso8601-1.1.0.ebuild        |  22 +++
 dev-python/aniso8601/metadata.xml                  |  12 ++
 dev-python/flask-admin/Manifest                    |   2 +-
 .../flask-admin-1.4.0-fix-peewee-2.8-compat.patch  |  49 ++++++
 ...in-1.3.0.ebuild => flask-admin-1.4.0-r1.ebuild} |   8 +-
 dev-python/flask-babel/Manifest                    |   2 +
 .../files/flask-babel-0.9-tests-fix.patch          |  41 ++++++
 dev-python/flask-babel/flask-babel-0.9.ebuild      |  37 +++++
 .../{flask-sqlalchemy => flask-babel}/metadata.xml |   8 +-
 dev-python/flask-mongoengine/Manifest              |   1 +
 .../flask-mongoengine-0.7.5.ebuild                 |  45 ++++++
 dev-python/flask-mongoengine/metadata.xml          |  11 ++
 dev-python/flask-pymongo/Manifest                  |   1 +
 dev-python/flask-pymongo/files/docbuild.patch      |  16 ++
 .../flask-pymongo/flask-pymongo-0.4.1.ebuild       |  45 ++++++
 dev-python/flask-pymongo/metadata.xml              |  16 ++
 dev-python/flask-restful/Manifest                  |   7 +
 .../flask-restful/flask-restful-0.3.5-r1.ebuild    |  51 +++++++
 dev-python/flask-restful/metadata.xml              |  14 ++
 dev-python/flask-script/Manifest                   |   1 +
 .../flask-script/flask-script-2.0.5-r1.ebuild      |  44 ++++++
 .../metadata.xml                                   |   8 +-
 dev-python/flask-sqlalchemy/files/mapping.patch    |   4 +-
 .../flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild   |   8 +-
 dev-python/flask-sqlalchemy/metadata.xml           |   7 +-
 dev-python/flask-testing/Manifest                  |   2 +
 .../files/0.4.2-test-fix-python-3.x.patch          |  13 ++
 .../flask-testing/files/0.4.2-test-fix.patch       |  17 +++
 .../flask-testing/flask-testing-0.4.2-r1.ebuild    |  46 ++++++
 .../metadata.xml                                   |   8 +-
 dev-python/flask-uploads/Manifest                  |   1 +
 .../flask-uploads/flask-uploads-0.2.0-r1.ebuild    |  28 ++++
 .../metadata.xml                                   |   8 +-
 dev-python/flask-wtf/Manifest                      |   3 -
 dev-python/flask-wtf/flask-wtf-0.12.ebuild         |   8 +-
 dev-python/mongoengine/Manifest                    |   1 +
 dev-python/mongoengine/metadata.xml                |  11 ++
 dev-python/mongoengine/mongoengine-0.10.6.ebuild   |  32 ++++
 dev-python/speaklater/Manifest                     |   1 +
 .../files/speaklater-1.3-python-3.x.patch          | 164 +++++++++++++++++++++
 dev-python/speaklater/metadata.xml                 |  12 ++
 dev-python/speaklater/speaklater-1.3-r2.ebuild     |  26 ++++
 dev-python/twill/Manifest                          |   1 +
 dev-python/twill/metadata.xml                      |  11 ++
 dev-python/twill/twill-1.8.0-r1.ebuild             |  47 ++++++
 dev-python/wtf-peewee/Manifest                     |   1 +
 dev-python/wtf-peewee/metadata.xml                 |  11 ++
 dev-python/wtf-peewee/wtf-peewee-0.2.6.ebuild      |  30 ++++
 .../{PyGitUp-1.3.0.ebuild => PyGitUp-1.3.1.ebuild} |   0
 50 files changed, 907 insertions(+), 36 deletions(-)

diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
new file mode 100644
index 0000000..23c3728
--- /dev/null
+++ b/dev-python/aniso8601/Manifest
@@ -0,0 +1 @@
+DIST aniso8601-1.1.0.tar.gz 49417 SHA256 4fc462db59811f541bc25d865b86367153d8ce773ae75b16d54e2e1cd393b5cc SHA512 c8e634ae00bb1eb465c48f1f5a4df2aef48ba8a868abbd0bd158c435646a43b681908a25361c9f916333b9e92ab321389b1b2be89320f37b8ce3c7238d86b1c8 WHIRLPOOL 0b455b0fb92abe13f5aa2bb1aaba3e87a4e529cf54360d2759ccab5eb65d88e04d92261c7786c2ca2de40cd18e4913af7aab29551e1156e640651137db2e2243

diff --git a/dev-python/aniso8601/aniso8601-1.1.0.ebuild b/dev-python/aniso8601/aniso8601-1.1.0.ebuild
new file mode 100644
index 0000000..97323fc
--- /dev/null
+++ b/dev-python/aniso8601/aniso8601-1.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for parsing ISO 8601 strings"
+HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.python.org/pypi/aniso8601/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m unittest discover ${PN}/tests || die "Tests fail with ${EPYTHON}"
+}

diff --git a/dev-python/aniso8601/metadata.xml b/dev-python/aniso8601/metadata.xml
new file mode 100644
index 0000000..3543616
--- /dev/null
+++ b/dev-python/aniso8601/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@g.o</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">aniso8601</remote-id>
+    <remote-id type="bitbucket">nielsenb/aniso8601</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/flask-admin/Manifest b/dev-python/flask-admin/Manifest
index 8bd709b..7ad970a 100644
--- a/dev-python/flask-admin/Manifest
+++ b/dev-python/flask-admin/Manifest
@@ -1 +1 @@
-DIST Flask-Admin-1.3.0.tar.gz 892104 SHA256 750d2e72670a6f0cac82fa4185998cd3fa4146dde3b647002ee03a65242248a6 SHA512 53c0b61a555ba5de3f0dd2cb0c844797b4855d9d6c6b325ebefba90193b0b7f16604c9c906a0675bfcdeacf693942e6ff745061143f17770ee9862d70b373a16 WHIRLPOOL ed39a7b9c9935e428f1671aacf4101862dab80cb558aa9c80ddc4e5df9e1de8264d8f757ed8aca531ff1e70c4d08a922fccf1dfc7e9e54d74e3b1bd12561e766
+DIST Flask-Admin-1.4.0.tar.gz 868807 SHA256 f2d58448985cf25d757be8e4764a46134a6d0a6ec7fcddc584050a6cc8732d6f SHA512 19b65e594821164cd80f0665bd3052865ada4d4676f3deb15ef32e040d3ed519a50cab53fac958d8efb26f6b2056f820a2116a34d73119d120a7eaf813a69712 WHIRLPOOL d4443241f4ccf3fb588264656d6df019ec3790a84ecb96a461d073d75ad2be739229a230d88ee48a1b73a5fe21ffad6caeba76271877ea6b0776a4f67b2452c1

diff --git a/dev-python/flask-admin/files/flask-admin-1.4.0-fix-peewee-2.8-compat.patch b/dev-python/flask-admin/files/flask-admin-1.4.0-fix-peewee-2.8-compat.patch
new file mode 100644
index 0000000..7c6cbd0
--- /dev/null
+++ b/dev-python/flask-admin/files/flask-admin-1.4.0-fix-peewee-2.8-compat.patch
@@ -0,0 +1,49 @@
+From f913fa09137e981d308d0d4b0049591acb1c740e Mon Sep 17 00:00:00 2001
+From: German Rosales <grosales@×××××××.com>
+Date: Tue, 2 Feb 2016 17:17:50 -0500
+Subject: [PATCH] fixes #1185 according to coleifer/peewee@50c9c1d with retro
+ compatibility for peewee's model meta fields hack
+
+---
+ flask_admin/contrib/peewee/form.py  | 4 ++--
+ flask_admin/contrib/peewee/tools.py | 8 ++++++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/flask_admin/contrib/peewee/form.py b/flask_admin/contrib/peewee/form.py
+index 1a68cb0..10edbf9 100644
+--- a/flask_admin/contrib/peewee/form.py
++++ b/flask_admin/contrib/peewee/form.py
+@@ -10,7 +10,7 @@
+ from flask_admin.model.form import InlineFormAdmin, InlineModelConverterBase
+ from flask_admin.model.fields import InlineModelFormField, InlineFieldList, AjaxSelectField
+ 
+-from .tools import get_primary_key
++from .tools import get_primary_key, get_meta_fields
+ from .ajax import create_ajax_loader
+ 
+ 
+@@ -210,7 +210,7 @@ def contribute(self, converter, model, form_class, inline_model):
+ 
+         info = self.get_info(inline_model)
+ 
+-        for field in info.model._meta.get_fields():
++        for field in get_meta_fields(info.model):
+             field_type = type(field)
+ 
+             if field_type == ForeignKeyField:
+diff --git a/flask_admin/contrib/peewee/tools.py b/flask_admin/contrib/peewee/tools.py
+index 32baa9d..8459756 100644
+--- a/flask_admin/contrib/peewee/tools.py
++++ b/flask_admin/contrib/peewee/tools.py
+@@ -11,3 +11,11 @@ def parse_like_term(term):
+         stmt = '%%%s%%' % term
+ 
+     return stmt
++
++
++def get_meta_fields(model):
++    try:
++        fields = model._meta.sorted_fields
++    except AttributeError:
++        fields = model._meta.get_fields()
++    return fields

diff --git a/dev-python/flask-admin/flask-admin-1.3.0.ebuild b/dev-python/flask-admin/flask-admin-1.4.0-r1.ebuild
similarity index 87%
rename from dev-python/flask-admin/flask-admin-1.3.0.ebuild
rename to dev-python/flask-admin/flask-admin-1.4.0-r1.ebuild
index 6425906..c665fa4 100644
--- a/dev-python/flask-admin/flask-admin-1.3.0.ebuild
+++ b/dev-python/flask-admin/flask-admin-1.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1
 
@@ -29,13 +29,15 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/flask-wtf[${PYTHON_USEDEP}]
+		dev-python/peewee[${PYTHON_USEDEP}]
 		dev-python/flask-pymongo[${PYTHON_USEDEP}]
-		dev-python/flask-peewee[${PYTHON_USEDEP}]
 		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
 		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=( "${FILESDIR}/${P}-fix-peewee-2.8-compat.patch" )
+
 S="${WORKDIR}/${MY_P}"
 
 python_prepare_all() {

diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
new file mode 100644
index 0000000..5f0e269
--- /dev/null
+++ b/dev-python/flask-babel/Manifest
@@ -0,0 +1,2 @@
+DIST Flask-Babel-0.8.tar.gz 44520 SHA256 a255d77910ddfbebc6318c618d9a23cda5d018c86c7e0dea64dc860a16cb3daa SHA512 76e34df0748ec0ee2c0964ab07e85dd708c38601e55626fcc40b5a6064e5f2065c1969c4f888827225daf0ce2bf0a41670ba020f7d52b93915f4120cc478798d WHIRLPOOL 35f914bc4e765e03ccf699bbba696980b1ea48e07491d9e401c9ac76ce701575e8d0d69a63c144ad45fd2df76c7d3948b15cadfdbbc7ffd528ee5eca73e0bd31
+DIST Flask-Babel-0.9.tar.gz 38881 SHA256 4afd150f360434b00684ba7848358f7961072fd0658a6e81aaa578522699fb4c SHA512 c667c8a532332bb3dd0d694932d17f7f9b2b51f68151767624116853b2e71f2a6b4c47164d17a6f368b67a5cabce97495b18147655fb36aee5034c058d3b9a89 WHIRLPOOL 28309a4a27bfd0fbe30be52613ee9eef5110e3cc38e863c6de200cced579476870e01b92edaeb08fd29e0deabcaa13d14742d188960742d61cf8ba5384476cd1

diff --git a/dev-python/flask-babel/files/flask-babel-0.9-tests-fix.patch b/dev-python/flask-babel/files/flask-babel-0.9-tests-fix.patch
new file mode 100644
index 0000000..5b11f1a
--- /dev/null
+++ b/dev-python/flask-babel/files/flask-babel-0.9-tests-fix.patch
@@ -0,0 +1,41 @@
+From d56d2c9a42c291a3592f3d7977b4dcca9ac755b3 Mon Sep 17 00:00:00 2001
+From: Jeffrey Kyllo <jkyllo@××××××××××.com>
+Date: Mon, 25 Jan 2016 14:00:04 +0000
+Subject: [PATCH] Updated DateFormattingTestCase with new datetime formats from
+ babel.
+
+---
+ tests/tests.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/tests.py b/tests/tests.py
+index 63c2ecf..2df68ee 100644
+--- a/tests/tests.py
++++ b/tests/tests.py
+@@ -35,7 +35,7 @@ def test_basics(self):
+         with app.test_request_context():
+             app.config['BABEL_DEFAULT_LOCALE'] = 'de_DE'
+             assert babel.format_datetime(d, 'long') == \
+-                '12. April 2010 15:46:00 MESZ'
++                '12. April 2010 um 15:46:00 MESZ'
+ 
+     def test_init_app(self):
+         b = babel.Babel()
+@@ -57,7 +57,7 @@ def test_init_app(self):
+         with app.test_request_context():
+             app.config['BABEL_DEFAULT_LOCALE'] = 'de_DE'
+             assert babel.format_datetime(d, 'long') == \
+-                '12. April 2010 15:46:00 MESZ'
++                '12. April 2010 um 15:46:00 MESZ'
+ 
+     def test_custom_formats(self):
+         app = flask.Flask(__name__)
+@@ -95,7 +95,7 @@ def select_timezone():
+         the_timezone = 'Europe/Vienna'
+ 
+         with app.test_request_context():
+-            assert babel.format_datetime(d) == '12.04.2010 15:46:00'
++            assert babel.format_datetime(d) == '12.04.2010, 15:46:00'
+ 
+     def test_refreshing(self):
+         app = flask.Flask(__name__)

diff --git a/dev-python/flask-babel/flask-babel-0.9.ebuild b/dev-python/flask-babel/flask-babel-0.9.ebuild
new file mode 100644
index 0000000..eea2489
--- /dev/null
+++ b/dev-python/flask-babel/flask-babel-0.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Babel"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
+HOMEPAGE="http://packages.python.org/Flask-Babel/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-tests-fix.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}

diff --git a/dev-python/flask-sqlalchemy/metadata.xml b/dev-python/flask-babel/metadata.xml
similarity index 57%
copy from dev-python/flask-sqlalchemy/metadata.xml
copy to dev-python/flask-babel/metadata.xml
index 10b93c9..7d703bc 100644
--- a/dev-python/flask-sqlalchemy/metadata.xml
+++ b/dev-python/flask-babel/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
-		<email>robbat2@g.o</email>
+	<maintainer type="project">
+		<email>python@g.o</email>
+		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">Flask-SQLAlchemy</remote-id>
+		<remote-id type="pypi">Flask-Babel</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
new file mode 100644
index 0000000..f271cc9
--- /dev/null
+++ b/dev-python/flask-mongoengine/Manifest
@@ -0,0 +1 @@
+DIST flask-mongoengine-0.7.5.tar.gz 110621 SHA256 9181cc3971bdf7ac08d3ad0a513a1cd5c111386e99f74def82bbae797bb8ea76 SHA512 76f616f33ae53021db7938322139979b036c031c64ba5cd8712176eb8bb1bd8780a8f2a1055340061bdf749e7a6a9c6d51a404c7fdd827e876ecbe164a72f7ec WHIRLPOOL 1fef63d261b73df7438c5f7d6e97cf37de67adf8148a154218d8a32bb4caf382beba052c456bfbbe17bda7fc0b595080de81786e38bb25fc7742e3517abec26b

diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.7.5.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.7.5.ebuild
new file mode 100644
index 0000000..a5d4baf
--- /dev/null
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.7.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+RESTRICT="test" # requires running MongoDB server
+
+DESCRIPTION="Flask support for MongoDB and with WTF model forms"
+HOMEPAGE="https://pypi.python.org/pypi/flask-mongoengine/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
+		>=dev-python/mongoengine-0.7.10[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# fix distutils sandbox violation due to missing test-deps in normal build
+	sed -i '/test_requirements/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/flask-mongoengine/metadata.xml b/dev-python/flask-mongoengine/metadata.xml
new file mode 100644
index 0000000..2ef0c03
--- /dev/null
+++ b/dev-python/flask-mongoengine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@g.o</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">flask-mongoengine</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/flask-pymongo/Manifest b/dev-python/flask-pymongo/Manifest
new file mode 100644
index 0000000..a6b518f
--- /dev/null
+++ b/dev-python/flask-pymongo/Manifest
@@ -0,0 +1 @@
+DIST flask-pymongo-0.4.1.tar.gz 22323 SHA256 0187dcbdf6a724556b3a88cc58b7c425449b0524568288894ac1c18f3762a73e SHA512 2d64ae430ee9592204462b5b81b4fe2d0f5fa8e17e03e1b139acf28b11330d7ef990108f1d49e3b968618acaa2ffdd4e26901b1e03b85f8f25ef05d59f5d6d83 WHIRLPOOL efc38195a1ea321ab5392b8b0c13c0327fcba4ebb163d87ea01245f60c59b8f2473b9c7bd349e47c9535d5089ac9934ca0b2135b54b2a7045cc5770eda2eadf9

diff --git a/dev-python/flask-pymongo/files/docbuild.patch b/dev-python/flask-pymongo/files/docbuild.patch
new file mode 100644
index 0000000..6ecdeb8
--- /dev/null
+++ b/dev-python/flask-pymongo/files/docbuild.patch
@@ -0,0 +1,16 @@
+Avoid un-needed d'loading
+diff -ur Flask-PyMongo-0.2.1.orig/docs/conf.py Flask-PyMongo-0.2.1/docs/conf.py
+--- a/docs/conf.py	2012-12-23 00:52:16.000000000 +0800
++++ b/docs/conf.py	2013-06-10 01:26:28.430485499 +0800
+@@ -247,11 +247,3 @@
+ 
+ # How to display URL addresses: 'footnote', 'no', or 'inline'.
+ #texinfo_show_urls = 'footnote'
+-
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {
+-    'python': ('http://docs.python.org/', None),
+-    'flask': ('http://flask.pocoo.org/docs/', None),
+-    'pymongo': ('http://api.mongodb.org/python/current/', None),
+-}

diff --git a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
new file mode 100644
index 0000000..3422457
--- /dev/null
+++ b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="PyMongo support for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-PyMongo"
+SRC_URI="https://github.com/dcrosta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RESTRICT="test"
+# Testsuite appears to require a running local instance of a pymongo server
+
+RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pymongo-2.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/docbuild.patch )
+
+python_prepare_all() {
+	# Req'd to avoid file collisions
+	sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/flask-pymongo/metadata.xml b/dev-python/flask-pymongo/metadata.xml
new file mode 100644
index 0000000..3ff5bc6
--- /dev/null
+++ b/dev-python/flask-pymongo/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ultrabug@g.o</email>
+    <name>Alexys Jacob</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@g.o</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Flask-PyMongo</remote-id>
+    <remote-id type="github">dcrosta/flask-pymongo</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
new file mode 100644
index 0000000..529d6d7
--- /dev/null
+++ b/dev-python/flask-restful/Manifest
@@ -0,0 +1,7 @@
+DIST flask-restful-0.2.12.tar.gz 96159 SHA256 fb44cff325a7f9581007c1f01c6d6f78a8d97ea95a7455b894e0004847213c04 SHA512 4a270431b07c0f3d11fc1a618ba58675b8c869af448894a8067ca297454584decdfe97a0a686f9398599d4888f4f57545d4514d90ee655169ab2b35c8acb1de4 WHIRLPOOL e9d6d9f6d43e912b45a8b4f0f93b3e329922b449d98fd4a2afe09bd14ea78547fbb62f6a9268bce41640b9da1d409bf9500ecfc971a4409401493f6b2e1d0f19
+DIST flask-restful-0.3.0.tar.gz 103123 SHA256 17cb9ef93f6a8329e3bbbf6956fa67e3415efcd142d7da34d5b154409a884078 SHA512 6cb768e591e9a5257eb22406c6857fd24f2cfcccf739c008cc92bda7b03b253726b42fc95fc0e121c4635c7d0a25a816186ba4497fb3b53277d8f0e6aa13f862 WHIRLPOOL 34511a91241a7e421878631ae9d91ffacb8863592e17b7e8c893c084a41f22b7ce96ecc81816a1195e94e34d16723216bc9a222a38fe49473f2254ffb6ddf121
+DIST flask-restful-0.3.1.tar.gz 103801 SHA256 b2171bb730511e2fc54d071a5b8d9f5e852273dcc72a092b0fd937b98956da74 SHA512 264497864297e2621d9a47a08f02bd8632b4030e3d09cb9ac9d04b431fee8cc1e3801220c7fb05fae0e2230e33461e1c7bcefc6b69432f10ac748b9845f1356b WHIRLPOOL 0776e4c2bcd9be0db9cc6664fb21c7433cbb0a8d6c4738890ad041830c9e8e98583a5d9f73ed1c69d5a4cb9457991cf59fc6e177e2541bb157f452f81c8d6359
+DIST flask-restful-0.3.2.tar.gz 106082 SHA256 0b91c5ac2fdfa3cebb25c2110ab24636833e5209eb186a8bd109f563a355ae1f SHA512 e35901f297ed9ec76f4be94c9511a12b7370f00ed959a22fab6804e739a13bf885023f00baf3fad29a59cc873c9d5d0b2e85b7e4657d3203983dc6775d71c89a WHIRLPOOL 7403fafbc37e8080731c7ad71076e986f2a06d30a216257bb10c08c5d230a88a4bde043af13e590be976e8c1953a829fe76827bb5a10db638dddf8b28282f9da
+DIST flask-restful-0.3.3.tar.gz 109947 SHA256 0aeb8f00c96335f90df304a57f36caecd12befccd333a39708f8929f0a528042 SHA512 f8e48048a25b38a09321efc98649970d959d41bf5cc15f5111e1326396ff305b2dbca757a3198a4ed8cf59a6d0144a981178926c1fecc462132888198b4dd8e6 WHIRLPOOL d4db2f013fb92a593731ea19eba6f0daf0f498ebc9fca17f1da8d23b75e243323004e8fe7425813740dc6bcd9c80780a1836a1f37d403a35a94667ecf8fa8a93
+DIST flask-restful-0.3.4.tar.gz 110669 SHA256 c991d85187e1e0e3e58713d62fc8543fe51d7479ee04151061cf9e452e1e2161 SHA512 3f4debac812ddb511f77802e184e24d1ebf023fd282ba37375484260118cafbad479033deed4e5cf9d2681880059fecf9ac34aafad230186f3e3e1cca2f2033b WHIRLPOOL 96e2a0d007fd8042d2e0d344c7042abf24cc3649b11a36330965a1ffaeeb8a21a04651cbdd486757e704b39773a5b8f8146e6d4ddb4477ad462b1ae7edc74567
+DIST flask-restful-0.3.5.tar.gz 113214 SHA256 30f3433c32d3251b83779034513994df93635db81bf5cd5122a4e0415dd3f5c1 SHA512 a541e6739644b4db6ae97cf529bfc43f3136c97fc19a8538277d1f9be033b7c6dc3e39e1c4b2f313e099efbe750dbdc85c67b527224df557567ecac668e5969a WHIRLPOOL d8d0673380263c25e84ed3e86a83b04bae88761c8f3456dcab7d6d58b9884b1b984c28c861bc091c9693b080c15f2f47f99ff6a3003a7f89dd50df851a7d3af5

diff --git a/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild b/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
new file mode 100644
index 0000000..5b6f387
--- /dev/null
+++ b/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple framework for creating REST APIs"
+HOMEPAGE="http://flask-restful.readthedocs.org/ https://github.com/twilio/flask-restful/"
+SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples paging test"
+
+RDEPEND="
+	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	paging? ( >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
+
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/flask-restful/metadata.xml b/dev-python/flask-restful/metadata.xml
new file mode 100644
index 0000000..7e42a30
--- /dev/null
+++ b/dev-python/flask-restful/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@g.o</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">twilio/flask-restful</remote-id>
+	</upstream>
+	<use>
+		<flag name="paging">Enable resource paging support</flag>
+	</use>
+</pkgmetadata>

diff --git a/dev-python/flask-script/Manifest b/dev-python/flask-script/Manifest
new file mode 100644
index 0000000..eb6c84e
--- /dev/null
+++ b/dev-python/flask-script/Manifest
@@ -0,0 +1 @@
+DIST Flask-Script-2.0.5.tar.gz 42580 SHA256 cef76eac751396355429a14c38967bb14d4973c53e07dec94af5cc8fb017107f SHA512 257b724c05dde79c99b028c7fa1980b700f273010de82fa9f1bb090b23519297d8bad87e436fa88a63feabfcd8908041d4a5ad9a673e08f4ed15e97310f16fbb WHIRLPOOL 2f05e8524a6f0ff0beca342f77f9c4b4f7f73cca65b2aa1fc21b4184ccc3a2e253f3d07a88c07c56c9ed1e5f3f9e12c4b6999bfdc85a35569def4107d0fbfb8e

diff --git a/dev-python/flask-script/flask-script-2.0.5-r1.ebuild b/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
new file mode 100644
index 0000000..e7162ac
--- /dev/null
+++ b/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Script"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flask support for writing external scripts"
+HOMEPAGE="http://packages.python.org/Flask-Script/ https://pypi.python.org/pypi/Flask-Script"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.10.1-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generation of documentation by" ${PYTHON}
+		PYTHONPATH=".." emake -C docs html || die "Generation of documentation failed"
+	fi
+}
+
+python_test() {
+	py.test tests.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/flask-sqlalchemy/metadata.xml b/dev-python/flask-script/metadata.xml
similarity index 56%
copy from dev-python/flask-sqlalchemy/metadata.xml
copy to dev-python/flask-script/metadata.xml
index 10b93c9..8c3b802 100644
--- a/dev-python/flask-sqlalchemy/metadata.xml
+++ b/dev-python/flask-script/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
-		<email>robbat2@g.o</email>
+	<maintainer type="project">
+		<email>python@g.o</email>
+		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">Flask-SQLAlchemy</remote-id>
+		<remote-id type="pypi">Flask-Script</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/flask-sqlalchemy/files/mapping.patch b/dev-python/flask-sqlalchemy/files/mapping.patch
index 32bee9c..af65724 100644
--- a/dev-python/flask-sqlalchemy/files/mapping.patch
+++ b/dev-python/flask-sqlalchemy/files/mapping.patch
@@ -1,6 +1,6 @@
 diff -ur Flask-SQLAlchemy-1.0.orig/docs/conf.py Flask-SQLAlchemy-1.0/docs/conf.py
---- docs/conf.py	2013-01-27 08:57:36.000000000 +0800
-+++ docs/conf.py	2014-04-03 18:08:34.772268079 +0800
+--- a/docs/conf.py	2013-01-27 08:57:36.000000000 +0800
++++ b/docs/conf.py	2014-04-03 18:08:34.772268079 +0800
 @@ -224,9 +224,9 @@
  
  

diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
index 3dc200b..7a4cff5 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

diff --git a/dev-python/flask-sqlalchemy/metadata.xml b/dev-python/flask-sqlalchemy/metadata.xml
index 10b93c9..74a0a80 100644
--- a/dev-python/flask-sqlalchemy/metadata.xml
+++ b/dev-python/flask-sqlalchemy/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>robbat2@g.o</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@g.o</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Flask-SQLAlchemy</remote-id>
 	</upstream>

diff --git a/dev-python/flask-testing/Manifest b/dev-python/flask-testing/Manifest
new file mode 100644
index 0000000..338d697
--- /dev/null
+++ b/dev-python/flask-testing/Manifest
@@ -0,0 +1,2 @@
+DIST Flask-Testing-0.4.1.tar.gz 39879 SHA256 d8c4d97d79de517a5d6e348bcc6aaccc45832827afa25ca15cdf8a5a16e543a2 SHA512 b7b71a40545aebed2616b5867951078930bc5d2ab6bf4bc259fab4f8d127ace3830f71bdb4a654c96bf5379bce49930c84e77486c8111b0645bfc515428592b0 WHIRLPOOL e3310b41b53da9847ad3143db30359af8a3eb515da42cc4ffc3068d681abb78a8d11302fb26d085197627aae7d7408175819a108dcf25fd2c0270e02ceaef9b7
+DIST Flask-Testing-0.4.2.tar.gz 40994 SHA256 921c7c653e0d511ed87fbf70d984e27afea8dfa7e10b358689863d7a63e05321 SHA512 57f1a58f352637b6c1d4dc5aa8b3cac215eae334f355d40b6c777f9c5a769c745ce11f2a98818669ec2c29fc170fd86fe4670bb66bd4e4607174b21c5c2067e3 WHIRLPOOL a1fc0723660c25cb18ea5eb4c283c79eb379f2d8cee1bf8fda6ed8b10391cdf0080fa3e2e1ce6cdc50845548a5d9be3f4b20ef267c1350a14049adfbdcfa8e20

diff --git a/dev-python/flask-testing/files/0.4.2-test-fix-python-3.x.patch b/dev-python/flask-testing/files/0.4.2-test-fix-python-3.x.patch
new file mode 100644
index 0000000..d5a5ed1
--- /dev/null
+++ b/dev-python/flask-testing/files/0.4.2-test-fix-python-3.x.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_utils.py b/tests/test_utils.py
+index 1b81c80..3f0bb8b 100644
+--- a/tests/test_utils.py
++++ b/tests/test_utils.py
+@@ -171,7 +171,7 @@ class TestNotRenderTemplates(TestCase):
+     def test_assert_not_process_the_template(self):
+         response = self.client.get("/template/")
+ 
+-        assert "" == response.data
++        assert len(response.data) == 0
+ 
+     def test_assert_template_rendered_signal_sent(self):
+         self.client.get("/template/")

diff --git a/dev-python/flask-testing/files/0.4.2-test-fix.patch b/dev-python/flask-testing/files/0.4.2-test-fix.patch
new file mode 100644
index 0000000..a0933e4
--- /dev/null
+++ b/dev-python/flask-testing/files/0.4.2-test-fix.patch
@@ -0,0 +1,17 @@
+https://github.com/jarus/flask-testing/commit/c969b41b31f60a5a8bacd44b3eb63d1642f2d8bf
+diff --git a/flask_testing/utils.py b/flask_testing/utils.py
+index add12ef..9b479df 100644
+--- a/flask_testing/utils.py
++++ b/flask_testing/utils.py
+@@ -143,8 +143,8 @@ def _post_teardown(self):
+ 
+         if _is_signals:
+             template_rendered.disconnect(self._add_template)
+-        if hasattr(self, '_true_render'):
+-            templating._render = self._true_render
++        if hasattr(self, '_original_template_render'):
++            templating._render = self._original_template_render
+ 
+         if self.run_gc_after_test:
+             gc.collect()
+

diff --git a/dev-python/flask-testing/flask-testing-0.4.2-r1.ebuild b/dev-python/flask-testing/flask-testing-0.4.2-r1.ebuild
new file mode 100644
index 0000000..2d6a5e2
--- /dev/null
+++ b/dev-python/flask-testing/flask-testing-0.4.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Testing"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unit testing for Flask"
+HOMEPAGE="http://pythonhosted.org/Flask-Testing/ https://pypi.python.org/pypi/Flask-Testing/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/twill[${PYTHON_USEDEP}]' 'python2*')"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/blinker[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-test-fix.patch
+	"${FILESDIR}"/${PV}-test-fix-python-3.x.patch
+)
+
+python_test() {
+	local exclude
+	if $(python_is_python3); then
+		# Twill is not available on python-3
+		exclude="-e twill"
+	fi
+	# test phase appears to run only py2.7 but if it passes for py2.7 is passes for pypy
+	nosetests ${exclude} || die "Testing failed with ${EPYTHON}"
+}

diff --git a/dev-python/flask-sqlalchemy/metadata.xml b/dev-python/flask-testing/metadata.xml
similarity index 56%
copy from dev-python/flask-sqlalchemy/metadata.xml
copy to dev-python/flask-testing/metadata.xml
index 10b93c9..d2f55a2 100644
--- a/dev-python/flask-sqlalchemy/metadata.xml
+++ b/dev-python/flask-testing/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
-		<email>robbat2@g.o</email>
+	<maintainer type="project">
+		<email>python@g.o</email>
+		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">Flask-SQLAlchemy</remote-id>
+		<remote-id type="pypi">Flask-Testing</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/flask-uploads/Manifest b/dev-python/flask-uploads/Manifest
new file mode 100644
index 0000000..2624832
--- /dev/null
+++ b/dev-python/flask-uploads/Manifest
@@ -0,0 +1 @@
+DIST flask-uploads-0.2.0.tar.gz 23304 SHA256 6d7898213b33f60db88c9d62f0a521cde2692d8ba3f085929fdc2db1ca15d826 SHA512 ad80448b111019a5e731529267a790d1dd95a356671780efc20f1dc830044e539ab348404b706baf3666c7407518ed04cd2871d811f72b6145261dcc307ffacc WHIRLPOOL 65cba4a20227d6373209a0511b862af1cf6e281912473392428bc3ecde755ad12deee628d52bd2f5742b4d210f07054e7729a9a227e44fe0c9721022004080ef

diff --git a/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild b/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
new file mode 100644
index 0000000..5e683d2
--- /dev/null
+++ b/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Flexible and efficient upload handling for Flask"
+HOMEPAGE="http://pythonhosted.org/Flask-Testing/
+	https://pypi.python.org/pypi/Flask-Testing/"
+SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# use the GitHub tarball since the pypi-tarball does not contain the tests
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}

diff --git a/dev-python/flask-sqlalchemy/metadata.xml b/dev-python/flask-uploads/metadata.xml
similarity index 56%
copy from dev-python/flask-sqlalchemy/metadata.xml
copy to dev-python/flask-uploads/metadata.xml
index 10b93c9..3af2b10 100644
--- a/dev-python/flask-sqlalchemy/metadata.xml
+++ b/dev-python/flask-uploads/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
-		<email>robbat2@g.o</email>
+	<maintainer type="project">
+		<email>python@g.o</email>
+		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">Flask-SQLAlchemy</remote-id>
+		<remote-id type="pypi">Flask-Uploads</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index b0cdc1f..a5247b9 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,4 +1 @@
-DIST Flask-WTF-0.10.2.tar.gz 246659 SHA256 2926a265e6aa163a2102a8f058ad89acb9304665c476cea9687243bcc8f99b45 SHA512 f4736f38a3443903ac6c9f55d448b1f079641721f471d24c1492c54ec1e96b2390c6669325156e8233ecb5c38744f3186ccf47d5df79b6f0c881bd9032836df2 WHIRLPOOL 0890f0004483be6cb5b2fdcbfeb93f83c5c431d40c5fa39c69b31d97941e465149bb4fbbae4be0a0c2ab553b4d398d66179993fc518391ac9205e58dff85a234
-DIST Flask-WTF-0.10.3.tar.gz 247240 SHA256 40da66462df074c2a0fd209e6047972bc226125f6c484c8e367ea10e71ddd718 SHA512 c8cbc817afca7efbc2c0302c4fa3625874159c10e4664b502693acfa3ffcca34aee0a6f17528b45340f1e7f103f87ac72178f2ca4d589307bde12fe47ac5cf50 WHIRLPOOL 08b1b66813a558918ed3e9da8ae2d0db9947f11bf6fccb2ec6f8de1e359422d4431754e982a81a959129230aa39c70470bbad944451238f6c1136976286f303b
-DIST Flask-WTF-0.11.tar.gz 247005 SHA256 2f53a4b314ec26824d0b70f0766b7dd74c6df77bcf8b64de88e1354bc900874b SHA512 213188fd9fb199e4c52cf3e74f5e66846217b817ecf2ffe08ddb5c7cda2ab10a88e3c655364b64393137be1fd105c7d973f82cbd0eca0bfb28bfa3118f5bee15 WHIRLPOOL 559353d70a15e99b18aeb2a54b3c4e27bf5ef0afd870f71085a2dd7384f5b72cfaee9376f45c6280ce19099b3a59152621c8630c9330f5527a03299ae77ec6ce
 DIST Flask-WTF-0.12.tar.gz 247397 SHA256 bd99316c97ed1d1cb90b8f0c242c86420a891a6a2058f20717e424bf5b0bb80e SHA512 d9861a4fa6ace46fb2a632ff51777bc30af9b63c4f2a35cbe4a68a2777468eb7b6e1813ce331472458c05ce7069f73d998b4e9d3fd9d6ef56fc3abf0bb219a9e WHIRLPOOL 4b044ab1ff2409468f1d1e21a79605432a817322784103cdbfb1708a745cab0f7b8d406607fa5fc594b311daadbcf7e23876fbc2021f2ce9e7d05f8c0852a77b

diff --git a/dev-python/flask-wtf/flask-wtf-0.12.ebuild b/dev-python/flask-wtf/flask-wtf-0.12.ebuild
index 3c97287..402a5b4 100644
--- a/dev-python/flask-wtf/flask-wtf-0.12.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.12.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+EAPI=6
 
-# silly captcha test trying to access things over the network
-RESTRICT="test"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1
 

diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
new file mode 100644
index 0000000..e5fc7bd
--- /dev/null
+++ b/dev-python/mongoengine/Manifest
@@ -0,0 +1 @@
+DIST mongoengine-0.10.6.tar.gz 469469 SHA256 0fa34c2747c987eebe624a794d18ffefbed440e374e3d230b2baed7c98b9513d SHA512 a8d16739892c64ed408afab49c6d33a4b438af83e003844caa101cd51366038ba75121d12b4385a546cf4d946a506bc11f173355f6855e740cef9fddfd6437e7 WHIRLPOOL 58f511cfe80cae44c41fe1f451bd19edfc653e7c885547b16f1cd3436f62273c947c7ce893639d1fe3e1417bc6c4c97034bb84a85cf76886252b426b2e776bf4

diff --git a/dev-python/mongoengine/metadata.xml b/dev-python/mongoengine/metadata.xml
new file mode 100644
index 0000000..f96ee66
--- /dev/null
+++ b/dev-python/mongoengine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@g.o</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">MongoEngine/mongoengine</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/mongoengine/mongoengine-0.10.6.ebuild b/dev-python/mongoengine/mongoengine-0.10.6.ebuild
new file mode 100644
index 0000000..8a99bfe
--- /dev/null
+++ b/dev-python/mongoengine/mongoengine-0.10.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+RESTRICT="test" # connects to local DB and other nonsense
+
+DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
+HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
+SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i -e 's/tests/tests*/g' setup.py || die "Failed to fix test removal thingy"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}

diff --git a/dev-python/speaklater/Manifest b/dev-python/speaklater/Manifest
new file mode 100644
index 0000000..fbf9617
--- /dev/null
+++ b/dev-python/speaklater/Manifest
@@ -0,0 +1 @@
+DIST speaklater-1.3.tar.gz 3582 SHA256 59fea336d0eed38c1f0bf3181ee1222d0ef45f3a9dd34ebe65e6bfffdd6a65a9 SHA512 ae137d94c497cd4214e230c8906f3ba40e092f248206d37b61de2571567e39e27b7f58bcf2145bd0c81c195c3c5ed03fc0428e0a50c657c5c909ec82719454ef WHIRLPOOL 9e9edc0f6b9943f515eb36a13b038402e4093dfeb302f856858000ce87316508d31aafaf85e67e332b8bdfccec518912d87c61b3e45c930bd22bafc3dae8e1f9

diff --git a/dev-python/speaklater/files/speaklater-1.3-python-3.x.patch b/dev-python/speaklater/files/speaklater-1.3-python-3.x.patch
new file mode 100644
index 0000000..a1997f8
--- /dev/null
+++ b/dev-python/speaklater/files/speaklater-1.3-python-3.x.patch
@@ -0,0 +1,164 @@
+From 62dd88ee0f8f39902e3950544dc02e28af5d2a2c Mon Sep 17 00:00:00 2001
+From: Thomas Waldmann <tw@××××××××××××.de>
+Date: Sun, 2 Jun 2013 04:01:37 +0200
+Subject: [PATCH] port to python 3.3 (and also support 2.6 / 2.7)
+
+added 3.3 to tox, py3 classifiers to setup.py
+added some compatibility wrappers
+adapted doctests so they work the same way on py2 and py3
+changed __repr__ so it gives the same on py2 and py3 (no "u" on py2)
+---
+ setup.py      |  2 ++
+ speaklater.py | 65 ++++++++++++++++++++++++++++++++++++++++++-----------------
+ tox.ini       |  2 +-
+ 3 files changed, 49 insertions(+), 20 deletions(-)
+
+diff --git a/speaklater.py b/speaklater.py
+index 67a4dc5..d14f819 100644
+--- a/speaklater.py
++++ b/speaklater.py
+@@ -12,24 +12,24 @@
+ 
+     Example:
+ 
+-    >>> from speaklater import make_lazy_string
++    >>> from speaklater import make_lazy_string, text_type
+     >>> sval = u'Hello World'
+     >>> string = make_lazy_string(lambda: sval)
+ 
+     This lazy string will evaluate to the value of the `sval` variable.
+ 
+     >>> string
+-    lu'Hello World'
+-    >>> unicode(string)
+-    u'Hello World'
+-    >>> string.upper()
+-    u'HELLO WORLD'
++    l'Hello World'
++    >>> text_type(string) == u'Hello World'
++    True
++    >>> string.upper() == u'HELLO WORLD'
++    True
+ 
+     If you change the value, the lazy string will change as well:
+ 
+     >>> sval = u'Hallo Welt'
+-    >>> string.upper()
+-    u'HALLO WELT'
++    >>> string.upper() == u'HALLO WELT'
++    True
+ 
+     This is especially handy when combined with a thread local and gettext
+     translations or dicts of translatable strings:
+@@ -40,10 +40,10 @@
+     >>> l.translations = {u'Yes': 'Ja'}
+     >>> lazy_gettext = make_lazy_gettext(lambda: l.translations.get)
+     >>> yes = lazy_gettext(u'Yes')
+-    >>> print yes
++    >>> print(yes)
+     Ja
+     >>> l.translations[u'Yes'] = u'Si'
+-    >>> print yes
++    >>> print(yes)
+     Si
+ 
+     Lazy strings are no real strings so if you pass this sort of string to
+@@ -59,6 +59,9 @@
+     >>> is_lazy_string(yes)
+     True
+ 
++    New in version 1.4: python >= 3.3 (and also 2.6 and 2.7) support,
++                        repr(lazystring) is l"foo" on py2 and py3 - no "u" on py2!
++
+     New in version 1.2: It's now also possible to pass keyword arguments to
+     the callback used with `make_lazy_string`.
+ 
+@@ -66,6 +69,28 @@
+     :license: BSD, see LICENSE for more details.
+ """
+ 
++import sys
++
++PY2 = sys.version_info[0] == 2
++_identity = lambda x: x
++
++if not PY2:
++    text_type = str
++    implements_to_string = _identity
++    implements_bool = _identity
++else:
++    text_type = unicode
++
++    def implements_to_string(cls):
++        cls.__unicode__ = cls.__str__
++        cls.__str__ = lambda x: x.__unicode__().encode('utf-8')
++        return cls
++
++    def implements_bool(cls):
++        cls.__nonzero__ = cls.__bool__
++        del cls.__bool__
++        return cls
++
+ 
+ def is_lazy_string(obj):
+     """Checks if the given object is a lazy string."""
+@@ -87,10 +112,10 @@ def make_lazy_gettext(lookup_func):
+     >>> lazy_gettext = make_lazy_gettext(lambda: translations.get)
+     >>> x = lazy_gettext(u'Yes')
+     >>> x
+-    lu'Ja'
++    l'Ja'
+     >>> translations[u'Yes'] = u'Si'
+     >>> x
+-    lu'Si'
++    l'Si'
+     """
+     def lazy_gettext(string):
+         if is_lazy_string(string):
+@@ -99,6 +124,8 @@ def lazy_gettext(string):
+     return lazy_gettext
+ 
+ 
++@implements_bool
++@implements_to_string
+ class _LazyString(object):
+     """Class for strings created by a function call.
+ 
+@@ -117,11 +144,11 @@ def __init__(self, func, args, kwargs):
+     def __contains__(self, key):
+         return key in self.value
+ 
+-    def __nonzero__(self):
++    def __bool__(self):
+         return bool(self.value)
+ 
+     def __dir__(self):
+-        return dir(unicode)
++        return dir(text_type)
+ 
+     def __iter__(self):
+         return iter(self.value)
+@@ -130,10 +157,7 @@ def __len__(self):
+         return len(self.value)
+ 
+     def __str__(self):
+-        return str(self.value)
+-
+-    def __unicode__(self):
+-        return unicode(self.value)
++        return text_type(self.value)
+ 
+     def __add__(self, other):
+         return self.value + other
+@@ -190,7 +214,10 @@ def __copy__(self):
+ 
+     def __repr__(self):
+         try:
+-            return 'l' + repr(self.value)
++            r = repr(self.value)
++            if PY2 and r.startswith('u'):
++                r = r[1:]  # make it look same as on py3
++            return 'l' + r
+         except Exception:
+             return '<%s broken>' % self.__class__.__name__
+ 

diff --git a/dev-python/speaklater/metadata.xml b/dev-python/speaklater/metadata.xml
new file mode 100644
index 0000000..28a065d
--- /dev/null
+++ b/dev-python/speaklater/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@g.o</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">speaklater</remote-id>
+    <remote-id type="github">mitsuhiko/speaklater</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/speaklater/speaklater-1.3-r2.ebuild b/dev-python/speaklater/speaklater-1.3-r2.ebuild
new file mode 100644
index 0000000..b8333fb
--- /dev/null
+++ b/dev-python/speaklater/speaklater-1.3-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Lazy strings for Python"
+HOMEPAGE="https://github.com/mitsuhiko/speaklater"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/${P}-python-3.x.patch" )
+
+python_test() {
+	"${PYTHON}" -m doctest speaklater.py || die "Tests failed with ${EPYTHON}"
+}

diff --git a/dev-python/twill/Manifest b/dev-python/twill/Manifest
new file mode 100644
index 0000000..eed4a7e
--- /dev/null
+++ b/dev-python/twill/Manifest
@@ -0,0 +1 @@
+DIST twill-1.8.0.tar.gz 176989 SHA256 d63e8b09aa4f6645571c70cd3ba47a911abbae4d7baa4b38fc7eb72f6cfda188 SHA512 c0b2a46f827d478939aa964712dcce4ab1a2f41a5ad21ecd6f122d219a2cb91315d04fb1b6e7b033d70f875824698a07e5a896431173057a6cd212b9a8c688cb WHIRLPOOL 8a967967feea8f6083245c105813b050d489e44cc277b24e8e4706c351a8b5322f599ac7d4a75d46b1a0a86fd69e5a7913c4d56268d4c441ec458952d160f16c

diff --git a/dev-python/twill/metadata.xml b/dev-python/twill/metadata.xml
new file mode 100644
index 0000000..99a143d
--- /dev/null
+++ b/dev-python/twill/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@g.o</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		twill is a simple language that allows users to browse the Web from a command-line interface. With twill, you can navigate through Web sites that use forms, cookies, and most standard Web features.  twill supports automated Web testing and has a simple Python interface. Check out the examples! twill is open source and written in Python.
+	</longdescription>
+</pkgmetadata>

diff --git a/dev-python/twill/twill-1.8.0-r1.ebuild b/dev-python/twill/twill-1.8.0-r1.ebuild
new file mode 100644
index 0000000..549e493
--- /dev/null
+++ b/dev-python/twill/twill-1.8.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple scripting language for web browsing with Python API"
+HOMEPAGE="http://twill.idyll.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc examples"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="dev-python/cssselect[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		$(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'virtual/python-dnspython[${PYTHON_USEDEP}]' 'python2*')
+	)"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup 'python2*'
+		pushd doc > /dev/null || die
+		chmod +x make-epydoc.sh || die
+		./make-epydoc.sh || die
+		popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/epydoc-html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/wtf-peewee/Manifest b/dev-python/wtf-peewee/Manifest
new file mode 100644
index 0000000..b6ad0c4
--- /dev/null
+++ b/dev-python/wtf-peewee/Manifest
@@ -0,0 +1 @@
+DIST wtf-peewee-0.2.6.tar.gz 61072 SHA256 93d36bac202be4d268bd4e4ad188c5160a4c1f3d8a5d5dd8a2d7c106adaeb26e SHA512 073973e1dbec17fb3b036447e5150d5de36aeb47c697878e4e97abec4de53a77275278000f4dc982bc1aa1a76736f5a15053d583ab04316c568085973025f833 WHIRLPOOL 798ec4d858291d6d5ecbe4ea618abae8d5d39c891a037deeebeff85b974cd5574b0ae8063a8170609ac6c924adbe64c6b8c675089750ad5f9af362c8a2cab5aa

diff --git a/dev-python/wtf-peewee/metadata.xml b/dev-python/wtf-peewee/metadata.xml
new file mode 100644
index 0000000..f2ed65f
--- /dev/null
+++ b/dev-python/wtf-peewee/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@g.o</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">coleifer/wtf-peewee</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/wtf-peewee/wtf-peewee-0.2.6.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.2.6.ebuild
new file mode 100644
index 0000000..3da8e8e
--- /dev/null
+++ b/dev-python/wtf-peewee/wtf-peewee-0.2.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="WTForms integration for peewee models"
+HOMEPAGE="https://github.com/coleifer/wtf-peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=">=dev-python/peewee-2.7.4[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" ./runtests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r example
+	distutils-r1_python_install_all
+}

diff --git a/dev-vcs/PyGitUp/PyGitUp-1.3.0.ebuild b/dev-vcs/PyGitUp/PyGitUp-1.3.1.ebuild
similarity index 100%
rename from dev-vcs/PyGitUp/PyGitUp-1.3.0.ebuild
rename to dev-vcs/PyGitUp/PyGitUp-1.3.1.ebuild