Remove hartbeat-{1,2} support, bug 387543

Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64

4 files changed, 19 insertions, 37 deletions

diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 49c6c147e102..20137d3bec4b 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/evms
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.103 2011/07/08 10:00:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.104 2011/10/18 17:16:11 reavertm Exp $
+
+*evms-2.5.5-r13 (18 Oct 2011)
+
+  18 Oct 2011; Maciej Mrozowski <reavertm@gentoo.org> -evms-2.5.5-r12.ebuild,
+  +evms-2.5.5-r13.ebuild, metadata.xml:
+  Remove hartbeat-{1,2} support, bug 387543
 
   08 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> evms-2.5.5-r12.ebuild:
   Convert from "hasq" to "has".
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index be05c1a177ea..de632b9c9ce7 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST evms-2.5.5.tar.gz 2286321 RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 SHA1 8c679e958398a299f7b3c76f4dd552d6bf35a28b SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c
 DIST evms-patches-2.5.5-3.tar.bz2 8372 RMD160 f391ae1eb0011f92e42c92b3360f59ed275aa96f SHA1 4db6c880de762fdf9e329e16de98417636762922 SHA256 f46486427e753a7506d8ea6c351ed045edafce82436f5eef8288e667b6d05e46
-EBUILD evms-2.5.5-r12.ebuild 4341 RMD160 bf7775b404f85b951b74e6b2c61b10e658e61b1f SHA1 9a1d512651faa4466925a334fc62fbd5e6b095e4 SHA256 adc833b193a8208a61a205f910ad03ff89c75bb1b703feb90d81ee20394b3daf
-MISC ChangeLog 718 RMD160 f934028ce90c823f92ace84db071b0eb35b3d69e SHA1 ed932b82f2c563fbc2a2e3f7c2498efeca3b23b8 SHA256 d6912ae74ce57ad779917aaffb7708a462c0e9e940d43ecd27a42d6e538a7606
-MISC metadata.xml 470 RMD160 44e648294100c2f5ef66a4f10bbd0dbaf18a3e58 SHA1 0a75ab4bae3f82b719d9fb8989456f2e5d5b1e21 SHA256 2a1ed12098cebfd46264ad712c3ae6687f5cc60aa00c1fbf0d6d3685234f5584
+EBUILD evms-2.5.5-r13.ebuild 3912 RMD160 38144dd765e237e01af1a4430dcef40876103208 SHA1 df7b30c4403b76a6db5c3d1be9b507ca9baa132c SHA256 5386f82b89578e898939e58c8c2dc9692a6330a229ac264478e1fafc507336e8
+MISC ChangeLog 911 RMD160 7349fb2f21a94097969d2e1a396ab1c297d7edf5 SHA1 c241824b16a4dbcc1e64d7b3369f18851cc3658c SHA256 74d66af6b9ed19557424ac812b07a68d1596456748a3b6bb5a3337af3325d2fa
+MISC metadata.xml 341 RMD160 afe36b4fa93a0f0acaa87cfef5f1012ce947245d SHA1 e7e219c97874a2bcb7e75f5b1e849239960c62d7 SHA256 1aed14ecc896a61c969ddef9024f30eeaf77d6a4cd5a2671dedfab9cc1db4bde
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59s3MACgkQfXuS5UK5QB1W9gP/enpUnXgX+iOUBWW8YG1NT5lw
-o7jBH8051cgIm+vo0qa/C2/houWN5C4JZbEtCThDh3gKeHDa2cEf4VtnWmUbSOYu
-kdQxdYN9JIdebE9QxyMhpwc0zcLCQLULAvcN5fLpBPVxv5yfhNi/3XQMhyKMZaJk
-/+ZHkPPVqS4tG/vOmZ0=
-=lkGU
+iEYEARECAAYFAk6dtGAACgkQFuHa/bHpVduUhACfdsXWXGF1jpXvUSRjDCje3vvV
+N8AAoJM3zp+dza99gMrawsbZcBELQZ9e
+=u1iP
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/evms/evms-2.5.5-r12.ebuild b/sys-fs/evms/evms-2.5.5-r13.ebuild
index dfcfa0764765..7b92fa35a508 100644
--- a/sys-fs/evms/evms-2.5.5-r12.ebuild
+++ b/sys-fs/evms/evms-2.5.5-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r12.ebuild,v 1.2 2011/07/08 10:00:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r13.ebuild,v 1.1 2011/10/18 17:16:11 reavertm Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://gentoo/${PN}-patches-${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="hb hb2 ncurses nls"
+IUSE="ncurses nls"
 
 # sys-apps/util-linux: libuuid
 # sys-libs/readline: evms cli
@@ -26,10 +26,6 @@ RDEPEND="
 		sys-fs/device-mapper
 		>=sys-fs/lvm2-2.02.45
 	)
-	hb? (
-		!hb2? ( =sys-cluster/heartbeat-1* )
-	)
-	hb2? ( >=sys-cluster/heartbeat-2 )
 	ncurses? (
 		>=dev-libs/glib-2.12.4-r1
 		sys-libs/ncurses
@@ -46,11 +42,6 @@ RESTRICT="test"
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
 pkg_setup() {
-	if use hb && use hb2 ; then
-		ewarn "It's not possible to have support for heartbeat version 1 and 2 at the same time."
-		ewarn "Assuming  that you want heartbeat-2, if not, please do not enable the hb2 use flag."
-	fi
-
 	get_running_version
 	if [[ ${KV_MAJOR} -eq 2 ]]; then
 		if [[ ${KV_PATCH} -lt 19 ]] || [[ ${KV_MINOR} -eq 4 ]]; then
@@ -75,17 +66,9 @@ src_configure() {
 	replace-flags -O3 -O2
 	replace-flags -Os -O2
 
-	# hb2 should override hb
-	local myeconfargs=(
-		$(use_enable hb ha)
-		--disable-hb2
-	)
-	use hb2 && myeconfargs=(
-		--disable-ha
-		--enable-hb2
-	)
-
 	myeconfargs+=(
+		--disable-ha
+		--disable-hb2
 		--disable-gui
 		--enable-cli
 		--without-debug
diff --git a/sys-fs/evms/metadata.xml b/sys-fs/evms/metadata.xml
index e55ebdbb8a0b..c9496660184f 100644
--- a/sys-fs/evms/metadata.xml
+++ b/sys-fs/evms/metadata.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer>
 		<email>reavertm@gentoo.org</email>
 		<name>Maciej Mrozowski</name>
 	</maintainer>
 	<longdescription>evms is a volume management system written by IBM, it's open source</longdescription>
-	<use>
-		<flag name='hb'>Enable support for heartbeat-1</flag>
-		<flag name='hb2'>Enable support for heartbeat-2</flag>
-	</use>
 </pkgmetadata>