From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C77BD13877A for ; Thu, 21 Aug 2014 02:55:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFF57E07D3; Thu, 21 Aug 2014 02:55:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68269E07D8 for ; Thu, 21 Aug 2014 02:55:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 175BB340296 for ; Thu, 21 Aug 2014 01:00:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B43393A85 for ; Thu, 21 Aug 2014 01:00:27 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1408582813.a00efb254eca85bbfca006d9f901e55d1e90cdfa.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: app-crypt/qca/ X-VCS-Repository: proj/qt X-VCS-Files: app-crypt/qca/qca-9999.ebuild X-VCS-Directories: app-crypt/qca/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: a00efb254eca85bbfca006d9f901e55d1e90cdfa X-VCS-Branch: master Date: Thu, 21 Aug 2014 01:00:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 80302d48-9088-439f-8ca9-b3faaf0c63ad X-Archives-Hash: 69525d96a2884fb221beb0c83237095d commit: a00efb254eca85bbfca006d9f901e55d1e90cdfa Author: Davide Pesavento gentoo org> AuthorDate: Thu Aug 21 01:00:13 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Aug 21 01:00:13 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a00efb25 [app-crypt/qca] Specify correct QCA_FEATURE_INSTALL_DIR. Package-Manager: portage-2.2.12 --- app-crypt/qca/qca-9999.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-crypt/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild index 395eb61..d3bed01 100644 --- a/app-crypt/qca/qca-9999.ebuild +++ b/app-crypt/qca/qca-9999.ebuild @@ -13,7 +13,9 @@ EGIT_REPO_URI="git://anongit.kde.org/${PN}.git" LICENSE="LGPL-2.1" SLOT="2" KEYWORDS="" + IUSE="botan debug doc examples gcrypt gpg logger nss openssl pkcs11 +qt4 qt5 sasl softstore test" +REQUIRED_USE="^^ ( qt4 qt5 )" RDEPEND=" !app-crypt/qca-cyrus-sasl @@ -45,7 +47,6 @@ DEPEND="${RDEPEND} qt5? ( dev-qt/qttest:5 ) ) " -REQUIRED_USE="^^ ( qt4 qt5 )" DOCS=( README TODO ) @@ -55,7 +56,8 @@ qca_plugin_use() { src_configure() { local mycmakeargs=( - -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/$(usev qt4 || usev qt5)/plugins/crypto" + -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/$(usex qt4 qt4 qt5)/plugins/crypto" + -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}/usr/$(usex qt4 share $(get_libdir))/$(usex qt4 qt4 qt5)/mkspecs/features" $(cmake-utils_use qt4 QT4_BUILD) $(qca_plugin_use botan) $(qca_plugin_use gcrypt)