fix #466668 thx to jer

Package-Manager: portage-2.1.12.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

3 files changed, 35 insertions, 11 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/Manifest b/sys-cluster/crmsh/Manifest
index fb7660135184..0970b3d84a2d 100644
--- a/sys-cluster/crmsh/Manifest
+++ b/sys-cluster/crmsh/Manifest
@@ -6,13 +6,13 @@ DIST b6bb311c7bd3.tar.bz2 148729 SHA256 2c3e4c1ab9c79f4ef7a8fb2fa8535d566a8ad4b3
 DIST ef3f08547688.tar.bz2 222930 SHA256 628ac6bfe802b81a3223b4f5fad97124fba82fa18d7990a7247fad74ad7234af SHA512 186377e52d5be5b80b96613243af302c8795efbcbc7dc5bfea0b3090157fdce9e2861dbacb1ff0e4519c7301c6c2a5a04a80973476e4bd5079a9f70c2467ac2a WHIRLPOOL 10c00f73af62e5540504f0a96e94557bb3592172dd54a91a97d6d07ecae2e877f2645cb07d3b97314f4d99f1ac80958d0589a59d6dff0655bf00bba379bf6101
 EBUILD crmsh-1.2.1.ebuild 794 SHA256 f390300066612c356f5e7cd7c831e3f867790d9db0dd5f3dfca010fd246f501f SHA512 b850c8ac53ae03fa917b373da597a08b950dde6871a250f57477ac84f9d715d9b9deb96644052330e92f75c77d58d93d0284b141a67f5de4d25a2385393691f9 WHIRLPOOL 90b5b7fd9244d70754ed8c46151efb3fa783608befda05c8c2f82a3ac65bd033e673526449c8049c868a2bc5e8cfe2cf33aacaa35898b1047502cdf46bb628b5
 EBUILD crmsh-1.2.4.ebuild 799 SHA256 0911cd9081609150b70fbb5f6687371d2e7db7ea41727d4d08a7bc0889eb1d2b SHA512 de0d726deff4b856b889c4e7ec6481e4bf360d61dbd9a2855b8cc2b4d08ad3b520c8e9d877aaa0f7d4e27c169ed3d1e5d393e63b88d2dc41e016ad986ea31853 WHIRLPOOL 64ffd62fcfb163e341aef3f406c68324434e9dd33fb314f15d5bbace0e14a69fade5cf30c9c2e72c38296d875239eea113d46b641378b9928a71709778970171
-EBUILD crmsh-1.2.5-r1.ebuild 802 SHA256 80d40a286a1b84d303daee3febaa6e298e565bef0e0bb5d9fc068cee7a945cb9 SHA512 861da16fd08521b040609fc5887f4395b4e0d9452fdee8c42ccfd9623cfd5d25c1053e7d033c7008e73b8202cb20854f34a8919f4a5a229edb13de31571b3495 WHIRLPOOL a664a0244578bf39304361763a43712ff5e63d2d09d76a7987dd6da5303c54401b312fd6953f8f5a1f5b42d8e47bd536d2a7fc568c6e83a3215da4e1be07e113
-MISC ChangeLog 808 SHA256 9e7e534199598dc08dcbf1202709b7a7c140d1b336d2a76eb56a015552ddad43 SHA512 ccfc46873134109c9c163afe9f8dd2afaede0b3c3f4454787c388b121e0b3777e4adbbea8c02c12263755492cad72219e6d37ec478beecd99a8866dcf806e0aa WHIRLPOOL 62a7f0d85754603f292e848c8dff048888c4211b519fb4c123a244a8c5ed4410f6c7dd416500b528475c6238a3e037ffd5b9b050a113ec4379577b88397275a6
+EBUILD crmsh-1.2.5-r2.ebuild 1124 SHA256 8852664172d805d81a7e101bba3fd7dc75d589b338467e14e343098f2f2ca313 SHA512 21e6aa5d93ecbbf3f20f3f13c1a3798a17717e2f12701e7ec8da4e801ed3443ffe9ef501674ead9582e9b9a57b81d7c6527845f541b3abb35190728625491493 WHIRLPOOL 3722d95ca0e4049c1d078dc87da138665c8851fd79ffe1e2183c44af9d9c00fc061dcf4cc0ac456827c11c4aef1247a06d2cc6b8f80b6b59bb1728455322cbf2
+MISC ChangeLog 961 SHA256 b772e2258e6b3236110fdf79cde81c906dc51f376f3d360cb1f3228fddc8e8c9 SHA512 429f499e562daea05f141d19655f1388c2a591fda2568e429a1556a9169dbce7a08ef9de0b317689b5cfa97f8d5b4a0f25177fa812d3bd4b1854acf27866cdfc WHIRLPOOL a68336471e570b0f8ff904d12f608b9e4eec480634efe2f907899d96abc63857afc26d1e824b059582e83748bb1bf21ad6f27782cb96b614bc4a4eb29f07d5cf
 MISC metadata.xml 161 SHA256 fb0c2b5d458c0b9e6cae1b1cf1c80137c4b23c54e657343370b7d293fb29ecce SHA512 f3e07a100754c87015a67a1dd5e71686adbaf25281054a74ec21cb342a2440c010b30eb7d3d813a2504ea2b6d0330ac32511f11b583df1c519d579ad2b6f0c6a WHIRLPOOL c13246d1d1357f83c01bfb11b06c0bfe565c741b971d846363d44579f974fc1cb7b29470627460f6fc4d62eff22056b98cae11bfd497e5a20dfb566abd46c6d3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGWAt0ACgkQKiQSS7ZY+hPU/gEAwY7RBWABWu4zdGD/B6cfIFQi
-JTTA9C6JhIfInScX1MUA/3OXkIOoXbjVpR85q8DZHCzk98KsU8x1R8mLf+LHHRi4
-=iBs9
+iF4EAREIAAYFAlGd6E8ACgkQKiQSS7ZY+hM4UAEAniocDyS7rvdLvzsvFZy7Gmtu
+wxk1RJmnmoClQj/6Sm8A/j4KbIlMfoD5LwOA2fNa3nioHxxKp8apMt9NY1H9yf8M
+=PSPA
 -----END PGP SIGNATURE-----
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
+}