From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/qtkeychain/
Date: Tue, 5 Sep 2017 18:54:58 +0000 (UTC) [thread overview]
Message-ID: <1504637688.9e0e1395d26965ff36730a54f9bf46ced110ce3b.johu@gentoo> (raw)
commit: 9e0e1395d26965ff36730a54f9bf46ced110ce3b
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 5 18:54:18 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 18:54:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e0e1395
dev-libs/qtkeychain: Restore qt4/qt5 use flags
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild | 58 +++++++++++++++++++++++------
1 file changed, 46 insertions(+), 12 deletions(-)
diff --git a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
index c82410ffc7a..8763ecfe4d8 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils
+inherit cmake-utils multibuild
DESCRIPTION="Qt API for storing passwords securely"
HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
@@ -12,26 +12,60 @@ SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.t
LICENSE="BSD"
SLOT="0/1"
KEYWORDS="~amd64 ~x86"
-IUSE="gnome-keyring"
+IUSE="gnome-keyring qt4 +qt5"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ )
"
DEPEND="${RDEPEND}
gnome-keyring? ( gnome-base/libgnome-keyring )
- dev-qt/linguist-tools:5
+ qt5? ( dev-qt/linguist-tools:5 )
"
DOCS=( ChangeLog ReadMe.txt )
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
src_configure() {
- local mycmakeargs+=(
- -DBUILD_WITH_QT4=OFF
- -DQTKEYCHAIN_STATIC=OFF
- -DBUILD_TRANSLATIONS=ON
- -DLIBSECRET_SUPPORT=$(usex gnome-keyring)
- )
+ 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
+
+ mycmakeargs+=(
+ -DQTKEYCHAIN_STATIC=OFF
+ -DBUILD_TRANSLATIONS=ON
+ -DLIBSECRET_SUPPORT=$(usex gnome-keyring)
+ )
+
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ multibuild_foreach_variant cmake-utils_src_test
+}
- cmake-utils_src_configure
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
}
next reply other threads:[~2017-09-05 18:55 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-05 18:54 Johannes Huber [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-06-29 18:41 [gentoo-commits] repo/gentoo:master commit in: dev-libs/qtkeychain/ Andreas Sturmlechner
2024-06-17 5:54 Arthur Zamarin
2024-06-17 5:19 Arthur Zamarin
2024-05-14 17:41 Andreas Sturmlechner
2024-03-06 20:32 Andreas Sturmlechner
2023-12-25 17:04 Andreas Sturmlechner
2023-07-09 10:09 Andreas Sturmlechner
2023-06-28 23:59 Sam James
2023-06-28 21:14 Sam James
2023-06-28 21:14 Sam James
2023-06-10 19:04 Andreas Sturmlechner
2023-06-10 19:04 Andreas Sturmlechner
2023-06-08 19:38 Andreas Sturmlechner
2023-06-03 7:09 WANG Xuerui
2021-12-12 22:15 Andreas Sturmlechner
2021-12-10 22:13 Sam James
2021-12-10 20:54 Sam James
2021-12-10 17:04 Jakov Smolić
2021-11-19 9:55 Andreas Sturmlechner
2021-11-19 9:55 Andreas Sturmlechner
2021-11-09 7:14 Andreas Sturmlechner
2021-11-07 17:23 Andreas Sturmlechner
2021-11-07 16:12 Andreas Sturmlechner
2021-10-11 12:30 Andreas Sturmlechner
2021-10-10 4:45 Yixun Lan
2021-10-02 12:58 Andreas Sturmlechner
2021-07-17 8:47 Andreas Sturmlechner
2021-04-27 18:02 Sam James
2021-04-27 18:01 Sam James
2020-12-08 7:37 Johannes Huber
2020-08-03 23:25 Sam James
2020-03-28 8:33 Johannes Huber
2020-03-19 6:39 Johannes Huber
2020-02-19 1:31 Georgy Yakovlev
2020-02-18 16:58 Johannes Huber
2020-02-17 12:13 Agostino Sarubbo
2020-02-16 21:14 Thomas Deutschmann
2020-01-12 11:02 Johannes Huber
2020-01-02 11:42 Johannes Huber
2018-10-07 20:32 Johannes Huber
2018-10-07 11:53 Mikle Kolyada
2018-10-06 23:05 Thomas Deutschmann
2018-07-17 8:31 Johannes Huber
2018-03-31 19:01 Mart Raudsepp
2018-02-22 17:34 Johannes Huber
2018-02-06 15:10 Thomas Deutschmann
2018-01-28 12:10 Johannes Huber
2017-09-01 21:41 Andreas Sturmlechner
2017-01-10 18:08 Johannes Huber
2017-01-09 10:24 Aaron Bauman
2017-01-08 14:43 Johannes Huber
2016-06-27 18:30 Johannes Huber
2016-05-23 20:04 Johannes Huber
2016-05-23 20:04 Johannes Huber
2016-05-13 8:41 Agostino Sarubbo
2016-04-11 16:59 Johannes Huber
2016-03-13 11:32 Johannes Huber
2016-01-05 10:49 Agostino Sarubbo
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=1504637688.9e0e1395d26965ff36730a54f9bf46ced110ce3b.johu@gentoo \
--to=johu@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