Fix heartbeat init script fix #438672

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

4 files changed, 116 insertions, 11 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index e3e0ef71a623..bde49902cde5 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.103 2012/05/04 07:20:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.104 2012/10/29 16:44:23 ultrabug Exp $
+
+*heartbeat-3.0.5-r1 (29 Oct 2012)
+
+  29 Oct 2012; Ultrabug <ultrabug@gentoo.org> +heartbeat-3.0.5-r1.ebuild,
+  files/heartbeat-init:
+  Fix init script vital directory creation wrt #438672 thx to Petric Frank.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> heartbeat-3.0.5.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index ea5e4c233aa8..33c580e23e20 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,8 +1,19 @@
-AUX 3.0.4-docs.patch 1727 RMD160 ec20f10c56ce13fa935818bd8dd3d7f528ad858b SHA1 b146ff45d6215973380766c8ea9a3bcaf1b97bd6 SHA256 68478a2cc1ca5a68a819ca88dcff64c9fd3d7dd34559f70507fed6ed985fc7f8
-AUX 3.0.4-fix_configure.patch 3322 RMD160 d6ed81c6c896c56a3de7706278e6a771c024f908 SHA1 924073d87e3ebb802cd69836ae595763021003f7 SHA256 6740e254d13d63e9b242de3492bb799d5743f5b7e746e28c509440bc48fabbea
-AUX 3.0.4-python_tests.patch 464 RMD160 f89b045be69ade44f454330ec6940fdaa80b863d SHA1 3fbd36b9f433b1b2ae3f40e620bb7b2f8bab98d4 SHA256 4adecb3af45c651bd28bc315e1e8607c2a1829a7295b155e1ad61e65afe0efaf
-AUX heartbeat-init 1770 RMD160 583e9081777c7143b0376a04150f1e125e63cd69 SHA1 2f6b3d17a335b99bc64eedf945490eb40c44fc23 SHA256 18c4dce7af12445ff207fabab83c70665b9724da224cb75b56d27a057ebb2f26
-DIST STABLE-3.0.5.tar.bz2 538986 RMD160 c2d29613e44c4fffc853db3aea0ca6d535723cf8 SHA1 8c13d83a54f2e2738cb93af37943449bcac4ab0f SHA256 fc7b11f9e1f16bc853434208a1ce86803acf1d0fb6f43715209a84c1c34661c3
-EBUILD heartbeat-3.0.5.ebuild 2029 RMD160 7977f7ac388c7b7255e2b77ec9cd58739b96a2b3 SHA1 3894ca01628a6b07559a5e8f08ec02212e4b2680 SHA256 41bd3c59c78cf11070c39d3f49bd1810211a46e7fecabc60bcc656dae5b5dc70
-MISC ChangeLog 17249 RMD160 7b30c9852ac2997ea3762a54520713b7a620f30d SHA1 b3af4c46681f42fdac9a5dcb6f7cdac722fb6b19 SHA256 acedf4ed2a7b0794d4ce4969734f871b30a210272d0c5029626dfe934f11c611
-MISC metadata.xml 272 RMD160 868ee60a671bc6262c57dfb9ecc30341354e3936 SHA1 097c1cb38fedb913617e0339aa476c21defd9fe5 SHA256 5e1fe1f75603b05ad8e099bd10e1a7b6894baa1a6562471da4e0c87e3c2d378d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 3.0.4-docs.patch 1727 SHA256 68478a2cc1ca5a68a819ca88dcff64c9fd3d7dd34559f70507fed6ed985fc7f8 SHA512 45d2a09a7171f76224ae643c3607f9cf495fcf05ac455b4300781da4a22af867f1a6ecfd1e85a817fe90df35c0e0c41fb068be81f8b31d540506ed0152ef0077 WHIRLPOOL d42a5d0e705adc0be4dd80c8386de4cea6506e69ae78c3ffd45499727c75b4ed05847722d630372c69e7dadcfcea72da14c8adf3d7fe2f36b4db461ad7de7664
+AUX 3.0.4-fix_configure.patch 3322 SHA256 6740e254d13d63e9b242de3492bb799d5743f5b7e746e28c509440bc48fabbea SHA512 d76120ecd481749607b56afe63e7d4141a881cb2e7e51a18af185f063c96c4f16b39c853b20bd97fcdb7024208d0cd0bb5ca0f61e4c96f7926bb9cd82e4ec0df WHIRLPOOL 3aa8feb0dab5a7122a73471b5dd9223e0bddc4c0ffef772cef4a7c85351b4302a8466b4963368c6001e5fc8fa595ff822cb60758e840bf5b328fd0d873b7a137
+AUX 3.0.4-python_tests.patch 464 SHA256 4adecb3af45c651bd28bc315e1e8607c2a1829a7295b155e1ad61e65afe0efaf SHA512 337775d86ad246a8fdde81c04f03bd8d99d2a5410c67084cc220f7316c734c69fe8206384b71c3d43417689099a831bca9b0190e7ee215c47b3ee17001a831aa WHIRLPOOL 3e113e414c5c12970c01cd16b1342c8a30e3b144b983fd7ba8ed885fe316c39837d6b47cee8dfbe2245801dc4103a6f88798df984fe17dab3f68215afbd1d9d9
+AUX heartbeat-init 1829 SHA256 8df2337e77799fc43b4c5b9d4322201d26f96885c2e25dda0abaa57094764876 SHA512 5c6d48e854bafde8a80720ad8208120e0c58c438b8dbd2530a24e919ed57cdff06c0f09356082c803253e68ce4936583607e18c527a41aff361e7351f19706d5 WHIRLPOOL ee38abcd5f33bfc658e26e399250434dfb772655b9eb5502e05af3e90de22db32a8da4a5f5c446c195b31ac1452e8e633e5d0507c9dc82912f0a1f5762653b3e
+DIST STABLE-3.0.5.tar.bz2 538986 SHA256 fc7b11f9e1f16bc853434208a1ce86803acf1d0fb6f43715209a84c1c34661c3
+EBUILD heartbeat-3.0.5-r1.ebuild 2037 SHA256 3932b3459b59f6dc814aa306d68ab956fa0da08c17b715c5ed200f85367829b1 SHA512 1c16dee36bf573d4519372715b5855dc8a3b157542df5938882e930033bec12e7c5438c1f2b8b3c763466bea2829ca4e7bb2d014f30e025dd182993cc6e90437 WHIRLPOOL 2d884cb4919563373eef4cec5b28c631d588d29f8ff751ccae2e6333daa1044422f18ef10a95c674622d5fdef915bee1cf4a5007be3c1e1eb4145ee3061e82c6
+EBUILD heartbeat-3.0.5.ebuild 2029 SHA256 41bd3c59c78cf11070c39d3f49bd1810211a46e7fecabc60bcc656dae5b5dc70 SHA512 1aa5305a9e71e6719f5503ee990b563f25bd1d2760faa358370f4c025eaca4b3a6652356d39d5f5c107de8e7c7567b9cb1f1d72c333b346ce5589da4a1416010 WHIRLPOOL f55688e54b7d034c335a711c3c159796677859e92deab70bfdbf8215506bd7b75d44d19edf8af88c2059970dffa480fe5e38f6c91c3906bef4592c7424ea46f8
+MISC ChangeLog 17461 SHA256 4381879e56357efe2b1bc4518cfe4c56dbb7b9975a3a1607bde4415dcd980a9b SHA512 1e194d65a51c0e9764798e680c1cdfc920785d87b107f146b456c48a99e5a9c9a50a004f55b52dcfcc830de46aba8889a4aea507e70293bb26175350286fb135 WHIRLPOOL 4751b8c84a62f28ac9504055a8b2b188904b2538d264c562ecc29f9cbfea63d00f46aaed02448bad4f394272709f5b85e7a476f36691c9285ed28a438e66d6ff
+MISC metadata.xml 272 SHA256 5e1fe1f75603b05ad8e099bd10e1a7b6894baa1a6562471da4e0c87e3c2d378d SHA512 94a2917ffdbcae97bdf62d487868ded60f498b5cb11075ac89be835bf340df99f6dfabbff41ae4efe07235423db5fc7fee0c9f4d281c6d9a579ae2c1134e1047 WHIRLPOOL fc606d06d9f58d17b5709b7d0c5f4aa4afc5a6af56cc6eab663b899e2d54fe9429bbbf88d31104e724c9ef0d5c43048732de262a13742bf667efe5135b839fad
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlCOsm0ACgkQKiQSS7ZY+hMBsQEAhO0PLDXPHd0dh3uYF21gqrE+
+B0bgzs14UW3pnyUo6u0A/2Ba3RLiZETD/y4yIreq1BkbdzYH/jbvDO5WZPmcyPcW
+=1Fqr
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/heartbeat/files/heartbeat-init b/sys-cluster/heartbeat/files/heartbeat-init
index 5a81a21ce818..1de6fc5862e4 100644
--- a/sys-cluster/heartbeat/files/heartbeat-init
+++ b/sys-cluster/heartbeat/files/heartbeat-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/files/heartbeat-init,v 1.7 2007/03/01 00:48:11 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/files/heartbeat-init,v 1.8 2012/10/29 16:44:23 ultrabug Exp $
 
 HA_DIR=/etc/ha.d
 . $HA_DIR/shellfuncs
