version bump, drop old

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

4 files changed, 26 insertions, 60 deletions

diff --git a/sys-cluster/crmsh/ChangeLog b/sys-cluster/crmsh/ChangeLog
index f884297355e7..eafa4466ef77 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.10 2013/10/24 12:32:45 xarthisius Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/ChangeLog,v 1.11 2014/06/16 11:14:43 ultrabug Exp $
+
+*crmsh-2.0.0 (16 Jun 2014)
+
+  16 Jun 2014; Ultrabug <ultrabug@gentoo.org> -crmsh-1.2.4.ebuild,
+  -crmsh-1.2.5-r3.ebuild, +crmsh-2.0.0.ebuild:
+  version bump, drop old
 
   24 Oct 2013; Kacper Kowalik <xarthisius@gentoo.org> crmsh-1.2.4.ebuild,
   crmsh-1.2.5-r3.ebuild, crmsh-1.2.6.ebuild:
diff --git a/sys-cluster/crmsh/Manifest b/sys-cluster/crmsh/Manifest
index 497dfeac5b78..5d806b3362a3 100644
--- a/sys-cluster/crmsh/Manifest
+++ b/sys-cluster/crmsh/Manifest
@@ -1,28 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST 51379136d692.tar.bz2 215842 SHA256 ec9bb8da1a997c1adecae5aebb7b1e3f03b2ac8ee8f103216025c559e58a0690 SHA512 f6e6cbe04a3658361f057eb1a4fc1865a15d29425bacc3dfeaa69226a8eea68b546c8f2ba0c85152475fa9f5fae5a3509f22eff8581f76c43154a2954e29bc34 WHIRLPOOL 6cdd8c9687469cad20b8cefb4a880d09036c5407bbd88d2fe352ecef1e5817a28a2c1a3865e222d5eec34029ec2e99d2d34e6fced65d0689eac4022a3c952413
 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.4.ebuild 818 SHA256 cd258c2b2dac05423333a46b8fda1846802ba4db1a385ca8f19cae44f63037be SHA512 25b8997cff102cde9be9d872ae8c08bf143f892af81f4247311480c96d72dcc3a494d14aacf782c5ab75de03b7fc095391a451866794e5f8816e3f846e959db9 WHIRLPOOL cfaf47d5098dd09f315589cb9f343e2ddd1a145ddad4a6bc3d13c7c034de0030525100f844a2f8c5b62061443056db3251f2e957bbe5d016c7a845e8134bb19c
-EBUILD crmsh-1.2.5-r3.ebuild 1237 SHA256 f32a0af76906ba0dd95360c5aa89828a7cde6a96b74c647981bd60130d5b77b7 SHA512 82fc113964541e50224634be7f1d312d04152e1f472bda701047cce353de5374cd5d8b3b00f82c7e02639f0aca042d7021a9565aa29747b7203c1faf474757dd WHIRLPOOL 7ea3753c128c577bf316bad73ca920de928dc5b2531a5bcc06eea9845601d79a5fcc186a8690d4fff6a704e488f261563497071bc334afd2ad875b6c7eb7cf2d
 EBUILD crmsh-1.2.6.ebuild 1234 SHA256 30fce7a87bc86d6cc995e113e76a7f4e70b68477c0a1a32d63a416047db9a10f SHA512 ea7300dd6c45ca53b35daaa140f875ed22b24e7967b5b9fa097c54187984b941f662372b1eff252707a6d67b82960ea72cd7eb990221cea64f747c275582c04e WHIRLPOOL b8c0afb4bd1d3af71be6c26491ca8807a96a007f640e559b7203c4d663ef8af8ae106ba9a6435e85ec8a2c977d0b6131a3347b56bd225518a10972fbda0fd554
