public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: app-crypt/qca/
Date: Fri, 28 Nov 2014 18:53:05 +0000 (UTC)	[thread overview]
Message-ID: <1417200782.9146141c89bf4249e78e602b1c18e858adca2143.kensington@gentoo> (raw)

commit:     9146141c89bf4249e78e602b1c18e858adca2143
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 28 18:51:43 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Nov 28 18:53:02 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9146141c

[app-crypt/qca] Add experimental multibuild support.

This is subject to change as upstream is still in flux.

Package-Manager: portage-2.2.14

---
 app-crypt/qca/qca-9999.ebuild | 76 +++++++++++++++++++++++++++++++------------
 1 file changed, 55 insertions(+), 21 deletions(-)

diff --git a/app-crypt/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild
index 8e313ba..f1c1452 100644
--- a/app-crypt/qca/qca-9999.ebuild
+++ b/app-crypt/qca/qca-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit multilib cmake-utils git-r3
+inherit cmake-utils multilib multibuild git-r3
 
 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="http://delta.affinix.com/qca/"
@@ -15,7 +15,6 @@ 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
@@ -54,31 +53,66 @@ qca_plugin_use() {
 	echo "-DWITH_${2:-$1}_PLUGIN=$(use $1 && echo yes || echo no)"
 }
 
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=( qt4 )
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=( qt5 )
+	fi
+}
+
 src_configure() {
-	local mycmakeargs=(
-		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/$(usex qt4 qt4 qt5)/plugins"
-		-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)
-		$(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)
-	)
-	cmake-utils_src_configure
+	myconfigure() {
+		local mycmakeargs=(
+			-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/$(usex qt4 qt4 qt5)/plugins"
+			-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}/usr/$(usex qt4 share $(get_libdir))/$(usex qt4 qt4 qt5)/mkspecs/features"
+			$(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 [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			mycmakeargs+=( -DQT4_BUILD=true )
+		fi
+
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=( -DQCA_SUFFIX=QT5 )
+		fi
+
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
 }
 
-src_install() {
-	cmake-utils_src_install
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
 
 	if use doc; then
-		pushd "${BUILD_DIR}" >/dev/null
+		pushd "${BUILD_DIR}" > /dev/null
 		doxygen Doxyfile || die
+		popd > /dev/null
+	fi
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+
+	if use doc; then
+		pushd "${BUILD_DIR}" > /dev/null
 		dohtml apidocs/html/*
 		popd >/dev/null
 	fi


             reply	other threads:[~2014-11-28 18:53 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-28 18:53 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-13 16:45 [gentoo-commits] proj/qt:master commit in: app-crypt/qca/ Sam James
2023-06-18 17:58 Andreas Sturmlechner
2023-06-18 15:32 Andreas Sturmlechner
2023-06-18 15:32 Andreas Sturmlechner
2023-06-13 12:16 Andreas Sturmlechner
2023-04-12  2:20 Sam James
2022-10-11 16:16 Andreas Sturmlechner
2022-10-11 15:57 Andreas Sturmlechner
2021-05-02 19:52 Andreas Sturmlechner
2021-05-02 19:52 Andreas Sturmlechner
2020-02-11 15:38 Andreas Sturmlechner
2019-12-31 16:44 Andreas Sturmlechner
2019-10-26 16:12 Andreas Sturmlechner
2018-06-12 16:05 Andreas Sturmlechner
2018-04-11 23:10 Andreas Sturmlechner
2018-04-11 23:10 Andreas Sturmlechner
2018-04-11 23:10 Andreas Sturmlechner
2017-04-25 11:36 Michael Palimaka
2017-04-25 11:32 Michael Palimaka
2016-10-28 15:19 Michael Palimaka
2015-06-30 21:47 Davide Pesavento
2015-03-04  7:55 git@oystercatcher mirror+tproxy
2015-03-04  7:55 Michael Palimaka
2015-01-29  0:27 Davide Pesavento
2014-12-02 15:50 Michael Palimaka
2014-11-29 14:15 Michael Palimaka
2014-11-29 14:15 Michael Palimaka
2014-09-24 23:19 Davide Pesavento
2014-08-21  1:00 Davide Pesavento
2014-08-21  0:34 Davide Pesavento
2014-08-20 23:52 Davide Pesavento
2014-06-29 23:24 Davide Pesavento

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1417200782.9146141c89bf4249e78e602b1c18e858adca2143.kensington@gentoo \
    --to=kensington@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox