sys-cluster/crmsh: Support multi ABI installations

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 27 insertions, 10 deletions

diff --git a/sys-cluster/crmsh/ChangeLog b/sys-cluster/crmsh/ChangeLog
index d56077ec4500..8b59c7d1f7ce 100644
--- a/sys-cluster/crmsh/ChangeLog
+++ b/sys-cluster/crmsh/ChangeLog
@@ -1,6 +1,9 @@
 # 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.7 2013/06/04 12:17:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/ChangeLog,v 1.8 2013/06/04 12:30:54 jlec Exp $
+
+  04 Jun 2013; Justin Lecher <jlec@gentoo.org> crmsh-1.2.5-r3.ebuild:
+  Support multi ABI installations
 
 *crmsh-1.2.5-r3 (04 Jun 2013)
 
diff --git a/sys-cluster/crmsh/Manifest b/sys-cluster/crmsh/Manifest
index c77f70518a5e..2813424dccc4 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-r3.ebuild 937 SHA256 1e3d1f04aedb610feb829479e03ef40b2d769a0e76d5a59d396a3042ed6785c1 SHA512 f755d13161f0a4bb3793b02cd0b721d244a7d8acb3a16510c51938b0980d0b57770e69c97e9cde632b91fd1f794e942f2471f0392bfdc0f09b50b4f8ca751516 WHIRLPOOL 0c6d2cea14489abf67a6797f1ecb4654f46417e3ae2b4e2997c7bd52e414fd496307edbc2fb290f57450824ca4655f6f84590f34d9fa8a80221297c9de7acd02
-MISC ChangeLog 1147 SHA256 3cf66ba9a62bfbb0f937b40b8e08fb4fb6dbeab190163d1c8cb86199817e31a1 SHA512 9817b0c6cad566f9adb7b0510cf2824a518eb0c307027390468a1e1447cd4b7c8583cd8783e31ce1989b26f82e13b68a00a0f538dfed4213149eef114e099336 WHIRLPOOL 7edea5c54f8a274b4a63b594d921bfbb43d284d6181995274ad37580b56ad743b44d28f104c3855b9064395894dd1061921079ce9a3a7dbd30bb439f0d56e16a
+EBUILD crmsh-1.2.5-r3.ebuild 1196 SHA256 e95196a6d92b54a71d123a9db4f198a2f0f9022418e8b2d0629e3c85f733da3c SHA512 a025e67cad061a48c33203ec83bbfc8b78b1427003ed3aed04b8855d3d04eaa6f911fae7737f5e3f2073d7f9578a33ca46734267eee541573f0e469e4d38e771 WHIRLPOOL 130cd358ee8a251db22f5bce6c9bd519d2f03cd2563471a408c084d9dd7f7d6f33c5903e4f0a28d1899f2b7d7a663d06e7041d75fe0182ffd38425592830fbac
+MISC ChangeLog 1252 SHA256 12bd68a9e31637f4f90d8860dbdfee55a4b6ee68f21448eed59f82633d99ead6 SHA512 30028ee35b023d844538a86c34794807439aab08bc2fafe6efe1ea5a50380fe4bf9ba386e22204f32238732c9a1f310093657bbd99a40ea8e5d9f98af65b503a WHIRLPOOL 0b971a6277e8310b4e6f5755d4d54b85d8439c45e0da02e9809e52711cac3c035bb85482a009a039ea8233d7490195a9ce06811b7b6de0a9b3292891a716aa82
 MISC metadata.xml 162 SHA256 ba8ac4b0fbb2acb09677330e980feed7de66b52d6ec4ee0ff9e44cccea58fa7c SHA512 2f5b58b83e2be686d8c7a0151b76ec40b9139b62065464f629b8f27d0e46d0a3e314e85c5d8f376372dd4b66ec8d21570f043a7bbeba3684a40517fa1b04bc37 WHIRLPOOL e9aa5ace065aeac9ec418a0bf1fba7321e970f49b853af8201983aa73563ec8a9ecc6a8177d378b7f122178667501865dab9f16136b09ab7cf08a46faa179d3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGt2u4ACgkQgAnW8HDreRYWQACgrov+4WueS/uWEqPCtApnSJqD
-9CEAn1+slUCtvwHTyz2ryFbwoS+Q2TqJ
-=iRQz
+iEYEAREKAAYFAlGt3f8ACgkQgAnW8HDreRY5jgCfaMb1jL4yajxTDgA4CRW3eD2D
+gPAAn31enf2Ta4iHIooXtcwS3C4V9Tms
+=tF/L
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/crmsh/crmsh-1.2.5-r3.ebuild b/sys-cluster/crmsh/crmsh-1.2.5-r3.ebuild
index 386eda4ca765..19dfecb78670 100644
--- a/sys-cluster/crmsh/crmsh-1.2.5-r3.ebuild
+++ b/sys-cluster/crmsh/crmsh-1.2.5-r3.ebuild
@@ -1,12 +1,14 @@
 # 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-r3.ebuild,v 1.1 2013/06/04 12:17:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/crmsh-1.2.5-r3.ebuild,v 1.2 2013/06/04 12:30:54 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit autotools-utils python-single-r1
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1
 
 MY_TREE="ef3f08547688"
 
@@ -31,6 +33,18 @@ src_prepare() {
 	sed \
 		-e 's@CRM_CACHE_DIR=${localstatedir}/cache/crm@CRM_CACHE_DIR=${localstatedir}/crmsh@g' \
 		-i configure.ac || die
-	python_fix_shebang "${S}"/crm
-	eautoreconf
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	python_foreach_impl autotools-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl autotools-utils_src_compile
+}
+
+src_install() {
+	python_foreach_impl autotools-utils_src_install
+	python_replicate_script "${ED}"/usr/sbin/crm
 }