gentoo resync : 13.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-13 06:19:51 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-13 06:19:51 +0000
commit: 8be70107efbb417f839292165ee39d07a062046f (patch)
tree: 013918887ec4a00f0cefdb4b4d1313cbc3054305 /dev-python
parent: 343a7272d559a21a0e0ed13cb743fabb2bfcc479 (diff)
30 files changed, 259 insertions, 193 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9fb87d1c0715..ca1ad08c8e5e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index c12760be625d..b06cc666ada3 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -1,3 +1,5 @@
+DIST aiosmtpd-1.0.tar.gz 49930 BLAKE2B 7c8f845746b51e2b77f2ff00de2c88c3a090a4cd65e55fa69fc371f8ac5a2966c31e3e7184188a1b4af1f5c3d22b7af5655c5673d199b9920865ddf56c119a06 SHA512 874b3505dd35cbb176cba058a8816329eb4177db705b10c3883f88d76e3f587efc35543812fd36a03f453c8c1ee359bb3f0239d8a246908c5c17b59be134d933
 DIST aiosmtpd-1.1.tar.gz 50722 BLAKE2B c7d21eea7816a758fb69061c0f1c4c5dbb7bd28a6daddc436211e4d8066380847255af537904ad5c09badb813269d0bc4b54dbb527b7b0c717d498c9475c8c2d SHA512 b61df616f2e14d1da67ac05149543bf48b14a31d44437d9a1dd11b166b98b56220c00e7c55e18d4fd99872d724e23f272922dd3548150632a189d9cb9b652883
+EBUILD aiosmtpd-1.0.ebuild 549 BLAKE2B 14c6ffe28a888a76e22b11eee177a78de96cfc16a23776703b49eb3e43564b2a1ead75b5e8e24170ea8cd61a5b1b68ff1caa465077a39258af7b173f7b1e9c67 SHA512 7bac181a777c81f32a89b9a22cd62f0f5ba5b2cbb287e0677cbd0cb144ea478a201a60e6dae19cabbedaeb36d3b19305b2a3ceb53d15cd0cf006737b738da439
 EBUILD aiosmtpd-1.1.ebuild 549 BLAKE2B 14c6ffe28a888a76e22b11eee177a78de96cfc16a23776703b49eb3e43564b2a1ead75b5e8e24170ea8cd61a5b1b68ff1caa465077a39258af7b173f7b1e9c67 SHA512 7bac181a777c81f32a89b9a22cd62f0f5ba5b2cbb287e0677cbd0cb144ea478a201a60e6dae19cabbedaeb36d3b19305b2a3ceb53d15cd0cf006737b738da439
 MISC metadata.xml 451 BLAKE2B 71e452a1b393808879ead1ea59d7b7a7136a39810533db9a43e1da155724ae75ff4cdfa1019fdec699fc4d4a0b7fe2291af27877a60867a63c300d4b6f089e51 SHA512 15ade72252545bff264b5504ac70210b8f8a1fc9b816b9d00bc1fbcda685efd4f1cdd6dfdd01ec27888b59d7098c0e6f64d4781a8b9ba697f4613775d0b966a1
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
new file mode 100644
index 000000000000..8595ce17c0db
--- /dev/null
+++ b/dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="asyncio based SMTP server"
+HOMEPAGE="http://aiosmtpd.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	rm -r examples
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index a79832cf14bf..cb1a5582c90a 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,4 +1,4 @@
 AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905
 DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
-EBUILD appdirs-1.4.3.ebuild 1190 BLAKE2B e4ca960043fec64cc379571e9e9d26f0a56fe3ef893e2af78521116e16b89393d0b0a7d1f63fb2fcfe8e790e06a2b2412aae67c36e0cd10693cd2a54f6f67365 SHA512 8a1526f09c8445277a2bbd3a5819bc558d313ee233eefaca7c3391ee2b5e269b532717bc8a3d8657f5493df148f7766de6e9d886ffb96d45f2e7885d3366f08e
+EBUILD appdirs-1.4.3.ebuild 1187 BLAKE2B 8435f5c829d22d9f0c84d45dbd50ce1de925e97b3110b85195881b24bcc2a7ff4988ef4a3b99982f488cb71fb3c11c1e02ca8c596adc5ca1c6716bd3847bfdcd SHA512 a5904317594dfc2119a9da22b6e3cfd9c0d7a6bcf9721c506cb51e2202d8b181acddd91a99ea6ab725b0836c7a188bff49fbe191a628b0af89730d9ec387bb0f
 MISC metadata.xml 742 BLAKE2B 4731940c3aa6e3e0616487d4600c77f31712455aa70eff1bb900ec121cb062e45e1551206b86a5716b49f6163612096cb5ab9e3cf693af2d1fedaac023de29e6 SHA512 c1e35e090d6e3af99b8879a8a553c89989b149617857696fccecb4ea0435979f547049db2cdb7c505b50c20dc9f081233990f6fc0ee05de8ee27c7629292244e
diff --git a/dev-python/appdirs/appdirs-1.4.3.ebuild b/dev-python/appdirs/appdirs-1.4.3.ebuild
index e2de18ca890c..45809ec5dfb9 100644
--- a/dev-python/appdirs/appdirs-1.4.3.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch )
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 64d979becc94..e9eec89172c4 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -6,6 +6,6 @@ DIST certifi-2017.7.27.1.tar.gz 348217 BLAKE2B 5c3531b0537df743010c5969c88fc40eb
 EBUILD certifi-2016.9.26.ebuild 724 BLAKE2B aad0c66fb167bc21893503c57e671e7faba78a4e30b990fef86a804f10b34c91d68db7a7cb7b0b1923ef4ba80d08b4666dfaf8250b15546d914f875e85853df3 SHA512 acbcfcafaafc2b257018df09ebea8680900b69bd82209a21ce0ae9f462f166daae14e1e0d93d7e1104d7c9dc85595a522b87d14bd6f0991efe096b6f642499b7
 EBUILD certifi-2017.1.23.ebuild 740 BLAKE2B 54fb273e2f0399608731e2a6216f33121746f6769772e31d83671a64ee39daa1a507659c1c2d23a72ee29af88e129e1fefd64221e521a796d6e33757ccdf3107 SHA512 d1e7e8c1d981084796ec441656414ba40b83ccf41313e5dd68eadb3da86cf65cb2f0758f5479ee23b4d1b6f4bbcfbbf4215ac45c53fac4f57e32574fe27b683d
 EBUILD certifi-2017.11.5.ebuild 748 BLAKE2B 11f215adc44f6eb78b359f9816eab5380ba0224e1f1d699d307f7ce98e6745489022ab76cc6c72f8e705de9223e0f418b9c109ae5f2a0ad969b3664a457d8157 SHA512 7fa014910bac4fd96e0544072ec075edc5950b60087bf75601a1b0023cd4c787113519823de10a7cdff005816ff14883fba73a568e5e1b11b5eeffa5977a73b4
