1.0 branch version bump thx to Kazuyoshi, fix #425670.

(Portage version: 2.1.11.5/cvs/Linux x86_64)

3 files changed, 125 insertions, 1 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 34b7bfd089cc..0fc37ffe901b 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/pacemaker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.21 2012/05/30 14:55:32 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.22 2012/07/11 08:10:46 ultrabug Exp $
+
+*pacemaker-1.0.12 (11 Jul 2012)
+
+  11 Jul 2012; Ultrabug <ultrabug@gentoo.org>
+  +files/1.0.12-BUILD_VERSION.patch, +pacemaker-1.0.12.ebuild:
+  1.0 branch version bump thx to Kazuyoshi, fix #425670.
 
   30 May 2012; Kacper Kowalik <xarthisius@gentoo.org> pacemaker-1.1.6.1.ebuild,
   pacemaker-1.1.7.ebuild:
diff --git a/sys-cluster/pacemaker/files/1.0.12-BUILD_VERSION.patch b/sys-cluster/pacemaker/files/1.0.12-BUILD_VERSION.patch
new file mode 100644
index 000000000000..8e526644820a
--- /dev/null
+++ b/sys-cluster/pacemaker/files/1.0.12-BUILD_VERSION.patch
@@ -0,0 +1,43 @@
+# HG changeset patch
+# Parent d90c3d4786da4cfa7944c9009a0071e3ea6f8581
+
+diff -r d90c3d4786da configure.ac
+--- a/configure.ac	Wed Jun 13 11:43:31 2012 +0900
++++ b/configure.ac	Wed Jun 13 11:44:38 2012 +0900
+@@ -464,20 +464,26 @@
+ AC_DEFINE_UNQUOTED(STONITH_PLUGIN_DIR,"$STONITH_PLUGIN_DIR", Location for Stonith plugins)
+ AC_SUBST(STONITH_PLUGIN_DIR)
+ 
+-AC_PATH_PROGS(HG, hg false)
++AC_PATH_PROGS(GIT, git false)
+ AC_MSG_CHECKING(build version)
+-BUILD_VERSION=unknown
+-if test -f $srcdir/.hg_archival.txt; then
+-   BUILD_VERSION=`cat $srcdir/.hg_archival.txt | awk '/node:/ { print $2 }'`
+-elif test -x $HG -a -d .hg; then
+-   BUILD_VERSION=`$HG id -itb`
+-   if test $? != 0; then
+-       BUILD_VERSION=unknown
+-   fi
++
++BUILD_VERSION=$Format:%H$
++if test $BUILD_VERSION != ":%H$"; then
++   AC_MSG_RESULT(archive hash: $BUILD_VERSION)
++
++elif test -x $GIT -a -d .git; then
++   BUILD_VERSION=`$GIT log --pretty="format:%h" -n 1`
++   AC_MSG_RESULT(git hash: $BUILD_VERSION)
++
++else
++   # The current directory name make a reasonable default
++   # Most generated archives will include the hash or tag 
++   BASE=`basename $PWD`
++   BUILD_VERSION=`echo $BASE | sed s:.*[[Pp]]acemaker-::`
++   AC_MSG_RESULT(directory based hash: $BUILD_VERSION)
+ fi
+ 
+ AC_DEFINE_UNQUOTED(BUILD_VERSION, "$BUILD_VERSION", Build version)
+-AC_MSG_RESULT($BUILD_VERSION)
+ AC_SUBST(BUILD_VERSION)
+ 
+ dnl ===============================================
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
new file mode 100644
index 000000000000..e81c6c2a137e
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild,v 1.1 2012/07/11 08:10:46 ultrabug Exp $
+
+EAPI="2"
+
+MY_PN=Pacemaker
+MY_P=${MY_PN}-${PV}
+PYTHON_DEPEND="2"
+
+inherit autotools base python
+
+MY_TREE="066152e"
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
+SRC_URI="https://github.com/ClusterLabs/${PN}-1.0/tarball/${MY_P} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="+ais heartbeat smtp snmp static-libs"
+
+DEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	sys-cluster/cluster-glue
+	sys-cluster/resource-agents
+	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
+	!heartbeat? ( sys-cluster/corosync )
+	smtp? ( net-libs/libesmtp )
+	snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.10-asneeded.patch"
+	"${FILESDIR}/${PN}-1.0.10-installpaths.patch"
+	"${FILESDIR}/1.0.12-BUILD_VERSION.patch"
+)
+
+S="${WORKDIR}/ClusterLabs-${PN}-1.0-${MY_TREE}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e "/ggdb3/d" configure.ac || die
+	sed -e "s:<glib/ghash.h>:<glib.h>:" \
+		-i lib/ais/plugin.c || die
+	eautoreconf
+}
+
+src_configure() {
+	local myopts=""
+	use heartbeat || myopts="--with-ais"
+	# appends lib to localstatedir automatically
+	econf \
+		--localstatedir=/var \
+		--disable-dependency-tracking \
+		--disable-fatal-warnings \
+		$(use_with heartbeat) \
+		$(use_with smtp esmtp) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		${myopts}
+}
+
+src_install() {
+	base_src_install
+	use static-libs || find "${D}" -type f -name "*.la" -delete
+}
\ No newline at end of file