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 190F0138D03 for ; Tue, 30 Jun 2015 21:47:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9431E089A; Tue, 30 Jun 2015 21:47:49 +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 6370AE089A for ; Tue, 30 Jun 2015 21:47:49 +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 4C4C1340792 for ; Tue, 30 Jun 2015 21:47:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D2A4741 for ; Tue, 30 Jun 2015 21:47:43 +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: <1435700852.2201d9297b858a9eacd0bfed524fa9ed89c0488b.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: 2201d9297b858a9eacd0bfed524fa9ed89c0488b X-VCS-Branch: master Date: Tue, 30 Jun 2015 21:47:43 +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: 9ed2caf9-1f1c-4b67-9396-df7333c65b08 X-Archives-Hash: 5a45166cc8fcad5db5a3db80daeee9b6 commit: 2201d9297b858a9eacd0bfed524fa9ed89c0488b Author: Davide Pesavento gentoo org> AuthorDate: Tue Jun 30 21:47:32 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Jun 30 21:47:32 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2201d929 [app-crypt/qca] Sync. Package-Manager: portage-2.2.20 app-crypt/qca/qca-9999.ebuild | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/app-crypt/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild index b8498a1..8174e3e 100644 --- a/app-crypt/qca/qca-9999.ebuild +++ b/app-crypt/qca/qca-9999.ebuild @@ -4,14 +4,11 @@ EAPI=5 -# for multibuild support, until merged to master -EGIT_BRANCH="qt5" - -inherit multilib cmake-utils multibuild git-r3 +inherit cmake-utils multibuild qmake-utils git-r3 DESCRIPTION="Qt Cryptographic Architecture (QCA)" HOMEPAGE="http://delta.affinix.com/qca/" -EGIT_REPO_URI="git://anongit.kde.org/${PN}" +EGIT_REPO_URI=("git://anongit.kde.org/${PN}.git") LICENSE="LGPL-2.1" SLOT="2" @@ -56,7 +53,7 @@ DOCS=( README TODO ) PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" ) qca_plugin_use() { - echo "-DWITH_${2:-$1}_PLUGIN=$(use $1 && echo yes || echo no)" + echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1") } pkg_setup() { @@ -66,6 +63,8 @@ pkg_setup() { src_configure() { myconfigure() { local mycmakeargs=( + -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features" + -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)" $(qca_plugin_use botan) $(qca_plugin_use gcrypt) $(qca_plugin_use gpg gnupg) @@ -78,19 +77,8 @@ src_configure() { $(cmake-utils_use_build test TESTS) ) - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - mycmakeargs+=( - -DQT4_BUILD=ON - -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt4/plugins" - -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}/usr/share/qt4/mkspecs/features" - ) - fi - - if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then - mycmakeargs+=( - -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt5/plugins" - -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs/features" - ) + if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then + mycmakeargs+=(-DQT4_BUILD=ON) fi cmake-utils_src_configure @@ -104,17 +92,22 @@ src_compile() { } src_test() { - multibuild_foreach_variant cmake-utils_src_test + mytest() { + local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" + cmake-utils_src_test + } + + multibuild_foreach_variant mytest } src_install() { multibuild_foreach_variant cmake-utils_src_install if use doc; then - pushd "${BUILD_DIR}" >/dev/null + pushd "${BUILD_DIR}" >/dev/null || die doxygen Doxyfile.in || die dodoc -r apidocs/html - popd >/dev/null + popd >/dev/null || die fi if use examples; then