commit: 0590b7f4e1f14adcee7a6698e89b6ef14c0a58bd
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 15:18:59 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 15:19:09 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0590b7f4
app-crypt/qca: sync with main tree
Package-Manager: portage-2.3.2
app-crypt/qca/metadata.xml | 1 -
app-crypt/qca/qca-9999.ebuild | 16 ++++++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml
index 85f20ae..07b5287 100644
--- a/app-crypt/qca/metadata.xml
+++ b/app-crypt/qca/metadata.xml
@@ -19,7 +19,6 @@
<flag name="gpg">Enable GnuPG plugin</flag>
<flag name="logger">Enable logger plugin</flag>
<flag name="nss">Enable NSS plugin</flag>
- <flag name="openssl">Enable OpenSSL plugin</flag>
<flag name="pkcs11">Enable PKCS#11 plugin</flag>
<flag name="sasl">Enable SASL plugin</flag>
<flag name="softstore">Enable softstore plugin</flag>
diff --git a/app-crypt/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild
index bea5a3b..6924f77 100644
--- a/app-crypt/qca/qca-9999.ebuild
+++ b/app-crypt/qca/qca-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit cmake-utils multibuild qmake-utils git-r3
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1"
SLOT="2"
KEYWORDS=""
-IUSE="botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5
sasl softstore test"
+IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 +qt4 qt5
sasl softstore +ssl test"
REQUIRED_USE="|| ( qt4 qt5 )"
RDEPEND="
@@ -27,9 +27,9 @@ RDEPEND="
gcrypt? ( dev-libs/libgcrypt:= )
gpg? ( app-crypt/gnupg )
nss? ( dev-libs/nss )
- openssl? ( dev-libs/openssl:0 )
pkcs11? (
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
dev-libs/pkcs11-helper
)
qt4? ( dev-qt/qtcore:4 )
@@ -39,6 +39,10 @@ RDEPEND="
dev-qt/qtnetwork:5
)
sasl? ( dev-libs/cyrus-sasl:2 )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
@@ -70,11 +74,11 @@ src_configure() {
$(qca_plugin_use gpg gnupg)
$(qca_plugin_use logger)
$(qca_plugin_use nss)
- $(qca_plugin_use openssl ossl)
$(qca_plugin_use pkcs11)
$(qca_plugin_use sasl cyrus-sasl)
$(qca_plugin_use softstore)
- $(cmake-utils_use_build test TESTS)
+ $(qca_plugin_use ssl ossl)
+ -DBUILD_TESTS=$(usex test)
)
if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
