Add recipes for different python and python3 packages

index 7a596c1..337da1b 100644
@@ -1,17 +1,28 @@
-SUMMARY = "Python XML bindings for libxml2 and libxslt"
-DESCRIPTION = "Powerful and Pythonic XML processing library combining \
-libxml2/libxslt with the ElementTree API."
+SUMMARY = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
+DESCRIPTION = "lxml is a Pythonic, mature binding for the libxml2 and \
+libxslt libraries. It provides safe and convenient access to these \
+libraries using the ElementTree API. It extends the ElementTree API \
+significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \
+C14N and much more."
 HOMEPAGE = "http://codespeak.net/lxml"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=f9f1dc24f720c143c2240df41fe5073b"
+SECTION = "devel/python"
+LICENSE = "BSD & GPLv2 & MIT & PSF"
+LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=f9f1dc24f720c143c2240df41fe5073b \
+                    file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \
+                    file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \
+                    file://doc/licenses/GPL.txt;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/lxml/isoschematron/resources/rng/iso-schematron.rng;startline=2;endline=7;md5=a2914d12acc7066b3f5b60e8f94a012e \
+                    file://src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl;startline=2;endline=24;md5=96976dcc66249c51e8026b159ca5e755 \
+                    file://src/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl;startline=2;endline=7;md5=5cac4ad4b5e131a10e9af755b10fbbb7 \
+                    "
 SRCNAME = "lxml"
 
 DEPENDS += "libxml2 libxslt"
 
 SRC_URI = "http://pypi.python.org/packages/source/l/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "a9a65972afc173ec7a39c585f4eea69c"
-SRC_URI[sha256sum] = "b3d362bac471172747cda3513238f115cbd6c5f8b8e6319bf6a97a7892724099"
+SRC_URI[md5sum] = "9f0c5f1eb43ff44d5455dab4b4efbe73"
+SRC_URI[sha256sum] = "349f93e3a4b09cc59418854ab8013d027d246757c51744bf20069bc89016f578"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 

similarity index 100%
rename from meta-python/recipes-devtools/python/python-lxml_3.4.4.bb
rename to meta-python/recipes-devtools/python/python-lxml_3.5.0.bb

similarity index 100%
rename from meta-python/recipes-devtools/python/python3-lxml_3.4.4.bb
rename to meta-python/recipes-devtools/python/python3-lxml_3.5.0.bb

new file mode 100644
index 0000000..1a02a4f
@@ -0,0 +1,11 @@
+DESCRIPTION = "A Python library for generating news feeds in RSS and Atom formats"
+HOMEPAGE = "http://code.google.com/p/feedformatter/"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=258e3f39e2383fbd011035d04311008d"
+SRCREV = "7391193c83e10420b5a2d8ef846d23fc368c6d85"
+PR = "r0"
+
+SRC_URI = "git://github.com/marianoguerra/feedformatter.git"
+
+S = "${WORKDIR}/git"

new file mode 100644
index 0000000..175f944
@@ -0,0 +1,2 @@
+inherit setuptools
+require python-feedformatter.inc

new file mode 100644
index 0000000..95a5405
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-feedformatter.inc

new file mode 100644
index 0000000..365002e
@@ -0,0 +1,21 @@
+def pypi_package(d):
+    bpn = d.getVar('BPN', True)
+    if bpn.startswith('python-'):
+        return bpn[7:]
+    elif bpn.startswith('python3-'):
+        return bpn[8:]
+    return bpn
+
+PYPI_PACKAGE ?= "${@pypi_package(d)}"
+
+def pypi_src_uri(d):
+    package = d.getVar('PYPI_PACKAGE', True)
+    pv = d.getVar('PV', True)
+    return 'https://pypi.python.org/packages/source/%s/%s/%s-%s.tar.gz' % (package[0], package, package, pv)
+
+PYPI_SRC_URI ?= "${@pypi_src_uri(d)}"
+
+HOMEPAGE ?= "https://pypi.python.org/pypi/${PYPI_PACKAGE}/"
+SECTION = "devel/python"
+SRC_URI += "${PYPI_SRC_URI}"
+S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}"