-EBUILD certifi-2017.4.17.ebuild 739 BLAKE2B 6c4b654b1e41d84333d085e85ef9c37865aa2a52f67b5fdb5d764f9cfeb0f0e64d3e0b10f78fdec4f632412d3c6035f3a4f72a78376c4ccacf8619218411798e SHA512 885694b67b712fe63e16c3e4543972eed00ec37da8c732a54d05e222ac361f7f5b0113ad7b261c3fa41f03191a74614e9df7cde4bbae211e6d0d91760793e68d
+EBUILD certifi-2017.4.17.ebuild 736 BLAKE2B bf1d016013550970887d62036ac71dee3a682b229b8b8972a66a94b72dd83c8415a059309e0fe9ca969e57ceeef28f746411112e834093e7366ef7042304e4cd SHA512 71456ae15328a13d945a3f637fef48ef96921a0763f7390c0748ba397da1166c7c1406f98a04c70b3de4142178e49288befd505f31a3b83892d996ef3293a186
 EBUILD certifi-2017.7.27.1.ebuild 748 BLAKE2B 11f215adc44f6eb78b359f9816eab5380ba0224e1f1d699d307f7ce98e6745489022ab76cc6c72f8e705de9223e0f418b9c109ae5f2a0ad969b3664a457d8157 SHA512 7fa014910bac4fd96e0544072ec075edc5950b60087bf75601a1b0023cd4c787113519823de10a7cdff005816ff14883fba73a568e5e1b11b5eeffa5977a73b4
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2017.4.17.ebuild b/dev-python/certifi/certifi-2017.4.17.ebuild
index 5d86bae9c5b5..a7fa755182ce 100644
--- a/dev-python/certifi/certifi-2017.4.17.ebuild
+++ b/dev-python/certifi/certifi-2017.4.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/libpillowfight/Manifest b/dev-python/libpillowfight/Manifest
index 5091e5b6c73a..a0855ec3c808 100644
--- a/dev-python/libpillowfight/Manifest
+++ b/dev-python/libpillowfight/Manifest
@@ -1,5 +1,3 @@
-DIST libpillowfight-0.2.1.tar.gz 23125246 BLAKE2B 74af3c24cbe252ec66a0c2ab1431189509d1da34620df8f37898ec5b45d9c30651f37fdede72906d8ec690b32020c8a2a6d70a17ff6102a4e489e61cd008a127 SHA512 352f23daa2cce39395604f3c545773fec26b336ae17cea9148b8d6b7f61f0fcd314ab08e4fde8dff85531ecfa07fbee0fda90e3258c04c39cad397a775318d95
 DIST libpillowfight-0.2.2.tar.gz 23125494 BLAKE2B b9620b0e574869d1efcc9449e09f281a5d2611ec15f144ee24b385b5f6f693f037c844904f0abc715d49125df7d1a27d6c433aed83b33371b3f07310be8288db SHA512 76dcaf9105b4dbbe427851d794e92ba023453e2d750ecdd4e3feb864534f9d99adb562b719b7c9af299ae16c0778b510ab96b4997cf9bcc6ea4c6f8f7471ae8a
-EBUILD libpillowfight-0.2.1.ebuild 668 BLAKE2B 7c17ca8191eb721be1881877067e755aeeb229da6ee4154ba2298b75373e1a27de36b612181062f0c0c4608e5d6bee3189dbc5f1a49e6abac9f872182eeff90b SHA512 6127bba47f4091ee83466c925278ef8f65613f1a3c6de66a2ef45ab7992cb4781a69715dfc6a49b79c411f7e0bd11e7f6df6367a847850bfaef58be7cc8e3224
 EBUILD libpillowfight-0.2.2.ebuild 676 BLAKE2B 07c3d9097cd838705c06523c4c19b8314b822ce7427c011da9760b2b033dfb0aea8202ae3cbe00546cdb20074f121b607f66ceff7d712c4e24e39d89c22433eb SHA512 8919455d801ce8da7f49b41728d3dd41362b3669e3a23a57b3381e6a97011f3e5ddd045b3c5b59bc7fa08b1f02634076c8c288ce9d2455874cd1b672079fb46b
 MISC metadata.xml 349 BLAKE2B 4b7c076969b0b1a899de7615bea08f02595e340b4ec1228e630d8feafca7709693993ac48dc3cac91ab912cb1c41fa13dac818e598eec4bfb8d928d385484b98 SHA512 5934060618b194c844776072f78ac15400fbee4629595a8c3ed60acf30b4ffd9cfed4dfcd9b263101842be197a1491daeb3e929bdd924839c17819b185ae7578
