[gentoo-commits] repo/gentoo:master commit in: dev-python/pyopenssl/, dev-python/asn1crypto/, dev-python/cryptography/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pyopenssl/, dev-python/asn1crypto/, dev-python/cryptography/

[Matt Turner]

commit:     d9c6f5da90c3eae9632e939894837f428a021b96
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 31 04:52:09 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 31 04:54:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c6f5da

Revert collection of bad stabilizations

The following is a squash of the following reverts:

Revert "dev-python/pyopenssl: fixing amdge-fbsd"

This reverts commit 4e058be4f713f961a477e3b09ad7e0e4a58e40b1.

Revert "dev-python/pyopenssl: 17.5.0 stablized amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 under allarches"

This reverts commit 9df03df64db374b5bf01eb2dcc1ddc23ab48c28d.

Revert "dev-python/cryptography: 2.1.4 stablized allarches"

This reverts commit 86b95fdb15331f93b276c309abc3ce42c1390b50.

Revert "dev-python/asn1crypto: adding alpha for cryptography under allarches"

This reverts commit 25c17342050fb0c7da351968e1c559a5d1d4db07.

There was an existing rekeywording request for pyopenssl and these
packages (bug 626836). They should not have been stabilized on
architectures that had no existing keywords.

 dev-python/asn1crypto/asn1crypto-0.22.0.ebuild    | 4 ++--
 dev-python/asn1crypto/asn1crypto-0.24.0.ebuild    | 2 +-
 dev-python/cryptography/cryptography-2.1.4.ebuild | 9 ++++-----
 dev-python/pyopenssl/pyopenssl-17.5.0.ebuild      | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
index cce121553cf..7d17ec13ec6 100644
--- a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~x64-solaris"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~x64-solaris"
 IUSE="test"
 
 RDEPEND=""

diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index 7447491c7a3..1e78322804b 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
 IUSE="test"
 
 RDEPEND=""

diff --git a/dev-python/cryptography/cryptography-2.1.4.ebuild b/dev-python/cryptography/cryptography-2.1.4.ebuild
index 9316538d336..ca6ef79819a 100644
--- a/dev-python/cryptography/cryptography-2.1.4.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.4.ebuild
@@ -14,14 +14,13 @@ 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-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
 IUSE="libressl test"
 
-	#!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)]
-	#									=dev-libs/openssl-1.0.2l-r1:0
-	#									>=dev-libs/openssl-1.1.0g-r1:0 ) ) )
 RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+	!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)]
+										=dev-libs/openssl-1.0.2l-r1:0
+										>=dev-libs/openssl-1.1.0g-r1:0 ) ) )
 	libressl? ( dev-libs/libressl )
 	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})

diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
index 5892f7a8303..53103be665c 100644
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc examples test"
 
 RDEPEND="