diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-06-04 12:17:49 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-06-04 12:17:49 +0000 |
| commit | 833d7c2ce3a4f77150f9de7808ecdc658014a36b (patch) | |
| tree | 73a8388c6b72a91dcae8f6cbdc3de07b3a9b468a /sys-cluster | |
| parent | Version bump to 1.9.0. (diff) | |
| download | gentoo-2-833d7c2ce3a4f77150f9de7808ecdc658014a36b.tar.gz gentoo-2-833d7c2ce3a4f77150f9de7808ecdc658014a36b.tar.bz2 gentoo-2-833d7c2ce3a4f77150f9de7808ecdc658014a36b.zip | |
sys-cluster/crmsh: Fix for correct usage of new python eclasses
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/crmsh/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-cluster/crmsh/crmsh-1.2.5-r3.ebuild (renamed from sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild) | 35 | ||||
| -rw-r--r-- | sys-cluster/crmsh/metadata.xml | 2 |
3 files changed, 19 insertions, 26 deletions
diff --git a/sys-cluster/crmsh/ChangeLog b/sys-cluster/crmsh/ChangeLog index f13c1306d028..d56077ec4500 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.6 2013/05/23 09:58:33 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/ChangeLog,v 1.7 2013/06/04 12:17:49 jlec Exp $ + +*crmsh-1.2.5-r3 (04 Jun 2013) + + 04 Jun 2013; Justin Lecher <jlec@gentoo.org> -crmsh-1.2.5-r2.ebuild, + +crmsh-1.2.5-r3.ebuild, metadata.xml: + Fix for correct usage of new python eclasses *crmsh-1.2.5-r2 (23 May 2013) diff --git a/sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild b/sys-cluster/crmsh/crmsh-1.2.5-r3.ebuild index 66210bbce0e1..386eda4ca765 100644 --- a/sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild +++ b/sys-cluster/crmsh/crmsh-1.2.5-r3.ebuild @@ -1,9 +1,10 @@ # 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-r2.ebuild,v 1.1 2013/05/23 09:58:33 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/crmsh-1.2.5-r3.ebuild,v 1.1 2013/06/04 12:17:49 jlec Exp $ EAPI=5 -PYTHON_COMPAT="python2_7" + +PYTHON_COMPAT=( python{2_6,2_7} ) inherit autotools-utils python-single-r1 @@ -16,34 +17,20 @@ SRC_URI="http://hg.savannah.gnu.org/hgweb/crmsh/archive/${MY_TREE}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~hppa ~x86" -IUSE="python" +IUSE="" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND=" - >=sys-cluster/pacemaker-1.1.8 - || ( dev-lang/python:2.7 dev-lang/python:2.6 ) -" +DEPEND="${PYTHON_DEPS} + >=sys-cluster/pacemaker-1.1.8" RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-${MY_TREE}" src_prepare() { - sed -e 's@CRM_CACHE_DIR=${localstatedir}/cache/crm@CRM_CACHE_DIR=${localstatedir}/crmsh@g' \ + 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 + python_fix_shebang "${S}"/crm eautoreconf } - -src_configure() { - configure_crmsh() { - PYTHON="/usr/bin/python2.7" econf - } - configure_crmsh -} - -src_compile() { - default -} - -src_install() { - default -} diff --git a/sys-cluster/crmsh/metadata.xml b/sys-cluster/crmsh/metadata.xml index 55dd68aadc97..081af556e9a2 100644 --- a/sys-cluster/crmsh/metadata.xml +++ b/sys-cluster/crmsh/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>cluster</herd> + <herd>cluster</herd> </pkgmetadata> |