diff --git a/dev-db/rethinkdb/rethinkdb-2.3.4.ebuild b/dev-db/rethinkdb/rethinkdb-2.3.4.ebuild
index 5e9709e11e21..db9bb82d1d7b 100644
--- a/dev-db/rethinkdb/rethinkdb-2.3.4.ebuild
+++ b/dev-db/rethinkdb/rethinkdb-2.3.4.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-cpp/gtest
>=dev-libs/re2-0.2016.05.01
sys-libs/libunwind
sys-libs/ncurses:=
- jemalloc? ( >=dev-libs/jemalloc-3.2 )
+ jemalloc? ( >=dev-libs/jemalloc-4.0 )
tcmalloc? ( dev-util/google-perftools )"
RDEPEND="${DEPEND}"
REQUIRED_USE="?? ( tcmalloc jemalloc )"
diff --git a/dev-ml/OCaml-ImageMagick/Manifest b/dev-ml/OCaml-ImageMagick/Manifest
new file mode 100644
index 000000000000..61f860f174e5
--- /dev/null
+++ b/dev-ml/OCaml-ImageMagick/Manifest
@@ -0,0 +1 @@
+DIST OCaml-ImageMagick-0.34.tgz 64219 SHA256 7840f72b07d17756bdc12b1792e915ebc6197a2aab0a86baf0eba1dcb0a0c93e SHA512 cf1f979aed0aad1fb27dd6817adbc22c2f7c0d6d8c96a48d9532ce89c128b046ea7ac38ad96a5267a5920fccd0cd3631844e428e933143a405522ed5ebcbee39 WHIRLPOOL 2f861c9be8f587d7caf7181cef248e509ea8db10bcb6ff67b179d9dee1c0f53c1b61ae5b8b3122cc0fa279a8cc47478fdc570fb8ab05db6928f7ceaec54f8a44
diff --git a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34.ebuild b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34.ebuild
new file mode 100644
index 000000000000..e93cb0eb40fa
--- /dev/null
+++ b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Provide the ImageMagick methods to OCaml"
+HOMEPAGE="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"
+SRC_URI="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+# interactive tests
+RESTRICT="test"
+
+DEPEND="media-gfx/imagemagick:=
+ dev-lang/ocaml:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake OCAML_DIR="${D}/$(ocamlc -where)" install
+ dodoc README.txt
+}
diff --git a/dev-ml/OCaml-ImageMagick/metadata.xml b/dev-ml/OCaml-ImageMagick/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/OCaml-ImageMagick/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ ml@gentoo.org
+ Gentoo ML Project
+
+
diff --git a/dev-ml/calendar/Manifest b/dev-ml/calendar/Manifest
index caaba3ba040c..061080af952f 100644
--- a/dev-ml/calendar/Manifest
+++ b/dev-ml/calendar/Manifest
@@ -1 +1,2 @@
DIST calendar-2.03.2.tar.gz 270225 SHA256 0e381faaa3bba522cbac705a7f872e6ecfa15220671f4688d1e311631687fb12 SHA512 c6acc326aaed77d238126f8723a8e3e4054808ddfef974d9aead39731f4ab9f386eff2f34aab17e4eade3825dd1e3b708a404ecde3fc9b82416482c7095de82b WHIRLPOOL 68505b62aee8b41c53aae81a3a3d22776867c4885461f1fac33365b4a03cc8d7e4e1ebfa8bf72fc6665d3eb7eb2ca4ae93b98989bd76f22931103707a1b3712c
+DIST calendar-2.04.tar.gz 271522 SHA256 bea6faa0337a1c54b0f3c2b9b45c9eb90e2b2747406e6f0b841e1fd20fd4d9f7 SHA512 3941768428eda47f47912846cc2921ee82c722bda7cf6095c1c8bdcfebc19bb8f64ebb1a25475396d2a49c186b83421af63602a54a261684117b1c036a66cf3d WHIRLPOOL 64e041dd0b9c8ab9128d2b79a7b62d761e2d74b3388822335807b8c05f3a453bc0ca17c58d0728fa56f1255f8f7b6f779ed6ba27c761c525bdbe1f19e1125f4b
diff --git a/dev-ml/calendar/calendar-2.04.ebuild b/dev-ml/calendar/calendar-2.04.ebuild
new file mode 100644
index 000000000000..cd3126dc9cd8
--- /dev/null
+++ b/dev-ml/calendar/calendar-2.04.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="An Ocaml library to handle dates and time"
+HOMEPAGE="http://forge.ocamlcore.org/projects/calendar/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1481/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ emake
+ use doc && emake doc
+}
+
+src_test() {
+ emake tests
+}
+
+src_install() {
+ findlib_src_install
+ dodoc README CHANGES
+ use doc && dohtml -r doc
+}
diff --git a/dev-ml/gen/gen-0.4.0.1.ebuild b/dev-ml/gen/gen-0.4.0.1.ebuild
index 8ec569e9df47..bdd5931d2034 100644
--- a/dev-ml/gen/gen-0.4.0.1.ebuild
+++ b/dev-ml/gen/gen-0.4.0.1.ebuild
@@ -20,6 +20,6 @@ IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
- test? ( dev-ml/ounit dev-ml/qcheck )
+ test? ( dev-ml/ounit dev-ml/iTeML )
"
DOCS=( "README.md" "CHANGELOG.md" )
diff --git a/dev-ml/iTeML/Manifest b/dev-ml/iTeML/Manifest
index 59755f72fbba..5cbe8e9127c9 100644
--- a/dev-ml/iTeML/Manifest
+++ b/dev-ml/iTeML/Manifest
@@ -1 +1,2 @@
DIST iTeML-2.0.1.tar.gz 38387 SHA256 ae6ff9d0fcc20b8e96a44517fb3641d5193c63169aae33f0c1912db8e14bef1f SHA512 1f72ed8320a7589206daa16232199f33012cac397cf21a60fd8afccb7e8aad6f9125e8b4ac494866f699d0a47569bbd0486584a299786e0ef7a3a2c234f0ac2b WHIRLPOOL c23392412b4fcead6dd5958739802d895cdee3a86f333038ad03639d28a5439858de411bea19ce25df1bce72482b07d3047e8862a89fb49e24cfe0956d45d768
+DIST iTeML-2.2.tar.gz 50025 SHA256 c31e5449624fc6729a362cc73efe475b2965d2e602b69b3a06fab2b38ea18b36 SHA512 78fb71a00d785f7faf0faa08c988bdfffe755dc6554437c86c80a4e56d6fb001606c78159e23acf0230286167585d136754dda68f8d7486aef64b228cc69034d WHIRLPOOL 672ce047cd901cd38671cf6f1020bf5d4c6e7cd13b3af4138ebad2015ca7db54a558cbbbdbda66d2aacfb3a1c7f709de95808b8d193b9551660f60349e3f346b
diff --git a/dev-ml/iTeML/iTeML-2.2.ebuild b/dev-ml/iTeML/iTeML-2.2.ebuild
new file mode 100644
index 000000000000..a13efbe16629
--- /dev/null
+++ b/dev-ml/iTeML/iTeML-2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Inline (Unit) Tests for OCaml"
+HOMEPAGE="https://github.com/vincent-hugot/iTeML"
+SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/ounit:=
+ dev-lang/ocaml:=[ocamlopt]
+ !dev-ml/qckeck
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ findlib_src_preinst
+ dodir /usr/bin
+ emake BIN="${ED}/usr/bin/" install
+ dodoc README.adoc HOWTO.adoc
+}
diff --git a/dev-ml/stringext/Manifest b/dev-ml/stringext/Manifest
index 1e526192e021..b8d69f30ccf9 100644
--- a/dev-ml/stringext/Manifest
+++ b/dev-ml/stringext/Manifest
@@ -1,3 +1 @@
-DIST stringext-1.4.0.tar.gz 49163 SHA256 452caddd80c85aebda74f65615aeba4045ab2496498d844ab110605c97a156a5 SHA512 5c9b64f42b1517c255376a81886b946d852fe5f4b11dee87986eb1eab856e89a79f088d2bbd7d79dfa13cce5e51649a32bfe06242d5afbf7b868085b272173bf WHIRLPOOL 15b2501095f2c6143eac33751b26f9c82e7226125c49b270fe8dff92bd51b97eede8e7865343766fa56fcffa373b591da4f8170afba46d12c413dfec0d1431eb
-DIST stringext-1.4.1.tar.gz 49181 SHA256 abcecd6f8f207804b95ea87222ac263a37d76fb3a3fe0dfd6aaa7343585ef64c SHA512 a5b364e8a7f56c5b91b2114e10fd5c534ef7c2f5737505f52fddeb61de1a90fb75fd6f2cbb1b83934d5dfd020e2be9df81ab8774126a0d8c033c45faa0d17a00 WHIRLPOOL da524dce7541b87276eb12aee8138f5fafd3f282875e7ae464524399c3447470fee92d6ea43a3bf78102a9b5232c32de49cfb8bf9a95f9dff7a04f126662babc
DIST stringext-1.4.2.tar.gz 49194 SHA256 1f0c108785ab4d80650748779fea38837a80fcf89f2b1ce9ccbbcc300134fdec SHA512 dd35b90d68f156ec6845fbd1c9b2c479874559696ea2a964c2b78a7ded61f128066a4752670b8db3c4dc0bde82fb6bce02733615c4950256c7071ae1c43b4b69 WHIRLPOOL c338647b23d426777c07febbe8494871471ee400cd8cb543f5d18a15c817986bd72a8e9028341e049cd7eb56427e3ca38d82939dbe981c98ec05ea4444c375f3
diff --git a/dev-ml/stringext/stringext-1.4.0-r1.ebuild b/dev-ml/stringext/stringext-1.4.0-r1.ebuild
deleted file mode 100644
index 25377ced513b..000000000000
--- a/dev-ml/stringext/stringext-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Extra string functions for OCaml"
-HOMEPAGE="https://github.com/rgrinberg/stringext"
-SRC_URI="https://github.com/rgrinberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
- test? ( dev-ml/qcheck[ounit(-)] )
- >=dev-lang/ocaml-4:=
-"
-RDEPEND="
- >=dev-lang/ocaml-4:=
-"
-
-DOCS=( README.md )
diff --git a/dev-ml/stringext/stringext-1.4.1.ebuild b/dev-ml/stringext/stringext-1.4.1.ebuild
deleted file mode 100644
index 25377ced513b..000000000000
--- a/dev-ml/stringext/stringext-1.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Extra string functions for OCaml"
-HOMEPAGE="https://github.com/rgrinberg/stringext"
-SRC_URI="https://github.com/rgrinberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
- test? ( dev-ml/qcheck[ounit(-)] )
- >=dev-lang/ocaml-4:=
-"
-RDEPEND="
- >=dev-lang/ocaml-4:=
-"
-
-DOCS=( README.md )
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 94dd1f377bec..24364278d6c2 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -5,3 +5,4 @@ DIST flake8-2.4.1.tar.gz 50324 SHA256 2e7ebbe59d8c85e626e36d99f0db2f578394313d3f
DIST flake8-2.5.0.tar.gz 82600 SHA256 8216c8c6ee092ae93d51f89bc91045648c88cd9be77d60cf47df7ca26ee4f88c SHA512 6f55ae237fb834fa9376760eddf77553f9edb1b7328175c5f07232b160e4d5ea9d65caa91241f7d1db90845f9c02b8d41129cd453c1b09a4d6870e0e53ba0f8d WHIRLPOOL d08e5c2d2c488e558e02a272c1753defa2a200d37b2b113f1f1523dc06f6ee5dc7f37c60f598eff91c4aeb47a76bd0dd60c0fdd7d2a6b7fa0a7bbec2b60a88d2
DIST flake8-2.5.1.tar.gz 83692 SHA256 448aed48b0671fe6062f47b98c3081f3a4b36fbe99ddb8ac2a3be6e6cb135603 SHA512 030d2464717f62e3c5501631e7bc4482321086ca3e7f7dfe845dab66aaf38be94565c1e147792ba7e7d2850fd5290e61a24fe1006daf18c3be2ff81348c5731c WHIRLPOOL 63a6915eeb32be4aa51f3b69c5c6918c3a2953a4dff203515d20a10e58dc12cf7732a5e715b279c17d2a0e4b77f6879dc9f489395ddbcb6d0c340a21be39f9e4
DIST flake8-2.5.4.tar.gz 81663 SHA256 cc1e58179f6cf10524c7bfdd378f5536d0a61497688517791639a5ecc867492f SHA512 31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28 WHIRLPOOL 2547b78092b1a85edd2a0d03d9e0bc31e7d3b7cb3958cf5dea9947377851a69d5c37f64c0d65a5d7e88ab9573597729adbe07ae758b0510e455b26bf62292f47
+DIST flake8-3.0.4.tar.gz 1382588 SHA256 b4c210c998f07d6ff24325dd91fbc011f2c37bcd6bf576b188de01d8656e970d SHA512 845b38824112edfc8244f6ec795b5659f99b4e8171af5e6c737f345e5a429f7b26f57e24ccc42fa2d8117b7ceff4dd100fe840064260fa17f203804e4b83ab06 WHIRLPOOL 79300674a1a326d95e80208cee664b0ddcd518653cac2aac381a3a32c1bcc40b4ddb00f95b064e119bc7f40098240e77b16898db688b87a2571ad523eac72a44
diff --git a/dev-python/flake8/flake8-3.0.4.ebuild b/dev-python/flake8/flake8-3.0.4.ebuild
new file mode 100644
index 000000000000..3d9a910153d5
--- /dev/null
+++ b/dev-python/flake8/flake8-3.0.4.ebuild
@@ -0,0 +1,59 @@
+# 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,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+IUSE="test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="0"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+ >=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
+ =dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
+ <=dev-python/pycodestyle-2.1.0[${PYTHON_USEDEP}]
+ "
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${PDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest-runner[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+ >=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
+ =dev-python/mccabe-0.5.0[${PYTHON_USEDEP}]
+ =dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
+ <=dev-python/pycodestyle-2.1.0[${PYTHON_USEDEP}]
+ "
+
+python_prepare_all() {
+ # Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
+ sed -e 's:, != 1.6.2::' -i setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # The test suite assumes the presence of a tox.ini file in ${S},
+ # yet the distributed tarballs do not include that file.
+ touch "${S}/tox.ini" || die "Could not create tox.ini"
+
+ # using "test" instead of "ptr" results in name collisions
+ esetup.py ptr
+}
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index d0cd90999e1b..a9299463e374 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -2,3 +2,4 @@ DIST mccabe-0.2.1.tar.gz 5031 SHA256 5a2a170e47de5593a6abfae1e9542bd2c3924ac62bb
DIST mccabe-0.3.1.tar.gz 7586 SHA256 5f7ea6fb3aa9afe146d07fd6d5cedf788747d8b0c29e44732453c2b2db1e3d16 SHA512 83a5cb389343628b8a464f8f17452f116557735ed0a5f40411fe06f63af1f7c5ac4501fce2617a22fc7fb8395918deda2afba39728c1e72713930f14dddf08f9 WHIRLPOOL 2f8354395d9c291377ec8cac9f7911ffdeaf348f37ab7a0b3a87fb10ec0490e4e398963c02989de5240d54e1e4c34945fe15ad60c0b8605d5b8367f6efe7e72b
DIST mccabe-0.3.tar.gz 6127 SHA256 3d8ca9bf65c5014f469180544d1dd5bb5b9df709aad6304f9c2e4370ae0a7b7c SHA512 3bb176d486de5e0d3de8db0bf923b4b03e5ad2fd82df079babd6e6551afe9077b956698ac335f23d340a16212d73c1c5ab5a3055d2788b7f81040f3cb0d1b4ee WHIRLPOOL bfa0480cca9cc082f60c20d07d6edac203c5e9144f2caf57576304dbf01c8a96b19e111f9e1abe5774a4de235729d69c3c89d4fddf8213f403568228e92f38f6
DIST mccabe-0.4.0.tar.gz 7916 SHA256 9a2b12ebd876e77c72e41ebf401cc2e7c5b566649d50105ca49822688642207b SHA512 4a7158a3a28eed0a98ae64b3a0394542f263c9b4e08fc31ad47b2317ba434b1002e13d40a9766e4e39ea798aa35e83a79b81936cebdaabdae582160f1780e1a2 WHIRLPOOL d3b1ce9613ababb86f54e392fb9a5b5e96de7226ce6a3d6fd1c72ae2985c2dfe27319851ddaf8140b3b4f92f1b44f02683b88a2237539d5495199b479b267303
+DIST mccabe-0.5.2.tar.gz 8366 SHA256 3473f06c8b757bbb5cdf295099bf64032e5f7d6fe0ec2f97ee9b23cb0a435aff SHA512 08dbfadc4d270e5fe58492536a27d9008efd61c77aac817b2d77b9b4510cccb41e76e1e016ff1228ebe3ac6ea1cc6ce396601f6a692388e981ddba2549288e01 WHIRLPOOL 715242d4f242a1055b7e10abc3f03103bc221f3344682e0bdecb0e8eb7bdcd27812451c79ce68e4e3cdf8df7d514420acc31bf5aa0559ea41f17eb76a72c4b38
diff --git a/dev-python/mccabe/mccabe-0.5.2.ebuild b/dev-python/mccabe/mccabe-0.5.2.ebuild
new file mode 100644
index 000000000000..343258f34013
--- /dev/null
+++ b/dev-python/mccabe/mccabe-0.5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="flake8 plugin: McCabe complexity checker"
+HOMEPAGE="https://github.com/PyCQA/mccabe"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ sed -i -e '/pytest-runner/d' setup.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ py.test -v || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
new file mode 100644
index 000000000000..8ad2207ca8d6
--- /dev/null
+++ b/dev-python/pycodestyle/Manifest
@@ -0,0 +1 @@
+DIST pycodestyle-2.0.0.tar.gz 81701 SHA256 37f0420b14630b0eaaf452978f3a6ea4816d787c3e6dcbba6fb255030adae2e7 SHA512 c003a75bb8873d8ec09cbaf7391c75ebd4739eeab518bbea03c8b2cdc18839773190352166ded78d32992adb56895ee1502003bca11b2d63676c10facb879ac8 WHIRLPOOL 3f162936ea03c8bcd2ba7adbcb77c3d8e44549090875719c888a9fbd86bb9cbf16d4378ffc1c2f28050253520aa86753172816429bc530bc074a2f8fd3e88613
diff --git a/dev-python/pycodestyle/metadata.xml b/dev-python/pycodestyle/metadata.xml
new file mode 100644
index 000000000000..639c1bc61f6b
--- /dev/null
+++ b/dev-python/pycodestyle/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ klausman@gentoo.org
+ Tobias Klausmann
+
+
+
diff --git a/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild
new file mode 100644
index 000000000000..5edf90516fcb
--- /dev/null
+++ b/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker (fka pep8)"
+HOMEPAGE="https://pypi.python.org/pypi/pycodestyle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
+ PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --testsuite=testsuite || die
+ PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
+ esetup.py test
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 35b2e1e03112..ef4ce6de400b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Sep 2016 08:40:38 +0000
+Tue, 06 Sep 2016 13:10:36 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 35b2e1e03112..ef4ce6de400b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Sep 2016 08:40:38 +0000
+Tue, 06 Sep 2016 13:10:36 +0000
diff --git a/metadata/md5-cache/dev-db/rethinkdb-2.3.4 b/metadata/md5-cache/dev-db/rethinkdb-2.3.4
index 3ce6e8987c7b..d5476e2c4045 100644
--- a/metadata/md5-cache/dev-db/rethinkdb-2.3.4
+++ b/metadata/md5-cache/dev-db/rethinkdb-2.3.4
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile config configure install prepare setup
-DEPEND=dev-cpp/gtest dev-libs/boost dev-libs/protobuf-c >=dev-libs/re2-0.2016.05.01 sys-libs/libunwind sys-libs/ncurses:= jemalloc? ( >=dev-libs/jemalloc-3.2 ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig
+DEPEND=dev-cpp/gtest dev-libs/boost dev-libs/protobuf-c >=dev-libs/re2-0.2016.05.01 sys-libs/libunwind sys-libs/ncurses:= jemalloc? ( >=dev-libs/jemalloc-4.0 ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig
DESCRIPTION=The open-source database for the realtime web.
EAPI=6
HOMEPAGE=http://www.rethinkdb.com
IUSE=doc +jemalloc tcmalloc
KEYWORDS=~amd64 ~x86
LICENSE=AGPL-3
-RDEPEND=dev-cpp/gtest dev-libs/boost dev-libs/protobuf-c >=dev-libs/re2-0.2016.05.01 sys-libs/libunwind sys-libs/ncurses:= jemalloc? ( >=dev-libs/jemalloc-3.2 ) tcmalloc? ( dev-util/google-perftools )
+RDEPEND=dev-cpp/gtest dev-libs/boost dev-libs/protobuf-c >=dev-libs/re2-0.2016.05.01 sys-libs/libunwind sys-libs/ncurses:= jemalloc? ( >=dev-libs/jemalloc-4.0 ) tcmalloc? ( dev-util/google-perftools )
REQUIRED_USE=?? ( tcmalloc jemalloc )
SLOT=0
SRC_URI=http://download.rethinkdb.com/dist/rethinkdb-2.3.4.tgz
_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 user 80aaa71614ced86f02ee1a513821dc87
-_md5_=add66f82c6a5896d19198b1af1602012
+_md5_=5f10980bac7ad8fe9b336682db4db757
diff --git a/metadata/md5-cache/dev-ml/OCaml-ImageMagick-0.34 b/metadata/md5-cache/dev-ml/OCaml-ImageMagick-0.34
new file mode 100644
index 000000000000..971e88e02c7b
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/OCaml-ImageMagick-0.34
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=media-gfx/imagemagick:= dev-lang/ocaml:=[ocamlopt]
+DESCRIPTION=Provide the ImageMagick methods to OCaml
+EAPI=6
+HOMEPAGE=http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=media-gfx/imagemagick:= dev-lang/ocaml:=[ocamlopt]
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/OCaml-ImageMagick-0.34.tgz
+_md5_=27431185c13284d27da7d8ecae5f2ff5
diff --git a/metadata/md5-cache/dev-ml/calendar-2.04 b/metadata/md5-cache/dev-ml/calendar-2.04
new file mode 100644
index 000000000000..3702c3e9e945
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/calendar-2.04
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=An Ocaml library to handle dates and time
+EAPI=5
+HOMEPAGE=http://forge.ocamlcore.org/projects/calendar/
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt]
+SLOT=0/2.04
+SRC_URI=http://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=a0ebe99d45c4a25b01dd0ed6cec7bfef
diff --git a/metadata/md5-cache/dev-ml/gen-0.4.0.1 b/metadata/md5-cache/dev-ml/gen-0.4.0.1
index d1c3aca116f6..35c6b0c020da 100644
--- a/metadata/md5-cache/dev-ml/gen-0.4.0.1
+++ b/metadata/md5-cache/dev-ml/gen-0.4.0.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ml/ounit dev-ml/qcheck ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] || ( dev-ml/ocamlbuild =dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] || ( dev-ml/ocamlbuild =dev-lang/ocaml-3.12:=[ocamlopt?]
SLOT=0/0.4.0.1
SRC_URI=https://github.com/c-cube/gen/archive/0.4.0.1.tar.gz -> gen-0.4.0.1.tar.gz
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils b83a2420b796f7c6eff682679d08fe25 findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 165fc17c38d1b11dac2008280dab6e80 oasis cc6dfb8b0c04cedd9840ff2ec5e38539 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=8442de87df0619bac8d785caecd429a9
+_md5_=8ca3f57a8a5da1e17bb2a9fdd234e271
diff --git a/metadata/md5-cache/dev-ml/iTeML-2.2 b/metadata/md5-cache/dev-ml/iTeML-2.2
new file mode 100644
index 000000000000..3af11e8fd258
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/iTeML-2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] !dev-ml/qckeck >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Inline (Unit) Tests for OCaml
+EAPI=5
+HOMEPAGE=https://github.com/vincent-hugot/iTeML
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] !dev-ml/qckeck
+SLOT=0/2.2
+SRC_URI=https://github.com/vincent-hugot/iTeML/archive/v2.2.tar.gz -> iTeML-2.2.tar.gz
+_eclasses_=findlib 9909e5ca0f77ff5b693885a3d7aeadb7
+_md5_=83c529d0388f6df07587157b0b84fff9
diff --git a/metadata/md5-cache/dev-ml/stringext-1.4.0-r1 b/metadata/md5-cache/dev-ml/stringext-1.4.0-r1
deleted file mode 100644
index 38ea0355b399..000000000000
--- a/metadata/md5-cache/dev-ml/stringext-1.4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ml/qcheck[ounit(-)] ) >=dev-lang/ocaml-4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] || ( dev-ml/ocamlbuild =dev-lang/ocaml-4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.4.0
-SRC_URI=https://github.com/rgrinberg/stringext/archive/v1.4.0.tar.gz -> stringext-1.4.0.tar.gz
-_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils b83a2420b796f7c6eff682679d08fe25 findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 165fc17c38d1b11dac2008280dab6e80 oasis cc6dfb8b0c04cedd9840ff2ec5e38539 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=0af2733928109760d96b7adf7d0f9e10
diff --git a/metadata/md5-cache/dev-ml/stringext-1.4.1 b/metadata/md5-cache/dev-ml/stringext-1.4.1
deleted file mode 100644
index 9643d9e89678..000000000000
--- a/metadata/md5-cache/dev-ml/stringext-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ml/qcheck[ounit(-)] ) >=dev-lang/ocaml-4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] || ( dev-ml/ocamlbuild =dev-lang/ocaml-4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.4.1
-SRC_URI=https://github.com/rgrinberg/stringext/archive/v1.4.1.tar.gz -> stringext-1.4.1.tar.gz
-_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils b83a2420b796f7c6eff682679d08fe25 findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 165fc17c38d1b11dac2008280dab6e80 oasis cc6dfb8b0c04cedd9840ff2ec5e38539 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=0af2733928109760d96b7adf7d0f9e10
diff --git a/metadata/md5-cache/dev-python/flake8-3.0.4 b/metadata/md5-cache/dev-python/flake8-3.0.4
new file mode 100644
index 000000000000..1e8865dd327c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flake8-3.0.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/pycodestyle-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/pycodestyle-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
+EAPI=6
+HOMEPAGE=https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+PDEPEND=>=dev-python/mccabe-0.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/pycodestyle-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/pycodestyle-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/pycodestyle-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/pycodestyle-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/f/flake8/flake8-3.0.4.tar.gz
+_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=69dc32a6bc8269505f87606d9e6413f3
diff --git a/metadata/md5-cache/dev-python/mccabe-0.5.2 b/metadata/md5-cache/dev-python/mccabe-0.5.2
new file mode 100644
index 000000000000..5f1ae2874c1f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mccabe-0.5.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=flake8 plugin: McCabe complexity checker
+EAPI=6
+HOMEPAGE=https://github.com/PyCQA/mccabe
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/m/mccabe/mccabe-0.5.2.tar.gz
+_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=cf8db9931a7769c902cafcfe5c3ed0f1
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.0.0 b/metadata/md5-cache/dev-python/pycodestyle-2.0.0
new file mode 100644
index 000000000000..4448edcddba3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python style guide checker (fka pep8)
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/pycodestyle
+IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.0.0.tar.gz
+_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=bb29d9d1752506c9eab42dbf4639eb4c
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.31 b/metadata/md5-cache/net-misc/memcached-1.4.31
index 624c208c90c0..9dadd5ee5f97 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.31
+++ b/metadata/md5-cache/net-misc/memcached-1.4.31
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
EAPI=5
HOMEPAGE=http://memcached.org/
IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=BSD
RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
SLOT=0
SRC_URI=http://www.memcached.org/files/memcached-1.4.31.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 user 80aaa71614ced86f02ee1a513821dc87
-_md5_=170626950d288375193eac13053e635b
+_md5_=f5448fe5ea7af810c5b343f4b7823d24
diff --git a/metadata/md5-cache/sys-devel/llvm-3.8.1-r2 b/metadata/md5-cache/sys-devel/llvm-3.8.1-r2
index b2416a289cfe..3dcdee504198 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.8.1-r2
+++ b/metadata/md5-cache/sys-devel/llvm-3.8.1-r2
@@ -6,10 +6,10 @@ HOMEPAGE=http://llvm.org/
IUSE=clang debug default-compiler-rt default-libcxx doc gold libedit +libffi lldb multitarget ncurses ocaml python +sanitize +static-analyzer test xml video_cards_radeon elibc_musl kernel_Darwin kernel_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=UoI-NCSA
-PDEPEND=clang? ( =sys-devel/clang-3.8.1-r100 )
-RDEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) clang? ( !<=sys-devel/clang-3.8.1-r99 ) default-libcxx? ( sys-libs/libcxx ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+PDEPEND=clang? ( =sys-devel/clang-3.8.1-r100 ) default-libcxx? ( sys-libs/libcxx )
+RDEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) clang? ( !<=sys-devel/clang-3.8.1-r99 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
SLOT=0/3.8.0
SRC_URI=http://llvm.org/releases/3.8.1/llvm-3.8.1.src.tar.xz clang? ( http://llvm.org/releases/3.8.1/compiler-rt-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/cfe-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/clang-tools-extra-3.8.1.src.tar.xz ) lldb? ( http://llvm.org/releases/3.8.1/lldb-3.8.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.8.0-manpages.tar.bz2 )
_eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils 4c2654a34ebe732e85fda354f6ee642f prefix 99dcca42e6528d8fe3c214bf5731aaf2 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3f1c34c0c7a69a1ce4eb94779daec2ed
+_md5_=1b7bbbf715a979b106d6ab4347d1700f
diff --git a/metadata/md5-cache/sys-devel/llvm-3.9.0 b/metadata/md5-cache/sys-devel/llvm-3.9.0
index a2ebc7733984..ba0d408d1b0b 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.9.0
+++ b/metadata/md5-cache/sys-devel/llvm-3.9.0
@@ -6,10 +6,10 @@ HOMEPAGE=http://llvm.org/
IUSE=clang debug default-compiler-rt default-libcxx doc gold libedit +libffi lldb multitarget ncurses ocaml python +sanitize +static-analyzer test xml video_cards_radeon elibc_musl kernel_Darwin kernel_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=UoI-NCSA
-PDEPEND=clang? ( =sys-devel/clang-3.9.0-r100 )
-RDEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) clang? ( !<=sys-devel/clang-3.9.0-r99 ) default-libcxx? ( sys-libs/libcxx ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+PDEPEND=clang? ( =sys-devel/clang-3.9.0-r100 ) default-libcxx? ( sys-libs/libcxx )
+RDEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) clang? ( !<=sys-devel/clang-3.9.0-r99 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
SLOT=0/3.9.0
SRC_URI=http://llvm.org/releases/3.9.0/llvm-3.9.0.src.tar.xz clang? ( http://llvm.org/releases/3.9.0/compiler-rt-3.9.0.src.tar.xz http://llvm.org/releases/3.9.0/cfe-3.9.0.src.tar.xz http://llvm.org/releases/3.9.0/clang-tools-extra-3.9.0.src.tar.xz ) lldb? ( http://llvm.org/releases/3.9.0/lldb-3.9.0.src.tar.xz ) !doc? ( http://dev.gentoo.org/~mgorny/dist/llvm-3.9.0_rc3-manpages.tar.bz2 )
_eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils 4c2654a34ebe732e85fda354f6ee642f prefix 99dcca42e6528d8fe3c214bf5731aaf2 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=87b25ec53be9e1f3059153db44fb93db
+_md5_=6a45ab44eec292adaf550c6d79f3cdbe
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.27-r1 b/metadata/md5-cache/sys-libs/ldb-1.1.27-r1
new file mode 100644
index 000000000000..7e94eca84e99
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-1.1.27-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.8[python,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.29[python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.10[python,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!=net-fs/samba-4.0.0[ldb] >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ldap? ( net-nds/openldap )
+DESCRIPTION=An LDAP-like embedded database
+EAPI=6
+HOMEPAGE=http://ldb.samba.org
+IUSE=doc +ldap python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-3
+RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.8[python,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.29[python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.10[python,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!=net-fs/samba-4.0.0[ldb] >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ldap? ( net-nds/openldap )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0/1.1.27
+SRC_URI=http://www.samba.org/ftp/pub/ldb/ldb-1.1.27.tar.gz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs 6198c04daba0e1307bd844df7d37f423 waf-utils c21174962af5ca8091b66f58612797ce
+_md5_=8e7db23dcba3e2514fa2a1ca6afb563f
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 35b2e1e03112..ef4ce6de400b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Sep 2016 08:40:38 +0000
+Tue, 06 Sep 2016 13:10:36 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f4a2717b1a7e..e10e1beb52ef 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Sep 6 08:39:43 UTC 2016
+Tue Sep 6 13:09:41 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 3362911dfaeb..1659718fa2cc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Sep 2016 09:30:01 +0000
+Tue, 06 Sep 2016 13:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d9773e3b1f6f..3435084a28f2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1473151201 Tue 06 Sep 2016 08:40:01 AM UTC
+1473167401 Tue 06 Sep 2016 01:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 35b2e1e03112..ef4ce6de400b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Sep 2016 08:40:38 +0000
+Tue, 06 Sep 2016 13:10:36 +0000
diff --git a/net-misc/memcached/memcached-1.4.31.ebuild b/net-misc/memcached/memcached-1.4.31.ebuild
index 53f09846f643..8e68dcb9108f 100644
--- a/net-misc/memcached/memcached-1.4.31.ebuild
+++ b/net-misc/memcached/memcached-1.4.31.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
RDEPEND=">=dev-libs/libevent-1.4
diff --git a/profiles/package.mask b/profiles/package.mask
index 1b6f735f6322..c157ecca522f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,12 @@
#--- END OF EXAMPLES ---
+# Lars Wendler (06 Sep 2016)
+# Dead upstream since 2013. Superseded by eject from
+# sys-apps/util-linux.
+# Slated for removal in 30 days.
+sys-block/eject
+
# Mike Gilbert (03 Sep 2016)
# Python 3.3 will be removed from Gentoo in 30 days.
# dev-lang/python:3.3 will be available in the python overlay.
diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index de892fd0b38e..7db30d1df19d 100644
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -67,10 +67,10 @@ DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}"
RDEPEND="${COMMON_DEPEND}
clang? ( !<=sys-devel/clang-${PV}-r99 )
- default-libcxx? ( sys-libs/libcxx )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
+ default-libcxx? ( sys-libs/libcxx )"
# pypy gives me around 1700 unresolved tests due to open file limit
# being exceeded. probably GC does not close them fast enough.
diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild
index d31007227fc5..fa91fb535861 100644
--- a/sys-devel/llvm/llvm-3.9.0.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0.ebuild
@@ -69,10 +69,10 @@ DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}"
RDEPEND="${COMMON_DEPEND}
clang? ( !<=sys-devel/clang-${PV}-r99 )
- default-libcxx? ( sys-libs/libcxx )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
+ default-libcxx? ( sys-libs/libcxx )"
# pypy gives me around 1700 unresolved tests due to open file limit
# being exceeded. probably GC does not close them fast enough.
diff --git a/sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch b/sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch
new file mode 100644
index 000000000000..92e14c651c86
--- /dev/null
+++ b/sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch
@@ -0,0 +1,92 @@
+--- ldb-1.1.27/lib/talloc/wscript
++++ ldb-1.1.27/lib/talloc/wscript
+@@ -48,7 +48,7 @@
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
+ implied_deps='replace'):
+ conf.define('USING_SYSTEM_TALLOC', 1)
+- if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
++ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
+ implied_deps='talloc replace'):
+ conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
+
+--- ldb-1.1.27/wscript
++++ ldb-1.1.27/wscript
+@@ -5,6 +5,7 @@
+
+ blddir = 'bin'
+
++import Logs
+ import sys, os
+
+ # find the buildtools directory
+@@ -13,7 +14,7 @@
+ srcdir = srcdir + '/..'
+ sys.path.insert(0, srcdir + '/buildtools/wafsamba')
+
+-import wafsamba, samba_dist, Utils
++import wafsamba, samba_dist, Utils, Options
+
+ samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
+ lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent
+@@ -28,8 +29,21 @@
+ opt.RECURSE('lib/tevent')
+ opt.RECURSE('lib/replace')
+ opt.tool_options('python') # options for disabling pyc or pyo compilation
++ if opt.IN_LAUNCH_DIR():
++ opt.add_option('--disable-python',
++ help=("disable the pyldb modules"),
++ action="store_true", dest='disable_python', default=False)
++ if opt.IN_LAUNCH_DIR():
++ opt.add_option('--disable-ldap',
++ help=("disable ldap support"),
++ action="store_true", dest='disable_ldap', default=False)
+
+ def configure(conf):
++ conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
++
++ conf.env.disable_python = getattr(Options.options, 'disable_python', False)
++ conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False)
++
+ conf.RECURSE('lib/tdb')
+ conf.RECURSE('lib/tevent')
+
+@@ -44,16 +58,18 @@
+ conf.RECURSE('lib/replace')
+ conf.find_program('python', var='PYTHON')
+ conf.find_program('xsltproc', var='XSLTPROC')
+- conf.check_tool('python')
+- conf.check_python_version((2,4,2))
+- conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
++
++ if not conf.env.disable_python:
++ conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2))
++ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
++ if not conf.env.HAVE_PYTHON_H:
++ Logs.warn('Disabling pyldb-util as python devel libs not found')
++ conf.env.disable_python = True
+
+ # where does the default LIBDIR end up? in conf.env somewhere?
+ #
+ conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb')
+
+- conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
+-
+ if not conf.env.standalone_ldb:
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION,
+ onlyif='talloc tdb tevent',
+@@ -67,9 +83,12 @@
+ if conf.env.standalone_ldb:
+ conf.CHECK_XSLTPROC_MANPAGES()
+
+- # we need this for the ldap backend
+- if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
+- conf.env.ENABLE_LDAP_BACKEND = True
++ if not conf.env.disable_ldap:
++ # we need this for the ldap backend
++ if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
++ conf.env.ENABLE_LDAP_BACKEND = True
++ else:
++ conf.env.ENABLE_LDAP_BACKEND = False
+
+ # we don't want any libraries or modules to rely on runtime
+ # resolution of symbols
diff --git a/sys-libs/ldb/ldb-1.1.27-r1.ebuild b/sys-libs/ldb/ldb-1.1.27-r1.ebuild
new file mode 100644
index 000000000000..e3f70e519176
--- /dev/null
+++ b/sys-libs/ldb/ldb-1.1.27-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 waf-utils multilib-minimal eutils
+
+DESCRIPTION="An LDAP-like embedded database"
+HOMEPAGE="http://ldb.samba.org"
+SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc +ldap"
+
+RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+ dev-libs/popt[${MULTILIB_USEDEP}]
+ >=sys-libs/talloc-2.1.8[python,${MULTILIB_USEDEP}]
+ >=sys-libs/tevent-0.9.29[python(+),${MULTILIB_USEDEP}]
+ >=sys-libs/tdb-1.3.10[python,${MULTILIB_USEDEP}]
+ !!=net-fs/samba-4.0.0[ldb]
+ ${PYTHON_DEPS}
+ ldap? ( net-nds/openldap )
+ "
+
+DEPEND="dev-libs/libxslt
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig
+ ${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.27-optional_packages.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myconf=(
+ $(use_enable ldap) \
+ --disable-rpath \
+ --disable-rpath-install --bundled-libraries=NONE \
+ --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba \
+ --builtin-libraries=NONE
+ )
+ if ! multilib_is_native_abi; then
+ myconf+=( --disable-python )
+ fi
+ waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile(){
+ waf-utils_src_compile
+ multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ WAF_MAKE=1 \
+ PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+ waf test || die
+ fi
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+
+ if multilib_is_native_abi && use doc; then
+ doman apidocs/man/man3/*.3
+ docinto html
+ dodoc -r apidocs/html/*
+ fi
+}
+
+pkg_postinst() {
+ if has_version sys-auth/sssd; then
+ ewarn "You have sssd installed. It is known to break after ldb upgrades,"
+ ewarn "so please try to rebuild it before reporting bugs."
+ ewarn "See https://bugs.gentoo.org/404281"
+ fi
+}