From dff14ae64994735612d091fd5d585bfcc59dae5b Mon Sep 17 00:00:00 2001
From: Alexys Jacob <ultrabug@gentoo.org>
Date: Thu, 29 Aug 2013 10:32:25 +0000
Subject: version bump, drop old

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
---
 sys-cluster/pacemaker/ChangeLog                   |  8 +-
 sys-cluster/pacemaker/pacemaker-1.1.10.ebuild     | 92 +++++++++++++++++++++++
 sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild | 92 -----------------------
 3 files changed, 99 insertions(+), 93 deletions(-)
 create mode 100644 sys-cluster/pacemaker/pacemaker-1.1.10.ebuild
 delete mode 100644 sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild

(limited to 'sys-cluster')

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 60237bb3acac..294299a95f26 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/pacemaker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.33 2013/04/23 08:04:02 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.34 2013/08/29 10:32:25 ultrabug Exp $
+
+*pacemaker-1.1.10 (29 Aug 2013)
+
+  29 Aug 2013; Ultrabug <ultrabug@gentoo.org> -pacemaker-1.1.10_rc1.ebuild,
+  +pacemaker-1.1.10.ebuild:
+  version bump, drop old
 
 *pacemaker-1.1.8-r2 (23 Apr 2013)
 
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild
new file mode 100644
index 000000000000..f935ce715afc
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild,v 1.1 2013/08/29 10:32:25 ultrabug Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2"
+WANT_AUTOMAKE="1.12"
+
+inherit autotools base python
+
+MY_PN="Pacemaker"
+MY_P=${MY_PN}-${PV/_/-}
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE="cman? ( !heartbeat )"
+IUSE="acl cman heartbeat smtp snmp static-libs"
+
+DEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	sys-cluster/cluster-glue
+	>=sys-cluster/libqb-0.14.0
+	sys-cluster/resource-agents
+	cman? ( sys-cluster/cman )
+	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
+	!heartbeat? ( sys-cluster/corosync )
+	smtp? ( net-libs/libesmtp )
+	snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e "/ggdb3/d" configure.ac || die
+	sed -i -e "s/ -ggdb//g" configure.ac || die
+	sed -i -e "s/uid2username(uid)/uid2username(uid_client)/g" lib/common/ipc.c || die
+	sed -i -e "s:<glib/ghash.h>:<glib.h>:" lib/ais/plugin.c || die
+	eautoreconf
+	python_convert_shebangs -r 2 .
+}
+
+src_configure() {
+	local myopts=""
+	if use heartbeat ; then
+		myopts="--without-corosync"
+	else
+		myopts="--with-ais"
+	fi
+	# appends lib to localstatedir automatically
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--disable-dependency-tracking \
+		--disable-fatal-warnings \
+		$(use_with acl) \
+		$(use_with cman cs-quorum) \
+		$(use_with cman cman) \
+		$(use_with heartbeat) \
+		$(use_with smtp esmtp) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		${myopts}
+}
+
+src_install() {
+	base_src_install
+	rm -rf "${D}"/var/run "${D}"/etc/init.d
+	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
+	if has_version "<sys-cluster/corosync-2.0"; then
+		insinto /etc/corosync/service.d
+		newins "${FILESDIR}/${PN}.service" ${PN} || die
+	fi
+}
+
+pkg_postinst() {
+	elog " "
+	elog "Looking for the crm CLI ? emerge sys-cluster/crmsh !"
+	elog " "
+}
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild
deleted file mode 100644
index d71e41626476..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.10_rc1.ebuild
+++ /dev/null
@@ -1,92 +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/pacemaker/pacemaker-1.1.10_rc1.ebuild,v 1.2 2013/04/23 08:04:02 ultrabug Exp $
-
-EAPI="5"
-PYTHON_DEPEND="2"
-WANT_AUTOMAKE="1.12"
-
-inherit autotools base python
-
-MY_PN="Pacemaker"
-MY_P=${MY_PN}-${PV/_/-}
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="acl cman heartbeat smtp snmp static-libs"
-
-DEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	>=sys-cluster/libqb-0.14.0
-	sys-cluster/resource-agents
-	cman? ( sys-cluster/cman )
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -i -e "s/ -ggdb//g" configure.ac || die
-	sed -i -e "s/uid2username(uid)/uid2username(uid_client)/g" lib/common/ipc.c || die
-	sed -i -e "s:<glib/ghash.h>:<glib.h>:" lib/ais/plugin.c || die
-	eautoreconf
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
-	# appends lib to localstatedir automatically
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		$(use_with acl) \
-		$(use_with cman cs-quorum) \
-		$(use_with cman cman) \
-		$(use_with heartbeat) \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	base_src_install
-	rm -rf "${D}"/var/run "${D}"/etc/init.d
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-	if has_version "<sys-cluster/corosync-2.0"; then
-		insinto /etc/corosync/service.d
-		newins "${FILESDIR}/${PN}.service" ${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	elog " "
-	elog "Looking for the crm CLI ? emerge sys-cluster/crmsh !"
-	elog " "
-}
-- 
cgit v1.2.3-65-gdbad