diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-08-16 14:44:49 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-08-16 14:44:49 +0000 |
| commit | b91dbd7ade74e3c4e92d73d2e2f8888ca9553303 (patch) | |
| tree | 7b97bdd72ae3ad4e21f23bacfb7053357b706e53 /dev-cpp | |
| parent | Include new revision of sys-apps/kmod to the sys-apps/openrc 0.12 mask becaus... (diff) | |
| download | gentoo-2-b91dbd7ade74e3c4e92d73d2e2f8888ca9553303.tar.gz gentoo-2-b91dbd7ade74e3c4e92d73d2e2f8888ca9553303.tar.bz2 gentoo-2-b91dbd7ade74e3c4e92d73d2e2f8888ca9553303.zip | |
Convert to python-any-r1.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/gtest/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-cpp/gtest/gtest-1.6.0-r2.ebuild | 18 |
2 files changed, 11 insertions, 12 deletions
diff --git a/dev-cpp/gtest/ChangeLog b/dev-cpp/gtest/ChangeLog index 41082d6bbac1..3572ad9bd7ef 100644 --- a/dev-cpp/gtest/ChangeLog +++ b/dev-cpp/gtest/ChangeLog @@ -1,5 +1,8 @@ # ChangeLog for dev-cpp/gtest -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.32 2013/06/19 18:44:11 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.33 2013/08/16 14:44:49 mgorny Exp $ + + 16 Aug 2013; Michał Górny <mgorny@gentoo.org> gtest-1.6.0-r2.ebuild: + Convert to python-any-r1. 19 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> gtest-1.6.0-r2.ebuild: Keyword amd64-linux and x86-linux diff --git a/dev-cpp/gtest/gtest-1.6.0-r2.ebuild b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild index b3d31c32077b..01731a73f2f7 100644 --- a/dev-cpp/gtest/gtest-1.6.0-r2.ebuild +++ b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild @@ -1,11 +1,13 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r2.ebuild,v 1.2 2013/06/19 18:44:11 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r2.ebuild,v 1.3 2013/08/16 14:44:49 mgorny Exp $ EAPI="5" -PYTHON_DEPEND="2" -inherit eutils python autotools-multilib +# Python is required for tests and some build tasks. +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit eutils python-any-r1 autotools-multilib DESCRIPTION="Google C++ Testing Framework" HOMEPAGE="http://code.google.com/p/googletest/" @@ -16,7 +18,8 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux ~ppc-macos" IUSE="examples static-libs" -DEPEND="app-arch/unzip" +DEPEND="app-arch/unzip + ${PYTHON_DEPS}" RDEPEND="" PATCHES=( @@ -25,11 +28,6 @@ PATCHES=( AUTOTOOLS_AUTORECONF="1" -pkg_setup() { - python_pkg_setup - python_set_active_version 2 -} - src_prepare() { sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die sed -i -r \ @@ -37,8 +35,6 @@ src_prepare() { Makefile.am || die autotools-multilib_src_prepare - python_convert_shebangs -r 2 . - multilib_copy_sources } |