diff options
| author |   Johannes Huber <johu@gentoo.org> | 2015-01-30 22:24:22 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2015-01-30 22:24:22 +0000 |
| commit | 80eb636909a48f544d10a1e3477331eab6e34b2a (patch) | |
| tree | 3fb772f4dee42fd7ef9dc8966c285af0af4a9d77 | |
| parent | Shorten pkg setup. Sort functions. Remove old. (diff) | |
| download | gentoo-2-80eb636909a48f544d10a1e3477331eab6e34b2a.tar.gz gentoo-2-80eb636909a48f544d10a1e3477331eab6e34b2a.tar.bz2 gentoo-2-80eb636909a48f544d10a1e3477331eab6e34b2a.zip | |
Shorten pkg setup. Sort functions.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
| -rw-r--r-- | net-libs/telepathy-qt/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild | 20 |
2 files changed, 12 insertions, 15 deletions
diff --git a/net-libs/telepathy-qt/ChangeLog b/net-libs/telepathy-qt/ChangeLog index 648d30a027a6..8640602b6788 100644 --- 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 43446f6e98ac..4987038cf352 100644 --- 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 +} |