-MISC ChangeLog 1604 SHA256 38b313de38374f49f6cad0a7f59e62a6232bdbf0b4ae38c599d45a4f422b1c3c SHA512 bd3b7310792e6364514f5a9e276776bfd5e857a686c2ad72eedc36284845b09f5102450fc6abea5c798470ef04a5bc9d7c4009d160d433afd096a8f5a200c6e0 WHIRLPOOL b395df4267a60a9d9895ac225bc8f4c1b177154a9b55c566b1bab4352ed3fc82a9daefc1e81b355b0174cbaaa59eef8b902bad1e6166f49335e5ab01a94d7c12
+EBUILD crmsh-2.0.0.ebuild 1248 SHA256 01ff8234fc80ccf0db798c53e442dbb8f7d864ce44667ff2c80c9be8c8cfc05c SHA512 adb2e3e6e73903fba8561e76a09a417a10005abe8b07031d49529b8777664c0d06fd75f805d03d094e4c13ffd9a1c66dd5a571ccf61419277b51862fd5d342f6 WHIRLPOOL 30e8587ab4e1460239bb890bd69de9b9f0b5b1c87b93bc12ba63d65b065d00d1574c8c5d518cbde5f02ccf708a0bac8ec8e12443c0ad06d6427976609d6dfdd7
+MISC ChangeLog 1770 SHA256 7b0e606e90ce695447d1b872b022b97fb731a288e1b20987507a474b986ba1ba SHA512 9f4a611e2998de49f4ad833e975f8e46e1ad6a4dffd80a217f2dcbc6318c4cbc80682e28df5d180b1a20045433d7da41b5aebe9aa986227a5890d2edecb0170b WHIRLPOOL 9e3b8897f835b772068672e181182af0e9b14b13620ed95f3d58de8ec6d48cd60901daa6df462547688b8a14c06cc6f729e138a6ee130e6a89f402695ac8aa6f
 MISC metadata.xml 162 SHA256 ba8ac4b0fbb2acb09677330e980feed7de66b52d6ec4ee0ff9e44cccea58fa7c SHA512 2f5b58b83e2be686d8c7a0151b76ec40b9139b62065464f629b8f27d0e46d0a3e314e85c5d8f376372dd4b66ec8d21570f043a7bbeba3684a40517fa1b04bc37 WHIRLPOOL e9aa5ace065aeac9ec418a0bf1fba7321e970f49b853af8201983aa73563ec8a9ecc6a8177d378b7f122178667501865dab9f16136b09ab7cf08a46faa179d3a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJSaRN0AAoJEF0huFKJUZL5ilEQAKc/tW2bU3VWu98kucKnuywL
-dZ2lm11gCLmlNGRdV3Q9fcwjWdbG57x4NL2y/C8y0ecv89F4iZSE2ORQByOE9RoW
-scqRMo4DpqMVtW+bfFDrnIYTrIGRIe4UkoccDWX/YGniIJTLZ5xDI/QH7/wz55m+
-n1tgyi9vikFZUdZ1E5DW5JpGwQ0MBlVUnOaxC54NSS1KwJ0yMaou2USZ83KECwk0
-OylyVgS7zdMQ8N5ibbzlqLBFLSgRq4y3V5W3QA8n8c8CGDkjh3lI9b0hBv5RnsRE
-ZsgFYJmO3MkEr3MundhmlPsiZFYWtp+4YcQ03OKA9zkdCUduRvEeTSIVuraXtBpV
-bMmU0Q9Y9FKD4eLBwFKktFxUZpmm+FEnZXl+Amif6F0VdeLCnDQq9DDnmkgLhFwK
-beh+0rB5YKiruH7CHKs1UTcthAAVsVY96XNvnDvOzWZRnKusyVsVCrqzuDlHi4nK
-IzfEse7PASFEoYCiUw17cy1pLdZs9Ng+5qePJyzfcQZGaCtQL6K/74W9oY4tMzhR
-eIw8vHZjXOPdZeRQMG7tBH5BpzF9uWuIDIJUoxv55Gn/M7CaxgDyYHcA90IVe/4G
-3jScrhKjOJ2LAoIj0Vmsi2cHWXmLIakQitNfbEoBpJpjqEEaq/dmrgsAVusPtIPS
-q9bsIWu5Iogjch1Zf6s0
-=RbCQ
+iF4EAREIAAYFAlOe0agACgkQKiQSS7ZY+hNlVAD/anlbd8DuVTidgA59G0VM2Fz1
+GrK+5zzBOJ+cb8KjOVAA/10y5NP7cfvY3C6PC1NkkUNJvLZH4uxnNIBe2Kh/hsH5
+=Jpqi
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/crmsh/crmsh-1.2.4.ebuild b/sys-cluster/crmsh/crmsh-1.2.4.ebuild
deleted file mode 100644
index 30392ca04d7a..000000000000
--- a/sys-cluster/crmsh/crmsh-1.2.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.4.ebuild,v 1.2 2013/10/24 12:32:45 xarthisius Exp $
-
-EAPI=4
-
-inherit autotools-utils
-
-MY_TREE="51379136d692"
-
-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}
-	dev-python/lxml"
-
-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.5-r3.ebuild b/sys-cluster/crmsh/crmsh-2.0.0.ebuild
index a8f1f2ebdaec..a346474d9bb6 100644
--- a/sys-cluster/crmsh/crmsh-1.2.5-r3.ebuild
+++ b/sys-cluster/crmsh/crmsh-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.3 2013/10/24 12:32:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/crmsh-2.0.0.ebuild,v 1.1 2014/06/16 11:14:43 ultrabug Exp $
 
 EAPI=5
 
@@ -8,17 +8,22 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 
 AUTOTOOLS_AUTORECONF=true
 
-inherit autotools-utils python-r1
+EGIT_REPO_URI="git://github.com/crmsh/crmsh"
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	EGIT_COMMIT="${PV}"
+	KEYWORDS="~amd64 ~hppa ~x86"
+fi
 
-MY_TREE="ef3f08547688"
+inherit autotools-utils git-2 python-r1
 
 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"
+HOMEPAGE="http://crmsh.github.io/"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"