index 41a70e2..8d8350a 100644
@@ -1,21 +1 @@
-def pypi_package(d):
-    bpn = d.getVar('BPN', True)
-    if bpn.startswith('python-'):
-        return bpn[7:]
-    return bpn
-
-PYPI_PACKAGE ?= "${@pypi_package(d)}"
-
-def pypi_src_uri(d):
-    package = d.getVar('PYPI_PACKAGE', True)
-    pv = d.getVar('PV', True)
-    return 'https://pypi.python.org/packages/source/%s/%s/%s-%s.tar.gz' % (package[0], package, package, pv)
-
-PYPI_SRC_URI ?= "${@pypi_src_uri(d)}"
-
-HOMEPAGE ?= "https://pypi.python.org/pypi/${PYPI_PACKAGE}/"
-SECTION = "devel/python"
-SRC_URI += "${PYPI_SRC_URI}"
-S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}"
-
-inherit setuptools
+inherit pypi-common setuptools

new file mode 100644
index 0000000..e0f7bb3
@@ -0,0 +1 @@
+inherit pypi-common setuptools3

similarity index 69%
rename from meta-python/recipes-devtools/python/python-six_1.9.0.bb
rename to meta-python/recipes-devtools/python/python-six.inc
index c6575f3..450e05b 100644
@@ -2,10 +2,8 @@ SUMMARY = "Python 2 and 3 compatibility library"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=6f00d4a50713fa859858dd9abaa35b21"
 
-SRC_URI[md5sum] = "476881ef4012262dfc8adc645ee786c4"
-SRC_URI[sha256sum] = "e24052411fc4fbd1f672635537c3fc2330d9481b18c0317695b46259512c91d5"
-
-inherit pypi
+SRC_URI[md5sum] = "34eed507548117b2ab523ab14b2f8b55"
+SRC_URI[sha256sum] = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a"
 
 do_compile_append() {
     export BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS}

new file mode 100644
index 0000000..839a0e6
@@ -0,0 +1,2 @@
+inherit pypi
+require python-six.inc

new file mode 100644
index 0000000..2bc5bc5
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-six.inc

