diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2011-10-18 17:16:12 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2011-10-18 17:16:12 +0000 |
| commit | c551db49ecb3b9cb4d0fe362f6531c846867c628 (patch) | |
| tree | e57d4b4aefba76fd5d64230e51d9a80f3719747e /sys-fs | |
| parent | ppc stable wrt #372455 (diff) | |
| download | gentoo-2-c551db49ecb3b9cb4d0fe362f6531c846867c628.tar.gz gentoo-2-c551db49ecb3b9cb4d0fe362f6531c846867c628.tar.bz2 gentoo-2-c551db49ecb3b9cb4d0fe362f6531c846867c628.zip | |
Remove hartbeat-{1,2} support, bug 387543
(Portage version: 2.2.0_alpha69/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/evms/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-fs/evms/evms-2.5.5-r13.ebuild (renamed from sys-fs/evms/evms-2.5.5-r12.ebuild) | 25 | ||||
| -rw-r--r-- | sys-fs/evms/metadata.xml | 5 |
3 files changed, 11 insertions, 27 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/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> |