@@ -26,6 +26,8 @@ RunStartStop() {
 }
 
 start() {
+	checkpath -q -d -m 0755 -o root:root /var/run/heartbeat
+
 	ebegin "Starting heartbeat"
 
 	. $HA_DIR/shellfuncs
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.5-r1.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..0fe750c33700
--- /dev/null
+++ b/sys-cluster/heartbeat/heartbeat-3.0.5-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.5-r1.ebuild,v 1.1 2012/10/29 16:44:23 ultrabug Exp $
+
+EAPI="2"
+
+PYTHON_DEPEND="2"
+inherit python autotools multilib eutils base
+
+DESCRIPTION="Heartbeat high availability cluster manager"
+HOMEPAGE="http://www.linux-ha.org/wiki/Heartbeat"
+SRC_URI="http://hg.linux-ha.org/${PN}-STABLE_3_0/archive/STABLE-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc snmp static-libs"
+
+RDEPEND="sys-cluster/cluster-glue
+	dev-libs/glib:2
+	virtual/ssh
+	net-libs/gnutls
+	snmp? ( net-analyzer/net-snmp )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-lang/swig
+	doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets )"
+
+PDEPEND="sys-cluster/resource-agents"
+
+S=${WORKDIR}/Heartbeat-3-0-STABLE-${PV}
+
+PATCHES=(
+	"${FILESDIR}/3.0.4-fix_configure.patch"
+	"${FILESDIR}/3.0.4-docs.patch"
+	"${FILESDIR}/3.0.4-python_tests.patch"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	ewarn "If you're upgrading from heartbeat-2.x please follow:"
+	ewarn "http://www.gentoo.org/proj/en/cluster/ha-cluster/heartbeat-upgrade.xml"
+}
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+
+	cp "${FILESDIR}"/heartbeat-init "${T}" || die
+	sed -i \
+		-e "/ResourceManager/ s/lib/share/" \
+		-e "s:lib:$(get_libdir):g" \
+		"${T}"/heartbeat-init || die
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-fatal-warnings \
+		$(use_enable static-libs static) \
+		$(use_enable doc) \
+		--disable-tipc \
+		--enable-dopd \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable snmp)
+}
+
+src_install() {
+	base_src_install
+
+	newinitd "${T}/heartbeat-init" heartbeat || die
+
+	# fix collisions
+	rm -rf "${D}"/usr/include/heartbeat/{compress,ha_msg}.h
+
+	use static-libs || find "${D}"/usr/$(get_libdir) -name "*.la" -delete
+
+	if use doc ; then
+		dodoc README doc/*.txt doc/AUTHORS  || die
+	fi
+}