summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2014-10-08 10:02:22 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2014-10-08 10:02:22 +0000
commit47b77e50b73b9a121e08733d97995bda154e5ef7 (patch)
tree065bd8ace1b471e87118d814ddc5139145bf0fb1 /sys-cluster
parentremove old (diff)
downloadgentoo-2-47b77e50b73b9a121e08733d97995bda154e5ef7.tar.gz
gentoo-2-47b77e50b73b9a121e08733d97995bda154e5ef7.tar.bz2
gentoo-2-47b77e50b73b9a121e08733d97995bda154e5ef7.zip
version bump, fix #515030
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/crmsh/ChangeLog8
-rw-r--r--sys-cluster/crmsh/crmsh-2.1.0.ebuild (renamed from sys-cluster/crmsh/crmsh-2.0.0.ebuild)20
2 files changed, 16 insertions, 12 deletions
diff --git a/sys-cluster/crmsh/ChangeLog b/sys-cluster/crmsh/ChangeLog
index bf2b9e5d64af..6e859d9d627b 100644
--- a/sys-cluster/crmsh/ChangeLog
+++ b/sys-cluster/crmsh/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-cluster/crmsh
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/ChangeLog,v 1.12 2014/06/25 05:56:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/ChangeLog,v 1.13 2014/10/08 10:02:22 ultrabug Exp $
+
+*crmsh-2.1.0 (08 Oct 2014)
+
+ 08 Oct 2014; Ultrabug <ultrabug@gentoo.org> -crmsh-2.0.0.ebuild,
+ +crmsh-2.1.0.ebuild:
+ version bump, drop invalid fix #515030
25 Jun 2014; Patrick Lauer <patrick@gentoo.org> crmsh-2.0.0.ebuild:
Remove keywords from live ebuild
diff --git a/sys-cluster/crmsh/crmsh-2.0.0.ebuild b/sys-cluster/crmsh/crmsh-2.1.0.ebuild
index b025464fdb6c..092fbfe2f206 100644
--- a/sys-cluster/crmsh/crmsh-2.0.0.ebuild
+++ b/sys-cluster/crmsh/crmsh-2.1.0.ebuild
@@ -1,28 +1,28 @@
# 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-2.0.0.ebuild,v 1.2 2014/06/25 05:56:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/crmsh-2.1.0.ebuild,v 1.1 2014/10/08 10:02:22 ultrabug Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
AUTOTOOLS_AUTORECONF=true
+KEYWORDS=""
+SRC_URI=""
-EGIT_REPO_URI="git://github.com/crmsh/crmsh"
if [[ ${PV} == *9999 ]]; then
- KEYWORDS=""
+ EGIT_REPO_URI="git://github.com/crmsh/crmsh"
+ inherit git-2
+ S="${WORKDIR}/${PN}-${MY_TREE}"
else
- EGIT_COMMIT="${PV}"
- #KEYWORDS="~amd64 ~hppa ~x86"
- # QA: No keywords for ebuilds that fetch from VCS
- KEYWORDS=""
+ SRC_URI="https://github.com/crmsh/crmsh/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~hppa ~x86"
fi
-inherit autotools-utils git-2 python-r1
+inherit autotools-utils python-r1
DESCRIPTION="Pacemaker command line interface for management and configuration"
HOMEPAGE="http://crmsh.github.io/"
-SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
@@ -35,8 +35,6 @@ DEPEND="${PYTHON_DEPS}
RDEPEND="${DEPEND}
dev-python/lxml[${PYTHON_USEDEP}]"
-S="${WORKDIR}/${PN}-${MY_TREE}"
-
src_prepare() {
sed \
-e 's@CRM_CACHE_DIR=${localstatedir}/cache/crm@CRM_CACHE_DIR=${localstatedir}/crmsh@g' \