ultrabug 14/12/12 13:41:15 Modified: pacemaker-1.1.10.ebuild ChangeLog Added: pacemaker-1.1.12.ebuild Removed: pacemaker-1.1.7.ebuild pacemaker-1.1.8-r2.ebuild Log: fix #526770, drop old and version bump (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Revision Changes Path 1.2 sys-cluster/pacemaker/pacemaker-1.1.10.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild?r1=1.1&r2=1.2 Index: pacemaker-1.1.10.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pacemaker-1.1.10.ebuild 29 Aug 2013 10:32:25 -0000 1.1 +++ pacemaker-1.1.10.ebuild 12 Dec 2014 13:41:15 -0000 1.2 @@ -1,12 +1,12 @@ -# 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/pacemaker/pacemaker-1.1.10.ebuild,v 1.1 2013/08/29 10:32:25 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild,v 1.2 2014/12/12 13:41:15 ultrabug Exp $ EAPI="5" -PYTHON_DEPEND="2" +PYTHON_COMPAT=( python{2_6,2_7} ) WANT_AUTOMAKE="1.12" -inherit autotools base python +inherit autotools base python-single-r1 MY_PN="Pacemaker" MY_P=${MY_PN}-${PV/_/-} @@ -35,6 +35,8 @@ " RDEPEND="${DEPEND}" +PATCHES=("${FILESDIR}"/pacemaker-1.1.10-tinfo.patch) + S="${WORKDIR}/${PN}-${MY_P}" pkg_setup() { 1.36 sys-cluster/pacemaker/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/ChangeLog?rev=1.36&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/ChangeLog?rev=1.36&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/ChangeLog?r1=1.35&r2=1.36 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ChangeLog 2 Dec 2014 14:45:32 -0000 1.35 +++ ChangeLog 12 Dec 2014 13:41:15 -0000 1.36 @@ -1,6 +1,13 @@ # ChangeLog for sys-cluster/pacemaker # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.35 2014/12/02 14:45:32 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.36 2014/12/12 13:41:15 ultrabug Exp $ + +*pacemaker-1.1.12 (12 Dec 2014) + + 12 Dec 2014; Ultrabug <[email protected]> -pacemaker-1.1.7.ebuild, + -pacemaker-1.1.8-r2.ebuild, pacemaker-1.1.10.ebuild, + +pacemaker-1.1.12.ebuild, +files/pacemaker-1.1.10-tinfo.patch: + fix #526770, drop old and version bump 02 Dec 2014; Ultrabug <[email protected]> pacemaker-1.0.10.ebuild, pacemaker-1.0.12.ebuild: 1.1 sys-cluster/pacemaker/pacemaker-1.1.12.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.12.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.12.ebuild?rev=1.1&content-type=text/plain Index: pacemaker-1.1.12.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.12.ebuild,v 1.1 2014/12/12 13:41:15 ultrabug Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) WANT_AUTOMAKE="1.12" inherit autotools base python-single-r1 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}" PATCHES=("${FILESDIR}"/pacemaker-1.1.10-tinfo.patch) S="${WORKDIR}/${PN}-${MY_P}" 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 " " }
