version bump, drop old

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

4 files changed, 65 insertions, 40 deletions

diff --git a/sys-cluster/crmsh/ChangeLog b/sys-cluster/crmsh/ChangeLog
index 8b59c7d1f7ce..e9fe3c46b2f2 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.8 2013/06/04 12:30:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/ChangeLog,v 1.9 2013/10/17 12:21:11 ultrabug Exp $
+
+*crmsh-1.2.6 (17 Oct 2013)
+
+  17 Oct 2013; Ultrabug <ultrabug@gentoo.org> -crmsh-1.2.1.ebuild,
+  +crmsh-1.2.6.ebuild:
+  version bump, drop old
 
   04 Jun 2013; Justin Lecher <jlec@gentoo.org> crmsh-1.2.5-r3.ebuild:
   Support multi ABI installations
diff --git a/sys-cluster/crmsh/Manifest b/sys-cluster/crmsh/Manifest
index 2813424dccc4..8d1069811102 100644
--- a/sys-cluster/crmsh/Manifest
+++ b/sys-cluster/crmsh/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST 51379136d692.tar.bz2 215842 SHA256 ec9bb8da1a997c1adecae5aebb7b1e3f03b2ac8ee8f103216025c559e58a0690 SHA512 f6e6cbe04a3658361f057eb1a4fc1865a15d29425bacc3dfeaa69226a8eea68b546c8f2ba0c85152475fa9f5fae5a3509f22eff8581f76c43154a2954e29bc34 WHIRLPOOL 6cdd8c9687469cad20b8cefb4a880d09036c5407bbd88d2fe352ecef1e5817a28a2c1a3865e222d5eec34029ec2e99d2d34e6fced65d0689eac4022a3c952413
-DIST b6bb311c7bd3.tar.bz2 148729 SHA256 2c3e4c1ab9c79f4ef7a8fb2fa8535d566a8ad4b3105b5813b87687365913535d SHA512 e7e37d93db341c26298a9b04aca914e3187d9cdcb85fdf75279108dae3389b8096c6fc0fe91e16274bbfa1be1c90382ad914fd62aa6fa61483cdafad4f767908 WHIRLPOOL b9d193ce0f84c61a1afe27dffcb7864bb83e9629c88df2037dd8c041c6baeec62eef2e4faca35163587df2dd6e62000b041d2cc88f314551a7c995ef5bb3d2db
+DIST ad8279d42fd4.tar.bz2 243229 SHA256 3ff19f035b8539c3972221aa1bad85f71c1635eeddd01e64eb17b6abf6669aa4 SHA512 3ff87ff0f007450c52094415dd955f4b5d2a99d21ed26483257cb418726970b814eb030078a307709eb7c6cedc98512bea1b464659591017bca1c061a0e7fca9 WHIRLPOOL 2b199472b05a72817057f238ffa12d79b040a2c8c9bea1604508f53bb7840df87366fcfaaa55f60f89b3c0ca7cc372aadf9c6ae57f57450cb26e504c109605db
 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 1196 SHA256 e95196a6d92b54a71d123a9db4f198a2f0f9022418e8b2d0629e3c85f733da3c SHA512 a025e67cad061a48c33203ec83bbfc8b78b1427003ed3aed04b8855d3d04eaa6f911fae7737f5e3f2073d7f9578a33ca46734267eee541573f0e469e4d38e771 WHIRLPOOL 130cd358ee8a251db22f5bce6c9bd519d2f03cd2563471a408c084d9dd7f7d6f33c5903e4f0a28d1899f2b7d7a663d06e7041d75fe0182ffd38425592830fbac
