* [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/
@ 2014-03-15 14:12 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-03-15 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 18556610a863ccf20f137c05dadffd1cdf6bd08e
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 14:12:38 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 15 14:12:38 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=18556610
[dev-libs/qtkeychain] Sync with tree
Package-Manager: portage-2.2.8-r1
---
dev-libs/qtkeychain/qtkeychain-9999.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-libs/qtkeychain/qtkeychain-9999.ebuild b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
index 9db6bed..5b4e581 100644
--- a/dev-libs/qtkeychain/qtkeychain-9999.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -27,6 +27,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+DOCS=( ChangeLog ReadMe.txt )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_build !qt5 WITH_QT4)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/
@ 2014-04-17 19:59 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-04-17 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 35452a2020f4baf53dda5fcde222dc8a8bce7cc6
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 17 17:59:22 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> 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 <uwelk <AT> 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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/
@ 2015-05-29 20:19 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2015-05-29 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 392a751cd089ecac087cf5ad2ef4eb43b1ba6c02
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 29 20:19:36 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 29 20:19:36 2015 +0000
URL: https://gitweb.gentoo.org/dev/johu.git/commit/?id=392a751c
[dev-libs/qtkeychain] Sync with tree
Package-Manager: portage-2.2.20
dev-libs/qtkeychain/qtkeychain-9999.ebuild | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/dev-libs/qtkeychain/qtkeychain-9999.ebuild b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
index b8daadb..cb23d1e 100644
--- a/dev-libs/qtkeychain/qtkeychain-9999.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -34,13 +34,7 @@ DEPEND="${RDEPEND}
DOCS=( ChangeLog ReadMe.txt )
pkg_setup() {
- MULTIBUILD_VARIANTS=()
- if use qt4; then
- MULTIBUILD_VARIANTS+=(qt4)
- fi
- if use qt5; then
- MULTIBUILD_VARIANTS+=(qt5)
- fi
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
}
src_configure() {
@@ -61,10 +55,10 @@ src_compile() {
multibuild_foreach_variant cmake-utils_src_compile
}
-src_install() {
- multibuild_foreach_variant cmake-utils_src_install
-}
-
src_test() {
multibuild_foreach_variant cmake-utils_src_test
}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/
@ 2016-03-13 11:33 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2016-03-13 11:33 UTC (permalink / raw
To: gentoo-commits
commit: 4559a535d33058568cd62024eb8e346df850b674
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 11:33:14 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 11:33:14 2016 +0000
URL: https://gitweb.gentoo.org/dev/johu.git/commit/?id=4559a535
dev-libs/qtkeychain: EAPI 6
Package-Manager: portage-2.2.28
dev-libs/qtkeychain/qtkeychain-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/qtkeychain/qtkeychain-9999.ebuild b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
index 7313ca0..0593c50 100644
--- a/dev-libs/qtkeychain/qtkeychain-9999.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit cmake-utils multibuild git-r3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/
@ 2016-04-11 17:00 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2016-04-11 17:00 UTC (permalink / raw
To: gentoo-commits
commit: 809ed23a98c41e90bca2d4e255c5881da75bb5b4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 17:00:18 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 17:00:18 2016 +0000
URL: https://gitweb.gentoo.org/dev/johu.git/commit/?id=809ed23a
dev-libs/qtkeychain: Sync with tree
Package-Manager: portage-2.2.28
dev-libs/qtkeychain/qtkeychain-9999.ebuild | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/dev-libs/qtkeychain/qtkeychain-9999.ebuild b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
index 0593c50..3f99080 100644
--- a/dev-libs/qtkeychain/qtkeychain-9999.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
@@ -45,6 +45,12 @@ src_configure() {
if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
local mycmakeargs=(-DBUILD_WITH_QT4=OFF)
fi
+
+ mycmakeargs+=(
+ -DQTKEYCHAIN_STATIC=OFF
+ -DBUILD_TRANSLATIONS=ON
+ )
+
cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/
@ 2016-05-23 20:04 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2016-05-23 20:04 UTC (permalink / raw
To: gentoo-commits
commit: c18c6ae2b0247b2cd4b4d04e576e9962c699f06d
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 19:51:43 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon May 23 19:51:43 2016 +0000
URL: https://gitweb.gentoo.org/dev/johu.git/commit/?id=c18c6ae2
dev-libs/qtkeychain: Introduce subslot
Package-Manager: portage-2.3.0_rc1
dev-libs/qtkeychain/qtkeychain-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/qtkeychain/qtkeychain-9999.ebuild b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
index 3f99080..b7425c9 100644
--- a/dev-libs/qtkeychain/qtkeychain-9999.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
EGIT_REPO_URI="git://github.com/frankosterfeld/${PN}"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/1"
KEYWORDS=""
IUSE="+qt4 qt5"
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-05-23 20:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-15 14:12 [gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2014-04-17 19:59 Johannes Huber
2015-05-29 20:19 Johannes Huber
2016-03-13 11:33 Johannes Huber
2016-04-11 17:00 Johannes Huber
2016-05-23 20:04 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox