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

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

4 files changed, 145 insertions, 28 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/Manifest b/sys-cluster/pacemaker/Manifest
index e3463ccbdc75..59b664ab0e5a 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,34 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pacemaker-1.0.10-asneeded.patch 750 RMD160 9aaf83ce34c8c3f35db805108d3446dd66a66e81 SHA1 58393bcef301cda18f4bc008f4edeba00ed90ffa SHA256 552e14bc626aafc7f290d5d5e2968679ee8b506bb200ef5f1bdb1dfd17db2b34
-AUX pacemaker-1.0.10-installpaths.patch 200 RMD160 d2b3bdae8d6f982b64af5f83375497df74fadbc0 SHA1 69a1b9a2c7415a0e0d10c982ecb64474da358fb3 SHA256 4b8d82244123f88491b7deecb99b2d36d6317ada5aa6c6339e95dbcdc73dbbee
-AUX pacemaker.initd 922 RMD160 1ee204b244f3e40a6fb272f43d0cf11d7e4404d0 SHA1 7ffa0222674d5003d550b51bad7f0735366ffe01 SHA256 0253da4a3a91d8c3aa7badd30062cbba32a0626b77f1a27db1d731d1bbe133af
-AUX pacemaker.service 105 RMD160 e743788acefa97f879ea67b5b3bbbff715c71bce SHA1 42739d9a111a25a643d8f5f8b9fdd2cf1267853a SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c
-DIST Pacemaker-1.0.10.tar.bz2 6642704 RMD160 9eaac150c7e3e7f2e1c00303025aa8fe5bfb90c7 SHA1 5901533948f85a1adfe2264b2ac0dae14ad8c116 SHA256 2d5635866dcf061a617a33bc4ae7957d038dd764ad840489e4f2f6b8d046e6f9
-DIST Pacemaker-1.0.11.tar.bz2 6706773 RMD160 6ab3dbccf537a2b635a87b0089307b5309705df4 SHA1 7b3bb3401d9a9183130766625a0e8eb587f89b55 SHA256 568a8a7257ca9eb2d546c74fb18ee27d1e4e8eb58d9e2be0325cda1569b0ae75
-DIST pacemaker-1.1.6.1.tar.gz 8722056 RMD160 e85dcdb57ae6afd3e351052cabd7938e15b39034 SHA1 d4d95ac06ea742965696552ba41bc2a49a643b25 SHA256 57b962cce13ae2a11e2439fb6c88722233baac329b5a634a42e410f0ce8db059
-DIST pacemaker-1.1.7.tar.gz 9207389 RMD160 8e0c8ef26572c3542ce57468803301cb9918df2b SHA1 92e4b381dfac4a90eefdf654ba216f2cb4f983b0 SHA256 acf02495a24efbe21c18d1f4a2289b4e91374fd56c0ceaaa402ae1cf88219861
-EBUILD pacemaker-1.0.10.ebuild 1779 RMD160 c8216432b08c797b784563429eeb3bd42bfd9a19 SHA1 5de63be100b9b9fe05478a80d97d9ea2fae4b6d6 SHA256 642b4687ce2abdbba8fcad04fc6c76f1aa3ddae94a84e4b85081524b87b7a65c
-EBUILD pacemaker-1.0.11.ebuild 1763 RMD160 15700a98fdffd95d78ab10a83cbf925de5ae3908 SHA1 c419add1ffcbaccf4e27093890674c45357fd731 SHA256 693a452ee09487ab23cc7a0e83f78249eb962644637ff4d1c68337ab93e9f5ed
-EBUILD pacemaker-1.1.6.1.ebuild 2350 RMD160 6c4ec1519b11ce3e13cb37e429cf6de7b8ad8d2e SHA1 19ffb20565570b158ae77b2d17c5b6d2ec7960ea SHA256 0d00fd97d4f15b9095ef4eb19751ed2f3d1640e5320fd818db124c42658278a6
-EBUILD pacemaker-1.1.7.ebuild 2348 RMD160 99ccb73b500d9b3c4383d32ce4888012674d801a SHA1 699b82837818000da4ca8dde761a8fd67d0e423d SHA256 ead218b4d921a3eed88a683746ee4b13de5579cd7ec26e8ecf30825b02d2ca5f
-MISC ChangeLog 4211 RMD160 c53ccd6510ea61dee5f6f7a6338b9ffd923a7304 SHA1 107c2b9786ed9c67ebf30e2aabe847002cc42541 SHA256 bae1dfe60c652abb9468906cf52e2f4832aa918cdccdda10276ec726833c53e2
-MISC metadata.xml 870 RMD160 eaebf5c9ba00ab06edbdd3d10fca4a5d85df3924 SHA1 824ec601ce5d08e2aa07471d4dab1307248ff06e SHA256 ca8b9f3af29de78a1e6196cd392c6c85635f8f7fb2303befc762bd135439fd3b
+AUX 1.0.12-BUILD_VERSION.patch 1423 SHA256 7b46b0d2200126e3294302448902b546a59bc8319f8afad3938f7aa020c5d847 SHA512 c9ed1d8adf750a81d11765bfcbb9d3de5ae9cf947d27ac114bcb146d2cf3450c1b98b66ec6b07861e368aed6674fbbb8f7eae8ec6407459652dcf42a5b30a0af WHIRLPOOL 239bcf96fc6339ba89b4dd708541faad5e4b596c3f85c4fcbf21b39cbad00a2e224d889f792203956e4ab615e47c3e5f5ed01b887e70d3743341159c7963f12b
+AUX pacemaker-1.0.10-asneeded.patch 750 SHA256 552e14bc626aafc7f290d5d5e2968679ee8b506bb200ef5f1bdb1dfd17db2b34 SHA512 01df0f4e0b7b429138cb0599242de0bb2c82ceb5f4cb2bf9c3c9952630c3721484fb9fb9367a09fea6d2234e1086b1ebb651bc42f9dbd81e2d17dee881c1e09b WHIRLPOOL 07cae71b91114a5aa7d22f48e41e72e11eb9676389f3df4c9158e878de28ac40665535e2dcc452e284758aac43261c5af4a6c681873bdcd7abc5d87ba18f19c4
+AUX pacemaker-1.0.10-installpaths.patch 200 SHA256 4b8d82244123f88491b7deecb99b2d36d6317ada5aa6c6339e95dbcdc73dbbee SHA512 68442af7365c145f28346e5d1b53ba8498b59b619cc6f769f5b407c246cd676821b28b7241777523794251cf1bdd36d57f2ace6d294ad6e33137bc57d71ae492 WHIRLPOOL 4c0e9c7deb9ed9244cb349ea8055328bf6d70b2dbc57b79538176a7fc5aca703ea4709623f137909203f76f376bf734175afbea56ebede7bf01614b6b0c8d4b4
+AUX pacemaker.initd 922 SHA256 0253da4a3a91d8c3aa7badd30062cbba32a0626b77f1a27db1d731d1bbe133af SHA512 ccd15fb4401863e51cf7639f3f143e35a969b11a53e0fcff49f70f33e78975051c7b879a299c082951e0b10db32eb9f53a52aaadfaab27cd27cc85be742e264a WHIRLPOOL 5f3e2a8cf4234684b9949d25e949ff187c1629914b580d379ad565856661127ceca48bcfd7715ecd0eb6e22650123d3dc1a282a3bbf5f0751fb95f8fb5e9bed7
+AUX pacemaker.service 105 SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b WHIRLPOOL ec891f83ec9f561060b08bd39e9e0ecf5b243617958bd68f07a2f087a881af85895a4f25f810657ababb6d4541dfcc63e59e195fb6006717dc0cb69a1f869376
+DIST Pacemaker-1.0.10.tar.bz2 6642704 SHA256 2d5635866dcf061a617a33bc4ae7957d038dd764ad840489e4f2f6b8d046e6f9
+DIST Pacemaker-1.0.11.tar.bz2 6706773 SHA256 568a8a7257ca9eb2d546c74fb18ee27d1e4e8eb58d9e2be0325cda1569b0ae75
+DIST pacemaker-1.0.12.tar.gz 7481273 SHA256 a3b4ea4106eda19ff5569bf0631168454b481fbfd23342421010832cce0a504e SHA512 a6944318cfbddaacfd87dda82be9c377af85cb9f92f913d785f5e8a060c23480a972efc0b255af9ad7c1bbd0f7c5ee57f5e7d9797fe3b2549f4c31c7751c1d86 WHIRLPOOL 2f707c4f74c235b358fff50b4e60069b4c16c9fac5114a74ba75d6aca85c67c56b43f49d1496f876b55e652585d4908e060306cb2a3579e2b15b15d0c2b217f5
+DIST pacemaker-1.1.6.1.tar.gz 8722056 SHA256 57b962cce13ae2a11e2439fb6c88722233baac329b5a634a42e410f0ce8db059
+DIST pacemaker-1.1.7.tar.gz 9207389 SHA256 acf02495a24efbe21c18d1f4a2289b4e91374fd56c0ceaaa402ae1cf88219861
+EBUILD pacemaker-1.0.10.ebuild 1779 SHA256 642b4687ce2abdbba8fcad04fc6c76f1aa3ddae94a84e4b85081524b87b7a65c SHA512 89deb4b02e43509591b1d62696a1e64a0e7ba31884124e1f9d9b89b27c579723d57ad931a6c12d263535b34c3bfa93b1a531731ed0b8f85d9744f08e511879bd WHIRLPOOL 06192033358d9700a3d786bffb074d1708f49e907ef2e9ac39f62a8ace867700b651275be7891dca7e9d1d8d46198c9cca26c0493e9416045648fbb9e45466ea
+EBUILD pacemaker-1.0.11.ebuild 1763 SHA256 693a452ee09487ab23cc7a0e83f78249eb962644637ff4d1c68337ab93e9f5ed SHA512 54589d39d6392afebf7f612007dc51b8bc36730bcc08de80597e5c41e2165694adffb1a8b4ddf18f0d051af573eba252610ad1c23e4225894e6908da8dd13f8a WHIRLPOOL 8a0c2ccd8e3d9aba8767607431efbe18c1265a815a840f58cfebfb6fc63fa28d5eed79535d06af24baae2adf2cac9c14bf44298969ffa0744799a0feffacfab6
+EBUILD pacemaker-1.0.12.ebuild 1746 SHA256 a60dc17a676fdb6b9c5542341bc92389d382ea007ae68ed724740debb21527cb SHA512 d5804cc0b075b49130fa5f4d2442b9eba8d5e3534e33e18eaabc6b9bb4cc9251db7ed9ca68dac6d2917bb5251ca7ce22ec1a15b1705c004e7c5d55b3d7368488 WHIRLPOOL 9dd76fdaeb543954f472f14c720e2d4bb525a6ba7df420d168398863c4d6d50b97e442c68c0ad800db1f4a6ed83bd7b9eba68da59d755b787f1848278f32a07c
+EBUILD pacemaker-1.1.6.1.ebuild 2350 SHA256 0d00fd97d4f15b9095ef4eb19751ed2f3d1640e5320fd818db124c42658278a6 SHA512 3c7a5d797fa7560b84a14516c7e6583ec1f1620f74711dcc98f9897b8ca5d98ecbe74608e72b016688d9588e6a9eb676ce6c8447096b3d4ded91866527a508da WHIRLPOOL ea5d9c183fa5b03608ddc923ea073cf18d85701cb3ed626dcd4be375d8c60e43f9921dc848b64b0f85794ab2819da37c02f42ae39461ce15de2ecac7189ce5fe
+EBUILD pacemaker-1.1.7.ebuild 2348 SHA256 ead218b4d921a3eed88a683746ee4b13de5579cd7ec26e8ecf30825b02d2ca5f SHA512 f835c8a7ffaa6cade3c2e2ad98ebd6ee75f46a3685aab92e989dcd5ee2fa38dc1206e31dff7bb87873861229e6f2d89e92156f5ebf2061fd25f50e61eb54f9b0 WHIRLPOOL 911731fa68d48dc55e756c17615e300a291870a6c03a211038e23c3b258d64788bff4e7a113fac9848733618155bec0bd56c1211cf01e8e42834fed37d160d57
+MISC ChangeLog 4409 SHA256 8b772b52a0af02104ae4e8eeb445f56f3a3eee89ef8b7480c03416b485ac4106 SHA512 a6e04c1bc841d47c42f8110564c33eae19abf7f4f03d782b1b0e90a5ebe32bff00e22c3db9141e4754bb651e4fc463d6f15bd3a2de054ef4489ee28649076093 WHIRLPOOL d382b0c2ca65de58afad75fff312fd96a043a260c3eec7d4c8714ff3a0c1bedb793101837b635f3b083d72b5f416b928ae68a5150dcde06b8382d334d8bfa8a6
+MISC metadata.xml 870 SHA256 ca8b9f3af29de78a1e6196cd392c6c85635f8f7fb2303befc762bd135439fd3b SHA512 57a334af692d25bd670f652d03aec50db6b19676910f8f988fff1f3e84af5d6c379204ee277eafcc8f570ad15445ce6364c9643f2d58540f9ee98b12ce9524c8 WHIRLPOOL 2e278c69b2f24eb38b876f832292bedcf2729252e36584c42a8438a965661bc63d87affe3e5e3e09b53b75a7e2f88e31f92edd857b1ff5ea897f47b286567c2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPxjTwAAoJEF0huFKJUZL5SnwP/RFyAH+TRaWeimb185XuBZ3q
-k2Mo2VWH39SAPyfFLhuYhwN9B7rI+N+xt6xLjB5/COHRzhRHCslTY6sdJreuo/n0
-JbLVEAlZ4ALADsHSecHy70q1rGEz/awS3cpkJAB02FFPrsNU+c8aUre31P/QXITS
-yEHOLeqiTKqZ52oHAmuPrtotX4jkaHjygIHhmhnmpJfnnkLdzU5iJZSkDQL1qovj
-Gx4ziVbxTJy6Uk8udqkL8uvG1YnOQjHdELWnFoV6VT0x//qbqGaHTWgHDHJILVCZ
-tc2NybndwFNsBe0O1lTVnB4cjUn/T07+ONIBTpSjxxxbVWrSm/kMeT8W35QK4ohz
-QVOX6PdPOZJSVRTTLiMs9T4Nbhc18U2DMTJrgDTTFH3jDkMNpDhYtE9+nHRIfRpd
-8Z1AHGl62Vq+mnzSN2RoLw7OSBk6yq+snm7uZ0Z8KMtBfHtKwKjxvgxDoSXlQxYD
-ADSpuia0A+RrdwwiUxXI/vO4Luite3CoiQIO7B4dgLQgehU1H6OPzWTeEF5V/N8z
-6YKexYB5g5uaH6KriFgOK7GgkDyYrhy9QkO7DXi2EKiUKOjRiOKn/6hBBsY5iWMT
-NrMNpLBWyjuBiStOW6Nc5x3MXgCfX28eMj9xNbttLQcDT064NTvnxPygNpJKq4qD
-zo0qBHF0Z/SmHKEwfdai
-=bIlu
+iF4EAREIAAYFAk/9NRAACgkQKiQSS7ZY+hPMJwEAt0lYKSSkw0FMFqzTAsHf8+pk
+kMHTciRIBnOXYbB+YhUA/iKjxp2gkBVslXYDKUkHcW0VDrAE2qv27bpjv6g+6o6F
+=uYCL
 -----END PGP SIGNATURE-----
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