-MISC ChangeLog 1252 SHA256 12bd68a9e31637f4f90d8860dbdfee55a4b6ee68f21448eed59f82633d99ead6 SHA512 30028ee35b023d844538a86c34794807439aab08bc2fafe6efe1ea5a50380fe4bf9ba386e22204f32238732c9a1f310093657bbd99a40ea8e5d9f98af65b503a WHIRLPOOL 0b971a6277e8310b4e6f5755d4d54b85d8439c45e0da02e9809e52711cac3c035bb85482a009a039ea8233d7490195a9ce06811b7b6de0a9b3292891a716aa82
+EBUILD crmsh-1.2.6.ebuild 1197 SHA256 dc3230a3153267fb08211091f09b19f49609b3f996b3c0e8722c12182433a0ac SHA512 97b44148a2ec46878426a52a4496a60e9519e9b5a3d6e8b36c54fd3f76919d2ad0fb51d00ae1794eb4ea75454f45b3f287f28735779b4d1c3bb4c027248f0e9f WHIRLPOOL 36ed634141d64b486c5d7f6dfde5ddd221e4e13794634c6d2e2f8a850ff17e375ad3dbff496bbd00e7b8122bca18b1665805296301a44785bda7a6cbc0c7a7d3
+MISC ChangeLog 1400 SHA256 fb008d95f74c94ac4e2c79ce8f93056be36bc8334b6ca91034f9538a8a146e2f SHA512 44d179fcaf50c835a2abe6a65711bddaac32a8610213b9a61b1d93e28fb8c3557f6992fb8644287eb6d030d6be4fed6fd6342e39f559f2d3f31a58f89c6dcb72 WHIRLPOOL a6a57247ceb63b68c84da41c6886720a96b96ef9b8661bfe891b3e9b2312d3f3ad9baed4da33c3bff286a7516944b206e37ec826a196a8080677ef6c7917f488
 MISC metadata.xml 162 SHA256 ba8ac4b0fbb2acb09677330e980feed7de66b52d6ec4ee0ff9e44cccea58fa7c SHA512 2f5b58b83e2be686d8c7a0151b76ec40b9139b62065464f629b8f27d0e46d0a3e314e85c5d8f376372dd4b66ec8d21570f043a7bbeba3684a40517fa1b04bc37 WHIRLPOOL e9aa5ace065aeac9ec418a0bf1fba7321e970f49b853af8201983aa73563ec8a9ecc6a8177d378b7f122178667501865dab9f16136b09ab7cf08a46faa179d3a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREKAAYFAlGt3f8ACgkQgAnW8HDreRY5jgCfaMb1jL4yajxTDgA4CRW3eD2D
-gPAAn31enf2Ta4iHIooXtcwS3C4V9Tms
-=tF/L
+iF4EAREIAAYFAlJf1jwACgkQKiQSS7ZY+hPWGwD/Qg6oqH0w1pQN4/uBE1zZWhxE
+uQwIZWYPaK+G0ViKu2AA/jrMPh6xn4SJa7cmJJ5tJwfww3Jz+b6p1LxEvC6LpnHW
+=isLn
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/crmsh/crmsh-1.2.1.ebuild b/sys-cluster/crmsh/crmsh-1.2.1.ebuild
deleted file mode 100644
index 8bddf1705a80..000000000000
--- a/sys-cluster/crmsh/crmsh-1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/crmsh-1.2.1.ebuild,v 1.2 2012/11/14 17:22:45 jer Exp $
-
-EAPI=4
-
-inherit autotools-utils
-
-MY_TREE="b6bb311c7bd3"
-
-DESCRIPTION="Pacemaker command line interface for management and configuration"
-HOMEPAGE="https://savannah.nongnu.org/projects/crmsh/"
-SRC_URI="http://hg.savannah.gnu.org/hgweb/crmsh/archive/${MY_TREE}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DEPEND="
-	>=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' \
-		-i configure.ac || die
-	eautoreconf
-}
diff --git a/sys-cluster/crmsh/crmsh-1.2.6.ebuild b/sys-cluster/crmsh/crmsh-1.2.6.ebuild
new file mode 100644
index 000000000000..af670e95a74e
--- /dev/null
+++ b/sys-cluster/crmsh/crmsh-1.2.6.ebuild
@@ -0,0 +1,50 @@
+# 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.6.ebuild,v 1.1 2013/10/17 12:21:11 ultrabug Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1
+
+MY_TREE="ad8279d42fd4"
+
+DESCRIPTION="Pacemaker command line interface for management and configuration"
+HOMEPAGE="https://savannah.nongnu.org/projects/crmsh/"
+SRC_URI="http://hg.savannah.gnu.org/hgweb/crmsh/archive/${MY_TREE}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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' \
+		-i configure.ac || die
+	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
+}