diff options
| author |   Alexys Jacob <ultrabug@gentoo.org> | 2013-05-23 09:58:33 +0000 |
|---|---|---|
| committer | Alexys Jacob <ultrabug@gentoo.org> | 2013-05-23 09:58:33 +0000 |
| commit | f686812393a151ccbda1aed2357dc76297f096a0 (patch) | |
| tree | 4cac4fdcc06e883ccc882fe7ed1278c64776e001 | |
| parent | Bump for #470868 (diff) | |
| download | gentoo-2-f686812393a151ccbda1aed2357dc76297f096a0.tar.gz gentoo-2-f686812393a151ccbda1aed2357dc76297f096a0.tar.bz2 gentoo-2-f686812393a151ccbda1aed2357dc76297f096a0.zip | |
fix #466668 thx to jer
(Portage version: 2.1.12.1/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
| -rw-r--r-- | sys-cluster/crmsh/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild (renamed from sys-cluster/crmsh/crmsh-1.2.5-r1.ebuild) | 26 |
2 files changed, 29 insertions, 5 deletions
diff --git a/sys-cluster/crmsh/ChangeLog b/sys-cluster/crmsh/ChangeLog index dbe66ee9209b..f13c1306d028 100644 --- a/sys-cluster/crmsh/ChangeLog +++ b/sys-cluster/crmsh/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-cluster/crmsh # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/ChangeLog,v 1.5 2013/05/17 10:13:43 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/ChangeLog,v 1.6 2013/05/23 09:58:33 ultrabug Exp $ + +*crmsh-1.2.5-r2 (23 May 2013) + + 23 May 2013; Ultrabug <ultrabug@gentoo.org> -crmsh-1.2.5-r1.ebuild, + +crmsh-1.2.5-r2.ebuild: + fix #466668 thx to jer *crmsh-1.2.5-r1 (17 May 2013) diff --git a/sys-cluster/crmsh/crmsh-1.2.5-r1.ebuild b/sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild index 20b17495b3b0..66210bbce0e1 100644 --- a/sys-cluster/crmsh/crmsh-1.2.5-r1.ebuild +++ b/sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/crmsh-1.2.5-r1.ebuild,v 1.1 2013/05/17 10:13:44 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild,v 1.1 2013/05/23 09:58:33 ultrabug Exp $ -EAPI=4 +EAPI=5 +PYTHON_COMPAT="python2_7" -inherit autotools-utils +inherit autotools-utils python-single-r1 MY_TREE="ef3f08547688" @@ -15,10 +16,11 @@ SRC_URI="http://hg.savannah.gnu.org/hgweb/crmsh/archive/${MY_TREE}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~hppa ~x86" -IUSE="" +IUSE="python" DEPEND=" >=sys-cluster/pacemaker-1.1.8 + || ( dev-lang/python:2.7 dev-lang/python:2.6 ) " RDEPEND="${DEPEND}" @@ -27,5 +29,21 @@ S="${WORKDIR}/${PN}-${MY_TREE}" src_prepare() { sed -e 's@CRM_CACHE_DIR=${localstatedir}/cache/crm@CRM_CACHE_DIR=${localstatedir}/crmsh@g' \ -i configure.ac || die + sed -e 's:/usr/bin/python$:/usr/bin/python2.7:g' -i "${S}/crm" || die eautoreconf } + +src_configure() { + configure_crmsh() { + PYTHON="/usr/bin/python2.7" econf + } + configure_crmsh +} + +src_compile() { + default +} + +src_install() { + default +} |