summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2014-12-29 14:11:03 +0100
committerTreeve Jelbert2014-12-31 10:11:21 +0100
commit8f7211ccc9f49cc05e328848f22c7aaed38521a4 (patch)
tree7fdf453d3ea74b2c0601862edea2da0047f55318
parentbbfbbabce5ddd4a0e9f9efac5e6c16ed342f3164 (diff)
qca2: => 2.1.0
-rwxr-xr-xcrypto/qca2/BUILD9
-rwxr-xr-xcrypto/qca2/CONFLICTS3
-rwxr-xr-xcrypto/qca2/DEPENDS12
-rwxr-xr-xcrypto/qca2/DETAILS6
-rw-r--r--crypto/qca2/HISTORY6
5 files changed, 25 insertions, 11 deletions
diff --git a/crypto/qca2/BUILD b/crypto/qca2/BUILD
index 8cacd51efa..432d717f34 100755
--- a/crypto/qca2/BUILD
+++ b/crypto/qca2/BUILD
@@ -1,6 +1,3 @@
-QTDIR=/usr &&
-PATH=$QTDIR/bin/qt4:$PATH &&
-export QTDIR=/usr &&
-./configure --prefix=/usr $OPTS &&
-qmake qca.pro &&
-make
+OPTS+=' -DBUILD_TESTS=0' &&
+OPTS+=" -DQT4_BUILD=1" &&
+qt4_cmake_build
diff --git a/crypto/qca2/CONFLICTS b/crypto/qca2/CONFLICTS
index 24b1c644ce..38cf4dcc85 100755
--- a/crypto/qca2/CONFLICTS
+++ b/crypto/qca2/CONFLICTS
@@ -1 +1,4 @@
conflicts qca2 y
+conflicts qca-gnupg y
+conflicts qca-openssl y
+conflicts qca-pkcs11 y
diff --git a/crypto/qca2/DEPENDS b/crypto/qca2/DEPENDS
index 69117422f2..63c38b683b 100755
--- a/crypto/qca2/DEPENDS
+++ b/crypto/qca2/DEPENDS
@@ -1,2 +1,10 @@
-depends qt4 &&
-optional_depends ca-certificates
+depends cmake &&
+depends qt4 &&
+optional_depends SSL '' '' 'OpenSSL plugin' &&
+optional_depends LIBSASL '' '' 'Sasl2 plugin' &&
+optional_depends botan '' '' 'Botan plugin' &&
+optional_depends nss ' '' 'NSS plugin' &&
+optional_depends GNUPG '' '' 'GPG plugin' &&
+optional_depends libgcrypt '' '' 'GCrypt plugin' &&
+optional_depends pkcs11-helper '' '' 'pkcs11 plugin' &&
+optional_depends ca-certificates '' '' ''
diff --git a/crypto/qca2/DETAILS b/crypto/qca2/DETAILS
index 2535d9938d..83897f959d 100755
--- a/crypto/qca2/DETAILS
+++ b/crypto/qca2/DETAILS
@@ -1,7 +1,7 @@
SPELL=qca2
- VERSION=2.0.3
- SOURCE_HASH=sha512:c1120ffb373e294fbcc76e21dc2f503ebd3398b26d0ffa7ab7ee3a3e1a4228159358b59c2673ac4a1c2363771e61da54a5080b201c65d586ceda2e3b2facc1bb
- SOURCE=qca-$VERSION.tar.bz2
+ VERSION=2.1.0
+ SOURCE_HASH=sha512:cf2f76fec4b75952ed06874dfe161f4979ece8c51b1d6f91b041f77fb644fcbe96fc7f00efe3b49b5981ef127c87dd929d9847cdab7844db0ac02645262670fb
+ SOURCE=qca-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-$VERSION
SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/$SOURCE
LICENSE[0]=GPL
diff --git a/crypto/qca2/HISTORY b/crypto/qca2/HISTORY
index 88cfb4db13..5847fc10ef 100644
--- a/crypto/qca2/HISTORY
+++ b/crypto/qca2/HISTORY
@@ -1,3 +1,9 @@
+2014-12-29 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: 2.1.0
+ * DEPENDS: several depends for plugins, cmake
+ * BUILD: use qt4_cmake_build
+ * CONFLICTS: added, the plugins are now included
+
2012-05-07 Ladislav Hagara <hgr@vabo.cz>
* PRE_BUILD: added to compile with gcc 4.7