Shorten pkg setup. Sort functions.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

diff --git a/net-libs/telepathy-qt/ChangeLog b/net-libs/telepathy-qt/ChangeLog
index 648d30a027a6a786171255e567c55c4637866bb8..8640602b678815fef1f5853ca5df4c202df0115d 100644 (file)
--- a/net-libs/telepathy-qt/ChangeLog
+++ b/net-libs/telepathy-qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/telepathy-qt
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.30 2014/09/15 16:41:59 johu Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v 1.31 2015/01/30 22:24:22 johu Exp $
+
+  30 Jan 2015; Johannes Huber <johu@gentoo.org> telepathy-qt-0.9.5.ebuild:
+  Shorten pkg setup. Sort functions.
 
 *telepathy-qt-0.9.5 (15 Sep 2014)
 

diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild
index 43446f6e98ac4200493523be79a2228e23f69dd9..4987038cf352c6ce00e7e509896e49091e8f0e3c 100644 (file)
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild,v 1.1 2014/09/15 16:41:59 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild,v 1.2 2015/01/30 22:24:22 johu Exp $
 
 EAPI=5
 
@@ -52,13 +52,7 @@ RESTRICT="test"
 
 pkg_setup() {
        python-any-r1_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() {
@@ -86,10 +80,6 @@ src_compile() {
        multibuild_foreach_variant cmake-utils_src_compile
 }
 
-src_install() {
-       multibuild_foreach_variant cmake-utils_src_install
-}
-
 src_test() {
        mytest() {
                pushd "${BUILD_DIR}" > /dev/null
@@ -99,3 +89,7 @@ src_test() {
 
        multibuild_foreach_variant mytest
 }
+
+src_install() {
+       multibuild_foreach_variant cmake-utils_src_install
+}