| 1 |
commit: d9c6f5da90c3eae9632e939894837f428a021b96 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 31 04:52:09 2018 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 31 04:54:19 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c6f5da |
| 7 |
|
| 8 |
Revert collection of bad stabilizations |
| 9 |
|
| 10 |
The following is a squash of the following reverts: |
| 11 |
|
| 12 |
Revert "dev-python/pyopenssl: fixing amdge-fbsd" |
| 13 |
|
| 14 |
This reverts commit 4e058be4f713f961a477e3b09ad7e0e4a58e40b1. |
| 15 |
|
| 16 |
Revert "dev-python/pyopenssl: 17.5.0 stablized amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 under allarches" |
| 17 |
|
| 18 |
This reverts commit 9df03df64db374b5bf01eb2dcc1ddc23ab48c28d. |
| 19 |
|
| 20 |
Revert "dev-python/cryptography: 2.1.4 stablized allarches" |
| 21 |
|
| 22 |
This reverts commit 86b95fdb15331f93b276c309abc3ce42c1390b50. |
| 23 |
|
| 24 |
Revert "dev-python/asn1crypto: adding alpha for cryptography under allarches" |
| 25 |
|
| 26 |
This reverts commit 25c17342050fb0c7da351968e1c559a5d1d4db07. |
| 27 |
|
| 28 |
There was an existing rekeywording request for pyopenssl and these |
| 29 |
packages (bug 626836). They should not have been stabilized on |
| 30 |
architectures that had no existing keywords. |
| 31 |
|
| 32 |
dev-python/asn1crypto/asn1crypto-0.22.0.ebuild | 4 ++-- |
| 33 |
dev-python/asn1crypto/asn1crypto-0.24.0.ebuild | 2 +- |
| 34 |
dev-python/cryptography/cryptography-2.1.4.ebuild | 9 ++++----- |
| 35 |
dev-python/pyopenssl/pyopenssl-17.5.0.ebuild | 2 +- |
| 36 |
4 files changed, 8 insertions(+), 9 deletions(-) |
| 37 |
|
| 38 |
diff --git a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild |
| 39 |
index cce121553cf..7d17ec13ec6 100644 |
| 40 |
--- a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild |
| 41 |
+++ b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild |
| 42 |
@@ -1,4 +1,4 @@ |
| 43 |
-# Copyright 1999-2018 Gentoo Foundation |
| 44 |
+# Copyright 1999-2017 Gentoo Foundation |
| 45 |
# Distributed under the terms of the GNU General Public License v2 |
| 46 |
|
| 47 |
EAPI=6 |
| 48 |
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 49 |
|
| 50 |
LICENSE="MIT" |
| 51 |
SLOT="0" |
| 52 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~x64-solaris" |
| 53 |
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~x64-solaris" |
| 54 |
IUSE="test" |
| 55 |
|
| 56 |
RDEPEND="" |
| 57 |
|
| 58 |
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild |
| 59 |
index 7447491c7a3..1e78322804b 100644 |
| 60 |
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild |
| 61 |
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild |
| 62 |
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar |
| 63 |
|
| 64 |
LICENSE="MIT" |
| 65 |
SLOT="0" |
| 66 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris" |
| 67 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris" |
| 68 |
IUSE="test" |
| 69 |
|
| 70 |
RDEPEND="" |
| 71 |
|
| 72 |
diff --git a/dev-python/cryptography/cryptography-2.1.4.ebuild b/dev-python/cryptography/cryptography-2.1.4.ebuild |
| 73 |
index 9316538d336..ca6ef79819a 100644 |
| 74 |
--- a/dev-python/cryptography/cryptography-2.1.4.ebuild |
| 75 |
+++ b/dev-python/cryptography/cryptography-2.1.4.ebuild |
| 76 |
@@ -14,14 +14,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 77 |
|
| 78 |
LICENSE="|| ( Apache-2.0 BSD )" |
| 79 |
SLOT="0" |
| 80 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris" |
| 81 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris" |
| 82 |
IUSE="libressl test" |
| 83 |
|
| 84 |
- #!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] |
| 85 |
- # =dev-libs/openssl-1.0.2l-r1:0 |
| 86 |
- # >=dev-libs/openssl-1.1.0g-r1:0 ) ) ) |
| 87 |
RDEPEND=" |
| 88 |
- !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) |
| 89 |
+ !libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] |
| 90 |
+ =dev-libs/openssl-1.0.2l-r1:0 |
| 91 |
+ >=dev-libs/openssl-1.1.0g-r1:0 ) ) ) |
| 92 |
libressl? ( dev-libs/libressl ) |
| 93 |
$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*') |
| 94 |
$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3}) |
| 95 |
|
| 96 |
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild |
| 97 |
index 5892f7a8303..53103be665c 100644 |
| 98 |
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild |
| 99 |
+++ b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild |
| 100 |
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
| 101 |
|
| 102 |
LICENSE="Apache-2.0" |
| 103 |
SLOT="0" |
| 104 |
-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" |
| 105 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
| 106 |
IUSE="doc examples test" |
| 107 |
|
| 108 |
RDEPEND=" |
Archives