[gentoo-commits] proj/qt:master commit in: app-crypt/qca/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     c91b9572689a22e2b804b62244ea9946881809b4
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 21 00:33:52 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Aug 21 00:33:52 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c91b9572

[app-crypt/qca] Minor cleanup.

Package-Manager: portage-2.2.12

---
 app-crypt/qca/metadata.xml    | 26 +++++++++++-----------
 app-crypt/qca/qca-9999.ebuild | 50 +++++++++++++++++++------------------------
 2 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml
index 379ecd4..71e6485 100644
--- a/app-crypt/qca/metadata.xml
+++ b/app-crypt/qca/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd></herd>
-	<use>
-		<flag name='botan'>Enable botan plugin</flag>
-		<flag name='sasl'>Enable cyrus-sasl plugin</flag>
-		<flag name='gcrypt'>Enable gcrypt plugin</flag>
-		<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='softstore'>Enable softstore plugin</flag>
-	</use>
+<herd>crypto</herd>
+<herd>qt</herd>
+<herd>kde</herd>
+<use>
+	<flag name="botan">Enable botan plugin</flag>
+	<flag name="gcrypt">Enable gcrypt plugin</flag>
+	<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>
+</use>
 </pkgmetadata>

diff --git a/app-crypt/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild
index f290f43..395eb61 100644
--- a/app-crypt/qca/qca-9999.ebuild
+++ b/app-crypt/qca/qca-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit cmake-utils git-r3
+inherit multilib cmake-utils git-r3
 
 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="http://delta.affinix.com/qca/"
@@ -22,58 +22,52 @@ RDEPEND="
 	!app-crypt/qca-ossl
 	!app-crypt/qca-pkcs11
 	botan? ( dev-libs/botan )
-	sasl? ( dev-libs/cyrus-sasl )
 	gcrypt? ( dev-libs/libgcrypt:= )
 	gpg? ( app-crypt/gnupg )
 	nss? ( dev-libs/nss )
 	openssl? ( dev-libs/openssl:0 )
 	pkcs11? (
 		dev-libs/openssl:0
-		>=dev-libs/pkcs11-helper-1.02
+		dev-libs/pkcs11-helper
 	)
 	qt4? ( dev-qt/qtcore:4 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtconcurrent:5
 		dev-qt/qtnetwork:5
-	)"
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? (
 		qt4? ( dev-qt/qttest:4 )
 		qt5? ( dev-qt/qttest:5 )
 	)
-	!<app-crypt/qca-1.0-r3:0"
-
+"
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
 DOCS=( README TODO )
 
-with_plugin_use() {
-	[[ -z $1 ]] && die "with_plugin_use <USE flag> [<flag name>]"
+qca_plugin_use() {
 	echo "-DWITH_${2:-$1}_PLUGIN=$(use $1 && echo yes || echo no)"
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/$(usev qt4 || usev qt5)/plugins/crypto"
 		$(cmake-utils_use qt4 QT4_BUILD)
-		$(cmake-utils_use test BUILD_TESTS)
-		$(with_plugin_use botan)
-		$(with_plugin_use sasl cyrus-sasl)
-		$(with_plugin_use gcrypt)
-		$(with_plugin_use gpg gnupg)
-		$(with_plugin_use logger)
-		$(with_plugin_use nss)
-		$(with_plugin_use openssl ossl)
-		$(with_plugin_use pkcs11)
-		$(with_plugin_use softstore)
+		$(qca_plugin_use botan)
+		$(qca_plugin_use gcrypt)
+		$(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)
 	)
-	if use qt4; then
-		mycmakeargs+=(-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt4/plugins/crypto")
-	else
-		mycmakeargs+=(-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt5/plugins/crypto")
-	fi
-
 	cmake-utils_src_configure
 }
 
@@ -81,14 +75,14 @@ src_install() {
 	cmake-utils_src_install
 
 	if use doc; then
-		pushd "${BUILD_DIR}"
-		doxygen Doxyfile
+		pushd "${BUILD_DIR}" >/dev/null
+		doxygen Doxyfile || die
 		dohtml apidocs/html/*
-		popd
+		popd >/dev/null
 	fi
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/
+		insinto /usr/share/doc/${PF}
 		doins -r "${S}"/examples
 	fi
 }