aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasufell <hasufell@hasufell.de>2015-01-23 18:52:10 +0100
committerhasufell <hasufell@hasufell.de>2015-01-23 20:06:42 +0100
commitc6494cf599c4abba777c7b361b34a8eb7f7d31e5 (patch)
tree80e9f23ecfc568171fc249f1bb7900f54478e0e5 /dev-python
parentMerge branch 'master' of git://github.com/lluixhi/libressl into master (diff)
downloadlibressl-c6494cf599c4abba777c7b361b34a8eb7f7d31e5.tar.gz
libressl-c6494cf599c4abba777c7b361b34a8eb7f7d31e5.tar.bz2
libressl-c6494cf599c4abba777c7b361b34a8eb7f7d31e5.zip
Use 'libressl' USE flag instead of virtual/openssl
This has several advantages: * more explicit control, less breakage by missynced virtuals or switching the provider * subslots work correctly Currently, we don't add a '!dev-libs/openssl:0' blocker to dev-libs/libressl to be able to test all packages. However, this should be done when importing it into the tree.
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/cryptography/cryptography-0.6.1.ebuild5
-rw-r--r--dev-python/cryptography/cryptography-0.7.1-r1.ebuild7
-rw-r--r--dev-python/cryptography/cryptography-0.7.2.ebuild5
3 files changed, 10 insertions, 7 deletions
diff --git a/dev-python/cryptography/cryptography-0.6.1.ebuild b/dev-python/cryptography/cryptography-0.6.1.ebuild
index 2ddd0c0..1161cd8 100644
--- a/dev-python/cryptography/cryptography-0.6.1.ebuild
+++ b/dev-python/cryptography/cryptography-0.6.1.ebuild
@@ -14,11 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
+IUSE="libressl test"
RDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl:= )
>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
"
diff --git a/dev-python/cryptography/cryptography-0.7.1-r1.ebuild b/dev-python/cryptography/cryptography-0.7.1-r1.ebuild
index a6fe84e..b3cc47d 100644
--- a/dev-python/cryptography/cryptography-0.7.1-r1.ebuild
+++ b/dev-python/cryptography/cryptography-0.7.1-r1.ebuild
@@ -14,11 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 BSD )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
+IUSE="libressl test"
RDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl:= )
>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
@@ -33,7 +34,7 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-PATCHES=(
+PATCHES=(
"${FILESDIR}"/0.7-setup.patch
"${FILESDIR}"/0.7-libressl.patch )
diff --git a/dev-python/cryptography/cryptography-0.7.2.ebuild b/dev-python/cryptography/cryptography-0.7.2.ebuild
index 1d83334..4de468f 100644
--- a/dev-python/cryptography/cryptography-0.7.2.ebuild
+++ b/dev-python/cryptography/cryptography-0.7.2.ebuild
@@ -14,11 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 BSD )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
+IUSE="libressl test"
RDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl:= )
>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')