| 1 |
commit: 0590b7f4e1f14adcee7a6698e89b6ef14c0a58bd |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 28 15:18:59 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 28 15:19:09 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0590b7f4 |
| 7 |
|
| 8 |
app-crypt/qca: sync with main tree |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
app-crypt/qca/metadata.xml | 1 - |
| 13 |
app-crypt/qca/qca-9999.ebuild | 16 ++++++++++------ |
| 14 |
2 files changed, 10 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml |
| 17 |
index 85f20ae..07b5287 100644 |
| 18 |
--- a/app-crypt/qca/metadata.xml |
| 19 |
+++ b/app-crypt/qca/metadata.xml |
| 20 |
@@ -19,7 +19,6 @@ |
| 21 |
<flag name="gpg">Enable GnuPG plugin</flag> |
| 22 |
<flag name="logger">Enable logger plugin</flag> |
| 23 |
<flag name="nss">Enable NSS plugin</flag> |
| 24 |
- <flag name="openssl">Enable OpenSSL plugin</flag> |
| 25 |
<flag name="pkcs11">Enable PKCS#11 plugin</flag> |
| 26 |
<flag name="sasl">Enable SASL plugin</flag> |
| 27 |
<flag name="softstore">Enable softstore plugin</flag> |
| 28 |
|
| 29 |
diff --git a/app-crypt/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild |
| 30 |
index bea5a3b..6924f77 100644 |
| 31 |
--- a/app-crypt/qca/qca-9999.ebuild |
| 32 |
+++ b/app-crypt/qca/qca-9999.ebuild |
| 33 |
@@ -2,7 +2,7 @@ |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
# $Id$ |
| 36 |
|
| 37 |
-EAPI=5 |
| 38 |
+EAPI=6 |
| 39 |
|
| 40 |
inherit cmake-utils multibuild qmake-utils git-r3 |
| 41 |
|
| 42 |
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1" |
| 43 |
SLOT="2" |
| 44 |
KEYWORDS="" |
| 45 |
|
| 46 |
-IUSE="botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test" |
| 47 |
+IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 +qt4 qt5 sasl softstore +ssl test" |
| 48 |
REQUIRED_USE="|| ( qt4 qt5 )" |
| 49 |
|
| 50 |
RDEPEND=" |
| 51 |
@@ -27,9 +27,9 @@ RDEPEND=" |
| 52 |
gcrypt? ( dev-libs/libgcrypt:= ) |
| 53 |
gpg? ( app-crypt/gnupg ) |
| 54 |
nss? ( dev-libs/nss ) |
| 55 |
- openssl? ( dev-libs/openssl:0 ) |
| 56 |
pkcs11? ( |
| 57 |
- dev-libs/openssl:0 |
| 58 |
+ !libressl? ( dev-libs/openssl:0 ) |
| 59 |
+ libressl? ( dev-libs/libressl ) |
| 60 |
dev-libs/pkcs11-helper |
| 61 |
) |
| 62 |
qt4? ( dev-qt/qtcore:4 ) |
| 63 |
@@ -39,6 +39,10 @@ RDEPEND=" |
| 64 |
dev-qt/qtnetwork:5 |
| 65 |
) |
| 66 |
sasl? ( dev-libs/cyrus-sasl:2 ) |
| 67 |
+ ssl? ( |
| 68 |
+ !libressl? ( >=dev-libs/openssl-1.0.1:0= ) |
| 69 |
+ libressl? ( dev-libs/libressl:= ) |
| 70 |
+ ) |
| 71 |
" |
| 72 |
DEPEND="${RDEPEND} |
| 73 |
doc? ( app-doc/doxygen ) |
| 74 |
@@ -70,11 +74,11 @@ src_configure() { |
| 75 |
$(qca_plugin_use gpg gnupg) |
| 76 |
$(qca_plugin_use logger) |
| 77 |
$(qca_plugin_use nss) |
| 78 |
- $(qca_plugin_use openssl ossl) |
| 79 |
$(qca_plugin_use pkcs11) |
| 80 |
$(qca_plugin_use sasl cyrus-sasl) |
| 81 |
$(qca_plugin_use softstore) |
| 82 |
- $(cmake-utils_use_build test TESTS) |
| 83 |
+ $(qca_plugin_use ssl ossl) |
| 84 |
+ -DBUILD_TESTS=$(usex test) |
| 85 |
) |
| 86 |
|
| 87 |
if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then |
Archives