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 5D503138A1F for ; Thu, 17 Apr 2014 19:59:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 951CDE0B3B; Thu, 17 Apr 2014 19:59:56 +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 26805E0B3B for ; Thu, 17 Apr 2014 19:59:56 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C52B33FC21 for ; Thu, 17 Apr 2014 19:59:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id CD8A118167 for ; Thu, 17 Apr 2014 19:59:53 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1397757562.35452a2020f4baf53dda5fcde222dc8a8bce7cc6.johu@gentoo> Subject: [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/ X-VCS-Repository: dev/johu X-VCS-Files: dev-libs/qtkeychain/qtkeychain-9999.ebuild X-VCS-Directories: dev-libs/qtkeychain/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 35452a2020f4baf53dda5fcde222dc8a8bce7cc6 X-VCS-Branch: master Date: Thu, 17 Apr 2014 19:59:53 +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: fbf3d86f-ec33-4f92-9893-7abf0eebe3d9 X-Archives-Hash: 67f62321d2c2f1ad9601fb558656e0a8 commit: 35452a2020f4baf53dda5fcde222dc8a8bce7cc6 Author: Johannes Huber gentoo org> AuthorDate: Thu Apr 17 17:59:22 2014 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu Apr 17 17:59:22 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=35452a20 [dev-libs/qtkeychain] Qt multibuild by Uwe L. Korn xhochy.com> Package-Manager: portage-2.2.10 --- dev-libs/qtkeychain/qtkeychain-9999.ebuild | 50 ++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/dev-libs/qtkeychain/qtkeychain-9999.ebuild b/dev-libs/qtkeychain/qtkeychain-9999.ebuild index 5b4e581..b8daadb 100644 --- a/dev-libs/qtkeychain/qtkeychain-9999.ebuild +++ b/dev-libs/qtkeychain/qtkeychain-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit cmake-utils git-r3 +inherit cmake-utils multibuild git-r3 DESCRIPTION="Qt API for storing passwords securely" HOMEPAGE="https://github.com/frankosterfeld/qtkeychain" @@ -13,26 +13,58 @@ EGIT_REPO_URI="git://github.com/frankosterfeld/${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="qt5" +IUSE="+qt4 qt5" -DEPEND=" +REQUIRED_USE="|| ( qt4 qt5 )" + +RDEPEND=" qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 ) - !qt5? ( + qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + qt5? ( dev-qt/linguist-tools:5 ) +" DOCS=( ChangeLog ReadMe.txt ) +pkg_setup() { + MULTIBUILD_VARIANTS=() + if use qt4; then + MULTIBUILD_VARIANTS+=(qt4) + fi + if use qt5; then + MULTIBUILD_VARIANTS+=(qt5) + fi +} + src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build !qt5 WITH_QT4) - ) + myconfigure() { + if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then + local mycmakeargs=(-DBUILD_WITH_QT4=ON) + fi + if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then + local mycmakeargs=(-DBUILD_WITH_QT4=OFF) + fi + cmake-utils_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake-utils_src_compile +} + +src_install() { + multibuild_foreach_variant cmake-utils_src_install +} - cmake-utils_src_configure +src_test() { + multibuild_foreach_variant cmake-utils_src_test }