johu 15/01/30 22:24:22 Modified: telepathy-qt-0.9.5.ebuild ChangeLog Log: Shorten pkg setup. Sort functions. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Revision Changes Path 1.2 net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild?r1=1.1&r2=1.2 Index: telepathy-qt-0.9.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- telepathy-qt-0.9.5.ebuild 15 Sep 2014 16:41:59 -0000 1.1 +++ telepathy-qt-0.9.5.ebuild 30 Jan 2015 22:24:22 -0000 1.2 @@ -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 @@ 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 @@ 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 @@ multibuild_foreach_variant mytest } + +src_install() { + multibuild_foreach_variant cmake-utils_src_install +} 1.31 net-libs/telepathy-qt/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/telepathy-qt/ChangeLog?rev=1.31&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/telepathy-qt/ChangeLog?rev=1.31&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/telepathy-qt/ChangeLog?r1=1.30&r2=1.31 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/ChangeLog,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- ChangeLog 15 Sep 2014 16:41:59 -0000 1.30 +++ ChangeLog 30 Jan 2015 22:24:22 -0000 1.31 @@ -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 <[email protected]> telepathy-qt-0.9.5.ebuild: + Shorten pkg setup. Sort functions. *telepathy-qt-0.9.5 (15 Sep 2014)