diff --git a/dev-python/libpillowfight/libpillowfight-0.2.1.ebuild b/dev-python/libpillowfight/libpillowfight-0.2.1.ebuild
deleted file mode 100644
index 1401864b5c3a..000000000000
--- a/dev-python/libpillowfight/libpillowfight-0.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Small library containing various image processing algorithms"
-HOMEPAGE="https://github.com/jflesch/libpillowfight"
-SRC_URI="https://github.com/jflesch/libpillowfight/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e "/'nose>=1.0'/d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 34d73133b654..b906420f8954 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.messaging-5.30.1.tar.gz 316794 BLAKE2B a962841520b559fb433fff6ac2cfa884419d1d53d8ae1e99572e5b32ba2f45cbce55bc812891ab0cffb65db765793e020cf42308a53ee199027e192fe5aaa880 SHA512 e59a17a76963681cd96ef63a5f946ad2e4126f80a7fbdb0d1bc48597ad889862c72450fe526b46d3712eaf92b489e1c0020096e825654c7554c382282923b526
 DIST oslo.messaging-5.30.2.tar.gz 317883 BLAKE2B 4003de476db2636eae2462cd3aef7bacb911e321c2cb228263482eda7a82361ec4c731872dbaa8394cfdb42759a8c5e200a03b919c0941f74da32498831394b2 SHA512 b4715c73c158414d1b65fd56c6697ff67ce24499e96ca076f8c3d5d93d0b06ca1f9f80fa0de43c5ee0d5e8de221f20b95e077738b026bac6671d1a2ec6128b08
-EBUILD oslo-messaging-5.30.1.ebuild 2145 BLAKE2B 3c903549b31026bbe3ee6d78e6fc8a651b15b381f3aefeb5d1d706eefef945adad87fab02024e795a7ae32a1c974edf43d1bc6d963acd4bbc6ada41aa16c1c23 SHA512 83b8c7a8adb6ef7e670a55b0d23c7b19cd9bac290bd2387363a61e8f6b357a92703df8c41d1c51432e0ae8f003a67456d9b45e3b59f54f8cd9c83e48337df035
-EBUILD oslo-messaging-5.30.2.ebuild 2147 BLAKE2B b4c24092e8fd62d0e2d1ab65a946454244223135177c2b56a80f4bb3e5b45974a1de4d12e96dfd91bc38113caf2e12dd45718069aa395f3fba0c3cc6675782f0 SHA512 b10f400551d0f03e5f70a957221c6556df34ba080b5dee487c9bf0f7a78d309fb54a556c6ac3feec1640bf7fe27873db8ec5d1f7c6cf12c43a5e774b082186d8
+EBUILD oslo-messaging-5.30.2.ebuild 2145 BLAKE2B d27a718e90755170492a47c25701e55f73332037e52a0463dd3a528521c284ef3ba01600e29f9f72b8416e21ec1b1e9a4049d5c50df54f3b07749606470c9c9a SHA512 5e6d85a3f10b78d37a0d77e4dc943ac0c4400682330bf90aed803c8a30349bb9d18fa67af0de5df12519b0d096759638a79b5fd69e248d7eed889d1e9bc7c1be
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.30.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.30.1.ebuild
deleted file mode 100644
index 66dab2f8da61..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-5.30.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
index 4686a5f1c6f5..4304312da896 100644
--- a/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.messaging-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index b1e2e3803bea..00c13f831b3a 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,4 +1,4 @@
 AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
 DIST packaging-16.8.tar.gz 44706 BLAKE2B 6443f05d3745eb6c4cc3d51fccfb1afcfa207ac12498be4d15cd0f5c52c80435f8ea513589e8aec671cf88b10cc8c98555e7cac7fe9a1e0c67f4625fce83f80f SHA512 d1a7b65472c7c02dd758f0c469d6c6aeea34de7b798613f7fcdf45fcccbeba1e9085cab113fa89b392a60f758f8747d13b1c265c809566990c22e61ca8db49bb
-EBUILD packaging-16.8.ebuild 1464 BLAKE2B ca45be2bc47f2cd1b21a8fad9581dab3a17c0cf40ed2311ffc4b2ceac2a750d76a2deca4990b13c532dfca0645dcabbb1d656109a4dd541e42744e3ba2d19dcb SHA512 bb6a69a0843c376d4d3eb4b501a25047e47e7fb3f2e594ab2cfcba38d073c1c8aa4c1ae8aabf66367a2500d1a92839beb666a3c449415023049462fd67725fea
+EBUILD packaging-16.8.ebuild 1461 BLAKE2B e84f2fa0a4e839008794b5d8a6bf8944e8d4c73940e65728a951426b65fc0c2856aa1f24e811d47bd51d768c1e9f7a4150bdc06b6c9ad1cb6722769aedd0eeac SHA512 07a982c089274c472bb4ff5050bd705aa9333fdf9267f72ed1fe79bc1a305bfec6db2f4503ad0fafd6e145f7caefc074438504872f20ad3e13dd0d29c5a8b464
 MISC metadata.xml 366 BLAKE2B 62088f9e06b99999bcb0082f1ff6d6e243c8502a7e3f399699cded85fa65395f558e019b08342c73e4f078183cd0732d88058fab8fba984ba0b531c19ff6560c SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index 62edc8ae2a28..be9240f517a2 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 3f5ab8eb4aa9..bf4ecc51cd4d 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,12 +1,16 @@
 AUX psycopg-2.4.2-setup.py.patch 568 BLAKE2B 820a8ab11084670b79d159dcdb75a30f157f740a8110370ab0ded41907dece280cc7095ec691b96f5288e82bd29d8b6a46f108faddde79c4ada709e52e489ad0 SHA512 9111df177d89559b0e397bc0ca9844636f981552d4bac3ae04abfdae5c68bc4f9efc553829da9c3a653536ddb18f01a3049e9ece746d0fe3328684a6ef6b6976
+AUX psycopg-2.7.3-avoid-mxdatetime.patch 1832 BLAKE2B dff21302f85dc05be27147d1a53ac525bca24cd9c2282edb92168ba38e73c38bad9f5a8b24910a690105bb4f98888e174f8d7c2a285e6e42efb36a45499ed02e SHA512 1c582abe153d73bd71cdfefff4293f2c497a5818fe2ea7e0deffe71d0acb89ccde8e20aaa33acf3d47900743c548eecbf01db24b01abe35b5ed60ca20bf4a658
+AUX psycopg-2.7.3-sphinx-1.6.patch 1164 BLAKE2B c8dc98f49f1070f7866b01a10bf779480a03620eea548f66e1f19c13d1e8ca72ea4761dcae857db5a350aa545d8b3dbb2695334a05496e6150853820a6105c1b SHA512 dd6438110f5a653236ba8e6efda0f6d5cb2baaa506398728990106a0fbcb1ff8d072716c48e7f14ec608fe0b7307b8f5c7c0076fe2921104e25f21c905c0f6a2
 DIST psycopg-1.1.21.tar.gz 213753 BLAKE2B 679b4ba810ad7821c781e169baae1f62b6f926e2c115c88f0055404ecd266ed69beaea6151643984ec2bc5696a79ac02f23adcec727afe4e6b6e657740a1692c SHA512 2681e8b3c4873f69a1a07aa4d3908a42f8e8be9392adbed189fe72c1a601699ac08643d24454622baf4b26153ef3a687f27a941308368e2227cb98ff948322eb
 DIST psycopg2-2.5.3.tar.gz 690689 BLAKE2B c1c070fc9acf5270f6bd711d457f162d2e5622a0cb40584d5b24cce441429c460aded278b67dbdf351605d710085c3e04ac63927d736c8d04ea27d21cccdea10 SHA512 88590c37be839e8cf5025b7ac40411c4682269700795c5f8f1b762966d906faf3f1ee85de35fc734a2d10c6a68d7fef569891bd96919bab809b9500625e2a41a
 DIST psycopg2-2.6.2.tar.gz 376348 BLAKE2B 279f2fb905c3e3034d89535a8c1de3114ef87cbd7f4b32a54b38150ef1cb845ae9811b3d6f57a5f46042db47e6d5f2563e87c986cdb8a8799fe6d60580180cc3 SHA512 614314b5ab7ab5fa7c5e9c4f861579f90bd73521a9964dcb5a0938f77a9d6dfbea689cef35ad399cda698a45bb736c315912cb5dca85a52132f011d79f4863ac
 DIST psycopg2-2.7.3.1.tar.gz 425069 BLAKE2B 4d34859c63217bad08374b0a8d03dbcba7711c1e8034eb106ba27211e85af148f51902e2d1b294e4c0ba4e798f4a64903d9d735605d09bbcb1d291ad23cfb4e0 SHA512 206d4cf62a091927daf4b734e0b3597399fc588cb738366711674fc06c39d68a682981bc4756c356d37c41caba49b5df2b915beace8670c190d7d41e374f1eb5
+DIST psycopg2-2.7.3.2.tar.gz 425107 BLAKE2B 47fe652d5e2e62c765150941d565b9ee896e221ae565e51745645f2723a0070481daf2f0d0d1a1fbd741b5b536c12cdf892becb4d5d4283a26cd324cd02c47c6 SHA512 38460369e339b16e433328e9bd6ccdbb4b03e41d40b9fb453a54513af4ec43f0a72dc795de6eb13d9618e1d5636991d3de7f619459b3f21d070798d497b2776f
 DIST psycopg2-2.7.3.tar.gz 425004 BLAKE2B df405ca5b5f5887fbd166523cafd5686a9148b313b7c30a85dbfc5dec42aff426505993f42a18d6d60569deb17a5748a858737a139d74943e66bce8bdd12beb3 SHA512 9e673f47190b12ab31e783a3d2b464231b933cc6ad4f12742c457020aab5db36b83829d84b4e63f793f5567e689081fd9479bfc4634b7bb08c7d873a3f42efc9
 EBUILD psycopg-1.1.21-r1.ebuild 1569 BLAKE2B 2bd03f117610681759be78e45636f721c16e2f8f54abfad2a985ab19d0e1c51ed5a878e3e7db810f03ed896a5b45a38155ca7c5debffc40c6065d71992d73588 SHA512 e69ba12412bc2d3d76fd3eeb4326bd33aec7ca8bf3f6830b6efdfd66640c7dfe036d7e09a8a0340a5b5fb448c57dd01cbb7b1a5a1810ca502ecd6796d285162e
 EBUILD psycopg-2.5.3.ebuild 1456 BLAKE2B f2bbc2a656e5cc4c3ab673ac42afa8a9367e443c2687f9f4e3f7eeb11ed88607278f5aff26f2c79d72e6d0eb84a6fb624078b8e25749a1530a10ca9025c7365c SHA512 c349bd2b9908bfd33e86d197569e080b52b08fd8255f719fcd625a0a5bffc391e18c66e988f8ba7be5383bf37adc1542c91e018bac76026f29a22c2dbfe81f3c
 EBUILD psycopg-2.6.2.ebuild 1966 BLAKE2B 81b3269d763a5e621ce9a6c706b7a391621e0554da40afda2946a1fe1a6598d4fd7b897a3232512052aeb1c965f8d0abf5442ec1a9534b4e7cf7bdb3ab0728da SHA512 0b87755b75f0ddd72a474795942247327fd8e05ba63f8723b505ac43f96980ebc273b9ace49f8a408c87c7a86d989b6f7627585f3764fed3bb9d11cb86718115
 EBUILD psycopg-2.7.3.1.ebuild 1928 BLAKE2B 4b032f272bd21902b4c0f4d0f1f11d4bf80aa994d27827448b8ea3162713acbf921863fe1e37cc62d73062e9850b57338b1baf01fd9a06eea5879d18848cc562 SHA512 3608d22ec32acfc50db5dd8c9cbf63138123153071bae3203db718d3ac822ff8da28da648de0268949dcabc71808e0e148bfdd64c153aa46a1c6b6650cece0ec
