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 | 2af133c6783bf0773d32ffec3b52eca6f3af6e80 (patch) | |
| tree | 8caf0b362c354fc7a091402be6c0811bb022d212 /dev-util | |
| parent | x86 stable, see bug 389133 (diff) | |
| download | historical-2af133c6783bf0773d32ffec3b52eca6f3af6e80.tar.gz historical-2af133c6783bf0773d32ffec3b52eca6f3af6e80.tar.bz2 historical-2af133c6783bf0773d32ffec3b52eca6f3af6e80.zip | |
Conditionalize python related setup.
Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/coccinelle/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/coccinelle/Manifest | 18 | ||||
| -rw-r--r-- | dev-util/coccinelle/coccinelle-1.0.0_rc7.ebuild | 18 |
3 files changed, 24 insertions, 17 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/Manifest b/dev-util/coccinelle/Manifest index ca94a1f31273..b38048e87cbd 100644 --- a/dev-util/coccinelle/Manifest +++ b/dev-util/coccinelle/Manifest @@ -7,17 +7,17 @@ AUX coccinelle-1.0.0_rc7-pcre.patch 1127 RMD160 e1020264de12f81f20490e2930828b19 DIST coccinelle-0.2.5.tgz 2295665 RMD160 a0811ba0a2c50b70fc52155cc062af6ba383d0d2 SHA1 fa9aed17ee23a253cf01a8571b61d1320082751b SHA256 b80360d8106be90aff4801330f0400525c980409dadf3eb6a1079a7e43c5d017 DIST coccinelle-1.0.0-rc7.tgz 2337344 RMD160 5a999e751e55232015c2741a25ea4f9835a9197c SHA1 42544ba5b5597793620b17b331612388609ef9fa SHA256 b74ab606938cd481bd4515b77f330e66e21ec6340b100a6f6dcfd9267aae53ba EBUILD coccinelle-0.2.5-r2.ebuild 1890 RMD160 6b1cb608a2a22796075db9a837138bdbdc39d96c SHA1 d89b93694e3cf94884205acd52cc974144ffb419 SHA256 3bf25cd7f660fa96e8f19b454bc853a5dd5cb1fef79e98b9219d279594d80146 -EBUILD coccinelle-1.0.0_rc7.ebuild 2486 RMD160 1463d3f45731793dbc0c38448226539abc44586f SHA1 8f7ccaf34f32e676365c609ecd18f21c75103d3c SHA256 bdb68c64b45752161ad92895112730bd7b100a020cfe0e9047cd06f9d0661f54 -MISC ChangeLog 2305 RMD160 a9d3ad6e4a69555f3e21478db2d1a13655b3053b SHA1 6ed5d2732798301294cd723c9d9b9079485374b8 SHA256 a8ceae6297aa95c68c257fec3be311869d8d65430746be6959f922674f799599 +EBUILD coccinelle-1.0.0_rc7.ebuild 2544 RMD160 42994d9bb410c48e9796cf1e8883f62c257c69bf SHA1 9c04ba25c328845b744be23edecd74a1ec2f2e72 SHA256 3ee94b636d68e2250b22ffbe2de6bc43ba98e19c1773f6173c51961f0749b1a9 +MISC ChangeLog 2423 RMD160 e8d39801c95a450ad10bebe6ae72196d9cdb485d SHA1 9ce7a20db9162e2d1fa6ba37f40b17f3c094eb46 SHA256 91b73c54caee7d757aecc36c4c29e123eb59bb3918e6551a26ca8bea560cc7f0 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOs51VAAoJEEqz6FtPBkyjDasH/R+Hu7bWnuimPAoBZgxGJVQL -gMT1cH6FEDjFF+e5hg4OO6Qct6ObkGhL2DaZExdckw6r7LJMr7/WDqin3OkIU1yy -bVWyY9/WPmYIVu6h7ra2Py84F78GJEmYTSI70T1BT7sLVgUHTtbvgmYvSfeXpdg2 -G5Yy2bNOFRTEp6/ij0x42D2zLPfdzj5f5n0cgeLvxxwZMW4gvDQizgVbkx/SdGJ6 -9oH00Xm8/CAzCg0CeKx86rqHmNSCelfBD2D7JqCRAyaYAKNhWDYPFYJGwuRx/IrW -w4diK/pMrvwpj4UrodQgvGwP1kFbbESrQ9TXBJKsmFb7/FrX621yyujDb4/Fwns= -=Oqkq +iQEcBAEBCgAGBQJOtVh8AAoJEEqz6FtPBkyjmd8IAK/YVfqkOZLeC05h5hGJhm1D +i6yKRcK4np1+TT07l955RdlC9p+nZ4U3rmO2smPipDow8s/7l/VfwBL/Q5Kpvjbo +Q8RYySjoxXKA+lJ2Cd9sfyCg292YgYy0hNnXUfi8UOZxZArKWYb4298gk9NCDzAZ +jdh3l9pEtTRZCH+XbUKHhoQJ0SQ9IM865KgB+AsnUETD4dZ4pSiBkGQUI1ygl5kq +4ZYm6MT1x7eatgsh2eWO1Ul++ZnoCi8vr9mQ+kCTBYyvc4fyJ1JluG6RyEkO7jqe +KTpnPMKA6a13qzWfwPwVb+DjmG+8uIhsp1+oXeAfa1CkomJaT6ArFPBUU6tOYck= +=vUmq -----END PGP SIGNATURE----- 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() { |