diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest deleted file mode 100644 index b290b4fc4..000000000 --- a/dev-python/cryptography-vectors/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST cryptography_vectors-2.2.2.tar.gz 27270814 BLAKE2B b57cfd402e85e34a1e52d034ef51699ba9ab7381e5baa28f0f062ecc8d6b7b5849ac4d5426c41768e1a4fb9462f84d7e22476ec64dc0bd0142a799caaf95eafb SHA512 bdaf53c8087d6c44fcd3ab54069d1d45b60ee80d98fd813fe180b9e88272203b5dd2abd5fa6dcd3b4ce9ec3215997fd8e99e63309e2f0ac619a6f72d552afff9 -DIST cryptography_vectors-2.3.tar.gz 35303908 BLAKE2B 694f5a741ddedce2101632dcf165961d4706feaa5c8482235f5afb69f4257bfb4f8a9b8423213661de0da2d56ebf43cc7ba138a4bbf9462f367ebd5adf2620f7 SHA512 7c51b0c29c182c4da3265824a1b6e44c943bd41dfa89199cded963d0182a8ade678a560ec9ea13f6e8918119fcacf1c90d804cc90368e51cc5d430228448231c diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild deleted file mode 100644 index db8ef24cc..000000000 --- a/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# 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} pypy pypy3 ) - -inherit distutils-r1 - -MY_PN=${PN/-/_} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Test vectors for the cryptography package" -HOMEPAGE="https://pypi.org/project/cryptography-vectors/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="|| ( Apache-2.0 BSD )" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-fbsd" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="" - -S=${WORKDIR}/${MY_P} diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.3.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.3.ebuild deleted file mode 100644 index db8ef24cc..000000000 --- a/dev-python/cryptography-vectors/cryptography-vectors-2.3.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# 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} pypy pypy3 ) - -inherit distutils-r1 - -MY_PN=${PN/-/_} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Test vectors for the cryptography package" -HOMEPAGE="https://pypi.org/project/cryptography-vectors/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="|| ( Apache-2.0 BSD )" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-fbsd" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="" - -S=${WORKDIR}/${MY_P} diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest deleted file mode 100644 index 1a1794af1..000000000 --- a/dev-python/cryptography/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST cryptography-2.2.2.tar.gz 443822 BLAKE2B d0fbaad78d172f1ba1bfa6edd64d2d5a0eac0853a564fdbb9830dfedc5c53fe1b28d8c1878be85ce38b8cd90a0c2e40e6a209158693a88a7053a80f0481e6302 SHA512 6c1b19cdb870d65abad42523697e9a0bebc7a0025b34f10c4bdd30c313333efd7c41bcb4237a29b3a1b270e3fbade75ccb35df172b055b7c075d619f4d9424c9 -DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19bd4420e91230d84b070cd77450a6805c56a2e37cda73b45c90ed969c8fdbb866a7cc9e53a6828a1ca6e45befd9de8 SHA512 75e14020da500fdbbd578f004b22ef3237844185329adf59288b29f1b3ee9dd2005a2c4a933fe8609a59d168012a9f687bab0f31ab39ed6ca325198aa9295e52 diff --git a/dev-python/cryptography/cryptography-2.2.2.ebuild b/dev-python/cryptography/cryptography-2.2.2.ebuild deleted file mode 100644 index e6f9fdffc..000000000 --- a/dev-python/cryptography/cryptography-2.2.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# 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} pypy{,3} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="Library providing cryptographic recipes and primitives" -HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 BSD )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" -IUSE="libressl test" - -# the openssl 1.0.2l-r1 needs to be updated again :( -# It'd theb be able to go into the || section again -#=dev-libs/openssl-1.0.2l-r1:0 -# the following is the original section, disallowing bindist entirely -#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) -RDEPEND=" - !libressl? ( - dev-libs/openssl:0= ( - || ( - dev-libs/openssl:0[-bindist(-)] - >=dev-libs/openssl-1.0.2o-r2:0 - ) - ) - ) - libressl? ( dev-libs/libressl:0= ) - $(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*') - virtual/python-enum34[${PYTHON_USEDEP}] - >=dev-python/idna-2.1[${PYTHON_USEDEP}] - >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/six-1.4.1[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] - test? ( - ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] - dev-python/hypothesis[${PYTHON_USEDEP}] - dev-python/iso8601[${PYTHON_USEDEP}] - dev-python/pretend[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - )" - -DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) - -PATCHES=( - "${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509.patch - "${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509_vfy.patch -) - -python_configure_all() { - append-cflags $(test-flags-CC -pthread) -} - -python_test() { - py.test -v -v -x || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/cryptography/cryptography-2.3.ebuild b/dev-python/cryptography/cryptography-2.3.ebuild deleted file mode 100644 index a024b6986..000000000 --- a/dev-python/cryptography/cryptography-2.3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# 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} pypy{,3} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="Library providing cryptographic recipes and primitives" -HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 BSD )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" -IUSE="libressl test" - -# the openssl 1.0.2l-r1 needs to be updated again :( -# It'd theb be able to go into the || section again -#=dev-libs/openssl-1.0.2l-r1:0 -# the following is the original section, disallowing bindist entirely -#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) -RDEPEND=" - !libressl? ( - dev-libs/openssl:0= ( - || ( - dev-libs/openssl:0[-bindist(-)] - >=dev-libs/openssl-1.0.2o-r2:0 - ) - ) - ) - libressl? ( dev-libs/libressl:0= ) - $(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*') - virtual/python-enum34[${PYTHON_USEDEP}] - >=dev-python/idna-2.1[${PYTHON_USEDEP}] - >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/six-1.4.1[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] - test? ( - ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] - dev-python/hypothesis[${PYTHON_USEDEP}] - dev-python/iso8601[${PYTHON_USEDEP}] - dev-python/pretend[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - )" - -DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) - -python_configure_all() { - append-cflags $(test-flags-CC -pthread) -} - -python_test() { - py.test -v -v -x || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/cryptography/files/cryptography-1.7.1-libressl251.patch b/dev-python/cryptography/files/cryptography-1.7.1-libressl251.patch deleted file mode 100644 index a23ed7658..000000000 --- a/dev-python/cryptography/files/cryptography-1.7.1-libressl251.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur cryptography-1.7.1.orig/src/_cffi_src/openssl/x509_vfy.py cryptography-1.7.1/src/_cffi_src/openssl/x509_vfy.py ---- cryptography-1.7.1.orig/src/_cffi_src/openssl/x509_vfy.py 2017-02-01 12:29:59.080728417 -0800 -+++ cryptography-1.7.1/src/_cffi_src/openssl/x509_vfy.py 2017-02-01 12:31:48.017895844 -0800 -@@ -221,10 +221,13 @@ - static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0; - static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0; - static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0; -+#if !CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2050100fL) - static const long X509_V_ERR_HOSTNAME_MISMATCH = 0; - static const long X509_V_ERR_EMAIL_MISMATCH = 0; - static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0; -+#endif - #endif - - /* OpenSSL 1.0.2beta2+ verification parameters */ - #if CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER && \ diff --git a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509.patch b/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509.patch deleted file mode 100644 index 9a14d4606..000000000 --- a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py ---- a/src/_cffi_src/openssl/x509.py 2017-07-27 05:11:29.000000000 +0200 -+++ b/src/_cffi_src/openssl/x509.py 2018-03-23 10:28:00.387774214 +0100 -@@ -254,8 +254,7 @@ - - const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *); - --/* in 1.1.0 becomes const ASN1_BIT_STRING, const X509_ALGOR */ --void X509_get0_signature(ASN1_BIT_STRING **, X509_ALGOR **, X509 *); -+void X509_get0_signature(const ASN1_BIT_STRING **, const X509_ALGOR **, const X509 *); - - long X509_get_version(X509 *); - -@@ -338,7 +337,8 @@ - CUSTOMIZATIONS = """ - /* Added in 1.0.2 beta but we need it in all versions now due to the great - opaquing. */ --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - /* from x509/x_x509.c version 1.0.2 */ - void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, - const X509 *x) diff --git a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch b/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch deleted file mode 100644 index a1c93cf0c..000000000 --- a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch +++ /dev/null @@ -1,73 +0,0 @@ -$OpenBSD: patch-src__cffi_src_openssl_x509_vfy_py,v 1.7 2018/02/22 18:49:16 sthen Exp $ - ---- a/src/_cffi_src/openssl/x509_vfy.py -+++ b/src/_cffi_src/openssl/x509_vfy.py -@@ -204,7 +204,7 @@ int sk_X509_OBJECT_num(Cryptography_STACK_OF_X509_OBJE - X509_OBJECT *sk_X509_OBJECT_value(Cryptography_STACK_OF_X509_OBJECT *, int); - X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *); - Cryptography_STACK_OF_X509_OBJECT *X509_STORE_get0_objects(X509_STORE *); --X509 *X509_OBJECT_get0_X509(X509_OBJECT *); -+X509 *X509_OBJECT_get0_X509(const X509_OBJECT *); - int X509_OBJECT_get_type(const X509_OBJECT *); - - /* added in 1.1.0 */ -@@ -220,14 +220,11 @@ static const long Cryptography_HAS_102_VERIFICATION_ER - static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1; - #else - static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0; -+#if LIBRESSL_VERSION_NUMBER >= 0x2070000fL -+static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1; -+#else - static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0; - --static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0; --static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0; --static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0; --static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0; --static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0; --static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0; - /* These 3 defines are unavailable in LibreSSL 2.5.x, but may be added - in the future... */ - #ifndef X509_V_ERR_HOSTNAME_MISMATCH -@@ -240,12 +237,6 @@ static const long X509_V_ERR_EMAIL_MISMATCH = 0; - static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0; - #endif - --/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately -- below because it shows up in some earlier 3rd party OpenSSL packages. */ --static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0; --static const long X509_V_FLAG_SUITEB_192_LOS = 0; --static const long X509_V_FLAG_SUITEB_128_LOS = 0; -- - int (*X509_VERIFY_PARAM_set1_host)(X509_VERIFY_PARAM *, const char *, - size_t) = NULL; - int (*X509_VERIFY_PARAM_set1_email)(X509_VERIFY_PARAM *, const char *, -@@ -257,6 +248,19 @@ void (*X509_VERIFY_PARAM_set_hostflags)(X509_VERIFY_PA - unsigned int) = NULL; - #endif - -+static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0; -+static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0; -+static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0; -+static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0; -+static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0; -+static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0; -+/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately -+ below because it shows up in some earlier 3rd party OpenSSL packages. */ -+static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0; -+static const long X509_V_FLAG_SUITEB_192_LOS = 0; -+static const long X509_V_FLAG_SUITEB_128_LOS = 0; -+#endif -+ - /* OpenSSL 1.0.2+ or Solaris's backport */ - #ifdef X509_V_FLAG_PARTIAL_CHAIN - static const long Cryptography_HAS_X509_V_FLAG_PARTIAL_CHAIN = 1; -@@ -292,7 +296,7 @@ X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx) - return ctx->cert; - } - --X509 *X509_OBJECT_get0_X509(X509_OBJECT *x) { -+X509 *X509_OBJECT_get0_X509(const X509_OBJECT *x) { - return x->data.x509; - } - #endif diff --git a/dev-python/cryptography/metadata.xml b/dev-python/cryptography/metadata.xml deleted file mode 100644 index 2dfa57bc0..000000000 --- a/dev-python/cryptography/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - python@gentoo.org - Python - - - cryptography - pyca/cryptography - - diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest index 84ccc5a09..b98fae625 100644 --- a/net-proxy/mitmproxy/Manifest +++ b/net-proxy/mitmproxy/Manifest @@ -1,4 +1,2 @@ -DIST mitmproxy-2.0.2.tar.gz 28498343 BLAKE2B f79eac8dd9e060787e7cd049983ce23bd7b6025efe1edfcd9a150611f5e08fa7a869d1c203e2d4d8e7ae3539d9e63d6665fb282f75392afcd70cdfe6cca87223 SHA512 8a38340b3b1dd73c99c9e9b06a59bff78a23b2a851e1032ee0b7354ac46c834a3d005a67dc5238030570719eb5f842cb2a8ce64ffc7c5a01cbfa9a9511c08e66 -DIST mitmproxy-3.0.4.tar.gz 27147733 BLAKE2B d14e0dcebcab9ff89038b913e56248aa8e4372aa14ae1d48c2f712765f06730e2546d621c84f5e568b21e18ea6cc5de25f7f51a066dae3747f23c00d66a23dd4 SHA512 a89b0bee6997ce51d23483101755dae9f5300339d65e4975679df5c6b60ff9af94e655651321cd8e831666a04ec5cc24c7af647f3aab913524b6755b47f1f57b -DIST mitmproxy-4.0.1.tar.gz 27130121 BLAKE2B 87d4d202edfe6b9c315131d282b2e75bdd58df342c6c03cbbd5223347a16724a4a789116f06a30d9e9313befa299e3644eac4594573ba92db6eed3c4810a2560 SHA512 2ba999854052a63182dbd2e1d5377fdef6b16c38a4d32912fc2c782ed8ad0e11694c6e010fd68bd6ecbc1c9f22ac7394444e6b2e8472990665bd7cb81a3cb82f DIST mitmproxy-4.0.3.tar.gz 27130720 BLAKE2B 994985e8c4921b6954478cb1fbb859b3ab3f35147850a9bae3e220aabd1e2912bd93d4b4ab6d14133be3f0d8ec0dd28d18201d41f38df905e116b129c65ce618 SHA512 f27aa7c7cc22903944c23b8d08e9cfd617ff27f519f14f1b2e887172f21dd799c1a9f6d5573d5eef68c3bb9590eaca299089a5ff01ad2289f4569e1c7e4fa3c7 +DIST mitmproxy-4.0.4.tar.gz 27131713 BLAKE2B 2748b0f3b66e1f5840aae792a1b4cd8ef8efa3673fa24bc0c3e15474b36d68c0f6b2203cf629b6444545b8c6223752232b2ce8526290fe5d74916946e8917a03 SHA512 e08ea8b1c75a95b822c463625509037bbc8a979161cacaa1f0185f98df8d6d7e5400925365dbbe70d18751251b1005824f739a8cd035c0389f7b4aea562adfb3 diff --git a/net-proxy/mitmproxy/mitmproxy-2.0.2-r6.ebuild b/net-proxy/mitmproxy/mitmproxy-2.0.2-r6.ebuild deleted file mode 100644 index 66d6f0b1c..000000000 --- a/net-proxy/mitmproxy/mitmproxy-2.0.2-r6.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{3,4,5} ) -inherit distutils-r1 versionator - -DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy" -HOMEPAGE="http://mitmproxy.org/" -SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples test" - -RDEPEND=" - >=dev-python/blinker-1.4[${PYTHON_USEDEP}] =dev-python/click-6.2[${PYTHON_USEDEP}] =dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}] - >=dev-python/construct-2.8[${PYTHON_USEDEP}] =dev-python/cryptography-1.3[${PYTHON_USEDEP}] <=dev-python/cryptography-2.1.4 - >=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}] =dev-python/hyper-h2-2.5.1[${PYTHON_USEDEP}] =dev-python/html2text-2016.1.8[${PYTHON_USEDEP}] <=dev-python/html2text-2016.9.19 - >=dev-python/hyperframe-4.0.1[${PYTHON_USEDEP}] =dev-python/jsbeautifier-1.6.3[${PYTHON_USEDEP}] =dev-python/kaitaistruct-0.6[${PYTHON_USEDEP}] =dev-python/passlib-1.6.5[${PYTHON_USEDEP}] =dev-python/pyasn1-0.1.9[${PYTHON_USEDEP}] =dev-python/pyopenssl-16.0[${PYTHON_USEDEP}] <=dev-python/pyopenssl-17.2.0 - >=dev-python/pyparsing-2.1.3[${PYTHON_USEDEP}] =dev-python/pyperclip-1.5.22[${PYTHON_USEDEP}] =dev-python/requests-2.9.1[${PYTHON_USEDEP}] =dev-python/ruamel-yaml-0.13.2[${PYTHON_USEDEP}] =www-servers/tornado-4.3[${PYTHON_USEDEP}] =dev-python/urwid-1.3.1[${PYTHON_USEDEP}] =dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] =dev-python/brotlipy-0.5.1[${PYTHON_USEDEP}] =dev-python/sortedcontainers-1.5.4[${PYTHON_USEDEP}] =dev-python/pytz-2015.07.0[${PYTHON_USEDEP}] - >=dev-python/pillow-3.2[${PYTHON_USEDEP}] =1.3, <1.9|cryptography>=1.3, <=2.0.3|" -i setup.py - sed -e "s|pyOpenSSL>=16.0, <17.0|pyOpenSSL>=16.0, <=17.2.0|" -i setup.py - distutils-r1_python_prepare_all -} - -python_prepare() { - #we allow to use 34 until 35 is stable - hack_python34() { - if [[ `pwd` == *python3_4 ]] ; then - # do not use circular imports - sed -i -e "s|^from mitmproxy import contentviews|#from mitmproxy import contentviews|" mitmproxy/contentviews/auto.py || die "failed to sed" - fi - } - python_foreach_impl hack_python34 - - # replace git describe with actual version - sed -i -e "s/\"git\", \"describe\", \"--tags\", \"--long\"/'echo', 'v${PV}-0-0'/" docs/conf.py || die -} - -python_test() { - nosetests -v || die "Tests fail with ${EPYTHON}" -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_install_all() { - local DOCS=( CHANGELOG CONTRIBUTORS ) - use doc && local HTML_DOCS=( docs/_build/html/. ) - use examples && local EXAMPLES=( examples/. ) - - distutils-r1_python_install_all -} - -pkg_postinst() { - if [[ ${PYTHON_TARGETS} == *python3_4* ]] ; then - ewarn "Attention: Python 3_4 is not officially supported by this version" - ewarn - fi -} diff --git a/net-proxy/mitmproxy/mitmproxy-3.0.4.ebuild b/net-proxy/mitmproxy/mitmproxy-3.0.4.ebuild deleted file mode 100644 index 636268013..000000000 --- a/net-proxy/mitmproxy/mitmproxy-3.0.4.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,6} ) -inherit distutils-r1 - -DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy" -HOMEPAGE="http://mitmproxy.org/" -SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples test" - -RDEPEND=" - >=dev-python/blinker-1.4[${PYTHON_USEDEP}] =dev-python/brotlipy-0.7.0[${PYTHON_USEDEP}] =dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}] - >=dev-python/click-6.2[${PYTHON_USEDEP}] =dev-python/cryptography-2.1.4[${PYTHON_USEDEP}] =dev-python/hyper-h2-3.0[${PYTHON_USEDEP}] =dev-python/hyperframe-5.0[${PYTHON_USEDEP}] =dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}] =dev-python/ldap3-2.4[${PYTHON_USEDEP}] =dev-python/passlib-1.6.5[${PYTHON_USEDEP}] =dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}] =dev-python/pyopenssl-17.5[${PYTHON_USEDEP}] =dev-python/pyparsing-2.1.3[${PYTHON_USEDEP}] =dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}] =dev-python/requests-2.9.1[${PYTHON_USEDEP}] =dev-python/ruamel-yaml-0.13.2[${PYTHON_USEDEP}] =dev-python/sortedcontainers-1.5.4[${PYTHON_USEDEP}] =www-servers/tornado-4.3[${PYTHON_USEDEP}] =dev-python/urwid-2.0.1[${PYTHON_USEDEP}] =dev-python/wsproto-0.11.0[${PYTHON_USEDEP}] =dev-python/pillow-4.3[${PYTHON_USEDEP}] pycryptodome migration =dev-python/dnspython-1.16.0_pre* + +#mitmproxy wants "protobuf>=3.6.0, <3.7", +~dev-libs/protobuf-3.6.0.1 +~dev-python/protobuf-python-3.6.0.1