[gentoo-commits] dev/johu:master commit in: dev-libs/qtkeychain/

[Johannes Huber]

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
+}