| 1 |
vapier 14/05/04 15:27:38 |
| 2 |
|
| 3 |
Modified: gmock-1.7.0-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Force python-2.x when running tests #455276 by Markus Oehme. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-cpp/gmock/gmock-1.7.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild?rev=1.2&view=markup |
| 13 |
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 |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: gmock-1.7.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- gmock-1.7.0-r1.ebuild 27 Mar 2014 02:35:20 -0000 1.1 |
| 23 |
+++ gmock-1.7.0-r1.ebuild 4 May 2014 15:27:38 -0000 1.2 |
| 24 |
@@ -1,10 +1,12 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
|
| 32 |
-inherit libtool multilib-minimal |
| 33 |
+PYTHON_COMPAT=( python2_7 ) |
| 34 |
+ |
| 35 |
+inherit libtool multilib-minimal python-any-r1 |
| 36 |
|
| 37 |
DESCRIPTION="Google's C++ mocking framework" |
| 38 |
HOMEPAGE="http://code.google.com/p/googlemock/" |
| 39 |
@@ -17,8 +19,15 @@ |
| 40 |
|
| 41 |
RDEPEND="=dev-cpp/gtest-${PV}*[${MULTILIB_USEDEP}]" |
| 42 |
DEPEND="${RDEPEND} |
| 43 |
+ test? ( ${PYTHON_DEPS} ) |
| 44 |
app-arch/unzip" |
| 45 |
|
| 46 |
+pkg_setup() { |
| 47 |
+ # Stub to disable python_setup running when USE=-test. |
| 48 |
+ # We'll handle it down in src_test ourselves. |
| 49 |
+ : |
| 50 |
+} |
| 51 |
+ |
| 52 |
src_unpack() { |
| 53 |
default |
| 54 |
# make sure we always use the system one |
| 55 |
@@ -36,6 +45,11 @@ |
| 56 |
ECONF_SOURCE=${S} econf $(use_enable static-libs static) |
| 57 |
} |
| 58 |
|
| 59 |
+multilib_src_test() { |
| 60 |
+ python_setup |
| 61 |
+ emake check |
| 62 |
+} |
| 63 |
+ |
| 64 |
multilib_src_install() { |
| 65 |
default |
| 66 |
dobin scripts/gmock-config |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.21 dev-cpp/gmock/ChangeLog |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gmock/ChangeLog?rev=1.21&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gmock/ChangeLog?rev=1.21&content-type=text/plain |
| 74 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/gmock/ChangeLog?r1=1.20&r2=1.21 |
| 75 |
|
| 76 |
Index: ChangeLog |
| 77 |
=================================================================== |
| 78 |
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v |
| 79 |
retrieving revision 1.20 |
| 80 |
retrieving revision 1.21 |
| 81 |
diff -u -r1.20 -r1.21 |
| 82 |
--- ChangeLog 27 Mar 2014 02:35:20 -0000 1.20 |
| 83 |
+++ ChangeLog 4 May 2014 15:27:38 -0000 1.21 |
| 84 |
@@ -1,6 +1,9 @@ |
| 85 |
# ChangeLog for dev-cpp/gmock |
| 86 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 87 |
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.20 2014/03/27 02:35:20 vapier Exp $ |
| 88 |
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.21 2014/05/04 15:27:38 vapier Exp $ |
| 89 |
+ |
| 90 |
+ 04 May 2014; Mike Frysinger <vapier@g.o> gmock-1.7.0-r1.ebuild: |
| 91 |
+ Force python-2.x when running tests #455276 by Markus Oehme. |
| 92 |
|
| 93 |
*gmock-1.7.0-r1 (27 Mar 2014) |
Archives