diff options
-rw-r--r-- | app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild | 2 | ||||
-rw-r--r-- | app-pda/usbmuxd/usbmuxd-1.1.0.ebuild | 2 | ||||
-rw-r--r-- | app-portage/elogv/elogv-0.7.8-r1.ebuild | 2 | ||||
-rw-r--r-- | dev-lang/sassc/sassc-3.6.0.ebuild | 2 | ||||
-rw-r--r-- | dev-libs/libbsd/libbsd-0.10.0.ebuild | 2 | ||||
-rw-r--r-- | dev-libs/libsass/libsass-3.6.1.ebuild | 2 | ||||
-rw-r--r-- | dev-python/pyopenssl/Manifest | 1 | ||||
-rw-r--r-- | dev-python/pyopenssl/pyopenssl-17.5.0.ebuild | 1 | ||||
-rw-r--r-- | dev-python/pyopenssl/pyopenssl-18.0.0.ebuild | 1 | ||||
-rw-r--r-- | dev-python/pyopenssl/pyopenssl-19.0.0.ebuild | 1 | ||||
-rw-r--r-- | dev-python/pyopenssl/pyopenssl-19.1.0.ebuild | 72 | ||||
-rw-r--r-- | eclass/python-any-r1.eclass | 2 | ||||
-rw-r--r-- | eclass/python-r1.eclass | 2 | ||||
-rw-r--r-- | virtual/python-cffi/python-cffi-0.ebuild | 4 |
14 files changed, 86 insertions, 10 deletions
diff --git a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild b/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild index dc0119d7a157..4aa2020649cd 100644 --- a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild +++ b/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2" # tools/iproxy.c is GPL-2+, everything else is LGPL-2.1+ LICENSE="GPL-2+ LGPL-2.1+" SLOT="0/4" # based on SONAME of libusbmuxd.so -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="kernel_linux static-libs" RDEPEND=" diff --git a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild index ffe942a66858..7c8568d85d76 100644 --- a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild +++ b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2" # src/utils.h is LGPL-2.1+, rest is found in COPYING* LICENSE="GPL-2 GPL-3 LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="" RDEPEND=" diff --git a/app-portage/elogv/elogv-0.7.8-r1.ebuild b/app-portage/elogv/elogv-0.7.8-r1.ebuild index e5004bc33c84..6d61dd70ff3f 100644 --- a/app-portage/elogv/elogv-0.7.8-r1.ebuild +++ b/app-portage/elogv/elogv-0.7.8-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" DOCS=( README ) diff --git a/dev-lang/sassc/sassc-3.6.0.ebuild b/dev-lang/sassc/sassc-3.6.0.ebuild index 8cf135700629..168f42261f2b 100644 --- a/dev-lang/sassc/sassc-3.6.0.ebuild +++ b/dev-lang/sassc/sassc-3.6.0.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit autotools SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" DESCRIPTION="A libsass command line driver" HOMEPAGE="https://github.com/sass/sassc" diff --git a/dev-libs/libbsd/libbsd-0.10.0.ebuild b/dev-libs/libbsd/libbsd-0.10.0.ebuild index 8a943aa0848c..37e39694527b 100644 --- a/dev-libs/libbsd/libbsd-0.10.0.ebuild +++ b/dev-libs/libbsd/libbsd-0.10.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz" LICENSE="BSD BSD-2 BSD-4 ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" DEPEND=">=sys-kernel/linux-headers-3.17" diff --git a/dev-libs/libsass/libsass-3.6.1.ebuild b/dev-libs/libsass/libsass-3.6.1.ebuild index 95f55959e193..e1645b967b90 100644 --- a/dev-libs/libsass/libsass-3.6.1.ebuild +++ b/dev-libs/libsass/libsass-3.6.1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then KEYWORDS= else SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" + KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" fi DESCRIPTION="A C/C++ implementation of a Sass CSS compiler" diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest index 806eb4df6f53..063275bd3eeb 100644 --- a/dev-python/pyopenssl/Manifest +++ b/dev-python/pyopenssl/Manifest @@ -1,3 +1,4 @@ DIST pyOpenSSL-17.5.0.tar.gz 170870 BLAKE2B e8b8986a7c5475ac3898df4877a8be86db359af79e1718bad85149440cff543c501ee23eb369270d2c539a9e3f4e13165ea87b858ef6916ee79ca6e49f6e5370 SHA512 f194662b5842f1e3a4fcb910b9f2e6482d1dcdf834f306acc3dd6d9723f65038f7bff550248fa6268d90c839c9d9e8248bb6c7d399495fe6aed25291b93ece86 DIST pyOpenSSL-18.0.0.tar.gz 167296 BLAKE2B 3a9c8db02e92858353389508d9791d2ff0b07b54150d27a513b4c26ef62899167d184702cd8ac3a9fb5be120a92e31259ce265a400513de4622c30b1269ecd9f SHA512 7106d4116243a164c1f458ad495564c2cf3a46b4b0fbb1d452b4174ead4409bc9c783c3a4674231ed3c26ecf588077b01dadbdefe033d5e7251a61531c6f6c15 DIST pyOpenSSL-19.0.0.tar.gz 168551 BLAKE2B 762d3358b3cc4f1e088e9464ac079e5212c537d25691e51edb3255a192c42276506c758ecf16eff999082bfd05aeb92a37741338d92036d2149b87c95008db05 SHA512 a7e12bf5be725ccebd1223d567a9b9e8bd35f79cbf3a0409108fa6f00e10ab137dd6876369e9dede02b2abc7d700786cc905532ca5c31b6e246f6df8b24e2818 +DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916 diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild index 167d9dc59854..a7d7cf3f88f9 100644 --- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild +++ b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild @@ -23,6 +23,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples test" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/six-1.5.2[${PYTHON_USEDEP}] diff --git a/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild index a0570e104b23..370f7551684f 100644 --- a/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild +++ b/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild @@ -23,6 +23,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples test" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/six-1.5.2[${PYTHON_USEDEP}] diff --git a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild index 9ac620f93eb0..5893c16d4bf2 100644 --- a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild +++ b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild @@ -23,6 +23,7 @@ LICENSE="Apache-2.0" 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples test" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/six-1.5.2[${PYTHON_USEDEP}] diff --git a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild new file mode 100644 index 000000000000..fb632677245b --- /dev/null +++ b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 flag-o-matic + +MY_PN=pyOpenSSL +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Python interface to the OpenSSL library" +HOMEPAGE=" + https://www.pyopenssl.org/ + https://pypi.org/project/pyOpenSSL/ + https://github.com/pyca/pyopenssl +" +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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc examples test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/six-1.5.2[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.8[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ') + ) + test? ( + virtual/python-cffi[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/pretend[${PYTHON_USEDEP}] + >=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] + )" + +S=${WORKDIR}/${MY_P} + +python_check_deps() { + use doc || return 0 + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" +} + +python_prepare_all() { + # Requires network access + sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C doc html +} + +python_test() { + TZ=UTC pytest -vv || die "Testing failed with ${EPYTHON}" # Fixes bug #627530 +} + +python_install_all() { + use doc && local HTML_DOCS=( doc/_build/html/. ) + use examples && dodoc -r examples + + distutils-r1_python_install_all +} diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index db8f23647cd1..3863ef6fa849 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -156,7 +156,7 @@ _python_any_set_globals() { python_export "${i}" PYTHON_PKG_DEP # note: need to strip '=' slot operator for || deps - deps="${PYTHON_PKG_DEP%=} ${deps}" + deps="${PYTHON_PKG_DEP/:0=/:0} ${deps}" done deps="|| ( ${deps})" diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index b06413170ae5..7665edbd87e3 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -543,7 +543,7 @@ python_gen_any_dep() { local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} # note: need to strip '=' slot operator for || deps - out="( ${PYTHON_PKG_DEP%=} ${i_depstr} ) ${out}" + out="( ${PYTHON_PKG_DEP/:0=/:0} ${i_depstr} ) ${out}" fi done echo "|| ( ${out})" diff --git a/virtual/python-cffi/python-cffi-0.ebuild b/virtual/python-cffi/python-cffi-0.ebuild index e5eac6d28cb4..dcf236bb4a8e 100644 --- a/virtual/python-cffi/python-cffi-0.ebuild +++ b/virtual/python-cffi/python-cffi-0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) inherit python-r1 |