vapier 14/05/04 15:27:38 Modified: gmock-1.7.0-r1.ebuild ChangeLog Log: Force python-2.x when running tests #455276 by Markus Oehme. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.2 dev-cpp/gmock/gmock-1.7.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild?r1=1.1&r2=1.2 Index: gmock-1.7.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gmock-1.7.0-r1.ebuild 27 Mar 2014 02:35:20 -0000 1.1 +++ gmock-1.7.0-r1.ebuild 4 May 2014 15:27:38 -0000 1.2 @@ -1,10 +1,12 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.1 2014/03/27 02:35:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.2 2014/05/04 15:27:38 vapier Exp $ EAPI="4" -inherit libtool multilib-minimal +PYTHON_COMPAT=( python2_7 ) + +inherit libtool multilib-minimal python-any-r1 DESCRIPTION="Google's C++ mocking framework" HOMEPAGE="http://code.google.com/p/googlemock/"; @@ -17,8 +19,15 @@ RDEPEND="=dev-cpp/gtest-${PV}*[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} + test? ( ${PYTHON_DEPS} ) app-arch/unzip" +pkg_setup() { + # Stub to disable python_setup running when USE=-test. + # We'll handle it down in src_test ourselves. + : +} + src_unpack() { default # make sure we always use the system one @@ -36,6 +45,11 @@ ECONF_SOURCE=${S} econf $(use_enable static-libs static) } +multilib_src_test() { + python_setup + emake check +} + multilib_src_install() { default dobin scripts/gmock-config 1.21 dev-cpp/gmock/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gmock/ChangeLog?rev=1.21&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gmock/ChangeLog?rev=1.21&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gmock/ChangeLog?r1=1.20&r2=1.21 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ChangeLog 27 Mar 2014 02:35:20 -0000 1.20 +++ ChangeLog 4 May 2014 15:27:38 -0000 1.21 @@ -1,6 +1,9 @@ # ChangeLog for dev-cpp/gmock # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.20 2014/03/27 02:35:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.21 2014/05/04 15:27:38 vapier Exp $ + + 04 May 2014; Mike Frysinger <[email protected]> gmock-1.7.0-r1.ebuild: + Force python-2.x when running tests #455276 by Markus Oehme. *gmock-1.7.0-r1 (27 Mar 2014)
