Version bump

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

3 files changed, 96 insertions, 7 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index d53f53e92232..1884692e3964 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.94 2011/04/16 18:59:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.95 2011/06/24 09:40:13 ultrabug Exp $
+
+*heartbeat-3.0.5 (24 Jun 2011)
+
+  24 Jun 2011; Ultrabug <ultrabug@gentoo.org> +heartbeat-3.0.5.ebuild:
+  Version bump.
 
   16 Apr 2011; Raúl Porcel <armin76@gentoo.org> heartbeat-1.2.5-r1.ebuild,
   heartbeat-2.0.8.ebuild:
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index 12f618a4216d..ac8f11b5bc03 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 3.0.4-docs.patch 1728 RMD160 95e043df6208ce0899e5473e5e34d63cf49face6 SHA1 46a19d06b9cf06f72a3f5292c2083ff21cbec69b SHA256 035698b8a53e7a59a29a1bf81e64f96c56f6b231d195da85d107985303fe0fe0
 AUX 3.0.4-fix_configure.patch 2996 RMD160 d142f1c0346ee25a0c1616db41f25ca35c7adb6e SHA1 92987cf7a938fcd6b64a9e599a89dd527bcd0264 SHA256 663ddbae715e8f0ba1926dcc5e0f67404b0b7d3cbe569f0253ac9eb5ca2ec3d1
@@ -13,6 +13,7 @@ AUX heartbeat-2.0.8-glibc.patch 532 RMD160 16e4fff7ccb75ac06c804998a8e92d4576dfe
 AUX heartbeat-2.0.8-install_fix.patch 300 RMD160 8fbf8b5f741d434976dbcfd16d5c6f3d0f93aa2b SHA1 4c66495d491c76f1005a0054cad1eefda0cdb917 SHA256 8c51a07100d7e15b6961c01e05f542bb2501e053e38fb5d8c684bb573770fdc2
 AUX heartbeat-init 1770 RMD160 583e9081777c7143b0376a04150f1e125e63cd69 SHA1 2f6b3d17a335b99bc64eedf945490eb40c44fc23 SHA256 18c4dce7af12445ff207fabab83c70665b9724da224cb75b56d27a057ebb2f26
 DIST STABLE-3.0.4.tar.bz2 537449 RMD160 849fd1ca46bb247b3115fea978bb6e639f8a2718 SHA1 41920cebc9e260d5ac43be742c74c5e3998ef571 SHA256 8f6997acd673d7ffef9f5946fa507d78b5c81dd0941e998c71cd72dd61a39784
+DIST STABLE-3.0.5.tar.bz2 538986 RMD160 c2d29613e44c4fffc853db3aea0ca6d535723cf8 SHA1 8c13d83a54f2e2738cb93af37943449bcac4ab0f SHA256 fc7b11f9e1f16bc853434208a1ce86803acf1d0fb6f43715209a84c1c34661c3
 DIST heartbeat-1.2.5.tar.gz 2107371 RMD160 0e94fa64339b9b77e11ffe92cffa66fef4f4f2b0 SHA1 eeea454bcf0e12dd1135f6544c95584fa2e66770 SHA256 46f88a69324012317a4426dc93654ab28947b77675826686624d15cd5a4e357f
 DIST heartbeat-2.0.7.tar.gz 3327126 RMD160 8fe70e64fc6714fef4e501ae0b240d870a51cf75 SHA1 c0caf848b90d2fc76e0a390aaf59352d580d714a SHA256 008214f51fd0c49e168d1bb262cb5c967bc166f99d0c8ff3a2623c8ba51a0ab3
 DIST heartbeat-2.0.8.tar.gz 3502095 RMD160 76f3a56cbbafac8c35a87266b73d46a86de86feb SHA1 1805fc4c6218f05006c506d532728c6664d5a35c SHA256 b8425098e1243976f1e9deedfbf763fd42f0461bdd8933b0b8a94f0626912c91
@@ -21,12 +22,13 @@ EBUILD heartbeat-1.2.5.ebuild 1983 RMD160 7dd59eece32bd4e3188cb0e79abf77780e6efd
 EBUILD heartbeat-2.0.7-r2.ebuild 3561 RMD160 75590142b265202e365c24176c0fe8413efd75d3 SHA1 34569b2284c2deee3cb3ab139ef3a4cc9329bdd9 SHA256 2ce7f5dbd9917d54f766e2dcb2173c4334947a2b86524b302cb62349b948c4b3
 EBUILD heartbeat-2.0.8.ebuild 4016 RMD160 7f0e9274e8d8d836ad70c1e7268454660f4ad667 SHA1 8076300a04563cea503a021a872130ad874d1846 SHA256 81b260d63d635156f6d16c2de79b2e15d566b6727a74b94fd7dcbcb63a13f93c
 EBUILD heartbeat-3.0.4-r1.ebuild 1901 RMD160 b46b0090c6f3f4a3069e88216990cdbe59f22aee SHA1 ef71001d4ccbfee944cc78da2a7177f07da23d67 SHA256 1922be0711a6300131af98e29f8df8fc4debcca818f623c3aca3121f0eb00a6e
-MISC ChangeLog 15557 RMD160 df35e457078033fda1334aac396f16258767bbf8 SHA1 9e5fdc908565a30e2c6675d8d44f51c7dc155ac6 SHA256 d78628c5df4563ae2ca4e3374183640fb873649a48b81e7eb16b749b9a934150
+EBUILD heartbeat-3.0.5.ebuild 1903 RMD160 3d14055349d2519b8a37d555825b5cdccbabd3eb SHA1 5890f3eab61246426acddd5cfa5414c2109e0aac SHA256 a99c58872501bd109333a08e9149c1c135e47d1a4fb404b0e0544e316290ae93
+MISC ChangeLog 15678 RMD160 46403b29e1e6687ce681de9f1c5b2bf26b75903c SHA1 ab3cf7d8a35a62e95f714b651b3564ecec2df77e SHA256 16c89f3e2b4b49a38523e1f76e7c7436bffcf4fe1ee5dce836b3e1f3ee859ef1
 MISC metadata.xml 459 RMD160 cef650d4af8ca48c3b73326cac202bc5475e036a SHA1 0a0cb879039ff023e83a5367ba656d83134de099 SHA256 a6f642dd6b76d6b97226688edd56d095aa97eb8ea76c273c7c321e1f9bfda6b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2p5wUACgkQuQc30/atMkDrYACdEbjWfIb6kC+K6b+G+IHkze4a
-fXgAniGGeq2DqB//yAmOv++Y4Y4h7cAo
-=JW9u
+iF4EAREIAAYFAk4EW4YACgkQKiQSS7ZY+hPOuAEAsTmgvd4D82SM9n53XYNqXbjQ
+EChKxRSLPf8O5Tqusr0A/3SlJkY9v6O0ZQJVrGT+nTQ8NjuDUVDgpsdZzyimzFHN
+=iEo5
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild
new file mode 100644
index 000000000000..ccfb21b8c85b
--- /dev/null
+++ b/sys-cluster/heartbeat/heartbeat-3.0.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 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.ebuild,v 1.1 2011/06/24 09:40:13 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}
+	dev-util/pkgconfig
+	dev-lang/swig"
+
+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
+
+	if use doc ; then
+		dodoc README doc/*.txt doc/AUTHORS  || die
+	fi
+}