new file mode 100644
index 0000000..b38c448
@@ -0,0 +1,23 @@
+SUMMARY = "Extensions to the standard Python datetime module"
+DESCRIPTION = "The dateutil module provides powerful extensions to the datetime module available in the Python standard library."
+HOMEPAGE = "https://dateutil.readthedocs.org"
+SECTION = "devel/python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=51430b33c900f45f999c459ee29ca493"
+PR = "r0"
+
+SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI[md5sum] = "4ef68e1c485b09e9f034e10473e5add2"
+SRC_URI[sha256sum] = "3e95445c1db500a344079a47b171c45ef18f57d188dffdb0e4165c71bea8eb3d"
+
+SRCNAME = "python-dateutil"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+PACKAGES =+ "${PN}-zoneinfo"
+FILES_${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo"
+
+RDEPENDS_${PN} = "\
+    ${PYTHON_PN}-core \
+    ${PYTHON_PN}-datetime \
+    ${PYTHON_PN}-six \
+    "

deleted file mode 100644
index 37f19a8..0000000
@@ -1,22 +0,0 @@
-SUMMARY = "Extensions to the standard Python date/time support"
-HOMEPAGE = "http://labix.org/python-dateutil"
-SECTION = "devel/python"
-LICENSE = "PSF"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d82268718c68bda0b091006ec6e583c6"
-SRCNAME = "${BPN}"
-
-SRC_URI = "http://labix.org/download/python-dateutil/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-PACKAGES =+ "${PN}-zoneinfo"
-FILES_${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo"
-
-RDEPENDS_${PN} = "\
-    python-core \
-    python-datetime \
-"
-
-SRC_URI[md5sum] = "35f3732db3f2cc4afdc68a8533b60a52"
-SRC_URI[sha256sum] = "c08aca7d85f8f8eed61e83b3423b829262c596a9a78f7ca3de0bcee2217d0e3b"

new file mode 100644
index 0000000..12ae4c3
@@ -0,0 +1,2 @@
+inherit setuptools
+require python-dateutil.inc

new file mode 100644
index 0000000..1d2baf5
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-dateutil.inc

new file mode 100644
index 0000000..73951fa
@@ -0,0 +1,9 @@
+SUMMARY = "Various helpers to pass trusted data to untrusted environments and back."
+HOMEPAGE = "http://github.com/mitsuhiko/itsdangerous"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b61841e2bf5f07884148e2a6f1bcab0c"
+
+SRC_URI[md5sum] = "a3d55aa79369aef5345c036a8a26307f"
+SRC_URI[sha256sum] = "cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519"
+
+CLEANBROKEN = "1"

new file mode 100644
index 0000000..350925d
@@ -0,0 +1,2 @@
+inherit pypi
+require python-itsdangerous.inc

new file mode 100644
index 0000000..8c791cc
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-itsdangerous.inc

new file mode 100644
index 0000000..1b3e0a0
@@ -0,0 +1,17 @@
+DESCRIPTION = "Implements a XML/HTML/XHTML Markup safe string for Python"
+HOMEPAGE = "http://github.com/mitsuhiko/markupsafe"
+SECTION = "devel/python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c6d1adcf45d69359f256c1cea3254127"
+
+PR = "r0"
+SRCNAME = "MarkupSafe"
+
+SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "f5ab3deee4c37cd6a922fb81e730da6e"
+SRC_URI[sha256sum] = "a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+RDEPENDS_${PN} += "${PYTHON_PN}-re"

index 4821c0a..396eff1 100644
@@ -1,19 +1,2 @@
-DESCRIPTION = "Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE = "http://github.com/mitsuhiko/markupsafe"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c6d1adcf45d69359f256c1cea3254127"
-
-PR = "r0"
-SRCNAME = "MarkupSafe"
-
-SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "f5ab3deee4c37cd6a922fb81e730da6e"
-SRC_URI[sha256sum] = "a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
 inherit setuptools
-
-RDEPENDS_${PN} += "python-re"
+require python-markupsafe.inc

new file mode 100644
index 0000000..765e3c9
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-markupsafe.inc

new file mode 100644
index 0000000..843e8e0
@@ -0,0 +1,14 @@
+SUMMARY = "comprehensive password hashing framework supporting over 30 schemes"
+DESCRIPTION = "\
+Passlib is a password hashing library for Python 2 & 3, which provides cross-platform \
+implementations of over 30 password hashing algorithms, as well as a framework for \
+managing existing password hashes. It’s designed to be useful for a wide range of \
+tasks, from verifying a hash found in /etc/shadow, to providing full-strength password \
+hashing for multi-user applications."
+HOMEPAGE = "https://bitbucket.org/ecollins/passlib"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bae8faa3e2689ee0df3f2127fc4517f5"
+PR = "r0"
+
+SRC_URI[md5sum] = "d2edd6c42cde136a538b48d90a06ad67"
+SRC_URI[sha256sum] = "a83d34f53dc9b17aa42c9a35c3fbcc5120f3fcb07f7f8721ec45e6a27be347fc"

new file mode 100644
index 0000000..73ace94
@@ -0,0 +1,2 @@
+inherit pypi
+require python-passlib.inc
\ No newline at end of file

new file mode 100644
index 0000000..1271832
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-passlib.inc
\ No newline at end of file

new file mode 100644
index 0000000..ebce253
@@ -0,0 +1,9 @@
+DESCRIPTION = "Python HTTP for Humans."
+HOMEPAGE = "http://python-requests.org"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=58c7e163c9f8ee037246da101c6afd1e"
+
+SRC_URI[md5sum] = "0b7f480d19012ec52bab78292efd976d"
+SRC_URI[sha256sum] = "c577815dd00f1394203fc44eb979724b098f88264a9ef898ee45b8e5e9cf587f"
+
+RDEPENDS_${PN} = "${PYTHON_PN}-email ${PYTHON_PN}-json ${PYTHON_PN}-netserver"

deleted file mode 100644
index ac47202..0000000
@@ -1,18 +0,0 @@
-DESCRIPTION = "Python HTTP for Humans."
-HOMEPAGE = "http://python-requests.org"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=58c7e163c9f8ee037246da101c6afd1e"
-
-SRCNAME = "requests"
-
-SRC_URI = "http://pypi.python.org/packages/source/r/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "29b173fd5fa572ec0764d1fd7b527260"
-SRC_URI[sha256sum] = "398a3db6d61899d25fd4a06c6ca12051b0ce171d705decd7ed5511517b4bb93d"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-RDEPENDS_${PN} = "python-email python-json python-netserver python-zlib"

new file mode 100644
index 0000000..acc8c16
@@ -0,0 +1,4 @@
+inherit pypi
+require python-requests.inc
+
+RDEPENDS_${PN} += "${PYTHON_PN}-zlib"
\ No newline at end of file

new file mode 100644
index 0000000..c2eb056
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-requests.inc

new file mode 100644
index 0000000..e64f041
@@ -0,0 +1,9 @@
+SUMMARY = "Python client for Redis key-value store"
+DESCRIPTION = "The Python interface to the Redis key-value store."
+HOMEPAGE = "http://github.com/andymccurdy/redis-py"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27"
+PR = "r0"
+
+SRC_URI[md5sum] = "3b26c2b9703b4b56b30a1ad508e31083"
+SRC_URI[sha256sum] = "5dfbae6acfc54edf0a7a415b99e0b21c0a3c27a7f787b292eea727b1facc5533"

new file mode 100644
index 0000000..6cb5288
@@ -0,0 +1,2 @@
+inherit pypi
+require python-redis.inc

new file mode 100644
index 0000000..59c4803
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-redis.inc

new file mode 100644
index 0000000..fab5a73
@@ -0,0 +1,16 @@
+SUMMARY = "The Swiss Army knife of Python web development"
+DESCRIPTION = "\
+Werkzeug started as simple collection of various utilities for WSGI \
+applications and has become one of the most advanced WSGI utility modules. \
+It includes a powerful debugger, full featured request and response objects, \
+HTTP utilities to handle entity tags, cache control headers, HTTP dates, \
+cookie handling, file uploads, a powerful URL routing system and a bunch \
+of community contributed addon modules."
+HOMEPAGE = "http://werkzeug.pocoo.org/"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a68f5361a2b2ca9fdf26b38aaecb6faa"
+
+SRC_URI[md5sum] = "9479bc7ea6a42c2d0d82929d3926df67"
+SRC_URI[sha256sum] = "eb5f700a9bfc96420b055635af9002d3662e43d80c3ffd31f224c25bc0d5f462"
+
+PYPI_PACKAGE = "Werkzeug"

new file mode 100644
index 0000000..2e1d9e2
@@ -0,0 +1,2 @@
+inherit pypi
+require python-werkzeug.inc

new file mode 100644
index 0000000..6386664
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-werkzeug.inc

new file mode 100644
index 0000000..ca543f0
@@ -0,0 +1,14 @@
+DESCRIPTION = "Python API for MISP"
+HOMEPAGE = "https://github.com/MISP/PyMISP"
+SECTION = "devel/python"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20"
+SRCREV = "a7fc1ceb20d455ccfa2ba7af229048330e22b173"
+PR = "r0"
+
+SRC_URI = "git://github.com/MISP/PyMISP.git;branch=master"
+
+SRCNAME = "pymisp"
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} += " ${PYTHON_PN}-requests"

new file mode 100644
index 0000000..a0b655f
@@ -0,0 +1,2 @@
+inherit setuptools
+require python-pymisp.inc

new file mode 100644
index 0000000..e41acd6
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-pymisp.inc

new file mode 100644
index 0000000..879550b
@@ -0,0 +1,16 @@
+DESCRIPTION = "Python Jinja2: A small but fast and easy to use stand-alone template engine written in pure python."
+HOMEPAGE = "https://pypi.python.org/pypi/Jinja2"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=20c831f91dd3bd486020f672ba2be386"
+
+PR = "r0"
+PYPI_PACKAGE = "Jinja2"
+
+SRC_URI[md5sum] = "edb51693fe22c53cee5403775c71a99e"
+SRC_URI[sha256sum] = "bc1ff2ff88dbfacefde4ddde471d1417d3b304e8df103a7a9437d47269201bf4"
+
+RDEPENDS_${PN} += "${PYTHON_PN}-io ${PYTHON_PN}-pickle ${PYTHON_PN}-crypt \
+    ${PYTHON_PN}-math ${PYTHON_PN}-netclient ${PYTHON_PN}-re ${PYTHON_PN}-textutils \
+    ${PYTHON_PN}-lang ${PYTHON_PN}-pprint ${PYTHON_PN}-shell ${PYTHON_PN}-markupsafe"
+
+CLEANBROKEN = "1"

deleted file mode 100644
index aa5c082..0000000
@@ -1,21 +0,0 @@
-DESCRIPTION = "Python Jinja2: A small but fast and easy to use stand-alone template engine written in pure python."
-HOMEPAGE = "https://pypi.python.org/pypi/Jinja2"
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=20c831f91dd3bd486020f672ba2be386"
-
-PR = "r0"
-SRCNAME = "Jinja2"
-
-SRC_URI = "https://pypi.python.org/packages/source/J/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "b9dffd2f3b43d673802fe857c8445b1a"
-SRC_URI[sha256sum] = "2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-RDEPENDS_${PN} += "python-io python-pickle python-crypt python-math python-netclient python-re python-textutils python-lang python-pprint python-shell python-markupsafe"
-
-CLEANBROKEN = "1"

new file mode 100644
index 0000000..712c796
@@ -0,0 +1,2 @@
+inherit pypi
+require python-jinja2.inc

new file mode 100644
index 0000000..e2f9c1e
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-jinja2.inc

new file mode 100644
index 0000000..5cdd5bd
@@ -0,0 +1,12 @@
+SUMMARY = "Python driver for MongoDB <http://www.mongodb.org>"
+DESCRIPTION = "\
+The PyMongo distribution contains tools for interacting with MongoDB \
+database from Python. The bson package is an implementation of the BSON \
+format for Python. The pymongo package is a native Python driver for \
+MongoDB. The gridfs package is a gridfs implementation on top of pymongo."
+HOMEPAGE = "http://github.com/mongodb/mongo-python-driver"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2a944942e1496af1886903d274dedb13"
+
+SRC_URI[md5sum] = "463b4d325d8fb4070c04f15391b457bf"
+SRC_URI[sha256sum] = "f50a5380b45a83c5ea1e673ff19363d3cfd5850f7620536e51341d26eb2ae979"

new file mode 100644
index 0000000..4038898
@@ -0,0 +1,2 @@
+inherit pypi
+require python-pymongo.inc

new file mode 100644
index 0000000..d2cfd55
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-pymongo.inc

similarity index 53%
rename from meta-python/recipes-devtools/python/python-certifi_14.05.14.bb
rename to meta-python/recipes-devtools/python/python-certifi.inc
index 5e0404e..c9c3e2d 100644
@@ -2,19 +2,10 @@ SUMMARY = "Python package for providing Mozilla's CA Bundle."
 DESCRIPTION = "This installable Python package contains a CA Bundle that you can reference in your \
 Python code. This is useful for verifying HTTP requests, for example.  This is the same CA Bundle \
 which ships with the Requests codebase, and is derived from Mozilla Firefox's canonical set."
-HOMEPAGE = "https://pypi.python.org/pypi/certifi"
-SECTION = "devel/python"
+HOMEPAGE = " http://certifi.io/"
 
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1"
 
-SRCNAME = "certifi"
-
-SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "315ea4e50673a16ab047099f816fd32a"
-SRC_URI[sha256sum] = "1e1bcbacd6357c151ae37cf0290dcc809721d32ce21fd6b7339568f3ddef1b69"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
+SRC_URI[md5sum] = "e04b512009401603f1485380ac879cf5"
+SRC_URI[sha256sum] = "30b0a7354a1b32caa8b4705d3f5fb2dadefac7ba4bf8af8a2176869f93e38f16"

new file mode 100644
index 0000000..ce121d6
@@ -0,0 +1,2 @@
+inherit pypi
+require python-certifi.inc

new file mode 100644
index 0000000..dfdd6e9
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-certifi.inc

new file mode 100644
index 0000000..679b7ba
@@ -0,0 +1,24 @@
+SUMMARY  = "Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed."
+DESCRIPTION = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed. \
+By using non-blocking network I/O, Tornado can scale to tens of thousands of open connections, making it ideal for long \
+polling, WebSockets, and other applications that require a long-lived connection to each user."
+HOMEPAGE = "http://www.tornadoweb.org/en/stable/"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://setup.py;startline=2;endline=15;md5=5ab7571a79ad62d0ca7aea308bac7560"
+
+SRC_URI[md5sum] = "d13a99dc0b60ba69f5f8ec1235e5b232"
+SRC_URI[sha256sum] = "c9c2d32593d16eedf2cec1b6a41893626a2649b40b21ca9c4cac4243bde2efbf"
+
+RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-numbers ${PYTHON_PN}-email ${PYTHON_PN}-subprocess \
+                   ${PYTHON_PN}-pkgutil ${PYTHON_PN}-html ${PYTHON_PN}-json ${PYTHON_PN}-certifi"
+
+RDEPENDS_${PN}-test += "${PN} ${PYTHON_PN}-unittest"
+
+PACKAGES =+ "\
+    ${PN}-test \
+"
+
+FILES_${PN}-test = " \
+    ${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/test \
+    ${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/testing.py* \
+"

index c107d6c..5bbad50 100644
@@ -1,34 +1,3 @@
-SUMMARY  = "Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed."
-DESCRIPTION = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed. \
-By using non-blocking network I/O, Tornado can scale to tens of thousands of open connections, making it ideal for long \
-polling, WebSockets, and other applications that require a long-lived connection to each user."
-HOMEPAGE = "http://www.tornadoweb.org/en/stable/"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=65b6c818261e415f48f5463a232ad195"
-
-SRCNAME = "tornado"
-
-SRC_URI = " \
-    https://pypi.python.org/packages/source/t/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "d13a99dc0b60ba69f5f8ec1235e5b232"
-SRC_URI[sha256sum] = "c9c2d32593d16eedf2cec1b6a41893626a2649b40b21ca9c4cac4243bde2efbf"
-
-inherit setuptools
-
-RDEPENDS_${PN} += "python-compression python-numbers python-email python-subprocess \
-                   python-pkgutil python-html python-json python-backports-ssl python-certifi"
-
-RDEPENDS_${PN}-test += "${PN} python-unittest"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-PACKAGES =+ "\
-    ${PN}-test \
-"
-
-FILES_${PN}-test = " \
-    ${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/test \
-    ${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/testing.py* \
-"
+inherit pypi
+require python-tornado.inc
+RDEPENDS_${PN} += "${PYTHON_PN}-backports-ssl"

new file mode 100644
index 0000000..21a4300
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-tornado.inc

new file mode 100644
index 0000000..3c0d26d
@@ -0,0 +1,10 @@
+SUMMARY = "Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"
+DESCRIPTION = "Extract data from Excel spreadsheets (.xls and .xlsx,\
+ versions 2.0 onwards) on any platform. Pure Python (2.6, 2.7, 3.2+). \
+Strong support for Excel dates. Unicode-aware."
+HOMEPAGE = "http://www.python-excel.org/"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://xlrd/licences.py;md5=b59dace5cc1db604c4219100b0422811"
+
+SRC_URI[md5sum] = "911839f534d29fe04525ef8cd88fe865"
+SRC_URI[sha256sum] = "8e8d3359f39541a6ff937f4030db54864836a06e42988c452db5b6b86d29ea72"

new file mode 100644
index 0000000..16eeac3
@@ -0,0 +1,2 @@
+inherit pypi
+require python-xlrd.inc

new file mode 100644
index 0000000..407346f
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-xlrd.inc

new file mode 100644
index 0000000..84868f9
@@ -0,0 +1,13 @@
+SUMMARY = "Fast, pure-Python full text indexing, search, and spell checking library."
+DESCRIPTION = "\
+Whoosh is a fast, featureful full-text indexing and searching library \
+implemented in pure Python. Programmers can use it to easily add search \
+functionality to their applications and websites. Every part of how \
+Whoosh works can be extended or replaced to meet your needs exactly."
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05303186defc6141143629961c7c8a60"
+
+SRC_URI[md5sum] = "9a0fc2df9335e1d2e81dd84a2c4c416f"
+SRC_URI[sha256sum] = "cdfc0e1c5173207ac7b312afe78d83fb552cfed30427bf7b3dba8b1d26cea8f7"
+
+PYPI_PACKAGE = "Whoosh"

new file mode 100644
index 0000000..79d097c
@@ -0,0 +1,2 @@
+inherit pypi
+require python-whoosh.inc

new file mode 100644
index 0000000..91f7018
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-whoosh.inc

new file mode 100644
index 0000000..4923726
@@ -0,0 +1,14 @@
+SUMMARY = "A microframework based on Werkzeug, Jinja2 and good intentions"
+DESCRIPTION = "\
+Flask is a microframework for Python based on Werkzeug, Jinja 2 and good \
+intentions. And before you ask: It’s BSD licensed!"
+HOMEPAGE = "https://github.com/mitsuhiko/flask/"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=79aa8b7bc4f781210d6b5c06d6424cb0"
+
+SRC_URI[md5sum] = "378670fe456957eb3c27ddaef60b2b24"
+SRC_URI[sha256sum] = "4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373"
+
+PYPI_PACKAGE = "Flask"
+
+RDEPENDS_${PN} = "${PYTHON_PN}-werkzeug ${PYTHON_PN}-jinja2 ${PYTHON_PN}-itsdangerous"

new file mode 100644
index 0000000..7ec8123
@@ -0,0 +1,2 @@
+inherit pypi
+require python-flask.inc

new file mode 100644
index 0000000..1ab2c02
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-flask.inc

new file mode 100644
index 0000000..95c4428
@@ -0,0 +1,14 @@
+SUMMARY = "User session management for Flask"
+DESCRIPTION = "Flask-Login provides user session management for Flask. \
+It handles the common tasks of logging in, logging out, and remembering \
+your users’ sessions over extended periods of time."
+HOMEPAGE = " https://github.com/maxcountryman/flask-login"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8aa87a1cd9fa41d969ad32cfdac2c596"
+
+SRC_URI[md5sum] = "c0a7eaf28623f0aeac4929dc05a7a064"
+SRC_URI[sha256sum] = "83d5f10e5c4f214feed6cc41c212db63a58a15ac32e56df81591bfa0a5cee3e5"
+
+PYPI_PACKAGE = "Flask-Login"
+
+RDEPENDS_${PN} = "${PYTHON_PN}-flask"

new file mode 100644
index 0000000..c6dce37
@@ -0,0 +1,2 @@
+inherit pypi
+require python-flask-login.inc

new file mode 100644
index 0000000..5d46954
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-flask-login.inc

new file mode 100644
index 0000000..939113b
@@ -0,0 +1,13 @@
+SUMMARY = "PyMongo support for Flask applications"
+DESCRIPTION = "PyMongo support for Flask applications."
+HOMEPAGE = "https://github.com/mitsuhiko/flask/"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://flask_pymongo/wrappers.py;startline=1;endline=24;md5=dff998d5a8469503612ee7757f3a2052"
+
+SRC_URI[md5sum] = "457a210f35ba49d2623dbcf27fbb89e1"
+SRC_URI[sha256sum] = "707ddff92f5b7bdc34d401f1f3857a3d1a9f5dba76e6a1422ccbc3651e2ca521"
+
+PYPI_PACKAGE = "Flask-PyMongo"
+
+RDEPENDS_${PN} = "${PYTHON_PN}-pymongo ${PYTHON_PN}-flask"

new file mode 100644
index 0000000..8daab00
@@ -0,0 +1,2 @@
+inherit pypi
+require python-flask-pymongo.inc

new file mode 100644
index 0000000..19d33ff
@@ -0,0 +1,2 @@
+inherit pypi3
+require python-flask-pymongo.inc