+EBUILD psycopg-2.7.3.2.ebuild 1679 BLAKE2B a77579c1033b439a81a76ed54d5eb9ba0d740792ef8f3b91d25b511a276d1557c30423d77b596f8091b82af307e39f2902926b339c7a4840bf7e3ba02510c45f SHA512 029c0ba87ab6f695a976e84ea4e3fbe067f4e31b7dc9e02fb355a963f337cb13a8f256ae9d8310992273e6dff175f6288df477c8cfb4340fcbebbe959fa3c268
 EBUILD psycopg-2.7.3.ebuild 1919 BLAKE2B 5d82b03df033826f9a4ee25f317d87f1700ae54f9b4ee45d685d2899b911bdb4e25742f50a5a7c6a16f4bfc2686d6efccc392c87642ce7294b818364c2764dd5 SHA512 84cfe36d770054cf31158dff615ce1cd7caf16b8db8af4a411a885f1c80e4ec9e668143c0828f68ccb0ad1fe5c72b2e188cbcccfff51db0ad305c797855c6271
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/files/psycopg-2.7.3-avoid-mxdatetime.patch b/dev-python/psycopg/files/psycopg-2.7.3-avoid-mxdatetime.patch
new file mode 100644
index 000000000000..aab130c54500
--- /dev/null
+++ b/dev-python/psycopg/files/psycopg-2.7.3-avoid-mxdatetime.patch
@@ -0,0 +1,40 @@
+Index: psycopg2-2.7.3/setup.py
+===================================================================
+--- psycopg2-2.7.3.orig/setup.py
++++ psycopg2-2.7.3/setup.py
+@@ -527,20 +527,21 @@ have_pydatetime = True
+ have_mxdatetime = False
+ use_pydatetime = int(parser.get('build_ext', 'use_pydatetime'))
+ 
+-# check for mx package
+-mxincludedir = ''
+-if parser.has_option('build_ext', 'mx_include_dir'):
+-    mxincludedir = parser.get('build_ext', 'mx_include_dir')
+-if not mxincludedir:
+-    mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx")
+-if mxincludedir.strip() and os.path.exists(mxincludedir):
+-    # Build the support for mx: we will check at runtime if it can be imported
+-    include_dirs.append(mxincludedir)
+-    define_macros.append(('HAVE_MXDATETIME', '1'))
+-    sources.append('adapter_mxdatetime.c')
+-    depends.extend(['adapter_mxdatetime.h', 'typecast_mxdatetime.c'])
+-    have_mxdatetime = True
+-    version_flags.append('mx')
++if not use_pydatetime:
++    # check for mx package
++    mxincludedir = ''
++    if parser.has_option('build_ext', 'mx_include_dir'):
++        mxincludedir = parser.get('build_ext', 'mx_include_dir')
++    if not mxincludedir:
++        mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx")
++    if mxincludedir.strip() and os.path.exists(mxincludedir):
++        # Build the support for mx: we will check at runtime if it can be imported
++        include_dirs.append(mxincludedir)
++        define_macros.append(('HAVE_MXDATETIME', '1'))
++        sources.append('adapter_mxdatetime.c')
++        depends.extend(['adapter_mxdatetime.h', 'typecast_mxdatetime.c'])
++        have_mxdatetime = True
++        version_flags.append('mx')
+ 
+ # now decide which package will be the default for date/time typecasts
+ if have_pydatetime and (use_pydatetime or not have_mxdatetime):
diff --git a/dev-python/psycopg/files/psycopg-2.7.3-sphinx-1.6.patch b/dev-python/psycopg/files/psycopg-2.7.3-sphinx-1.6.patch
new file mode 100644
index 000000000000..4052a14649ef
--- /dev/null
+++ b/dev-python/psycopg/files/psycopg-2.7.3-sphinx-1.6.patch
@@ -0,0 +1,29 @@
+--- psycopg-2.7.3.2/doc/src/tools/lib/dbapi_extension.py 	2016-04-10 08:48:37.000000000 +0200
++++ psycopg-2.7.3.2/doc/src/tools/lib/dbapi_extension.py 2017-12-20 22:14:19.097225121 +0100
+@@ -12,7 +12,7 @@
+ from docutils import nodes
+
+ from sphinx.locale import _
+-from sphinx.util.compat import Directive, make_admonition
++from docutils.parsers.rst import Directive
+
+ class extension_node(nodes.Admonition, nodes.Element): pass
+
+@@ -29,12 +29,11 @@ class Extension(Directive):
+     option_spec = {}
+
+     def run(self):
+-        nodes = make_admonition(extension_node,
+-                self.name, [_('DB API extension')], self.options,
+-                self.content, self.lineno, self.content_offset,
+-                self.block_text, self.state, self.state_machine)
+-        nodes[0]['classes'].append('dbapi-extension')
+-        return nodes
++        node = extension_node('\n'.join(self.content))
++        node += nodes.title(_('DB API extension'), _('DB API extension'))
++        self.state.nested_parse(self.content, self.content_offset, node)
++        node['classes'].append('dbapi-extension')
++        return [node]
+
+
+ def visit_extension_node(self, node):
diff --git a/dev-python/psycopg/psycopg-2.7.3.2.ebuild b/dev-python/psycopg/psycopg-2.7.3.2.ebuild
new file mode 100644
index 000000000000..93f6d5ad9cbb
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.7.3.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/pygments-2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="test"
+
+# Avoid using mxdatetime: https://bugs.gentoo.org/452028
+# Fixes build error with sphinx: https://bugs.gentoo.org/634730
+PATCHES=(
+	"${FILESDIR}"/psycopg-2.7.3-avoid-mxdatetime.patch
+	"${FILESDIR}"/psycopg-2.7.3-sphinx-1.6.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src html text
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r doc/src/_build/html
+		dodoc doc/src/_build/text/*
+	fi
+
+	if use examples ; then
+	   dodoc -r examples
+	   docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyinsane/Manifest b/dev-python/pyinsane/Manifest
index 47ea976b2685..53728cc98eee 100644
--- a/dev-python/pyinsane/Manifest
+++ b/dev-python/pyinsane/Manifest
@@ -1,5 +1,3 @@
 DIST pyinsane-2.0.10.tar.gz 327159 BLAKE2B ae63e08fc557513ccac0633fac47bb29b3c8a023c481289ec60724f5fcdae0827e02d5f37d3f104d454ebcb1d1a7681248866461bce6201f056c988f858aa0d3 SHA512 bb882ab51c1e6cea7cad75851ffe5918ee08467d4772d27c23a0c5ec9f2dea3ee7d83601ae35e56e2f717ff7683cec5a45aa47b2a4e167fe4dddb9db3229a3b1
-DIST pyinsane-2.0.9.tar.gz 325576 BLAKE2B eabf8444daba9b5da86f65d94d8f8c7402d0b2129aea349b12b933fab743fbd3753606dced8c29a00d0ad1c8f729b8724e26f203213ad3b4e65c8976d51c002f SHA512 e882e237ce6c0e7a5055633b79814115e104d4ef0c417fdfff8f3bcac92527f432b3cab96c018445ae40455bb93fc5ef71d5e8cff1977878d1f09c0b121dfa2b
 EBUILD pyinsane-2.0.10.ebuild 851 BLAKE2B 2ec7f8ce75cc7cdece605e1f3dd68dba4e445f4958da926c1f5659d6381db94262f8020c3ab8c9c8d48035a120eb2a82ac59ede1d9f761d4dcbd4c3cf232f4b7 SHA512 14f5240f6080be599afe2cc902f4ee133adeb21292978024f132af70cffe69a069fff6527db1f4fc4fe5204425906e708f51f131dec38de74ad8a3d36ac9e649
-EBUILD pyinsane-2.0.9.ebuild 759 BLAKE2B 368d1c0970d92c3d4173f69043d0a2fad25b11f492a4e454aa65699a75e1cc8dceac656cc853b569c3cbf4bf563c215cb9dd15e317935bd9676d553790776db6 SHA512 86117866d517e0e9efdb5f4420c49d8a6bd9c2c726c855ee418596ee5f7246a25cf78b14f617dc097c4f9400a47432dd233d60a6a124f6da719ea49a88b29cb1
 MISC metadata.xml 921 BLAKE2B 8ce4124a05f809f24b7381d4eb2111c0a4b816c146c790af54e145b6d93e713b8e7d973762cfa5e8852ed5f8d5069dfaa23f50723b1c0bff7a5cf43e72ae8ccb SHA512 5f7247aed15fb530cda752989621d2d806dc25f48dbf04ad34115f2d90b0c32f3209bfd7acf6478545e4f52cb3eb5bb97a1e8cff49abefc5ab9cddefdc49f1a9
diff --git a/dev-python/pyinsane/pyinsane-2.0.9.ebuild b/dev-python/pyinsane/pyinsane-2.0.9.ebuild
deleted file mode 100644
index 02c2710c8c1a..000000000000
--- a/dev-python/pyinsane/pyinsane-2.0.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Sane API and abstration layer"
-HOMEPAGE="https://github.com/jflesch/pyinsane"
-SRC_URI="https://github.com/jflesch/pyinsane/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="media-gfx/sane-backends
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RESTRICT="test" # Tests require at least one scanner with a flatbed and an ADF
-
-python_prepare_all() {
-	sed -e "/'nose>=1.0'/d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index a659bb811867..2c01ab924166 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,6 +1,3 @@
-DIST pyocr-0.4.6.tar.gz 1282437 BLAKE2B ba90aeedbe08991e41ecd0a690c87b195302a27b75e68a2bfdb9af64da34c1663f708b93f80bbbe9978a4dbd19a7f1d3debf8d45b959e2d421388c1079c88872 SHA512 3543ef444dc729506574120bafaa192a7b2a689ab408cf59960e2b0be2d9a2eb13fa3bcb02c27022ab48257e8ceac824ca9b8d7e9850ddeef0a877117b889c11
 DIST pyocr-0.4.7.tar.gz 1283774 BLAKE2B 0c4958882c350ee9e71f956694c180097607ca1c9e75b2886185361013f6038fd584a73de63de80546354de4023c6a8b1a589205f2e0c9165904d4fd3881b9f8 SHA512 ee4433c34058e0c79478dbf4276f55dabadcf5c841e86e1988e574bf91d96b96a314ef5e15047fb510737c956b4deed200eb47799de6fb1c021e407a6d49c192
-EBUILD pyocr-0.4.6.ebuild 745 BLAKE2B 6286a0aaa8ff59a39c5900dc3b80a64b9136675898c8f5dbfcf1184e8be035b5a3cef5bb84a5184230af846b54a19f36296db7b95917c27311609ec3a3778889 SHA512 359fd7441598355279852ce0aaf0716d43552d771f8d70c70698116c1167f6fc8285d945ade54df5758a85c4fcd73ec3f19e8dbce98b6ebfabeffb8beac20459
 EBUILD pyocr-0.4.7-r1.ebuild 761 BLAKE2B 92b5e1aada2a0c2f61e59ef14539df4469685ceeb0e474d1f1f155580b6df47f4b0720b7a755648e176d5ae53969ebf800f16c6526cb8ccf414c5b3bcf917f91 SHA512 68050ad1419fce72d68b419e3d0a0ef8a14acd330408ddab125bffc144d30710de49f3603cd0a3079f2b74fda0956d6d62e56137e9f182cb6d1163960e122d97
-EBUILD pyocr-0.4.7.ebuild 757 BLAKE2B d8d3c6ae67bbad9bf569be0c710355576debbaa312050b4599ac901766fad00cf247d53538704e686c798fd085b442666eb746494cbb9618a4fbdd1067120300 SHA512 eee4c10d8e3ea4b6f06ca0284e2334c28d2b9119d4d397bb7fba7f1004f1023a2b28edca7850f9ddb572d83864e864ef3354026a4517e3a19fe9417dc7d4f89b
 MISC metadata.xml 1068 BLAKE2B cf7a168a1119d56549e19884a57e65ef64b04e8ee281caf980c5cc1d03b100c9de11e3b35925de1cf5e00a58d51bcae1e01da32727cf2e5f1a44117c7719b383 SHA512 c4fe226c68e85011b2470ec1bcd43eb3744df25948c7dd13a8c21ac3b89e6394f21a4d92793366c17bcaa25c24d8979d75a21bb6e2e884dbeef73e2db0f8f52b
diff --git a/dev-python/pyocr/pyocr-0.4.6.ebuild b/dev-python/pyocr/pyocr-0.4.6.ebuild
deleted file mode 100644
index 1b297d3a7383..000000000000
--- a/dev-python/pyocr/pyocr-0.4.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/jflesch/pyocr"
-SRC_URI="https://github.com/jflesch/pyocr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-IUSE="cuneiform +tesseract"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	dev-python/pillow
-	dev-python/six"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
-
-RESTRICT="test" # reguires tesseract[l10n_fr,l10n_en,l10n_jp]
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
diff --git a/dev-python/pyocr/pyocr-0.4.7.ebuild b/dev-python/pyocr/pyocr-0.4.7.ebuild
deleted file mode 100644
index 634a7ad88580..000000000000
--- a/dev-python/pyocr/pyocr-0.4.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/openpaperwork/pyocr"
-SRC_URI="https://github.com/openpaperwork/pyocr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-IUSE="cuneiform +tesseract"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	dev-python/pillow
-	dev-python/six"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
-
-RESTRICT="test" # reguires tesseract[l10n_fr,l10n_en,l10n_jp]
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index a507a0ba1c05..7390c218f109 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -1,6 +1,8 @@
+AUX pysaml-4.0.2_CVE-2017-1000433.patch 1245 BLAKE2B ef0d8c68cadb6c53810e9b3d083a9de895fe70762a4dfe88140558d3b03848615319a08e777f488ce81f227994b7621039e0354967461fd403880e44eda19264 SHA512 be699d09afefeb9034c46a5d8cb0a86ef2d7bb5ae0dfbe708b6746a43236eaa21903fe6e6590247722f8fb68632f850d018143f19a4b8b5b67609219f37e4249
 AUX xxe-4.0.2.patch 10657 BLAKE2B 6ecb7b265c55ee9cffda2a9acc0358dc092eec1d8040415665d22104bc8ca1d54473c471c542ae74cda68fe1a62ec3d1ecab0c29f4a017e24d895da1f66bbb4c SHA512 5c18a3c850526e6fd0410d0526bbf385d3383978b944de80da781301114f6a9081d2a3c662f45990fbd7ed88f971382b1ce30d974e4e76e19c11d6aa74d010d1
 DIST pysaml2-4.0.2.tar.gz 13657558 BLAKE2B 35cb9dff897caf9f7fc39a70466dabce88098b6bbe0337a2ae47c733e4fd5de3bd80ddf73f27b6ff67e6f571b1f647d9856bbed58c8b19fe6547a35254dc2019 SHA512 debe23c2b193ca9f937bdb4fc9e8f308fa012c18e50e40183f7e531434af52b6e4d36608be3e9b0321190930cdfd9eb24555ed1805083e32db8de0f57e5afb14
 DIST pysaml2-4.5.0.tar.gz 20030696 BLAKE2B 547465c2c4191a26de6bf1bab55bd9c36ed7e477c620a4155b7a463c98dbf314a8067d45263055a05ec8ed696177fcbd1443dd856113871f2941b572b9df0628 SHA512 163dfc2acfa0f242bc97d3ec334aec98e993ef9265b2240223205e496f86df5518ca613620b371eabcca0c4070a0bf7bb72a2216f517e19e3b2ff0f20e30a0c7
 EBUILD pysaml2-4.0.2-r1.ebuild 1030 BLAKE2B 520548c8898e7c508ece1ae7c343b80eeabee5d2713fc5fbd367fa8fcfaa929463ccc9930e75c6375c86e92042a141b17f8c99866249341e0ef14fc9785889fd SHA512 7f0405c7dcad153ad041e1ced22c8d490e566fd090fd6baf61e9de3977de6d2d90c7b3e34899ce072b4bc0be58055e656546f62eef6ed57561a6ad85b2be3a4a
+EBUILD pysaml2-4.0.2-r3.ebuild 1083 BLAKE2B 4722c18270f2139a4238d3dd1d4430ecf9ced1edfaec70ab08c203520c4b3e0b3941fc8c531759a7708207aaa41d52226a264fe6e5c75a28d411121b648bf6b4 SHA512 132a6dfe3f0c81d6881277fc02c17fe284fb169baeb8cc461555c04da5574f8d282a01e7e4e337602770983eeaf2634c8f4ccbd4b8d3b9d5de4ba4885f49eb4a
 EBUILD pysaml2-4.5.0.ebuild 837 BLAKE2B ef546e17850b3d3088cda21c3cc31a18c7d80267ef51f89c091823c2e7b3ce5d64448a89d1f1b9bbb77780552b82058794d0b992ed3d0117522dd5ee924480b5 SHA512 6b313ff7137cb3b99ffa49148a2a76e10b5d1f4fe9256ac567e12b5be3698b8e95f0a7ab1d92b9b2c1136c3a0b512714730b6923468af5aeec3cfb469f813d76
 MISC metadata.xml 606 BLAKE2B 5262e7d7a6f2ff32547ab8570f3aace4dfc3af9d667fdaac6ba2eba77ffd562524a136154eb7b96d4f1f7dfb316b72ee7a0311efa46153afff150c3956151b32 SHA512 7b4facbe3e25898488fffb7b39f9ff7eedd12492f668fa294952711efb3ca9549f2653ab6bc2a948286deff5f45116b0b8bd9a5fc796e99413acc9334eade348
diff --git a/dev-python/pysaml2/files/pysaml-4.0.2_CVE-2017-1000433.patch b/dev-python/pysaml2/files/pysaml-4.0.2_CVE-2017-1000433.patch
new file mode 100644
index 000000000000..7abc765c2984
--- /dev/null
+++ b/dev-python/pysaml2/files/pysaml-4.0.2_CVE-2017-1000433.patch
@@ -0,0 +1,33 @@
+From 6312a41e037954850867f29d329e5007df1424a5 Mon Sep 17 00:00:00 2001
+From: Ioannis Kakavas <ikakavas@noc.grnet.gr>
+Date: Tue, 12 Sep 2017 12:22:47 +0300
+Subject: [PATCH] Quick fix for the authentication bypass due to optimizations
+ #451
+
+---
+ src/saml2/authn.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/saml2/authn.py b/src/saml2/authn.py
+index 1f2d02cf..1e1a220b 100644
+--- a/src/saml2/authn.py
++++ b/src/saml2/authn.py
+@@ -146,7 +146,8 @@ def __call__(self, cookie=None, policy_url=None, logo_url=None,
+         return resp
+ 
+     def _verify(self, pwd, user):
+-        assert is_equal(pwd, self.passwd[user])
++        if not is_equal(pwd, self.passwd[user]):
++            raise ValueError("Wrong password")
+ 
+     def verify(self, request, **kwargs):
+         """
+@@ -176,7 +177,7 @@ def verify(self, request, **kwargs):
+             return_to = create_return_url(self.return_to, _dict["query"][0],
+                                           **{self.query_param: "true"})
+             resp = Redirect(return_to, headers=[cookie])
+-        except (AssertionError, KeyError):
++        except (ValueError, KeyError):
+             resp = Unauthorized("Unknown user or wrong password")
+ 
+         return resp
diff --git a/dev-python/pysaml2/pysaml2-4.0.2-r3.ebuild b/dev-python/pysaml2/pysaml2-4.0.2-r3.ebuild
new file mode 100644
index 000000000000..8b3dded83c0c
--- /dev/null
+++ b/dev-python/pysaml2/pysaml2-4.0.2-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of SAML Version 2 to be used in a WSGI environment"
+HOMEPAGE="https://github.com/rohe/pysaml2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/xxe-4.0.2.patch"
+	"${FILESDIR}/pysaml-4.0.2_CVE-2017-1000433.patch"
+)
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/repoze-who[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.5[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index b5abdacea2ca..2aaecc7eebe9 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -2,6 +2,6 @@ AUX 1.10.0-no-setuptools.patch 545 BLAKE2B e884088c94e36283ce3e9a8df716cf25b040d
 AUX 1.9.0-mapping.patch 561 BLAKE2B 281a893fa6d0d589eb768c595e8931e4d743be9bc7eb288d87628f6a38c14a220f965430c0a480aecf0652c09155359aff9dff11449e2de3c55d7ef00f2527d3 SHA512 92d5bb1643264a04d5faf36bed16379e8844648a31739921bd97e2dd88e34a9b302c37a12a15a64aceb3d26c53f7cdbcbde2ce8d289a7a43f692af47bf05f58c
 DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c582611b2481475d5d9971c936b1742ea0821c65150694914af72f43155caa54616268735a4bd2447d5b4ba4 SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e
 DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d9abff96ce6fc3eea4464e577511f7c52328cbd9e6989db2128fa8d1ee57f9ce7bfc36b83ff655691b46c9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24
-EBUILD six-1.10.0.ebuild 1823 BLAKE2B bc29fccc4c631d29c84be40f5fcb9f61e81701e775078538efb4c2cfb7c4c94166fbe04d3f1aad7ebfa9b9dc5df6f55117b2e8c2a0f70629b59e1214af94fdf1 SHA512 258b5e8d0d9221d916260a1c2053b90224109933d3c87054588c2253910fcfb177e4bc329da491987eb88d7d7ff85b13a0057127c285855c2b896ba9ed8b9f51
+EBUILD six-1.10.0.ebuild 1820 BLAKE2B bbbae2233c95397a63029aec8b8f3ae2d161dea2406e9f9beaff577a42c11a3080e794a86d5efa55951a26a10902ee5b30ee0ddb8df2813a5a1a47a8bbfdda64 SHA512 4e68661a0b90e0f2235007aa98c1428f534080fbe593c52cd5400bb86dce440e5aae8a2df739f70ab8860fb2950cec895302800cba576377231657804373e2f0
 EBUILD six-1.11.0.ebuild 1095 BLAKE2B 6d6095cebcb5e05101a72f3f41042c71d0989c2037881bbcf733d673f87de56e07cacdad3b199d994ffbaac45171b162bae49284a0d8bc8b876e45696ee683c4 SHA512 87da6beb6dab97b5f20c6c84a69a7fc23a5f005958dd413ef299281db273691a6d97a3822619b12b5ca1bd47d36d0a9ba6ffa5c5c39703831709a660d61f16c5
 MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 950dd2975ff8..a7c52d164479 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/tlslite/Manifest b/dev-python/tlslite/Manifest
index 3427b51faab0..9cf835465bbf 100644
--- a/dev-python/tlslite/Manifest
+++ b/dev-python/tlslite/Manifest
@@ -1,3 +1,3 @@
 DIST tlslite-0.4.9.tar.gz 105402 BLAKE2B a26d0938dc713b701d6079263e46f44b23814708d04fef8698bd0b736e10d58ceb5e99dcb1ecdd66a225fc0a697aafdbb97ed46522229d3af7f760daf23f4d86 SHA512 5473139b5730ef946efa139fbb9adb3333dc67f33f03305f4a6d3b6eaaefce950ba93bc1053362fc31b9d68ff9f6deceb9449987e29ff44035b818d7310edbea
-EBUILD tlslite-0.4.9-r2.ebuild 878 BLAKE2B 0479a7e246e6093b63d0934a9b7726e3e9c9841f3e93a2d859112eccd57179990ce9234ea352af2aff6000cf9e573f3bbf00549fbad8418d4dc81f757accc65a SHA512 27f5c7767acd27f255a19a2c90a18cc4e130594f7c71215682ef9f6b4b81ee45f3407b0139421b26ead2e8434da724c02284089b77773d8d2b6b3d829b8f31ac
+EBUILD tlslite-0.4.9-r2.ebuild 882 BLAKE2B ef40129872619473963c0000800fef3f0d84cc24cc83c4a001ee7084a85ea840ab1a12f4425a499025ab38a0a235a24d3ab746727c301c05487d89adb5dee9a0 SHA512 01fff7fb7a1fc229b674aa8d383460747e30f4536d13b06ed3de2d5a3e9281cd403ce351f369a3450ab6c4ed5c52e952d528518a3661ec0fefb4b50762cd6a4e
 MISC metadata.xml 862 BLAKE2B efac680351c088ebb5c54afec47d1ff6539eba67860a891dedcf142ea2bcd56ec53a9ea7b5f5f16f90c70807bdf563344efb14a3308463413962e57bb22a475e SHA512 1374c0176a6a8386e8123bf1be106431d616de1b70d4b4948327b3e8f20a5d346bb622a2b83389aca1a0eda3f33591e9327929f2a7c062f04af80618ed3b0b8f
diff --git a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
index f4b5a7a47c55..b068342b957c 100644
--- a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
+++ b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 eutils
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-13 06:19:51 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-13 06:19:51 +0000
commit	8be70107efbb417f839292165ee39d07a062046f (patch)
tree	013918887ec4a00f0cefdb4b4d1313cbc3054305 /dev-python
parent	343a7272d559a21a0e0ed13cb743fabb2bfcc479 (diff)