diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-11-05 15:38:18 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-11-05 15:38:18 +0000 |
| commit | 9ecf189e9201624391456958100f4ff1bf73ed77 (patch) | |
| tree | 0efdad0e49c2b021fdf4f835764f7d7db35ab7b5 /dev-util/coccinelle | |
| parent | x86 stable, see bug 389133 (diff) | |
| download | gentoo-2-9ecf189e9201624391456958100f4ff1bf73ed77.tar.gz gentoo-2-9ecf189e9201624391456958100f4ff1bf73ed77.tar.bz2 gentoo-2-9ecf189e9201624391456958100f4ff1bf73ed77.zip | |
Conditionalize python related setup.
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/coccinelle')
| -rw-r--r-- | dev-util/coccinelle/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/coccinelle/coccinelle-1.0.0_rc7.ebuild | 18 |
2 files changed, 15 insertions, 8 deletions
diff --git a/dev-util/coccinelle/ChangeLog b/dev-util/coccinelle/ChangeLog index edba328c7d7a..525ceac5994d 100644 --- a/dev-util/coccinelle/ChangeLog +++ b/dev-util/coccinelle/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/coccinelle # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.12 2011/11/04 08:07:40 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.13 2011/11/05 15:38:18 radhermit Exp $ + + 05 Nov 2011; Tim Harder <radhermit@gentoo.org> coccinelle-1.0.0_rc7.ebuild: + Conditionalize python related setup. *coccinelle-1.0.0_rc7 (04 Nov 2011) diff --git a/dev-util/coccinelle/coccinelle-1.0.0_rc7.ebuild b/dev-util/coccinelle/coccinelle-1.0.0_rc7.ebuild index 7164a5d39350..14234042cf02 100644 --- a/dev-util/coccinelle/coccinelle-1.0.0_rc7.ebuild +++ b/dev-util/coccinelle/coccinelle-1.0.0_rc7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc7.ebuild,v 1.1 2011/11/04 08:07:40 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc7.ebuild,v 1.2 2011/11/05 15:38:18 radhermit Exp $ EAPI="4" PYTHON_DEPEND="python? 2" @@ -36,8 +36,10 @@ DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt ) S="${WORKDIR}/${MY_P}" pkg_setup() { - python_set_active_version 2 - python_pkg_setup + if use python ; then + python_set_active_version 2 + python_pkg_setup + fi } src_prepare() { @@ -45,10 +47,12 @@ src_prepare() { epatch "${FILESDIR}"/${P}-pcre-linking.patch epatch "${FILESDIR}"/${P}-parallel-make.patch - # Fix python install location - sed -i -e "s:\$(SHAREDIR)/python:$(python_get_sitedir):" Makefile || die - sed -i -e "/export PYTHONPATH/s:\$COCCINELLE_HOME/python:$(python_get_sitedir):" \ - scripts/spatch.sh || die + if use python ; then + # Fix python install location + sed -i -e "s:\$(SHAREDIR)/python:$(python_get_sitedir):" Makefile || die + sed -i -e "/export PYTHONPATH/s:\$COCCINELLE_HOME/python:$(python_get_sitedir):" \ + scripts/spatch.sh || die + fi } src_configure() { |